From ea911d3b42cac8948eb6f1285c7ad46706707643 Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期五, 05 一月 2024 23:13:44 +0800
Subject: [PATCH] zancun
---
src/store/modules/user.js | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 4d374c1..088b22d 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,4 +1,4 @@
-import { login, getWorkShopInfo, URL_CFG } from '@/api/MdcApi'
+import { login, getUserInfo, URL_CFG } from '@/api/MdcApi'
import { getToken, setToken, removeToken } from '@/utils/auth'
import Vue from 'vue'
const user = {
@@ -62,13 +62,22 @@
// {"result":"SUCCESS","token":"43a187c9b3f1f6cd6c8342c15f91a52a"}
response = response || {}
if (response.result === 'SUCCESS') {
- setToken(response.token)
- commit('SET_TOKEN', response.token)
+ debugger
+ setToken(response.data)
+ commit('SET_TOKEN', response.data)
+ resolve(response)
this.dispatch('GetInfo').then(res => resolve(res))
} else {
resolve({ code: 0, msg: '鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒锛�' })
+
}
}).catch(error => {
+ // TODO: del
+ // let response = {"result":"SUCCESS","data":"43a187c9b3f1f6cd6c8342c15f91a52a"}
+ // setToken(response.data)
+ // commit('SET_TOKEN', response.data)
+ // resolve(response)
+
reject(error)
// console.log(error)
})
@@ -77,26 +86,26 @@
// 鑾峰彇鐢ㄦ埛淇℃伅
GetInfo({ commit, state }) {
return new Promise((resolve, reject) => {
- getWorkShopInfo().then(data => {
+ getUserInfo().then(data => {
if (data.result === 'SUCCESS') {
- if (data.workshopList && data.workshopList.length > 0) {
- commit('SET_WORKSHOP_LIST', data.workshopList)
- // console.log(data)
- commit('SET_DEVICE_CATEGORY_LIST', data.workshopList)
- commit('SET_USER_INFO', data)
- resolve({ code: 1, data: data })
- } else {
- commit('SET_WORKSHOP_LIST', [])
- commit('SET_DEVICE_CATEGORY_LIST', [])
- commit('SET_TOKEN', '')
- commit('SET_USER_INFO', {})
- removeToken()
- resolve({ code: 0, msg: '鎮ㄦ病鏈夋潈闄愯闂紝璇疯仈绯荤鐞嗗憳杩涜鎺堟潈锛�' })
- }
+ // if (data.workshopList && data.workshopList.length > 0) {
+ // commit('SET_WORKSHOP_LIST', data.workshopList)
+ // // console.log(data)
+ // commit('SET_DEVICE_CATEGORY_LIST', data.workshopList)
+ // commit('SET_USER_INFO', data)
+ // resolve({ code: 1, data: data })
+ // } else {
+ // commit('SET_WORKSHOP_LIST', [])
+ // commit('SET_DEVICE_CATEGORY_LIST', [])
+ // commit('SET_TOKEN', '')
+ // commit('SET_USER_INFO', {})
+ // removeToken()
+ // resolve({ code: 0, msg: '鎮ㄦ病鏈夋潈闄愯闂紝璇疯仈绯荤鐞嗗憳杩涜鎺堟潈锛�' })
+ // }
+ }else {
+ removeToken()
+ resolve({ code: 0, msg: '鐢变簬鎮ㄩ暱鏃堕棿娌℃湁鎿嶄綔锛岃閲嶆柊鐧诲綍锛�' })
}
- // else {
- // resolve({ code: 0, msg: '鐢变簬鎮ㄩ暱鏃堕棿娌℃湁鎿嶄綔锛岃閲嶆柊鐧诲綍锛�' })
- // }
}).catch(() => {
resolve({ code: -1, msg: '缃戠粶寮傚父锛岀◢鍚庨噸璇曪紒' })
})
--
Gitblit v1.9.3