From fb5f6d9ea77f32f51ef425b41ff99a3ff66c20c2 Mon Sep 17 00:00:00 2001
From: yuanteng <1876787513@qq.com>
Date: Mon, 28 Oct 2024 17:56:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3pinia=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/myAxios.ts | 2 +-
src/layout/components/Header.vue | 1 -
src/store/userStore.ts | 14 +++++++-------
src/views/Commodity/TypeManagement.vue | 9 +++++++++
src/views/Login.vue | 6 +++---
5 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/api/myAxios.ts b/src/api/myAxios.ts
index 0105c53..58c7d3c 100644
--- a/src/api/myAxios.ts
+++ b/src/api/myAxios.ts
@@ -2,7 +2,7 @@
import axios from "axios";
const myAxios = axios.create({
withCredentials:true,
- baseURL: 'http://127.0.0.1:8888/api'//测试服务器
+ baseURL: 'http://localhost:8888/api'//测试服务器
});
// 添加请求拦截器
axios.interceptors.request.use(function (config) {
diff --git a/src/layout/components/Header.vue b/src/layout/components/Header.vue
index 979a435..99f7887 100644
--- a/src/layout/components/Header.vue
+++ b/src/layout/components/Header.vue
@@ -132,7 +132,6 @@
const logout = async () => {
const res: any = await myAxios.post("/user/logout",{})
- console.log(res)
if(res.data.code == 1 && res.data) {
store.$reset()
await router.replace('/')
diff --git a/src/store/userStore.ts b/src/store/userStore.ts
index b32786b..08b9501 100644
--- a/src/store/userStore.ts
+++ b/src/store/userStore.ts
@@ -6,8 +6,10 @@ export const userStore = defineStore( 'user' , {
state: () => {
return {
loginUser: {
- userName: '未登录',
+ id: 0,
+ phone: '',
userAvatar: '',
+ userName: '未登录',
userRole: 'notLogin'
}
}
@@ -15,13 +17,11 @@ export const userStore = defineStore( 'user' , {
//actions是用于定义和处理状态更改的方法。它们可以包含任意的逻辑，如异步请求、数据处理和状态更新。
actions: {
//获取登录用户信息
- async getLoginUser() {
+ async getLoginUser(res:any) {
//请求登录信息
- const res = await myAxios.get('/user/get')
- // console.log(res.data)
- if( res.data.code === 1 && res ?.data ) {
- this.updateUser( res.data )
- }
+ // const res = await myAxios.get('/user/get')
+ console.log(res,121212312312)
+ this.updateUser( res )
},
//更新用户信息
//更新state
diff --git a/src/views/Commodity/TypeManagement.vue b/src/views/Commodity/TypeManagement.vue
index 32052b0..dc19e5a 100644
--- a/src/views/Commodity/TypeManagement.vue
+++ b/src/views/Commodity/TypeManagement.vue
@@ -75,6 +75,7 @@
</template>
</el-table-column>
</el-table>
+ <button @click="pri">aaa</button>
</template>
<script setup lang="ts">
@@ -82,6 +83,9 @@ import { ref , reactive} from 'vue'
import { ElMessageBox } from 'element-plus'
import { ElMessage } from 'element-plus'
import type { UploadFile } from 'element-plus';
+import { userStore } from '../../store/userStore';
+
+const store = userStore()
const dialogImageUrl = ref('');
const disabled = ref(false);
@@ -96,6 +100,11 @@ const form = ref({
tips: ''
})
+const pri =()=>{
+ console.log(store.loginUser);
+
+}
+
const handleSelectionChange = (row: any) => {
selectedItems.value = JSON.parse(JSON.stringify(row))
}
diff --git a/src/views/Login.vue b/src/views/Login.vue
index bfbdcb5..e24049a 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -54,11 +54,11 @@
userAccount: username.value,
userPassword: password.value
})
- // console.log(res.data.code)
+ console.log(res.data.code)
if(res.data.code === 1 && res ?.data) {
//将用户信息放入pinia
- await store.getLoginUser()
- //存储角色
+ await store.getLoginUser(res.data.data)
+ //跳转个人中心
await router.replace('/PersonalCenter')
}
}