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

ghsApp/src/admin/home/workbench.vue

@@ -305,10 +305,8 @@ export default {
 	},
 	methods: {
 		init() {
-      this._init()
-		},
-    _init(){
-      getWeixinId().then(res => {
+
+			getWeixinId().then(res => {
 				this.getappIdList = res.data
 			});
 			getUser().then(res => {
@@ -339,6 +337,7 @@ export default {
 				}
 			});
 		},
+
 		goPage (item) {
 			if (item.url === '/admin/my-mall') {
 				this.getMyMall()