Merge branch 'sit'

src/views/mobile/order/addEdit.vue

@@ -29,7 +29,9 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="订单数量">
-                <span>{{ id.order_num }}{{id.unit}}/{{ id.unit_weight}}kg</span>
+                <span
+                  >{{ id.order_num }}{{ id.unit }}/{{ id.unit_weight }}kg</span
+                >
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -42,12 +44,19 @@
                 <span>{{ id.contector_mobile }}</span>
               </el-form-item>
             </el-col>
-            <el-form-item label="收货地址">
-              <span
-                >{{ id.provice_name }}{{ id.city_name }}{{ id.area_name
-                }}{{ id.addr }}</span
-              >
-            </el-form-item>
+            <el-col :span="24">
+              <el-form-item label="收货地址">
+                <span
+                  >{{ id.provice_name }}{{ id.city_name }}{{ id.area_name
+                  }}{{ id.addr }}</span
+                >
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="商品名称">
+                <span>{{ id.good_name }}</span>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-col>
         <el-col :span="24" v-if="isDetail === '009'">

src/views/mobile/order/index.vue

@@ -261,7 +261,11 @@ export default {
           fixed: "left",
           width: "160px",
         },
-
+        {
+          prop: "good_name",
+          label: "商品名称",
+          width: "130px",
+        },
         {
           prop: "username",
           label: "账户名",
@@ -375,7 +379,10 @@ export default {
         this.tableData.forEach((v1) => {
           v1.order_goods_num =
             v1.order_num + v1.unit + "/" + v1.unit_weight + "kg";
-          v1.order_goods_num_t = v1.order_num * 1 * (v1.unit_weight * 1) + "kg";
+          // v1.order_goods_num_t = v1.order_num * 1 * (v1.unit_weight * 1) + "kg";
+          v1.order_goods_num_t = this.accMul(this.accMul(v1.order_num,1),this.accMul(v1.unit_weight,1)) + "kg";
+
+          
         });
         console.log(this.tableData);
         this.pageInfo.total = Number(res.data.count);
@@ -386,6 +393,27 @@ export default {
         this.pageInfo.total = 0;
       }
       this.loading = false;
+
+      
+
+      
+      
+    },
+    //乘法精度问题
+    accMul(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)
+      );
     },
     /**
      * 导出

src/views/mobile/park/addEdit.vue

@@ -157,14 +157,10 @@ export default {
       if (value === "") {
         callback(new Error("账号不能为空！"));
       } else {
-        if (value.length !== 6) {
+        if (value.length > 10) {
           callback(new Error("账号不正确！"));
         } else {
-          if (!isnumber(value)) {
-            callback(new Error("账号不正确！"));
-          } else {
-            callback();
-          }
+          
         }
       }
     };
@@ -328,6 +324,7 @@ export default {
       }
     },
   },
+  
   methods: {
     restSearch() {
       this.select = "1";
@@ -419,7 +416,8 @@ export default {
           arr.push(v1.video_id);
         });
         this.ruleForm = {
-          username: username.substr(username.length - 6),
+          // username: username.substr(username.indexOf("CJ1745") + "CJ1745".length),
+          username: username.substr(6),
           password,
           starttime,
           expiretime,