Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

resources/views/customer/project/create.blade.php

@@ -782,7 +782,7 @@
                         }else{
                             this.model.storage.amount_interval.forEach((amount,i)=>{
                                 if (amount==="")error["amount_interval."+i] = ["未设定数量区间"];
-                                else if (i!==0 && amount<=this.model.storage.amount_interval[i-1])
+                                else if (i!==0 && Number(amount)<=Number(this.model.storage.amount_interval[i-1]))
                                     error["amount_interval."+i] = ["阶梯区间应大于上一区间值"];
                                 this.model.storage.amount_interval[i] = parseFloat(this.model.storage.amount_interval[i]);
                             });
@@ -998,12 +998,12 @@
                     if (this.model.express.isInterval){
                         this.model.express.amount_interval.forEach((amount,i)=>{
                             if (amount==="") error["amount_interval."+i] = ["区间值不得为空"];
-                            else if (i!==0 && amount<=this.model.express.amount_interval[i-1])error["amount_interval."+i] = ["阶梯区间应大于上一区间值"];
+                            else if (i!==0 && Number(amount)<=Number(this.model.express.amount_interval[i-1]))error["amount_interval."+i] = ["阶梯区间应大于上一区间值"];
                             if (this.model.express.weight_interval[i].length>0){
                                 this.model.express.weight_interval[i].forEach((weight,j)=>{
                                     this.model.express.weight_interval[i][j] = parseFloat(this.model.express.weight_interval[i][j]);
                                     if (weight==="") error["weight_interval."+i+"."+j] = ["区间值不得为空"];
-                                    else if (j!==0 && weight<=this.model.express.weight_interval[j-1])error["weight_interval."+i+"."+j] = ["阶梯区间应大于上一区间值"];
+                                    else if (j!==0 && Number(weight)<=Number(this.model.express.weight_interval[j-1]))error["weight_interval."+i+"."+j] = ["阶梯区间应大于上一区间值"];
                                 })
                             }
                         });