完善首页的判断

ghsApp/src/admin/home/apply.vue

@@ -24,7 +24,7 @@
             </view>
         </view>
         <kd-entrance></kd-entrance>
-        <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" experienceFun></none-hd>
+        <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" @experienceClick="experienceFun"></none-hd>
     </view>
 </template>
 

ghsApp/src/admin/home/me.vue

@@ -134,6 +134,7 @@
       @selectSussess="selectSussess"
     ></DorpdownSelect>
     <kd-entrance></kd-entrance>
+    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" @experienceClick="experienceFun"></none-hd>
   </view>
 </template>
 

ghsApp/src/admin/home/member.vue

@@ -57,7 +57,7 @@
       <app-wrapper-empty :is-empty="$util.isEmpty(list.data)" />
     </block>
     <kd-entrance></kd-entrance>
-    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" experienceFun></none-hd>
+    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" @experienceClick="experienceFun"></none-hd>
   </div>
 </template>
 

ghsApp/src/admin/home/order.vue

@@ -129,7 +129,7 @@
       themeColor="#4C83D6"
       fields="day"
     ></rangeDatePick>
-    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" experienceFun></none-hd>
+    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" @experienceClick="experienceFun"></none-hd>
   </div>
 </template>
 

ghsApp/src/admin/home/workbench.vue

@@ -111,7 +111,7 @@
 				</div>
 			</template>
 		</modal-module>
-    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" experienceFun></none-hd>
+    <none-hd :show="AUTHORITY_SHOW" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="true" @experienceClick="experienceFun"></none-hd>
 	</div>
 </template>
 
@@ -305,9 +305,7 @@ export default {
 	},
 	methods: {
 		init() {
-			if(!this.AUTHORITY_SHOW) {
-        this._init
-      }
+      this._init
 		},
     _init(){
       getWeixinId().then(res => {

ghsApp/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)){

ghsApp/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.super" 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,11 @@
 					@search="searchFn"
 				/>
 			</view>
+      <view v-if="loginInfo.super" 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 -->
@@ -195,8 +196,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;