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

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 ? 'similar' : null
       this.pageCommodity(this.pageParams)
     },
     showLittleDescription (description) {

pages/mobile/center/vendor/payCenter.vue

@@ -170,13 +170,13 @@
             <span class="inline-block"><i>*</i>开户名称：</span>
             <input type="text" placeholder="请填写开户人姓名或企业名称" v-model="bankAccountObj.accountname" @blur="checkAccountname">
           </div>
-          <div class="modal-content-line upload">
+          <!--<div class="modal-content-line upload">
             <span class="inline-block"><i>*</i>上传开户许可证：</span>
             <input type="text" v-model="file.name" disabled>
             <label class="upload-btn">选择文件
               <input type="file" @change="onUpload($event)" accept="image/jpeg,image/jpg,image/png,.pdf">
             </label>
-          </div>
+          </div>-->
           <div class="am-btn-wrap">
             <button @click="showModal = false">取消</button>
             <button @click="addAccount">确认</button>
@@ -191,8 +191,8 @@
               3. 如您的企业名称、开户银行及账号变更，您须在优软商城开展资金结算前进行更正，否则发生转账错误优软商城不承担赔偿责任。
               <br/>
               4. 更多的条款请阅读《优软商城代收代付协议》 。
-              <br/>
-              5. 附件仅支持JPG、PNG、PDF格式，大小超过3M。
+              <!--<br/>
+              5. 附件仅支持JPG、PNG、PDF格式，大小超过3M。-->
             </span>
           </p>
         </div>
@@ -650,11 +650,9 @@
           this.setRemindText('请填写正确的银行账号')
         } else if (!this.validBankAccountObj.accountname) {
           this.setRemindText('请填写正确的开户名称')
-        } else if (!this.file) {
-          this.setRemindText('请上传开户许可证')
         } else {
           let param = new FormData()
-          param.append('file', this.file, this.file.name)
+//          param.append('file', this.file, this.file.name)
           param.append('bankInfo', JSON.stringify(this.bankAccountObj))
           let config = {
             headers: {'Content-Type': 'multipart/form-data'}

pages/mobile/shop/index.vue

@@ -239,7 +239,7 @@
       onSearch: function (keyObj) {
 //        console.log(keyObj)
         this.keyword = keyObj.keyword
-        this.field = keyObj.type ? 'similar' : null
+        // this.field = keyObj.type ? 'similar' : null
         this.onDown('ORIGINAL_FACTORY-DISTRIBUTION-AGENCY-CONSIGNMENT')
         this.down = false
       }