Przeglądaj źródła

fix(controller): 优化保留小数

Zhou Jianjia 3 lat temu
rodzic
commit
226987b28a
2 zmienionych plików z 4 dodań i 18 usunięć
  1. 3 17
      core/util.js
  2. 1 1
      pages/formula/slice.vue

+ 3 - 17
core/util.js

xqd
@@ -71,26 +71,12 @@ const checkTriangle = (a,b,c) => {
 }
 
 const round = (number,percent) => {
-    console.log('-->data',number)
     if(!number) return  number
+    number = parseFloat(number).toFixed(percent)
     let flag = number < 0 ? '-' : '';
     let arr = number.toString().split(".");
-    if(arr.length > 1 && arr[1].length === 2)  return  number
-    let i = Number('1'.padEnd(percent+1,'0'))
-    number = Math.floor(Math.abs(Number(number)) * i) / i
-    if(arr.length > 1 ){
-        let str = arr[1]
-        if((str.length > 2 && str[2] >= 6) || (str.length > 2 && str[3] >= 5 && str[2] >= 4)){
-            number = Math.ceil(number * i)
-            number += 1;
-            number = number / i;
-        }
-    }
-    if(number.toString().indexOf(".") === -1) number += ".0"
-    arr = number.toString().split(".");
-    arr[1] = arr[1].toString().padEnd(2,'0')
-    number = arr.join(".")
-    return flag+number;
+    arr[1] = arr[1].padEnd(percent + 1,'0')
+    return flag+arr.join(".");
 }
 
 const objectToUrlParams = function (obj, urlencode) {

+ 1 - 1
pages/formula/slice.vue

xqd
@@ -31,7 +31,7 @@
             <view class="calc-img">
                 <text class="slice1">{{rules.slice.value?$util.round(rules.slice.value/2,2):'**'}}{{rules.slice.unit}}</text>
                 <text class="slice2">{{rules.slice.value?$util.round(rules.slice.value/2,2):'**'}}{{rules.slice.unit}}</text>
-                <text class="slice3 bottom">{{rules.slice.value?rules.slice.value:'**'}}{{rules.slice.unit}}</text>
+                <text class="slice3 bottom">{{rules.slice.value?$util.round(rules.slice.value,2):'**'}}{{rules.slice.unit}}</text>
                 <u-image width="100%" height="300rpx" :src="mathImgs[name].calc" mode="aspectFit"></u-image>
             </view>
             <view class="title">切割图</view>