概率用百分比展示

src/common/raffleProbability.js

-function getCommonDivisor(firstNum, secondNum) {
-  if (secondNum === 0) return firstNum;
+// function getCommonDivisor(firstNum, secondNum) {
+//   if (secondNum === 0) return firstNum;
 
-  var remainder = parseInt(firstNum % secondNum);
+//   var remainder = parseInt(firstNum % secondNum);
 
-  return getCommonDivisor(secondNum, remainder);
-}
+//   return getCommonDivisor(secondNum, remainder);
+// }
 
-function getProbability (quantity, coinQuantity) {
-  // 如果用户克币数是0
-  if (quantity === 0) {
-    return '0';
-  }
-  var divisor = getCommonDivisor(quantity, coinQuantity);
-  var value = quantity / divisor;
-  var value2 = coinQuantity / divisor;
-  // 如果分子比分母大说明中奖概率是100%，那么返回中奖概率
-  if (value >= value2) {
+// function getProbability (quantity, coinQuantity) {
+//   // 如果用户克币数是0
+//   if (quantity === 0) {
+//     return '0';
+//   }
+//   var divisor = getCommonDivisor(quantity, coinQuantity);
+//   var value = quantity / divisor;
+//   var value2 = coinQuantity / divisor;
+//   // 如果分子比分母大说明中奖概率是100%，那么返回中奖概率
+//   if (value >= value2) {
+//     return '100%';
+//   } else {
+//     return value + '/' + value2;
+//   }
+// }
+
+function getProbabilityByPercent(quantity, coinQuantity) {
+  if (quantity === 0) return '0%';
+
+  const quotient = quantity / coinQuantity;
+  if (quotient < 0.01) {
+    return '0.01%';
+  } else if (quotient >= 1) {
     return '100%';
   } else {
-    return value + '/' + value2;
+    const reg = new RegExp('\\.?0+$');
+    let str = quotient.toFixed(2);
+    return str.replace(reg, '') + '%';
   }
 }
 
@@ -56,6 +71,6 @@ function checkUpdateVersion() {
   });
 }
 module.exports = {
-  getProbability,
+  getProbability: getProbabilityByPercent,
   checkUpdateVersion
 };

src/common/raffleProbability.wxs

@@ -4,8 +4,22 @@ function getCommonDivisor(firstNum, secondNum) {
   return getCommonDivisor(secondNum, remainder);
 }
 
-module.exports = {
-  getProbability: function (quantity, coinQuantity) {
+function getProbabilityByPercent(quantity, coinQuantity) {
+  if (quantity === 0) return '0%';
+
+  var quotient = quantity / coinQuantity;
+  if (quotient < 0.01) {
+    return '0.01%';
+  } else if (quotient >= 1) {
+    return '100%';
+  } else {
+    var reg = getRegExp('\\.?0+$')
+    var str = quotient.toFixed(2);
+    return str.replace(reg, '') + '%';
+  }
+}
+
+function getProbability(quantity, coinQuantity) {
     if (!quantity) return 0;
     // 如果用户克币数是0
     if (quantity === 0) {
@@ -21,4 +35,7 @@ module.exports = {
       return value + '/' + value2;
     }
   }
+
+module.exports = {
+  getProbability: getProbabilityByPercent 
 };

src/common/utils.js

@@ -55,26 +55,3 @@ export function compressShareImage(url) {
   }
   return url;
 }
-
-function getCommonDivisor(firstNum, secondNum) {
-  if (secondNum === 0) return firstNum;
-  var remainder = parseInt(firstNum % secondNum);
-  return getCommonDivisor(secondNum, remainder);
-}
-
-export function getProbability(quantity, coinQuantity) {
-  if (!quantity) return 0;
-    // 如果用户克币数是0
-  if (quantity === 0) {
-    return '0%';
-  }
-  var divisor = getCommonDivisor(quantity, coinQuantity);
-  var value = quantity / divisor;
-  var value2 = coinQuantity / divisor;
-    // 如果分子比分母大说明中奖概率是100%，那么返回中奖概率
-  if (value >= value2) {
-    return '100%';
-  } else {
-    return value + '/' + value2;
-  }
-}

src/components/custom/video.wpy

@@ -53,7 +53,7 @@
 <script>
   import wepy from '@wepy/core';
   import { getAwardsDetail, getPrizeList } from '../../common/api.js';
-  import {getProbability} from '../../common/utils';
+  import {getProbability} from '../../common/raffleProbability';
   wepy.component({
     props: {
       videoList: {