完善首页的判断

hdApp/src/admin/home/result.vue

@@ -24,6 +24,7 @@ export default {
   },
 	methods: {
     loginSys(){
+      uni.setStorageSync('OPEN_SHOP_ID', '3')
       this.$util.pageTo({
         url: '/admin/home/workbench',
         type: 4

hdApp/src/admin/home/workbench.vue

@@ -301,9 +301,7 @@ export default {
       this.$util.pageTo(item)
     },
     init () {
-				if(!this.AUTHORITY_SHOW) {
-          this._init()
-        }	
+      this._init()
     },
     _init(){
       getWeixinId().then(res => {

hdApp/src/mixins/globalMixins.js

@@ -37,7 +37,11 @@ export default {
 		}
     uni.setStorageSync('currentQuery', JSON.stringify(option))
     console.log(uni.getStorageSync('SHOP_ADMIN_STROAGE_SHOW'),'this.shopAdminId', this.getLoginInfo, this.getLoginInfo.openShop)
-    if (uni.getStorageSync('SHOP_ADMIN_STROAGE_SHOW') == '0' || this.getLoginInfo.openShop == '2') {
+    if (uni.getStorageSync('SHOP_ADMIN_STROAGE_SHOW') == '0') {
+      this.AUTHORITY_SHOW = true
+    } else if (this.getLoginInfo.openShop == '2') {
+      this.MODEL_TITLE = '已申请'
+      this.MODEL_BTN_TEXT = '查看申请进度'
       this.AUTHORITY_SHOW = true
     }
     if (this.$util.isEmpty(this.getLoginInfo)) {
@@ -79,7 +83,7 @@ export default {
 		if (isLogin()) {
 			if (this.init) {
 				this.init()
-			}
+      }
 		}
 	},
 	methods: {

hdApp/src/pagesStorehouse/stockWarn/manage.vue

@@ -1,9 +1,7 @@
 <template>
 	<view class="billing_box_bg">
+    <app-tabs :tabs="tabs" :currentTab="tabIndex" @change="change" itemWidth="50%"/>
     <view class="input-wrap">
-			<view v-if="loginInfo.switchShop" class="city-select text-line">
-				<DorpdownSelect :menuObj.sync="menuObj" :selectItemId.sync="shopId" top="0" @selectSussess="selectSussess"></DorpdownSelect>
-			</view>
 			<view class="search-bar">
 				<app-search-module
 					v-model="py"
@@ -11,8 +9,10 @@
 					@search="searchFn"
 				/>
 			</view>
+      <view v-if="loginInfo.switchShop" class="city-select text-line">
+				<DorpdownSelect :menuObj.sync="menuObj" :selectItemId.sync="shopId" top="0" @selectSussess="selectSussess"></DorpdownSelect>
+			</view>
 		</view>
-		<app-tabs :tabs="tabs" :currentTab="tabIndex" @change="change" itemWidth="50%"/>
 		<view v-if="tabs[tabIndex].name=='库存预警'" class="scroll-middle_bx">
 			<!--内容部分 start -->
 			<!--内容部分 start -->
@@ -199,8 +199,8 @@ export default {
 			display: flex;
 			flex-shrink: 0;
 			align-items: center;
-			margin-right: 45upx;
-			margin-left: 15px;
+			margin-right: 15upx;
+			margin-left: 45px;
 			background-color: #ffff;
 			.iconfont {
 				margin-left: 20upx;