Skip to content

Commit f42d57c

Browse files
vanoneangvanoneang
committed
feat(*): code
change err_code to code & msg to message
1 parent 4059350 commit f42d57c

12 files changed

Lines changed: 42 additions & 49 deletions

File tree

‎src/components/base/upload-imgs/index.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -483,10 +483,8 @@ export default {
483483
item.cb(false)
484484
})
485485
let msg = '图像上传失败, 请重试'
486-
if (err.msg) {
486+
if (err.message) {
487487
// eslint-disable-next-line
488-
msg = err.msg
489-
} else if (err.message) {
490488
msg = err.message
491489
}
492490
console.error(err)

‎src/components/layout/User.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ export default {
265265
return false
266266
}
267267
// TODO: 错误码处理
268-
// if (res.error_code === 10110) {
268+
// if (res.code === 10110) {
269269
// throw new Error('文件体积过大')
270270
// }
271271
return this.$axios({
@@ -277,7 +277,7 @@ export default {
277277
})
278278
.then(putRes => {
279279
// eslint-disable-line
280-
if (putRes.error_code < window.SUCCESS_CODE) {
280+
if (putRes.code < window.SUCCESS_CODE) {
281281
this.$message({
282282
type: 'success',
283283
message: '更新头像成功',
@@ -318,7 +318,7 @@ export default {
318318
})
319319
.then(res => {
320320
debugger
321-
if (res.error_code < window.SUCCESS_CODE) {
321+
if (res.code < window.SUCCESS_CODE) {
322322
this.$message({
323323
type: 'success',
324324
message: '更新昵称成功',
@@ -367,8 +367,8 @@ export default {
367367
// eslint-disable-line
368368
if (valid) {
369369
const res = await User.updatePassword(this.form)
370-
if (res.error_code < window.SUCCESS_CODE) {
371-
this.$message.success(`${res.msg}`)
370+
if (res.code < window.SUCCESS_CODE) {
371+
this.$message.success(`${res.message}`)
372372
this.resetForm(formName)
373373
this.dialogFormVisible = false
374374
setTimeout(() => {

‎src/lin/plugins/axios.js‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ _axios.interceptors.request.use(
109109
// Add a response interceptor
110110
_axios.interceptors.response.use(
111111
async res => {
112-
let { error_code, msg } = res.data // eslint-disable-line
113-
let message = '' // 错误提示
112+
let { error_code, message } = res.data // eslint-disable-line
114113
if (res.status.toString().charAt(0) === '2') {
115114
return res.data
116115
}
@@ -142,12 +141,10 @@ _axios.interceptors.response.use(
142141
if (params && params.handleError) {
143142
return reject(res)
144143
}
145-
console.log('msg', msg)
144+
console.log('message', message)
146145
if (Config.useFrontEndErrorMsg) {
147146
// 这一次请求添加 params 参数：showBackend 为 true, 弹出后端返回错误信息
148-
if (params && params.showBackend) {
149-
message = msg
150-
} else {
147+
if (params && !params.showBackend) {
151148
// 弹出前端自定义错误信息
152149
const errorArr = Object.entries(ErrorCode).filter(v => v[0] === error_code.toString())
153150
// 匹配到前端自定义的错误码
@@ -159,8 +156,6 @@ _axios.interceptors.response.use(
159156
message = ErrorCode['777']
160157
}
161158
}
162-
} else {
163-
message = msg
164159
}
165160

166161
Vue.prototype.$message({

‎src/views/admin/group/GroupAdd.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ export default {
9191
this.loading = false
9292
console.log(e)
9393
}
94-
if (res.error_code < window.SUCCESS_CODE) {
94+
if (res.code < window.SUCCESS_CODE) {
9595
this.loading = false
96-
this.$message.success(`${res.msg}`)
96+
this.$message.success(`${res.message}`)
9797
this.eventBus.$emit('addGroup', true)
9898
this.$router.push('/admin/group/list')
9999
this.resetForm('form')
100100
} else {
101101
this.loading = false
102-
this.$message.error(`${res.msg}`)
102+
this.$message.error(`${res.message}`)
103103
}
104104
} else {
105105
this.$message.error('请将信息填写完整')

‎src/views/admin/group/GroupList.vue‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ export default {
124124
if (this.cacheForm.name !== this.form.name || this.cacheForm.info !== this.form.info) {
125125
// eslint-disable-line
126126
const res = await Admin.updateOneGroup(this.form.name, this.form.info, this.id)
127-
if (res.error_code < window.SUCCESS_CODE) {
128-
this.$message.success(`${res.msg}`)
127+
if (res.code < window.SUCCESS_CODE) {
128+
this.$message.success(`${res.message}`)
129129
this.getAllGroups()
130130
}
131131
}
@@ -150,7 +150,7 @@ export default {
150150
if (deletePermissions.length > 0) {
151151
delRes = await Admin.removePermissions(this.id, deletePermissions)
152152
}
153-
if (addRes.error_code < window.SUCCESS_CODE || delRes.error_code < window.SUCCESS_CODE) {
153+
if (addRes.code < window.SUCCESS_CODE || delRes.code < window.SUCCESS_CODE) {
154154
this.$message.success('权限修改成功')
155155
}
156156
}
@@ -191,17 +191,17 @@ export default {
191191
this.loading = false
192192
console.log(e)
193193
}
194-
if (res.error_code < window.SUCCESS_CODE) {
194+
if (res.code < window.SUCCESS_CODE) {
195195
await this.getAllGroups()
196196
this.$message({
197197
type: 'success',
198-
message: `${res.msg}`,
198+
message: `${res.message}`,
199199
})
200200
} else {
201201
this.loading = false
202202
this.$message({
203203
type: 'error',
204-
message: `${res.msg}`,
204+
message: `${res.message}`,
205205
})
206206
}
207207
})

‎src/views/admin/user/UserInfo.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@ export default {
165165
try {
166166
this.loading = true
167167
res = await User.register(this.form)
168-
if (res.error_code < window.SUCCESS_CODE) {
168+
if (res.code < window.SUCCESS_CODE) {
169169
this.loading = false
170-
this.$message.success(`${res.msg}`)
170+
this.$message.success(`${res.message}`)
171171
this.eventBus.$emit('addUser', true)
172172
this.resetForm(formName)
173173
}
@@ -192,13 +192,13 @@ export default {
192192
this.loading = false
193193
console.log(e)
194194
}
195-
if (res.error_code < window.SUCCESS_CODE) {
195+
if (res.code < window.SUCCESS_CODE) {
196196
this.loading = false
197-
this.$message.success(`${res.msg}`)
197+
this.$message.success(`${res.message}`)
198198
this.$emit('handleInfoResult', true)
199199
} else {
200200
this.loading = false
201-
this.$message.error(`${res.msg}`)
201+
this.$message.error(`${res.message}`)
202202
}
203203
}
204204
} else {

‎src/views/admin/user/UserList.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ export default {
170170
this.loading = false
171171
console.log(e)
172172
}
173-
if (res.error_code < window.SUCCESS_CODE) {
173+
if (res.code < window.SUCCESS_CODE) {
174174
this.loading = false
175175
if (this.total_nums % this.pageCount === 1 && this.currentPage !== 1) {
176176
// 判断删除的是不是每一页的最后一条数据
@@ -179,11 +179,11 @@ export default {
179179
await this.getAdminUsers()
180180
this.$message({
181181
type: 'success',
182-
message: `${res.msg}`,
182+
message: `${res.message}`,
183183
})
184184
} else {
185185
this.loading = false
186-
this.$message.error(`${res.msg}`)
186+
this.$message.error(`${res.message}`)
187187
}
188188
})
189189
},

‎src/views/admin/user/UserPassword.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,14 @@ export default {
8181
this.loading = false
8282
console.log(e)
8383
}
84-
if (res.error_code < window.SUCCESS_CODE) {
84+
if (res.code < window.SUCCESS_CODE) {
8585
this.loading = false
86-
this.$message.success(`${res.msg}`)
86+
this.$message.success(`${res.message}`)
8787
this.resetForm(formName)
8888
this.$emit('handlePasswordResult', true)
8989
} else {
9090
this.loading = false
91-
this.$message.error(`${res.msg}`)
91+
this.$message.error(`${res.message}`)
9292
}
9393
} else {
9494
console.log('error submit!!')

‎src/views/book/BookAdd.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ export default {
5454
async submitForm(formName) {
5555
try {
5656
const res = await book.addBook(this.form)
57-
if (res.error_code < window.SUCCESS_CODE) {
58-
this.$message.success(`${res.msg}`)
57+
if (res.code < window.SUCCESS_CODE) {
58+
this.$message.success(`${res.message}`)
5959
this.resetForm(formName)
6060
}
6161
} catch (error) {
62-
this.$message.error(error.data.msg)
62+
this.$message.error(error.data.message)
6363
console.log(error)
6464
}
6565
},

‎src/views/book/BookEdit.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ export default {
6060
methods: {
6161
async submitForm() {
6262
const res = await book.editBook(this.editBookID, this.form)
63-
if (res.error_code < window.SUCCESS_CODE) {
64-
this.$message.success(`${res.msg}`)
63+
if (res.code < window.SUCCESS_CODE) {
64+
this.$message.success(`${res.message}`)
6565
this.$emit('editClose')
6666
}
6767
},

0 commit comments

Comments
 (0)