module-menu-vue 0.0.83 → 0.0.85

package/package.json

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

package/src/components/Menu/ModuleMenu.vue

@@ -103,8 +103,8 @@ export default {
         });
     },
     toHref () {
-        if (this.sysName === 'admin' && this.stash !== "integration") {
-            location.href = `/#${this.systemPath}`
+        if (this.sysName === 'admin') {
+            location.href = this.stash === "GZW" ? `/data-platform/#${this.systemPath}` : this.stash !== "integration" ? `/#${this.systemPath}` : ''
         }
     },
     async getSessionMenu () {
@@ -228,7 +228,7 @@ export default {
     // 跳转首页
     toHomePage (index)  {
         if (index === 0) {
-            location.href = this.stash === "integration" ? '/dataadmin/#/index' : '/#/index'
+            location.href = this.stash === "integration" ? '/dataadmin/#/index' : this.stash === "GZW" ? '/data-platform/#/index' : '/#/index'
         }
     },
     getNewMenuList () {

package/src/components/User/UserInfo.vue

@@ -66,6 +66,7 @@ export default {
         if (this.stash === 'integration') {
             this.isShowAppFunc()
         }
+        localStorage.setItem('stash', 'GZW')
     },
     methods: {
         async isShowAppFunc() {
@@ -85,7 +86,7 @@ export default {
         handleClickmenu (flag){
             let url = ''
             if (flag === 'single') {
-                url = this.stash === "integration" ? '/admin-ui/data-share-portal/personal/info' : '/#/info/index'
+                url = this.stash === "integration" ? '/admin-ui/data-share-portal/personal/info' : this.stash === "GZW" ? '/data-platform/#/info/index' : '/#/info/index'
                 location.href = url;
             } else if (flag === 'systerm') {
                 if (this.stash === "integration") {
@@ -108,7 +109,7 @@ export default {
                             }
                         })
                     }
-                    location.href = `/#${systemPath}`
+                    location.href = this.stash === "GZW" ? `/data-platform/#${systemPath}` : `/#${systemPath}`
                 }
             } else if (flag === 'app') {
                 url = '/dataadmin/#/appSystem/index'
@@ -123,7 +124,7 @@ export default {
                 await integrationLogout();
                 this.logoutUrl()
             } else {
-                const url = this.stash === 'integration' ? '/admin-api/system/auth/logout' : '/auth/token/logout'
+                const url = this.stash === 'integration' ? '/admin-api/system/auth/logout' : this.stash === 'GZW' ? '/data-platform/auth/token/logout' : '/auth/token/logout'
                 const method = this.stash === 'integration'? 'post' : 'delete'
                 Axios(url, method).then(() => {
                     this.logoutUrl();
@@ -136,7 +137,7 @@ export default {
         logoutUrl() {
             localStorage.clear();
             sessionStorage.clear();
-            location.href = this.stash === 'integration' ? '/admin-ui/login' : '/#/login'
+            location.href = this.stash === 'integration' ? '/admin-ui/login' : this.stash === 'GZW' ? '/data-platform/#/login' : '/#/login'
         },
         getName ()  {
             return getUserName()

package/src/components/User/service.js

@@ -6,13 +6,6 @@ export const integrationLogout = () => {
     })
 }
 
-// 轻量级退出登录
-export async function compactLogout() {
-    return request({
-      url: '/auth/token/logout',
-      method: 'delete'
-    })
-}
 // 获取到要跳转的系统管理路径
 export const getSysUrl = () => {
   return request('/admin-api/system/auth/homePage', {

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 flag = localStorage.getItem('stash')
+    const url = flag === '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();