module-menu-vue 0.0.50 → 0.0.52

package/package.json

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

package/src/components/Menu/ModuleMenu.vue

@@ -87,8 +87,8 @@ export default {
   },
   methods: {
     toHref () {
-        if (this.stash !== "integration" && this.sysName === 'admin') {
-            location.href = '/#/admin/user/index'
+        if (this.sysName === 'admin') {
+            location.href = this.stash === "integration" ? '/dataadmin/#/datasource' : '/#/admin/user/index'
         }
     },
     async getSessionMenu () {

package/src/components/User/UserInfo.vue

@@ -27,7 +27,7 @@
 import Axios from '../Util/axios.js'
 import { userMenuIcon } from './constant.js'
 import { getUserName } from './../Util/userInfo.js'
-// import { integrationLogout, compactLogout } from './service.js'
+import { integrationLogout } from './service.js'
 export default {
     name: 'UserInfo',
     data () {
@@ -69,22 +69,22 @@ export default {
         },
         async logoutFunc () {
             console.log('开始调用退出接口...')
-            const url = this.stash === 'integration' ? '/admin-api/system/auth/logout' : '/auth/token/logout'
-            const method = this.stash === 'integration'? 'post' : 'delete'
-            Axios(url, method).then(() => {
-                localStorage.clear();
-                sessionStorage.clear();
-                location.href = this.stash === "integration" ? '/admin-ui/login' : '/#/login'
-            })
-            .catch((err) => {
-                console.log('err: ', err)
-            });
-            // if (this.stash === 'integration') {
-            //     await integrationLogout()
-            // } else {
-            //     await compactLogout()
-            // }
-            // this.logoutUrl()
+            if (this.stash === 'integration') {
+                await integrationLogout()
+                this.logoutUrl()
+            } else {
+                // await compactLogout()
+                const url = this.stash === 'integration' ? '/admin-api/system/auth/logout' : '/auth/token/logout'
+                const method = this.stash === 'integration'? 'post' : 'delete'
+                Axios(url, method).then(() => {
+                    localStorage.clear();
+                    sessionStorage.clear();
+                    location.href = this.stash === "integration" ? '/admin-ui/login' : '/#/login'
+                })
+                .catch((err) => {
+                    console.log('err: ', err)
+                });
+            }
         },
         logoutUrl() {
             localStorage.clear();

package/src/components/User/service.js

@@ -1,8 +1,7 @@
 import request from 'axios'
 // 一体化退出登录
-export async function integrationLogout()  {
-    return request({
-      url: '/admin-api/system/auth/logout',
+export const integrationLogout = () => {
+    return request('/admin-api/system/auth/logout', {
       method: 'post'
     })
 }