From 2cc66753086d6ce4c1154cd21f1cdacba09c914d Mon Sep 17 00:00:00 2001
From: 曹睿 <360930172@qq.com>
Date: 星期三, 23 四月 2025 10:13:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/yuanwang-mes-uniapp
---
src/store/modules/user.ts | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 0f364f9..335e2d0 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -10,9 +10,9 @@
const login = (data: LoginFormData) => {
return new Promise((resolve, reject) => {
AuthAPI.login(data)
- .then((data) => {
- setToken(data.accessToken);
- resolve(data);
+ .then((data: any) => {
+ setToken(data.data.token);
+ resolve(data.data);
})
.catch((error) => {
console.error("鐧诲綍澶辫触", error);
@@ -40,10 +40,11 @@
const getInfo = () => {
return new Promise((resolve, reject) => {
UserAPI.getUserInfo()
- .then((data) => {
- setUserInfo(data);
- userInfo.value = data;
- resolve(data);
+ .then((data: any) => {
+ console.log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛", data.data.user);
+ setUserInfo(data.data.user);
+ userInfo.value = data.data.user;
+ resolve(data.data);
})
.catch((error) => {
console.error("鑾峰彇鐢ㄦ埛淇℃伅澶辫触", error);
@@ -68,7 +69,8 @@
const isUserInfoComplete = (): boolean => {
if (!userInfo.value) return false;
- return !!(userInfo.value.nickname && userInfo.value.avatar);
+ // return !!(userInfo.value.nickName && userInfo.value.avatar);
+ return !!userInfo.value.nickName;
};
return {
--
Gitblit v1.9.3