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

components/applyPurchase/SayPrice.vue

@@ -347,8 +347,9 @@
     width: 476px;
     top: 50%;
     left: 50%;
-    margin-top: -162px;
+    margin-top: calc(((80vh - 113px) - 133px - 100vh) / 2);
     margin-left: -238px;
+    max-height: calc(80vh - 113px);
     overflow-y: auto;
     /*-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);*/
     /*-moz-box-shadow: 0 5px 15px rgba(0,0,0,.5);*/

pages/mobile/shop/index.vue

@@ -238,7 +238,7 @@
       },
       onSearch: function (keyObj) {
         this.keyword = keyObj.keyword
-        this.field = keyObj.type && keyObj.type !== 'store' ? obj.type : null
+        this.field = keyObj.type && keyObj.type !== 'store' ? keyObj.type : ''
         this.onDown('ORIGINAL_FACTORY-DISTRIBUTION-AGENCY-CONSIGNMENT')
         this.down = false
       }