Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/src/mixins/globalMixins.js

@@ -70,8 +70,6 @@ export default {
 				}
 			})
 		}
-
-
 	},
 	onShow(){
 		if (isLogin()&&!this.$util.isEmpty(this.getLoginInfo)) {
@@ -79,16 +77,6 @@ export default {
 				this.init()
 			}
     }
-    if (uni.setStorageSync('OPEN_SHOP_ID') == '2') {
-      this.MODEL_TITLE = '已申请'
-      this.MODEL_BTN_TEXT = '查看申请进度'
-      this.AUTHORITY_SHOW = true
-      uni.hideTabBar()
-    } else if (uni.setStorageSync('SHOP_ADMIN_STROAGE_SHOW') == '0') {
-      this.AUTHORITY_SHOW = true;
-      uni.hideTabBar()
-    }
-
 	},
 	methods: {
     ...mapActions(['setUserShopAll']),

ghsApp/src/pagesClient/official/result.vue

@@ -26,6 +26,7 @@ export default {
         close() {
           // this.pageTo({url: '/admin/home/workbench', type:})
           uni.reLaunch({url: '/admin/home/workbench'})
+          this.$store.commit("setLoginInfo", {});
           uni.setStorageSync('OPEN_SHOP_ID', '2')
         }
     }

hdApp/src/mixins/globalMixins.js

@@ -79,15 +79,6 @@ export default {
 			if (this.init) {
 				this.init()
       }
-    }
-    if (uni.setStorageSync('OPEN_SHOP_ID') == '2') {
-      this.MODEL_TITLE = '已申请'
-      this.MODEL_BTN_TEXT = '查看申请进度'
-      this.AUTHORITY_SHOW = true
-      uni.hideTabBar()
-    } else if (uni.setStorageSync('SHOP_ADMIN_STROAGE_SHOW') == '0') {
-      this.AUTHORITY_SHOW = true;
-      uni.hideTabBar()
     }
 	},
 	methods: {

hdApp/src/pagesClient/official/result.vue

@@ -24,7 +24,8 @@ export default {
             console.log(e)
         },
         close() {
-          this.pageTo({url: '/admin/home/workbench', type: 4})
+          uni.reLaunch({url: '/admin/home/workbench'})
+          this.$store.commit("setLoginInfo", {});
           uni.setStorageSync('OPEN_SHOP_ID', '2')
         }
     }