Merge branch 'master' of http://git.dayaedu.com/lex/dy-admin-live

src/permission.ts

@@ -1,7 +1,8 @@
 // import Vue from 'vue'
 import router from "./router";
-// import store from './store'
+import request from '/src/helpers/request'
 import { ElMessage } from "element-plus";
+import { state } from "./state";
 // import NProgress from "nprogress"; // progress bar
 // import "nprogress/nprogress.css"; // progress bar style
 import { getToken } from "./utils/auth";
@@ -11,35 +12,12 @@ import { getToken } from "./utils/auth";
 
 const whiteList = ["/login"]; // no redirect whitelist
 
-// let isOpen = false
-
-// router.onError((error: any) => {
-//   if (error instanceof Error) {
-//     const isChunkLoadFailed = error.name.indexOf('chunk')
-//     const targetPath = router.history.pending.fullPath;
-//     if (isChunkLoadFailed && !isOpen) {
-//       isOpen = true
-//       router.app.$confirm("网站有更新请点击确定刷新页面?", "更新提示", {
-//         confirmButtonText: "确定",
-//         cancelButtonText: "取消",
-//         type: "warning"
-//       })
-//         .then(() => {
-//           location.hash = targetPath
-//           window.location.reload()
-//         })
-//         .catch(() => {
-//           return
-//         });
-//     }
-//   }
-// });
-
 router.beforeEach(async (to, from, next) => {
   // from.query = to.query
   // start progress bar
   // NProgress.start();
   const hasToken = getToken();
+  console.log(hasToken)
   if (hasToken) {
     if (to.path === "/login") {
       // 如果有tonken直接跳转到首页
@@ -47,19 +25,20 @@ router.beforeEach(async (to, from, next) => {
 
       // NProgress.done();
     } else {
-      const hasGetUserInfo = store.getters.phone;
+      const hasGetUserInfo = state.user?.phone;
       // 有名字 说明有用户信息 跳走
       if (hasGetUserInfo) {
         next();
       } else {
         try {
           // 异步获取用户信息
-          await store.dispatch("user/getInfo");
-          
+          await request.get('/api-web/employee/queryUserInfo').then(res => {
+            console.log(res)
+          })
           next({ ...to, replace: true });
         } catch (error: any) {
           // remove token and go to login page to re-login
-          await store.dispatch("user/resetToken");
+          // await store.dispatch("user/resetToken");
           if (error.msg) {
             ElMessage.error(error.msg);
           }

src/state.ts

@@ -1,7 +1,6 @@
 import { reactive } from 'vue'
 
-const state = reactive({
-  
-})
 
-export default state
+export const state = reactive({
+  user: null as any
+})