Merge branch 'gcl' of http://gitlab.yiboshi.com/ynby/folacin-front into gcl

 Conflicts:
	src/views/Home.vue

src/views/Home.vue

@@ -55,7 +55,8 @@
         created() {
             //获取妇幼权限和登录基本信息
             // document.cookie = 'bGNnd3lwdF9hdA=8f26b5cc-1d66-4b31-8b86-26d916209e1e;'//昆明市
-            document.cookie = 'bGNnd3lwdF9hdA=e9a6025f-09d8-4181-acea-3232f53105a6;'//云南省
+
+            document.cookie = 'bGNnd3lwdF9hdA=a551a5a0-aa58-45fe-be4a-9304aa60b594;'//云南省
             let cookieToken = getCookie('bGNnd3lwdF9hdA')
             if (cookieToken) {//根据cookie获取token并调用接口获取菜单并设置初始选中菜单
                 window.sessionStorage.setItem('token','bearer'+' ' + cookieToken);
@@ -64,7 +65,7 @@
                     // window.sessionStorage.setItem('menuList', JSON.stringify(data.menuList));
                     window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
                     window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList))
-                    this.setInitMenuInfo();
+                    this.setInitMenuInfo()
                     this.showChildren = true
                 })
             } else {