diff --git a/src/utils/request.js b/src/utils/request.js index 56d7176..415a664 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -89,42 +89,68 @@ console.log('错误:' + error.response.data.message) // for debug // Message.error(error.response.data.message) // debugger - if (error.response.data.message === '原密码不正确') { - Message({ - showClose: true, - message: 'Old password error', - type: 'error', - duration: 3000 - }) - } else if (error.response.data.message === '该用户已经注册') { - Message({ - showClose: true, - message: 'This account has been registered', - type: 'error', - duration: 3000 - }) - } else if (error.response.data.message === '未授权.没有或者登录超时') { - Message({ - showClose: true, - message: 'Not authorized. No or login timed out', - type: 'error', - duration: 3000 - }) - } else if (error.response.data.message === '服务器异常') { - Message({ - showClose: true, - message: 'Server exception', - type: 'error', - duration: 3000 - }) - } else { - Message({ - showClose: true, - message: error.response.data.message, - type: 'error', - duration: 3000 - }) + var msg = error.response.data.message + switch (msg) { + case '原密码不正确': + msg = 'Old password error' + break + case '该用户已经注册': + msg = 'This account has been registered' + break + case '未授权.没有或者登录超时': + msg = 'Not authorized. No or login timed out' + break + case '添加用户失败(密码解密失败)!': + msg = 'Failed to add user (password decryption failed)!' + break + case '会话超时': + msg = 'Session timeout' + break + case '请求有错误': + msg = 'Error in request' + break + case '字典的值必须为数字': + msg = 'The dictionary value must be a number' + break + case '两次输入密码不一致': + msg = 'The passwords entered two times are inconsistent' + break + case '账号被冻结': + msg = 'Account is frozen' + break + case '没有此用户': + msg = 'There is no such user' + break + case '不能冻结当前用户': + msg = 'The current user cannot be frozen' + break + case '请求数据格式不正确': + msg = 'The requested data format is incorrect' + break + case '上传图片出错': + msg = 'Error uploading picture' + break + case '未授权': + msg = 'Unauthorized' + break + case '数据库中没有该资源': + msg = 'The resource does not exist in the database' + break + case '验证码不正确': + msg = 'Verification code is incorrect' + break + case '服务器异常': + msg = 'Server exception' + break + default: + break } + Message({ + showClose: true, + message: msg, + type: 'error', + duration: 3000 + }) } return Promise.reject(error) diff --git a/src/utils/request.js b/src/utils/request.js index 56d7176..415a664 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -89,42 +89,68 @@ console.log('错误:' + error.response.data.message) // for debug // Message.error(error.response.data.message) // debugger - if (error.response.data.message === '原密码不正确') { - Message({ - showClose: true, - message: 'Old password error', - type: 'error', - duration: 3000 - }) - } else if (error.response.data.message === '该用户已经注册') { - Message({ - showClose: true, - message: 'This account has been registered', - type: 'error', - duration: 3000 - }) - } else if (error.response.data.message === '未授权.没有或者登录超时') { - Message({ - showClose: true, - message: 'Not authorized. No or login timed out', - type: 'error', - duration: 3000 - }) - } else if (error.response.data.message === '服务器异常') { - Message({ - showClose: true, - message: 'Server exception', - type: 'error', - duration: 3000 - }) - } else { - Message({ - showClose: true, - message: error.response.data.message, - type: 'error', - duration: 3000 - }) + var msg = error.response.data.message + switch (msg) { + case '原密码不正确': + msg = 'Old password error' + break + case '该用户已经注册': + msg = 'This account has been registered' + break + case '未授权.没有或者登录超时': + msg = 'Not authorized. No or login timed out' + break + case '添加用户失败(密码解密失败)!': + msg = 'Failed to add user (password decryption failed)!' + break + case '会话超时': + msg = 'Session timeout' + break + case '请求有错误': + msg = 'Error in request' + break + case '字典的值必须为数字': + msg = 'The dictionary value must be a number' + break + case '两次输入密码不一致': + msg = 'The passwords entered two times are inconsistent' + break + case '账号被冻结': + msg = 'Account is frozen' + break + case '没有此用户': + msg = 'There is no such user' + break + case '不能冻结当前用户': + msg = 'The current user cannot be frozen' + break + case '请求数据格式不正确': + msg = 'The requested data format is incorrect' + break + case '上传图片出错': + msg = 'Error uploading picture' + break + case '未授权': + msg = 'Unauthorized' + break + case '数据库中没有该资源': + msg = 'The resource does not exist in the database' + break + case '验证码不正确': + msg = 'Verification code is incorrect' + break + case '服务器异常': + msg = 'Server exception' + break + default: + break } + Message({ + showClose: true, + message: msg, + type: 'error', + duration: 3000 + }) } return Promise.reject(error) diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue index aa40a5b..6d1f376 100644 --- a/src/views/system/user/listUser.vue +++ b/src/views/system/user/listUser.vue @@ -71,7 +71,7 @@ @@ -130,16 +130,16 @@ }, registerTime: [], // 注册时间范围 statusName: { - '1': 'Enable', - '2': 'Frozen' + '启用': 'Enable', + '已冻结': 'Frozen' }, tagNames: { '已冻结': 'warning', '启用': 'success' }, btnNames: { - '已冻结': '解冻', - '启用': '冻结' + '已冻结': 'Unfrozen', + '启用': 'Frozen' }, btnStatus: { '已冻结': 'success', @@ -237,17 +237,17 @@ if (this.singleCheck()) { const row = this.list[this.radio] this.$confirm( - '确定要删除' + row.name + '吗?', - '确认删除', + 'Are you sure you want to delete ' + row.name + ' ?', + 'Confirm', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'warning' } ).then(() => { delUser(row.id).then(response => { if (response.code === 200) { - this.$message.success('删除成功') + this.$message.success('delete success') this.deleteItem(this.list, row)// 前端删除指定项 } }) @@ -290,17 +290,17 @@ console.log(row.id) if (row.statusName === '已冻结') { this.$confirm( - '确定要对' + row.name + '解除冻结吗?', - '确认操作', + 'Are you sure you want to unfrozen ' + row.name + ' ?', + 'Confirm', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'warning' } ).then(() => { unfreezeUser(row.id).then(response => { if (response.code === 200) { - this.$message.success('解除冻结成功') + this.$message.success('unfrozen success') row.statusName = '启用' console.log('rowStatusName:' + row.statusName) } @@ -308,17 +308,17 @@ }) } else { this.$confirm( - '确定要冻结' + row.name + '吗?', - '确认操作', + 'Are you sure you want to frozen ' + row.name + ' ?', + 'Confirm', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'warning' } ).then(() => { freezeUser(row.id).then(response => { if (response.code === 200) { - this.$message.success('冻结用户成功') + this.$message.success('frozen success') row.statusName = '已冻结' } })