Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-ui-pc into dev

src/views/setting/template/create.vue

@@ -44,12 +44,12 @@
                   </el-form-item>
                 </td>
                 <td>
-                  <el-form-item :prop="`shippingTemplateRuleList.${index}.createNumber`" :rules='[{ required: true, message: "件数不能为空", trigger: "blur" },{ pattern: /^([1-9]\d*)$/, message: "请输入正确的件数", trigger: ["blur", "change"]}]' label-width="0">
+                  <el-form-item :prop="`shippingTemplateRuleList.${index}.createNumber`" :rules='[{ required: true, message: "件数不能为空", trigger: "blur" },{ pattern: /^([0-9]\d*)$/, message: "请输入正确的件数", trigger: ["blur", "change"]}]' label-width="0">
                     <el-input v-model="item.createNumber" placeholder="请输入内容"></el-input>
                   </el-form-item>
                 </td>
                 <td>
-                  <el-form-item :prop="`shippingTemplateRuleList.${index}.createPrice`" :rules="[{ required: true, message: '运费不能为空', trigger: 'blur' },{ pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: '请输入正确的金额，最多两位小数', trigger: ['blur', 'change'] }]" label-width="0">
+                  <el-form-item :prop="`shippingTemplateRuleList.${index}.createPrice`" :rules="[{ required: true, message: '运费不能为空', trigger: 'blur' },{ pattern: /^([0-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: '请输入正确的金额，最多两位小数', trigger: ['blur', 'change'] }]" label-width="0">
                     <el-input v-model="item.createPrice" placeholder="请输入内容"></el-input>
                   </el-form-item>
                 </td>
@@ -404,23 +404,14 @@ export default {
             arr.push(item)
         })
       }
-      if(arr == ""){
-        this.$message({
-          showClose: true,
-          message: '请至少添加一个区域',
-          type: 'warning'
-        });
-        return;
-      }else {
-        for (let i = 0; i < arr.length; i++) {
-          if(arr[i].type == 1){
-            arr[i].createPrice = accMul(arr[i].createPrice,100)
-            arr[i].defaultPrice = accMul(arr[i].defaultPrice,100)
-          }
+      for (let i = 0; i < arr.length; i++) {
+        if(arr[i].type == 1){
+          arr[i].createPrice = accMul(arr[i].createPrice,100)
+          arr[i].defaultPrice = accMul(arr[i].defaultPrice,100)
         }
-        this.addData.shippingTemplateRuleList = arr
-        this.submitForm()
       }
+      this.addData.shippingTemplateRuleList = arr
+      this.submitForm()
     },
 
     submitForm(){