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

pages/kotra/brand/list.vue

@@ -258,7 +258,7 @@ export default {
         "padding": "0 22rpx",
         "background": "#FFF"
       },
-      TenantId: 18,
+      TenantId: null,
       replace: null,
       secondary: null,
       GetYBConfig: null,

pages/kotra/carrier/list.vue

@@ -8,6 +8,7 @@
       <headers :title="replace.state=='1'?'载体列表':'楼宇列表'"></headers>
       <template v-if="isauth">
         <view v-if="TenantId==18" style="padding: 5px 10px">
+			{{TenantId}}
           <u-search
               placeholder="搜索载体名称"
               :focus="false"
@@ -324,7 +325,7 @@ export default {
         },
       ],
       curStatusName: "全部",
-      TenantId: 18,
+      TenantId: null,
       replace: null,
       secondary: null,
       ShopTypeList: [