解决冲突

ghsApp/src/admin/home/workbench.vue

@@ -305,6 +305,9 @@ export default {
 	},
 	methods: {
 		init() {
+      this._init()
+		},
+    _init(){
       getWeixinId().then(res => {
 				this.getappIdList = res.data
 			});

ghsApp/src/mixins/globalMixins.js

@@ -74,7 +74,7 @@ export default {
 
 	},
 	onShow(){
-		if (isLogin()) {
+		if (isLogin()&&!this.$util.isEmpty(this.getLoginInfo)) {
 			if (this.init) {
 				this.init()
 			}