ysy 2 rokov pred
rodič
commit
5e68117290

BIN
public/logo.png


+ 8 - 0
src/layout/index.vue

@@ -340,4 +340,12 @@
       }
     }
   }
+
+  .ele-admin-layout .ele-admin-logo img  {
+    height: auto !important;
+    width: 80px !important;
+    margin-right: 5px;
+    max-height: 35px
+  }
+
 </style>

+ 5 - 8
src/utils/math.js

@@ -7,13 +7,10 @@ export function add(a, b) {
   return (a * powN + b * powN) / powN;
 }
 
-export function multiply(a, b) {
- 
-  let aLen = (a + '').split('.')[1]?.length || 0;
-  let bLen = (b + '').split('.')[1]?.length || 0;
-
-  const powA = Math.pow(10, aLen);
-  const powB = Math.pow(10, bLen);
+export function multiply(arg1, arg2) {
+	var m = 0, s1 = arg1.toString(), s2 = arg2.toString();
+	try { m += s1.split(".")[1].length } catch (e) { }
+	try { m += s2.split(".")[1].length } catch (e) { }
+	return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
 
-  return (a * powA * (b * powB)) / (powA * powB);
 }

+ 1 - 1
src/views/saleOrder/components/create-order.vue

@@ -252,7 +252,7 @@ export default {
     },
     // 确定选择
     confirmChoose(list) {
-      console.log(list)
+      console.log('444',list)
       console.log(
         'this.form.productInfoList',
         deepClone(this.form.productInfoList)