Skip to content

Commit db316cf

Browse files
dodolalorcdodolalorc
committed
fixed resp.message -> resp.msg
1 parent 1456b8d commit db316cf

11 files changed

Lines changed: 34 additions & 33 deletions

File tree

‎src/core/request.core.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export class RequestCore {
5757
console.log(`[Response] ${response.config.url}`, response.data)
5858

5959
const responseBody = response.data as
60-
| (ApiResponse & { msg?: string; message?: string })
60+
| (ApiResponse & { msg?: string })
6161
| undefined
6262

6363
// 业务状态码 401（例如：{ code: 401, data: null, msg: "认证失败，无法访问系统资源" }）
@@ -66,7 +66,7 @@ export class RequestCore {
6666

6767
const unauthorizedError: ErrorResponse = {
6868
code: 401,
69-
message: responseBody.msg || responseBody.message || '登录状态已过期，请重新登录',
69+
msg: responseBody.msg || responseBody.msg || '登录状态已过期，请重新登录',
7070
success: false,
7171
}
7272

@@ -89,7 +89,7 @@ export class RequestCore {
8989
// 统一错误处理
9090
const errorResponse: ErrorResponse = {
9191
code: error.response?.status || 500,
92-
message: error.response?.data?.message || error.message || '请求失败',
92+
msg: error.response?.data?.msg || error.msg || '请求失败',
9393
success: false,
9494
}
9595

‎src/stores/cart-store.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ export const useCartStore = defineStore('cartStore', () => {
234234

235235
const response = await cartApi.update(payload)
236236
if (response.code !== 200) {
237-
ElMessage.warning(response.message || '更新商品数量失败，请稍后重试')
237+
ElMessage.warning(response.msg || '更新商品数量失败，请稍后重试')
238238
}
239239
}
240240

‎src/stores/manage-goods-store.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export const useManageGoodsStore = defineStore('manageGoods', () => {
8383
}
8484
goodsList.value = []
8585
total.value = 0
86-
ElMessage.error(response.message || response.msg || '商品列表加载失败')
86+
ElMessage.error(response.msg || '商品列表加载失败')
8787
} catch (error) {
8888
goodsList.value = []
8989
total.value = 0
@@ -116,7 +116,7 @@ export const useManageGoodsStore = defineStore('manageGoods', () => {
116116
await fetchGoods()
117117
return
118118
}
119-
ElMessage.error(response.message || response.msg || '删除失败')
119+
ElMessage.error(response.msg || '删除失败')
120120
} catch (error) {
121121
ElMessage.error('删除失败，请稍后重试')
122122
}
@@ -131,7 +131,7 @@ export const useManageGoodsStore = defineStore('manageGoods', () => {
131131
try {
132132
const response = await manageGoodsApi.getGoodsDetail(item.id)
133133
if (response.code !== 200) {
134-
ElMessage.error(response.message || response.msg || '加载商品详情失败')
134+
ElMessage.error(response.msg || '加载商品详情失败')
135135
return
136136
}
137137

@@ -166,7 +166,7 @@ export const useManageGoodsStore = defineStore('manageGoods', () => {
166166
try {
167167
const uploadResponse = await manageGoodsApi.uploadImage(file)
168168
if (uploadResponse.code !== 200 || !uploadResponse.data?.ossId) {
169-
ElMessage.error(uploadResponse.message || uploadResponse.msg || '上传失败')
169+
ElMessage.error(uploadResponse.msg || '上传失败')
170170
return
171171
}
172172

@@ -225,7 +225,7 @@ export const useManageGoodsStore = defineStore('manageGoods', () => {
225225
return true
226226
}
227227

228-
ElMessage.error(response.message || response.msg || '保存失败')
228+
ElMessage.error(response.msg || '保存失败')
229229
return false
230230
} catch (error) {
231231
ElMessage.error('保存失败，请稍后重试')
@@ -262,7 +262,7 @@ export const useManageGoodsStore = defineStore('manageGoods', () => {
262262
await fetchGoods()
263263
return true
264264
}
265-
ElMessage.error(response.message || response.msg || '进货失败')
265+
ElMessage.error(response.msg || '进货失败')
266266
return false
267267
} catch (error) {
268268
ElMessage.error('进货失败，请稍后重试')

‎src/stores/order-store.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export const useOrderStore = defineStore('order', () => {
8080

8181
orders.value = []
8282
paging.total = 0
83-
ElMessage.error(response.message || response.msg || '订单列表加载失败')
83+
ElMessage.error(response.msg || '订单列表加载失败')
8484
} catch (error) {
8585
orders.value = []
8686
paging.total = 0
@@ -137,7 +137,7 @@ export const useOrderStore = defineStore('order', () => {
137137
await fetchOrders()
138138
return
139139
}
140-
ElMessage.error(response.message || response.msg || '核销失败')
140+
ElMessage.error(response.msg || '核销失败')
141141
} catch (error) {
142142
ElMessage.error('核销失败，请稍后重试')
143143
}
@@ -157,7 +157,7 @@ export const useOrderStore = defineStore('order', () => {
157157
await fetchOrders()
158158
return
159159
}
160-
ElMessage.error(response.message || response.msg || '批量核销失败')
160+
ElMessage.error(response.msg || '批量核销失败')
161161
} catch (error) {
162162
ElMessage.error('批量核销失败，请稍后重试')
163163
}
@@ -201,7 +201,7 @@ export const useOrderStore = defineStore('order', () => {
201201

202202
currentDetail.value = null
203203
detailPaging.total = 0
204-
ElMessage.error(response.message || response.msg || '订单详情加载失败')
204+
ElMessage.error(response.msg || '订单详情加载失败')
205205
} catch (error) {
206206
currentDetail.value = null
207207
detailPaging.total = 0
@@ -266,7 +266,7 @@ export const useOrderStore = defineStore('order', () => {
266266
ElMessage.success('取消成功')
267267
await fetchOrderList(query.pageNum, query.pageSize)
268268
} else {
269-
ElMessage.error(response.message || response.msg || '取消失败')
269+
ElMessage.error(response.msg || '取消失败')
270270
}
271271
} catch (error) {
272272
ElMessage.error('取消订单失败')

‎src/stores/record-store.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export const useRecordStore = defineStore('record', () => {
5151

5252
items.value = []
5353
total.value = 0
54-
ElMessage.error(response.message || response.msg || '获取进货记录失败')
54+
ElMessage.error(response.msg || '获取进货记录失败')
5555
} catch (error) {
5656
items.value = []
5757
total.value = 0
@@ -78,7 +78,7 @@ export const useRecordStore = defineStore('record', () => {
7878
}
7979

8080
detail.value = defaultDetail()
81-
ElMessage.error(response.message || response.msg || '获取详情失败')
81+
ElMessage.error(response.msg || '获取详情失败')
8282
} catch (error) {
8383
detail.value = defaultDetail()
8484
ElMessage.error('获取详情失败，请稍后重试')

‎src/stores/user-store.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ export const useUserStore = defineStore('user', () => {
123123
loginBtnLoading.value = true
124124
setClientId()
125125
try {
126-
const { code, data, message: msg } = await userApi.login(ruleForm)
126+
const { code, data, msg } = await userApi.login(ruleForm)
127127
if (code === 200) {
128128
authToken.value = data.access_token || ''
129129
role.value = data.roles[0].roleName || ''
@@ -135,18 +135,19 @@ export const useUserStore = defineStore('user', () => {
135135

136136
return Promise.resolve({
137137
success: true,
138-
message: '登录成功',
138+
msg: '登录成功',
139139
})
140140
} else {
141141
return Promise.reject({
142142
success: false,
143-
message: msg,
143+
msg: msg,
144144
})
145145
}
146146
} catch (error) {
147+
console.log('登录失败:', error)
147148
return Promise.reject({
148149
success: false,
149-
message: error instanceof Error ? error.message : String((error as { msg?: unknown }).msg),
150+
msg: (error as any)?.msg || '登录失败，请稍后重试',
150151
})
151152
} finally {
152153
loginBtnLoading.value = false

‎src/types/request.types.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
export interface ApiResponse<T = any> {
22
code: number
3-
message: string
3+
msg: string
44
data: T
55
success: boolean
66
[key: string]: any
77
}
88

99
export interface ErrorResponse {
1010
code: number
11-
message: string
11+
msg: string
1212
success: boolean
1313
}
1414

‎src/views/framework/components/password-form.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ const resetPassword = async (oldPassword: string, newPassword: string) => {
193193
ElMessage.success('密码修改成功')
194194
handleReset()
195195
} else {
196-
ElMessage.error(response.msg || response.message || '密码修改失败')
196+
ElMessage.error(response.msg || '密码修改失败')
197197
}
198198
} catch (error: any) {
199199
console.error('请求错误:', error)
@@ -205,8 +205,8 @@ const resetPassword = async (oldPassword: string, newPassword: string) => {
205205
} else if (error.response.data?.msg) {
206206
errorMessage = error.response.data.msg
207207
}
208-
} else if (error?.message) {
209-
errorMessage = error.message
208+
} else if (error?.msg) {
209+
errorMessage = error.msg
210210
}
211211
212212
ElMessage.error(errorMessage)

‎src/views/home/goods-details.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ const addToCart = async () => {
126126
}
127127
const addResp = await cartApi.add(payload)
128128
if (addResp.code === 500) {
129-
ElMessage.error(addResp.message)
129+
ElMessage.error(addResp.msg)
130130
console.log('商品下架', addResp)
131131
} else if (addResp.code === 200) {
132132
console.log('加入购物车成功', addResp)

‎src/views/login/index.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ const rules = ref<FormRules>({
8888
8989
const getErrorMessage = (error: unknown) => {
9090
if (typeof error === 'string') return error
91-
if (error && typeof error === 'object' && 'message' in error) {
92-
const message = (error as { message?: unknown }).message
93-
if (typeof message === 'string') return message
91+
if (error && typeof error === 'object' && 'msg' in error) {
92+
const msg = (error as { msg?: unknown }).msg
93+
if (typeof msg === 'string') return msg
9494
}
9595
return '登录失败，请稍后重试'
9696
}
@@ -101,14 +101,14 @@ const submitForm = async () => {
101101
const valid = await ruleFormRef.value.validate()
102102
if (!valid) return
103103
104-
const { success, message } = await login()
104+
const { success, msg } = await login()
105105
if (success) {
106106
ElMessage.success('登录成功')
107107
router.push('/framework')
108108
return
109109
}
110110
111-
ElMessage.error(message)
111+
ElMessage.error(msg)
112112
} catch (error) {
113113
ElMessage.error(getErrorMessage(error))
114114
}

0 commit comments

Comments
 (0)