diff --git a/src/view/app/group.vue b/src/view/app/group.vue index 74a6c09362f93462e72b5081d3260da6ffa131f7..49e6b24f8f4bac9e0e12d3bc5c7994d627570303 100644 --- a/src/view/app/group.vue +++ b/src/view/app/group.vue @@ -171,7 +171,6 @@ export default { changeStatus(status, params.row.id).then(response => { vm.$Message.success(response.data.msg) vm.getList() - vm.cancel() }) } } @@ -248,7 +247,7 @@ export default { vm.getList() vm.cancel() }).catch(() => { - vm.cancel() + vm.modalSetting.loading = false }) } else { edit(vm.formItem).then(response => { @@ -256,7 +255,7 @@ export default { vm.getList() vm.cancel() }).catch(() => { - vm.cancel() + vm.modalSetting.loading = false }) } } diff --git a/src/view/app/list.vue b/src/view/app/list.vue index eca27d515cb136b9e151d65f81859256aad65dbc..09e18b6c9723e8762a90dbdf14faf3ae304d1536 100644 --- a/src/view/app/list.vue +++ b/src/view/app/list.vue @@ -242,7 +242,6 @@ export default { changeStatus(status, params.row.id).then(response => { vm.$Message.success(response.data.msg) vm.getList() - vm.cancel() }) } } @@ -338,7 +337,7 @@ export default { vm.getList() vm.cancel() }).catch(() => { - vm.cancel() + vm.modalSetting.loading = false }) } else { edit(vm.formItem).then(response => { @@ -346,7 +345,7 @@ export default { vm.getList() vm.cancel() }).catch(() => { - vm.cancel() + vm.modalSetting.loading = false }) } } diff --git a/src/view/interface/group.vue b/src/view/interface/group.vue index d0fc7c247ba57866e3cf797e0c18d5708e2e93d6..057d1b7aee08772de17e658a7e4ae6a44300b02f 100644 --- a/src/view/interface/group.vue +++ b/src/view/interface/group.vue @@ -213,7 +213,6 @@ export default { changeStatus(status, params.row.id).then(response => { vm.$Message.success(response.data.msg) vm.getList() - vm.cancel() }) } } @@ -291,7 +290,7 @@ export default { vm.getList() vm.cancel() }).catch(() => { - vm.cancel() + vm.modalSetting.loading = false }) } else { edit(vm.formItem).then(response => { @@ -299,7 +298,7 @@ export default { vm.getList() vm.cancel() }).catch(() => { - vm.cancel() + vm.modalSetting.loading = false }) } } diff --git a/src/view/interface/list.vue b/src/view/interface/list.vue index 3d8b89f55341b980992eea0ed9ccc33cfcddcf1a..fb6c3f1ddd8f1ec3e711b562c045de4976aa72bb 100644 --- a/src/view/interface/list.vue +++ b/src/view/interface/list.vue @@ -304,7 +304,6 @@ export default { changeStatus(status, params.row.hash).then(response => { vm.$Message.success(response.data.msg) vm.getList() - vm.cancel() }) } } @@ -398,7 +397,7 @@ export default { vm.getList() vm.cancel() }).catch(() => { - vm.cancel() + vm.modalSetting.loading = false }) } else { edit(vm.formItem).then(response => { @@ -407,7 +406,7 @@ export default { vm.getList() vm.cancel() }).catch(() => { - vm.cancel() + vm.modalSetting.loading = false }) } } diff --git a/src/view/interface/request.vue b/src/view/interface/request.vue index 4db1f328e489a6455b26c837db533bad3d43d84e..f762def8e0d445956186b0550fc45b288c7256ee 100644 --- a/src/view/interface/request.vue +++ b/src/view/interface/request.vue @@ -246,7 +246,7 @@ export default { vm.getList() vm.cancel() }).catch(() => { - vm.cancel() + vm.modalSetting.loading = false }) } else { edit(vm.formItem).then(response => { @@ -254,7 +254,7 @@ export default { vm.getList() vm.cancel() }).catch(() => { - vm.cancel() + vm.modalSetting.loading = false }) } } diff --git a/src/view/interface/response.vue b/src/view/interface/response.vue index 22b79a17351e8a837a24db6c4e51235e88b1de29..8ae2b621dac94aff35bf20edc366b54b9be7b7be 100644 --- a/src/view/interface/response.vue +++ b/src/view/interface/response.vue @@ -275,7 +275,7 @@ export default { vm.getList() vm.cancel() }).catch(() => { - vm.cancel() + vm.modalSetting.loading = false }) } }) @@ -291,7 +291,7 @@ export default { vm.getList() vm.cancelUpload() }).catch(() => { - vm.cancelUpload() + vm.uploadModal.loading = false }) } }) diff --git a/src/view/login/login.vue b/src/view/login/login.vue index 906fe21153b15b6c3d29a10bc4f4739af0282c18..f98a44c58392dab066be7fa6922fda41e017cb1e 100755 --- a/src/view/login/login.vue +++ b/src/view/login/login.vue @@ -61,8 +61,8 @@ export default { qq_login, wx_login, form: { - username: 'root', - password: '123456' + username: '', + password: '' }, rules: { username: [ diff --git a/src/view/system/auth.vue b/src/view/system/auth.vue index 2da5a78c5255dd88f72b40304a90647c28095a99..b195cf9c28264deeffd026f3cc3d6370e40aecb8 100644 --- a/src/view/system/auth.vue +++ b/src/view/system/auth.vue @@ -236,7 +236,6 @@ export default { changeStatus(status, params.row.id).then(response => { vm.$Message.success(response.data.msg) vm.getList() - vm.cancel() }) } } @@ -400,7 +399,7 @@ export default { vm.getList() vm.cancel() }).catch(() => { - vm.cancel() + vm.modalSetting.loading = false }) } else { edit(vm.formItem).then(response => { @@ -408,7 +407,7 @@ export default { vm.getList() vm.cancel() }).catch(() => { - vm.cancel() + vm.modalSetting.loading = false }) } } diff --git a/src/view/system/menu.vue b/src/view/system/menu.vue index a4e8f8fbe6d90936606edc2121df266d891cb440..e8e6aff368015cab2e65ad2293983a8012a7bf18 100755 --- a/src/view/system/menu.vue +++ b/src/view/system/menu.vue @@ -215,7 +215,7 @@ export default { vm.getList() vm.cancel() }).catch(() => { - vm.cancel() + vm.modalSetting.loading = false }) } else { edit(vm.formItem).then(response => { @@ -223,7 +223,7 @@ export default { vm.getList() vm.cancel() }).catch(() => { - vm.cancel() + vm.modalSetting.loading = false }) } } diff --git a/src/view/system/user.vue b/src/view/system/user.vue index 4ca6d196d01fda9bbc6db8a960ce166584903d6c..8ed0efb5f9daccb75ee4d0fd6ff1ba5091258e58 100644 --- a/src/view/system/user.vue +++ b/src/view/system/user.vue @@ -283,7 +283,7 @@ export default { vm.getList() vm.cancel() }).catch(() => { - vm.cancel() + vm.modalSetting.loading = false }) } else { edit(vm.formItem).then(response => { @@ -291,7 +291,7 @@ export default { vm.getList() vm.cancel() }).catch(() => { - vm.cancel() + vm.modalSetting.loading = false }) } } diff --git a/src/view/wiki/login.vue b/src/view/wiki/login.vue index ce0a4b999ae2fdf7b6d6bdf317ec1986cbfd56d9..4a340845d8ed2c3d73d895d131fe368ce3b0797a 100644 --- a/src/view/wiki/login.vue +++ b/src/view/wiki/login.vue @@ -42,8 +42,8 @@ export default { data () { return { form: { - username: '49686770', - password: 'RdZsbOQNeylhdacRXGTxUpWlrCQuOOnG' + username: '', + password: '' }, rules: { username: [