s

2020-1-16/TUI计算界面/main.js

@@ -103,7 +103,7 @@ var items = {
                         res = (Number(num1)*temp * Number(num2)*temp)/temp/temp
                     break;
                     case "/":
-                        res = (Number(num1)*temp / Number(num2)*temp)/temp
+                        res = ((Number(num1)*temp) / (Number(num2)*temp))
                     break;
                     case "%":
                         res = (Number(num1)*temp % Number(num2)*temp)/temp
@@ -140,6 +140,15 @@ function getNumFixed(num){
     if(!/\./g.test(num)){ 
         return 0
     } else {
-        return String(num).split(".")[1].length
+        var res = String(num).split(".")[1]
+        return removeZero(res).length
     }
 }
+
+function removeZero(str){
+    var s = str[str.length-1]
+    if(s == "0"){
+        return removeZero(str.substring(0, str.length-1)) 
+    } 
+    return str
+}
\ No newline at end of file