fix: 请求成功的判断条件code改为status(部分)

This commit is contained in:
chenjinsong
2023-08-24 17:15:41 +08:00
parent 7b0ec06a05
commit 21f32dfdda
75 changed files with 422 additions and 5595 deletions

View File

@@ -8,7 +8,7 @@
</div>
<div class="right-box__container">
<div class="container__form">
<el-form ref="userForm" :model="editObject" :rules="rules" label-position="top" label-width="120px">
<el-form ref="form" :model="editObject" :rules="rules" label-position="top" label-width="120px">
<!--name-->
<el-form-item :label="$t('overall.name')" prop="name">
<el-input id="proxy-name" v-model="editObject.name"

View File

@@ -56,7 +56,7 @@
<script>
import rightBoxMixin from '@/mixins/right-box'
import { get, post, put } from '@/utils/http'
import axios from 'axios'
import { storageKey } from '@/utils/constants'
import { api } from '@/utils/api'
@@ -84,8 +84,6 @@ export default {
langData: []
}
},
setup () {
},
mounted () {
this.getLangData()
},
@@ -106,23 +104,23 @@ export default {
this.$refs.i18nForm.validate((valid) => {
if (valid) {
if (this.editObject.id) {
put(this.url, this.editObject).then(res => {
axios.put(this.url, this.editObject).then(res => {
this.blockOperation.save = false
if (res.code === 200) {
if (res.status === 200) {
this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
this.esc(true)
} else {
this.$message.error(res.msg || res.message)
this.$message.error(res.data.message)
}
})
} else {
post(this.url, this.editObject).then(res => {
axios.post(this.url, this.editObject).then(res => {
this.blockOperation.save = false
if (res.code === 200) {
if (res.status === 200) {
this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
this.esc(true)
} else {
this.$message.error(res.msg || res.message)
this.$message.error(res.data.message)
}
})
}
@@ -133,9 +131,9 @@ export default {
})
},
getLangData () {
get(api.dict, { type: 'lang', pageSize: -1 }).then(response => {
if (response.code === 200) {
this.langData = response.data.list
axios.get(api.dict, { params: { type: 'lang', pageSize: -1 } }).then(response => {
if (response.status === 200) {
this.langData = response.data.data.list
}
})
}

View File

@@ -40,7 +40,7 @@
<button id="asset-edit-cancel" v-cancel="{object: editRole, func: esc}" class="footer__btn footer__btn--light">
<span>{{$t('overall.cancel')}}</span>
</button>
<button id="asset-edit-save" :class="{'footer__btn--disabled': prevent_opt.save}" :disabled="prevent_opt.save" class="footer__btn" @click="save">
<button id="asset-edit-save" :class="{'footer__btn--disabled': blockOperation.save}" :disabled="blockOperation.save" class="footer__btn" @click="save">
<span>{{$t('overall.save')}}</span>
</button>
</div>
@@ -49,8 +49,9 @@
<script>
import rightBoxMixin from '@/mixins/right-box'
import { get, post, put } from '@/utils/http'
import { api } from '@/utils/api'
import axios from 'axios'
import _ from 'lodash'
export default {
name: 'userBox',
@@ -117,7 +118,7 @@ export default {
},
/* 关闭弹框 */
esc (refresh) {
this.prevent_opt.save = false
this.blockOperation.save = false
this.$emit('close', refresh)
},
getMenus: function () {
@@ -125,19 +126,19 @@ export default {
return new Promise(resolve => {
self.menus = []
if (self.editRole.id) {
get(api.menu + self.editRole.id).then(response => {
if (response.code === 200) {
self.menus = response.data.menus
self.selectedIds = response.data.selectedIds
axios.get(api.menu + self.editRole.id).then(response => {
if (response.status === 200) {
self.menus = _.get(response, 'data.data.menus', [])
self.selectedIds = _.get(response, 'data.data.selectedIds', [])
} else {
self.$message.error('load menu faild')
self.$message.error('load menu failed')
}
resolve()
})
} else {
get(api.sysMenu).then(response => {
if (response.code === 200) {
self.menus = response.data.list
axios.get(api.sysMenu).then(response => {
if (response.status === 200) {
self.menus = _.get(response, 'data.data.list', [])
} else {
self.$message.error('load menu faild')
}
@@ -174,34 +175,34 @@ export default {
}
},
save () {
if (this.prevent_opt.save) { return }
this.prevent_opt.save = true
if (this.blockOperation.save) { return }
this.blockOperation.save = true
this.$refs.roleForm.validate((valid) => {
if (valid) {
if (this.editRole.id) {
put(this.url, this.editRole).then(res => {
this.prevent_opt.save = false
if (res.code === 200) {
axios.put(this.url, this.editRole).then(res => {
this.blockOperation.save = false
if (res.status === 200) {
this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
this.esc(true)
} else {
this.$message.error(res.msg || res.message)
this.$message.error(res.data.msg || res.data.message)
}
})
} else {
post(this.url, this.editRole).then(res => {
this.prevent_opt.save = false
if (res.code === 200) {
axios.post(this.url, this.editRole).then(res => {
this.blockOperation.save = false
if (res.status === 200) {
this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
this.esc(true)
} else {
this.$message.error(res.msg || res.message)
this.$message.error(res.data.msg || res.data.message)
}
})
}
} else {
this.prevent_opt.save = false
this.blockOperation.save = false
return false
}
})

View File

@@ -115,7 +115,8 @@
<script>
import rightBoxMixin from '@/mixins/right-box'
import { get, post, put } from '@/utils/http'
import axios from 'axios'
import _ from 'lodash'
import { themeData, langData, storageKey } from '@/utils/constants'
import { api } from '@/utils/api'
@@ -194,7 +195,6 @@ export default {
],
pinChange: [
{ validator: validatePin, trigger: 'blur' },
{ required: true, message: this.$t('validate.required') },
{ pattern: /^[a-zA-Z0-9]{5,64}$/, message: this.$t('validate.atLeastFive') }
],
roleIds: [
@@ -235,23 +235,23 @@ export default {
this.$refs.userForm.validate((valid) => {
if (valid) {
if (this.editObject.id) {
put(this.url, this.editObject).then(res => {
axios.put(this.url, this.editObject).then(res => {
this.blockOperation.save = false
if (res.code === 200) {
if (res.status === 200) {
this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
this.esc(true)
} else {
this.$message.error(res.msg || res.message)
this.$message.error(res.data.msg || res.data.message)
}
})
} else {
post(this.url, this.editObject).then(res => {
axios.post(this.url, this.editObject).then(res => {
this.blockOperation.save = false
if (res.code === 200) {
if (res.status === 200) {
this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
this.esc(true)
} else {
this.$message.error(res.msg || res.message)
this.$message.error(res.data.msg || res.data.message)
}
})
}
@@ -262,9 +262,9 @@ export default {
})
},
getRoleData () {
get(api.role, { pageSize: -1 }).then(response => {
if (response.code === 200) {
this.roleData = response.data.list
axios.get(api.role, { pageSize: -1 }).then(response => {
if (response.status === 200) {
this.roleData = _.get(response, 'data.data.list', [])
}
})
}