diff --git a/src/api/interface.js b/src/api/interface.js index a56875460d6ef4abe11ac1d2065a1c5bf0f43ea7..85486f74eb5b61c690c2eb451571fc1f476af647 100644 --- a/src/api/interface.js +++ b/src/api/interface.js @@ -47,16 +47,16 @@ export const del = (hash) => { /** * 启用/禁用接口 * @param status - * @param id + * @param hash * @returns {wx.RequestTask | never} */ -export const changeStatus = (status, id) => { +export const changeStatus = (status, hash) => { return axios.request({ url: 'InterfaceList/changeStatus', method: 'get', params: { status: status, - id: id + hash: hash } }) } diff --git a/src/components/main/main.vue b/src/components/main/main.vue index ce02e1df9a95f39988508e999214224f9bca2a10..b877154320996cd31616a674eabc474edc8a94c9 100644 --- a/src/components/main/main.vue +++ b/src/components/main/main.vue @@ -12,7 +12,7 @@
- + @@ -71,15 +71,11 @@ export default { tagNavList () { return this.$store.state.app.tagNavList }, - tagRouter () { - return this.$store.state.app.tagRouter - }, - userAvator () { - return typeof this.$store.state.user.userInfo.userData.head_img !== 'undefined' && this.$store.state.user.userInfo.userData.head_img ? this.$store.state.user.userInfo.userData.head_img : defaultImg + userAvatar () { + return JSON.stringify(this.$store.state.user.userInfo) !== '{}' && this.$store.state.user.userInfo.userData.head_img ? this.$store.state.user.userInfo.userData.head_img : defaultImg }, cacheList () { - const list = ['ParentView', ...this.tagNavList.length ? this.tagNavList.filter(item => !(item.meta && item.meta.notCache)).map(item => item.name) : []] - return list + return ['ParentView', ...this.tagNavList.length ? this.tagNavList.filter(item => !(item.meta && item.meta.notCache)).map(item => item.name) : []] }, menuList () { return this.$store.getters.menuList diff --git a/src/view/app/list.vue b/src/view/app/list.vue index 2dc260e29a7972b23dd2533d8dd14ec14d5bb2d4..45430e80bbc991ada877cda18da5164ce1113281 100644 --- a/src/view/app/list.vue +++ b/src/view/app/list.vue @@ -297,7 +297,7 @@ export default { }, ruleValidate: { app_name: [ - { required: true, message: '用户名不能为空', trigger: 'blur' } + { required: true, message: '应用名称不能为空', trigger: 'blur' } ] }, checkAllStatus: {}, diff --git a/src/view/interface/list.vue b/src/view/interface/list.vue index e5452d9bf3c994dffbe75a1b5cb548c865b1d997..0f4dc533011fd22680caa0f3e19965834b700e35 100644 --- a/src/view/interface/list.vue +++ b/src/view/interface/list.vue @@ -112,7 +112,7 @@

刷新路由是一个非常危险的操作,它有可能影响到您现有接口的访问,请确认无误后刷新!!

- +
@@ -223,6 +223,7 @@ export default { data () { return { confirmRefresh: false, + refreshLoading: false, columnsList: [ { title: '序号', @@ -359,7 +360,7 @@ export default { id: 0 }, ruleValidate: { - apiClass: [ + api_class: [ { required: true, message: '真实类库不能为空', trigger: 'blur' } ], info: [ @@ -450,11 +451,14 @@ export default { }, refreshRoute () { let vm = this + vm.refreshLoading = true refresh().then(response => { vm.$Message.success(response.data.msg) vm.confirmRefresh = false + vm.refreshLoading = false }).catch(() => { vm.confirmRefresh = false + vm.refreshLoading = false }) } } diff --git a/src/view/login/login.vue b/src/view/login/login.vue index 4214fc5db7906963de5feb24d5bb553f00549f10..906fe21153b15b6c3d29a10bc4f4739af0282c18 100755 --- a/src/view/login/login.vue +++ b/src/view/login/login.vue @@ -23,7 +23,7 @@ - +
@@ -61,8 +61,8 @@ export default { qq_login, wx_login, form: { - username: '', - password: '' + username: 'root', + password: '123456' }, rules: { username: [ @@ -73,7 +73,8 @@ export default { ] }, wxQrModel: false, - wxQrUrl: '' + wxQrUrl: '', + loading: false } }, created () { @@ -121,11 +122,15 @@ export default { let password = vm.form.password vm.$refs.loginForm.validate((valid) => { if (valid) { - vm.handleLogin({ username, password }).then(res => { + vm.loading = true + vm.handleLogin({ username, password }).then(() => { sessionStorage.setItem('ApiAdmin_AppInfo', '管理员') vm.$router.push({ name: 'home' }) + vm.loading = false + }).catch(() => { + vm.loading = false }) } }) diff --git a/src/view/single-page/own/own.vue b/src/view/single-page/own/own.vue index 449c17e28122ec104c25686ed49566cdca6d3029..2da57db7f9ac3b5c30b14cffe8ab8f7a7aee3e77 100755 --- a/src/view/single-page/own/own.vue +++ b/src/view/single-page/own/own.vue @@ -18,7 +18,7 @@
- +
@@ -77,7 +77,7 @@

个人信息修改后,将会退出系统重新登录,请明确后修改!

- +
@@ -127,7 +127,7 @@ export default { }, ruleValidate: { nickname: [ - { required: true, message: '请输入姓名', trigger: 'blur' } + { required: true, message: '请输入用户昵称', trigger: 'blur' } ], password: [ { min: 6, message: '请至少输入6个字符', trigger: 'blur' }, diff --git a/src/view/system/auth.vue b/src/view/system/auth.vue index 1902b6d35da42ead5bb7d2b94cf44436eb662896..7b94eb1be47691f9b7b4d189c5733f5191f03d6e 100644 --- a/src/view/system/auth.vue +++ b/src/view/system/auth.vue @@ -275,7 +275,7 @@ export default { key: 'username' }, { - title: '真实姓名', + title: '用户昵称', align: 'center', key: 'nickname', width: 90 diff --git a/src/view/system/user.vue b/src/view/system/user.vue index 165855818b6dc37d26a42d99d318a03eeaabc8bc..058e7c223e2299c5b0d830d374246045c18c0eff 100644 --- a/src/view/system/user.vue +++ b/src/view/system/user.vue @@ -16,7 +16,7 @@ @@ -55,8 +55,8 @@ - - + + @@ -150,7 +150,7 @@ export default { minWidth: 120 }, { - title: '真实姓名', + title: '用户昵称', align: 'center', key: 'nickname', width: 120 @@ -250,7 +250,7 @@ export default { }, ruleValidate: { username: [ - { required: true, message: '用户名不能为空', trigger: 'blur' } + { required: true, message: '用户账号不能为空', trigger: 'blur' } ], nickname: [ { required: true, message: '用户昵称不能为空', trigger: 'blur' } diff --git a/src/view/wiki/login.vue b/src/view/wiki/login.vue index 9f251a5d93c5c2f92e9b9eb0d80344b6ba1615fd..ce0a4b999ae2fdf7b6d6bdf317ec1986cbfd56d9 100644 --- a/src/view/wiki/login.vue +++ b/src/view/wiki/login.vue @@ -23,7 +23,7 @@ - +