module-menu-vue 0.0.84 → 0.0.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "module-menu-vue",
-  "version": "0.0.84",
+  "version": "0.0.86",
   "description": "城市大数据平台菜单--Vue版",
   "main": "/index.js",
   "scripts": {

package/src/components/User/UserInfo.vue

@@ -66,6 +66,11 @@ export default {
         if (this.stash === 'integration') {
             this.isShowAppFunc()
         }
+        if (this.stash === 'GZW') {
+            localStorage.setItem('stash', 'GZW')
+        } else {
+            localStorage.removeItem('stash')
+        }
     },
     methods: {
         async isShowAppFunc() {
@@ -108,7 +113,7 @@ export default {
                             }
                         })
                     }
-                    location.href = `/#${systemPath}`
+                    location.href = this.stash === "GZW" ? `/data-platform/#${systemPath}` : `/#${systemPath}`
                 }
             } else if (flag === 'app') {
                 url = '/dataadmin/#/appSystem/index'

package/src/components/Util/permessionUtils.js

@@ -12,7 +12,9 @@ export const checkToken = async (token) => {
         location.href = DEFAULT_LOGOUT_URL;
     }});
   } else {
-    Axios('get',`/auth/oauth/check_token?token=${token}`, '', {} )
+    const stash = localStorage.getItem('stash')
+    const url = stash === 'GZW' ? `/data-platform/auth/oauth/check_token?token=${token}` : `/auth/oauth/check_token?token=${token}`
+    Axios('get', url, '', {})
     .then().catch(() =>{
         this.$message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
             localStorage.clear();

package/src/components/Util/userInfo.js

@@ -63,6 +63,7 @@ export const getUserName = () => {
     } else {
         const userInfo = getStore({ name: 'userInfo' });
         if (userInfo && Object.keys(userInfo).length > 0 && userInfo.username) {
+            console.log('username', userInfo.username)
             return userInfo.username;
         }
         return '';