module-menu-vue 0.0.18 → 0.0.20

package/package.json

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

package/src/components/Menu/ModuleMenu.vue

@@ -4,7 +4,7 @@
             <div class='menuIcon' @click="showMenuList = !showMenuList">
                 <img class="menuIcon_img" :src="menuIconSrc" />
             </div>
-            <div class="menu_title_content" v-show="showCollapse">
+            <div class="menu_title_content" v-show="showCollapse" @click="toHref()">
                 <img class="menu_title_content_img" :src="getLogoAndTitle().logoSrc" alt="logo" />
                 <span class="menu_title">{{getLogoAndTitle().title}}</span>
             </div>
@@ -79,6 +79,11 @@ export default {
     this.getNewMenuList();
   },
   methods: {
+    toHref () {
+        if (this.sysName === 'admin') {
+            this.$router.push({path: '/admin/user/index'})
+        }
+    },
     getSessionMenu () {
         const menuObj = JSON.parse(sessionStorage.getItem('bigdata-menu'));
         if (menuObj) {

package/src/components/User/UserInfo.vue

@@ -57,7 +57,7 @@ export default {
             if (flag === 'single') {
                 url = '/#/info/index'
             } else if (flag === 'message') {
-                url = '/#/alert'
+                url = '/alert'
             } else if (flag === 'systerm') {
                 url = '/#/admin/user/index'
             } else if (flag === 'logout') {
@@ -69,22 +69,24 @@ export default {
             const config = {
                 headers: {}
             }
-            const TENANT_ID = getStore({ name: "tenantId" }) || '1';
+            // const TENANT_ID = getStore({ name: "tenantId" }) || '1';
             const isToken = (config.headers || {}).isToken === false;
             const token = getStore({ name: 'access_token' });
             if (token && !isToken) {
                 config.headers["Authorization"] = `Bearer ${token}`; // token
             }
-            if (TENANT_ID) {
-                config.headers["TENANT-ID"] = TENANT_ID; // 租户ID
-            }
+            // if (TENANT_ID) {
+            //     config.headers["TENANT-ID"] = TENANT_ID; // 租户ID
+            // }
+            sessionStorage.clear();
+            localStorage.clear();
             axios({
                 method: 'delete',
                 url: '/auth/token/logout',
                 ...config
             }).then(res => {
                 console.log('res', res)
-                location.href = '/#/login'
+                this.$router.push({ path: "/login" });
             }).catch((err) => {
                 console.error(err)
             })

package/src/components/User/service.js

@@ -1,23 +1,7 @@
 import request from 'axios'
-import { Message } from 'element-ui';
-const DEFAULT_LOGOUT_URL = '/#/login'
 export const logout = () => {
     return request({
       url: '/auth/token/logout',
       method: 'delete'
     })
-}
-
-// 校验token是否失效
-export const checkToken = (token) => {
-    return request({
-        url: `/auth/oauth/check_token?token=${token}`,
-        method: 'get'
-      }).then().catch(() => {
-        Message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
-            localStorage.clear();
-            sessionStorage.clear();
-            window.location.href = DEFAULT_LOGOUT_URL;
-        }});
-    })
 }