From 870a9499eb65de0031ef8e8f70607e5dfb64b806 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 30 十一月 2023 09:30:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/store/modules/user.js | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/admin-web/src/store/modules/user.js b/admin-web/src/store/modules/user.js
index 4910810..4a42577 100644
--- a/admin-web/src/store/modules/user.js
+++ b/admin-web/src/store/modules/user.js
@@ -1,12 +1,20 @@
-import {getInfo, login, logout,getCurInfo} from '@/api/user';
-import {getToken, removeToken,setUserInfo, setToken,getUser,getUserDetail,setUserDetail,setCPass} from '@/utils/auth';
+import {getCurInfo, getInfo, login, logout} from '@/api/user';
+import {
+ getToken,
+ getUser,
+ getUserDetail,
+ removeToken,
+ setCPass,
+ setToken,
+ setUserDetail,
+ setUserInfo
+} from '@/utils/auth';
import router, {resetRouter} from '@/router';
import {isLoginApi} from '@/api/system/sms';
import Cookies from 'js-cookie';
import {getQueryString} from '@/libs/wechat';
import {Loading} from 'element-ui';
import {encrypt} from '@/utils/jsencrypt'
-import store from "@/store";
const state = {
info: getUser(),
--
Gitblit v1.9.1