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

components/applyPurchase/BatchPublish.vue

@@ -361,7 +361,7 @@
     },
     methods: {
       getDate1: function () {
-        this.modifyObj.deadline = this.modifyObj.deadline ? this.baseUtils.getFullDay(this.modifyObj.deadline.getTime()) : null
+        this.modifyObj.deadline = this.modifyObj.deadline ? this.baseUtils.getFullDay(this.baseUtils.getClearDay(new Date(this.baseUtils.formatDate(new Date(this.modifyObj.deadline), 'yyyy-MM-dd')))) : null
         this.validObj.deadline = true
       },
       initModifyObj: function () {

components/provider/Suppliers.vue

@@ -98,7 +98,7 @@ export default {
       this.pageParams.type = this.storeType === 'factory' ? 'ORIGINAL_FACTORY' : 'AGENCY-DISTRIBUTION'
       this.pageParams.page = 1
       this.pageParams.keyword = obj.keyword === '' ? null : obj.keyword
-      // this.pageParams.field = obj.type ? 'similar' : null
+      this.pageParams.field = obj.type && obj.type !== 'store' ? 'similar' : null
       this.pageCommodity(this.pageParams)
     },
     showLittleDescription (description) {

components/supplier/merchant.vue

@@ -122,7 +122,7 @@
       search (type) {
         this.pageParams.page = 1
         this.searchCode = type.keyword
-        this.type = type.type
+        this.type = type.type && type.type !== 'store' ? type.type : null
         this.handleCurrentChange(1)
       },
       goodsSearch (type) {

pages/mobile/center/user/payCenter.vue

@@ -17,7 +17,7 @@
           </div>
           <div class="new-content-line">
             <span class="inline-block"><i>*</i>开户支行：</span>
-            <input type="text" placeholder="例如：乔香支行" v-model="bankAccountObj.branchname" @blur="checkBranchname">
+            <input type="text" placeholder="例如：侨香支行" v-model="bankAccountObj.branchname" @blur="checkBranchname">
           </div>
           <div class="new-content-line">
             <span class="inline-block"><i>*</i>银行账号：</span>
@@ -176,7 +176,7 @@
           </div>
           <div class="modal-content-line">
             <span class="inline-block"><i>*</i>开户支行：</span>
-            <input type="text" placeholder="例如：乔香支行" v-model="bankAccountObj.branchname" @blur="checkBranchname">
+            <input type="text" placeholder="例如：侨香支行" v-model="bankAccountObj.branchname" @blur="checkBranchname">
           </div>
           <div class="modal-content-line">
             <span class="inline-block"><i>*</i>银行账号：</span>

pages/mobile/center/vendor/payCenter.vue

@@ -19,7 +19,7 @@
           </div>
           <div class="new-content-line">
             <span class="inline-block"><i>*</i>开户支行：</span>
-            <input type="text" placeholder="例如：乔香支行" v-model="bankAccountObj.branchname" @blur="checkBranchname">
+            <input type="text" placeholder="例如：侨香支行" v-model="bankAccountObj.branchname" @blur="checkBranchname">
           </div>
           <div class="new-content-line">
             <span class="inline-block"><i>*</i>银行账号：</span>
@@ -151,7 +151,7 @@
           </div>
           <div class="modal-content-line">
             <span class="inline-block"><i>*</i>开户支行：</span>
-            <input type="text" placeholder="例如：乔香支行" v-model="bankAccountObj.branchname" @blur="checkBranchname">
+            <input type="text" placeholder="例如：侨香支行" v-model="bankAccountObj.branchname" @blur="checkBranchname">
           </div>
           <div class="modal-content-line">
             <span class="inline-block"><i>*</i>银行账号：</span>

pages/mobile/shop/index.vue

@@ -237,9 +237,8 @@
         return str && str.trim() !== ''
       },
       onSearch: function (keyObj) {
-//        console.log(keyObj)
         this.keyword = keyObj.keyword
-        // this.field = keyObj.type ? 'similar' : null
+        this.field = keyObj.type && keyObj.type !== 'store' ? 'similar' : null
         this.onDown('ORIGINAL_FACTORY-DISTRIBUTION-AGENCY-CONSIGNMENT')
         this.down = false
       }