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

components/mobile/center/outOfStorage/StorageList.vue

@@ -76,7 +76,7 @@
   .storage{
     ul{
       li{
-        padding: 0.24rem 0.24rem;
+        padding: 0.24rem 0.24rem 0;
         background: #fff;
         margin-bottom:.2rem;
         .linetext{
@@ -91,7 +91,7 @@
           }
         }
         .look-btn{
-          padding: 0.2rem 0;
+          padding: 0.2rem;
           border-top: 1px solid #d3d3d3;
           text-align: center;
         }

components/mobile/center/outOfStorage/otherStorage.vue

@@ -74,6 +74,7 @@
           spec: '',
           qty: '',
           price: '',
+          erpReserve: '',
           showSimilarCodeList: false,
         },
         similarCode:[]
@@ -94,7 +95,8 @@
               pcmpcode: '',
               spec: '',
               qty: '',
-              price: ''
+              price: '',
+              erpReserve: ''
             }
           }
           val.showSimilarCodeList = false
@@ -131,6 +133,7 @@
           spec: '',
           qty: '',
           price: '',
+          erpReserve: '',
           showSimilarCodeList: false,
         })
       },
@@ -152,6 +155,7 @@
                 this.allObj[type].pcmpcode = ''
                 this.allObj[type].spec = ''
                 this.allObj[type].productId = ''
+                this.allObj[type].erpReserve = ''
                 this.onRemind('产品库中没有找到相应产品信息')
               }
               this.allObj[type].showSimilarCodeList = response.data.length > 0
@@ -162,6 +166,7 @@
               this.allObj[type].pcmpcode = ''
               this.allObj[type].spec = ''
               this.allObj[type].productId = ''
+              this.allObj[type].erpReserve = ''
               this.onRemind('产品库中没有找到相应产品信息')
             })
         } else {
@@ -191,6 +196,7 @@
             spec: '',
             qty: '',
             price: '',
+            erpReserve: '',
             showSimilarCodeList: false,
           }
           this.allObj.push(_item)
@@ -316,6 +322,7 @@
       right: 0;
       z-index:100;
       text-align: center;
+      background: #f1f3f6;
       span{
         display:inline-block;
         width:30%;

pages/mobile/center/user/doPay/_ids.vue

@@ -19,7 +19,7 @@
           <div class="img inline-block">
             <upload @uploadAction="onUpload" :maxSize="20" @remindAction="setRemindText" :noReview="false"></upload>
           </div>
-          <div class="inline-block text">仅支持jpg、gif、pdf格式的文件，大小不超过3M</div>
+          <div class="inline-block text">仅支持jpg、gif、pdf格式的文件，大小不超过20M</div>
         </div>
       </div>
       <div class="remind clearfix">

pages/mobile/center/vendor/outOfStorage/index.vue

@@ -206,11 +206,11 @@
       filterRecord () {
         this.filterParams.page = 1
         this.filter.page = 1
-        this.filterParams.type = this.switchType
         this.isChange = true
         this.reloadList()
       },
       reloadList () {
+        this.filterParams.type = this.switchType
         if(this.handleItem === 0) {
           this.$store.dispatch('product/getLoadStorageData', this.filterParams)
         } else if(this.handleItem === 2) {

pages/mobile/center/vendor/outOfStorage/purchase/_storeid.vue

@@ -231,6 +231,7 @@
       left: 0;
       right: 0;
       text-align: center;
+      background: #f1f3f6;
       span{
         display:inline-block;
         width:30%;