Merge branch 'dev_hxz' into test

src/views/system/asset/withdraw/index.vue

@@ -36,10 +36,10 @@
           <p class="withdraw-tip-spe">当前提现手续费为：{{ chargeCount }} 元</p>
         </el-form-item>
 
-        <el-form-item label="支付密码：" prop="pay_pass">
+        <el-form-item label="提现密码：" prop="pay_pass">
           <el-input v-model="assetForm.pay_pass" type="password" placeholder="请输入提现密码" style="width:420px;"/>
           <span class="withdraw-tip">
-            忘记支付密码？<span class="spe-span-a" @click="goToSetting">重新设定</span>
+            忘记提现密码？<span class="spe-span-a" @click="goToSetting">重新设定</span>
           </span>
         </el-form-item>
 
@@ -89,7 +89,7 @@
         rules: {
           bank_id: [{required: true, message: "请选择要提现的银行卡", trigger: "change"}],
           code: [{required: true, message: "短信验证码不能为空", trigger: "blur"}],
-          pay_pass: [{required: true, message: "支付密码必须填写", trigger: "blur"}]
+          pay_pass: [{required: true, message: "提现密码必须填写", trigger: "blur"}]
         },
       };
     },

src/views/system/freight/freight_list/index.vue

@@ -109,7 +109,7 @@
           is_default: null,
           charge_type: null,
           dispatching: null,
-          disdispatching: null,
+          dis_dispatching: null,
           publish: null,
           created: null,
           modified: null,
@@ -212,7 +212,7 @@
           is_default: null,
           charge_type: null,
           dispatching: null,
-          disdispatching: null,
+          dis_dispatching: null,
           publish: null,
           created: null,
           modified: null
@@ -258,7 +258,7 @@
               np: 5,
             }
           ],
-          disDispatching: "",
+          dis_dispatching: "",
           publish: 0,
         };
         this.title = "添加运费模板";

src/views/system/freight/freight_list/indexbtn.vue

@@ -219,15 +219,22 @@ export default {
   },
   methods: {
     btndisabled(){
+      //debugger
       let checkListString = '';
-      if(this.btnindex == 99){
+      if (this.btnindex == 99) {
         checkListString = this.checkList.join();
-        if(checkListString.substr(0,1) === ',') {
+        if (checkListString.substr(0, 1) === ',') {
           checkListString = checkListString.slice(1);
         }
         this.goodsDate.dis_dispatching = checkListString;
-      }else{
-         this.goodsDate.dispatching[this.btnindex].a = this.checkList.join()
+      } else {
+        for(let i = 0; i < this.checkList.length; i++) {
+          if(this.checkList[i] == '') {
+            this.checkList.splice(i,1)
+            i--
+          }
+        }
+        this.goodsDate.dispatching[this.btnindex].a = this.checkList.join()
       }
       this.dialogVisible = false
     },
@@ -237,30 +244,37 @@ export default {
       })
 
     },
+    /** 选择 配送区域*/
     opendias(type, i, index) {
+      //debugger
 
       this.goodsDate.dispatching.forEach((element) => {
-        let arrd = element.a.split(',')
-        for(let i=0;i<arrd.length;i++){
-          this.disabledate.push(arrd[i]);
+        if(element.a && element.a != '') {
+          let arrd = element.a.split(',')
+          for (let i = 0; i < arrd.length; i++) {
+            this.disabledate.push(arrd[i]);
+          }
         }
       });
+
       let arr = this.goodsDate.dis_dispatching.split(',');
-      for(let i=0;i<arr.length;i++){
+      for (let i = 0; i < arr.length; i++) {
         this.disabledate.push(arr[i]);
       }
+
+
       this.btnindex = index;
-      this.arrlist.forEach(item =>{
-            item.value = false;
+      this.arrlist.forEach(item => {
+        item.value = false;
       })
       this.checkList = type.split(",");
 
       let disabledates = JSON.parse(JSON.stringify(this.disabledate)); //可以将json对象转换成json对符串
-      let disabarr = this.unique(disabledates,this.checkList) //去掉当前选择的disabled效果
-      this.arrlist.forEach(item =>{
-         if (disabarr.includes(item.lable)) {
-            item.value = true
-          }
+      let disabarr = this.unique(disabledates, this.checkList) //去掉当前选择的disabled效果
+      this.arrlist.forEach(item => {
+        if (disabarr.includes(item.lable)) {
+          item.value = true
+        }
       })
 
       this.dialogVisible = true;

src/views/system/order/components/orderDetail.vue

@@ -496,10 +496,12 @@ export default {
 
       // 批量 补单发货
       if (this.goShippingNum === 2 ) {
+        debugger
         let listObj = { list: [] }
         this.goods_ids.forEach((item,index)=> {
           item['express_name'] = expressName;
-          item['express_sn'] = this.express_sn
+          item['express_sn'] = this.express_sn;
+          item['express_code'] = this.expressNum;
         })
         listObj.list = this.goods_ids;
 
@@ -544,11 +546,13 @@ export default {
         let orderObj = {
           id: 0,
           express_name: '',
-          express_sn: ''
+          express_sn: '',
+          express_code: '',
         }
 
         orderObj.id = this.goods_ids;
         orderObj.express_name = expressName;
+        orderObj.express_code = this.expressNum;
         orderObj.express_sn = this.express_sn;
 
         singleOrderObj.list.push(orderObj);

src/views/system/settings/setpsd.vue

@@ -24,13 +24,13 @@
           <el-divider></el-divider>
         </div>
 
-        <el-form-item label="支付密码：">
+        <el-form-item label="提现密码：">
           <el-input v-model="setForm.paypsd" :disabled="true" style="width: 300px;margin-right:20px;"></el-input>
           <el-button type="primary" icon="el-icon-edit" @click="editPay('payForm')">修改密码</el-button>
         </el-form-item>
 
         <el-form-item>
-          <p class="tipsGray">支付密码用于提现，请妥善保管您的支付密码，切勿告诉其他人，以免财产造成损失！</p>
+          <p class="tipsGray">提现密码用于提现，请妥善保管您的提现密码，切勿告诉其他人，以免财产造成损失！</p>
         </el-form-item>
       </el-form>
     </el-card>
@@ -87,8 +87,8 @@
         <el-button type="primary" @click="submitLogin('loginForm')">确 定</el-button>
       </span>
     </el-dialog>
-    <!--修改支付密码 对话框-->
-    <el-dialog title="修改支付密码" :visible.sync="isPay" width="50%">
+    <!--修改提现密码 对话框-->
+    <el-dialog title="修改提现密码" :visible.sync="isPay" width="50%">
       <el-form :model="payForm" :rules="payRules" ref="payForm" label-width="200px" size="small">
 
         <el-form-item label="新密码：" prop="password">
@@ -156,7 +156,7 @@
           callback();
         }
       };
-      // 校验 支付密码
+      // 校验 提现密码
       let checkPayPsd = (rule, value, callback) => {
         const reg = /^[0-9]{6}$/;
         if (value === '') {
@@ -227,7 +227,7 @@
     },
     mounted() {
       this.setForm.name = this.$store.state.user.name;
-      console.log(333,this.setForm.name);
+      //console.log(333,this.setForm.name);
       let repStr = this.setForm.name.substring(3,7);
       this.showMobilePlaceholder = '请输入' + this.setForm.name.replace(repStr, '****') + '的验证码';
     },
@@ -240,7 +240,7 @@
       editLogin() {
         this.isLogin = true;
       },
-      // 修改 支付密码
+      // 修改 提现密码
       editPay() {
         this.isPay = true;
       },
@@ -317,7 +317,7 @@
           }
         });
       },
-      // 修改支付密码，获取手机验证码
+      // 修改提现密码，获取手机验证码
       getPayCode() {
         let paypsdReg = /^[0-9]{6}$/;
         if (this.payForm.password === '' || !paypsdReg.test(this.payForm.password)) {
@@ -410,13 +410,13 @@
           }
         });
       },
-      // 支付密码 确定
+      // 提现密码 确定
       submitPay(formName) {
         this.$refs[formName].validate(valid => {
           if (valid) {
             changePayPassword(this.payForm).then(res => {
               if(res.code === 1) {
-                this.$message({type:"success",message: '支付密码修改成功'});
+                this.$message({type:"success",message: '提现密码修改成功'});
                 this.clearAccountCodeDown();
                 this.isPay = false;
               }else {