Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

pages/mobile/center/user/payCenter.vue

@@ -595,7 +595,7 @@
           this.validBankAccountObj.number = false
         }
         if (this.validBankAccountObj.number) {
-          this.$http.get('/trade/bankInfo/number/count', {params: {type: 1061, number: this.bankAccountObj.number}}).then(res => {
+          this.$http.get('/trade/bankInfo/number/count', {params: {accountType: 'PAY_TYPE', number: this.bankAccountObj.number,type:1061}}).then(res => {
             if (res.data.success) {
               this.validBankAccountObj.number = res.data.data === 0
             } else {

pages/mobile/center/vendor/material.vue

@@ -240,8 +240,8 @@
                   <div class="name"><a class="red">*</a>更新规格书需重新审核</div>
                 </span>
                 <div style="clear:both"></div>
-                <div class="uploadImgBtn pull-left" v-if="MaterielItem.Regulpic === ''">上传规格书<input type="file" class="com-input" @change.stop="update" accept=".pdf" /></div>
-
+                <div class="uploadImgBtn pull-left" v-if="MaterielItem.standard !== 1">上传规格书<input type="file" class="com-input" @change.stop="update" accept=".pdf" /></div>
+                <div style="color: #ea0f42;font-size: 0.2rem;line-height: 0.47rem;margin-left: 0.2rem" class="pull-left" v-if="MaterielItem.standard !== 1 && MaterielItem.Regulpic !== ''" >该规格书正在审核中</div>
               </div>
 
               <div class="update-materiel-wrapper-list clearfix">
@@ -546,7 +546,11 @@
           packaging: this.MaterielItem.packaging, // 包装
           minPackQty: this.MaterielItem.minPackQty // 最小包装数
         }
-        this.$http.post(`/trade/products/update/product?attachUrl=${item.url}`, item).then(res => {
+        let _url = item.url
+        if (this.MaterielItem.standard === 1) {
+          _url = ''
+        }
+        this.$http.post(`/trade/products/update/product?attachUrl=${_url}`, item).then(res => {
           if (res.data.success) {
             this.setRemindText('修改成功')
             this.showMateriel = false

pages/mobile/center/vendor/payCenter.vue

@@ -607,7 +607,7 @@
           this.validBankAccountObj.number = false
         }
         if (this.validBankAccountObj.number) {
-          this.$http.get('/trade/bankInfo/number/count', {params: {type: 1061, number: this.bankAccountObj.number}}).then(res => {
+          this.$http.get('/trade/bankInfo/number/count', {params: {accountType: 'RECEIVE_TYPE', number: this.bankAccountObj.number, type:1063}}).then(res => {
             if (res.data.success) {
               if (res.data.data === 0) {
                 this.validBankAccountObj.number = true

pages/mobile/order/index.vue

@@ -587,7 +587,7 @@
                 let _id = this.sendGoodsInfo.purchaseDetails[i].id
                 _obj.push({
                   id: _id,
-                  qty: this.sendGoodsInfo.purchaseDetails[i].number - this.sendGoodsInfo.purchaseDetails[i].shipQty
+                  qty: this.sendGoodsInfo.purchaseDetails[i].number - (this.sendGoodsInfo.purchaseDetails[i].shipQty || 0)
                 })
               }
             }