Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/kotra/brand/list.vue

@@ -23,6 +23,19 @@
         ></u-search>
       </view>
       <view v-else class="brandSearch" style="padding: 5px 10px;margin-top: 6rpx;">
+        <template v-if="iscpswjselectall==1&&replace.state=='1'">
+          <view class="brandSearch-left">
+            <uni-section title="" type="line">
+              <uni-data-select
+                v-model="msg.MallBaseId"
+                :localdata="ShopTypeList"
+                :clear="false"
+                @change="ResetQuery"
+              ></uni-data-select>
+            </uni-section>
+          </view>
+          <view class="brandSearch-auto"></view>
+          </template>
         <view class="brandSearch-right">
           <input v-model="msg.BrandName" 
           :placeholder="`搜索${replace.state=='1'?'品牌':'企业'}名称`" 
@@ -249,6 +262,8 @@ export default {
       replace: null,
       secondary: null,
       GetYBConfig: null,
+      iscpswjselectall: 0,
+      ShopTypeList: [],
     };
   },
   onShareTimeline() {
@@ -310,6 +325,7 @@ export default {
     };
   },
   onLoad(options) {
+    this.iscpswjselectall = uni.getStorageSync("basedata").iscpswjselectall
     let uid = uni.getStorageSync("mall_UserInfo")
     this.TenantId = uid.TenantId
     // this.msg.TenantId = uid.TenantId
@@ -394,6 +410,13 @@ export default {
         (res) => {
           if (res.resultCode == 1) {
             this.GetYBConfig =  res.data
+            res.data.mallBaselList.forEach(x=>{
+              let obj = {
+                text: x.Name,
+                value: x.MallBaseId
+              }
+              this.ShopTypeList.push(obj)
+            })
           }
         }
       );
@@ -497,6 +520,27 @@ export default {
 </script>
 
 <style>
+.brandSearch-auto{
+    width: 2rpx;
+    height: 40rpx;
+    background: #E1EDF7;
+    border-radius: 1rpx;
+    margin-left: 30rpx;
+    margin-right: 30rpx;
+  }
+  .brandSearch-left .uni-icons{
+    color: #017EDF !important;
+    margin-left: 24rpx !important;
+  }
+  .brandSearch-left .uni-select__input-text{
+    font-size: 27rpx;
+    font-weight: bold;
+  }
+  .brandSearch-left .uni-select {
+    border: 0;
+    padding: 0;
+    padding-left: 0;
+  }
   .brandSearch-right>input::placeholder{
     color: #95AAB9;
   }

pages/kotra/carrier/list.vue

@@ -526,7 +526,6 @@ export default {
                 }
                 this.ShopTypeList.push(obj)
               })
-              console.log(this.ShopTypeList,'------this.ShopTypeList')
 						}
 					}
 				);