From 1b6553b7cae24be5c686ad9a0e12bb4f5c88297b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=A7=80=E9=92=A2?= Date: Tue, 1 Oct 2019 17:51:23 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix=201=20=E5=BA=94=E7=94=A8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E6=96=87=E6=A1=88=20fix=202=20=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E6=96=87=E6=A1=88=20=E7=94=A8=E6=88=B7=E6=98=B5?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/view/app/list.vue | 2 +- src/view/single-page/own/own.vue | 4 ++-- src/view/system/auth.vue | 2 +- src/view/system/user.vue | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/view/app/list.vue b/src/view/app/list.vue index 2dc260e..45430e8 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/single-page/own/own.vue b/src/view/single-page/own/own.vue index 449c17e..2784167 100755 --- a/src/view/single-page/own/own.vue +++ b/src/view/single-page/own/own.vue @@ -18,7 +18,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 1902b6d..7b94eb1 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 1658558..058e7c2 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' } -- Gitee From 1b2afb09a15858671252a88929716ea19d8b0b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=A7=80=E9=92=A2?= Date: Tue, 1 Oct 2019 18:47:24 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9C=9F=E5=AE=9E=E7=B1=BB=E5=BA=93=E5=BF=85?= =?UTF-8?q?=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/view/interface/list.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/interface/list.vue b/src/view/interface/list.vue index e5452d9..bee9c4c 100644 --- a/src/view/interface/list.vue +++ b/src/view/interface/list.vue @@ -359,7 +359,7 @@ export default { id: 0 }, ruleValidate: { - apiClass: [ + api_class: [ { required: true, message: '真实类库不能为空', trigger: 'blur' } ], info: [ -- Gitee From 31d70b8ffe77d0862db42de38db0f285988ea153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=A7=80=E9=92=A2?= Date: Tue, 1 Oct 2019 18:56:16 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8A=A0=E8=BD=BD=E4=B8=AD=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/view/login/login.vue | 15 ++++++++++----- src/view/wiki/login.vue | 13 +++++++++---- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/view/login/login.vue b/src/view/login/login.vue index 4214fc5..906fe21 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/wiki/login.vue b/src/view/wiki/login.vue index 9f251a5..ce0a4b9 100644 --- a/src/view/wiki/login.vue +++ b/src/view/wiki/login.vue @@ -23,7 +23,7 @@ - +
- +
@@ -223,6 +223,7 @@ export default { data () { return { confirmRefresh: false, + refreshLoading: false, columnsList: [ { title: '序号', @@ -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/single-page/own/own.vue b/src/view/single-page/own/own.vue index 2784167..2da57db 100755 --- a/src/view/single-page/own/own.vue +++ b/src/view/single-page/own/own.vue @@ -77,7 +77,7 @@

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

- +
-- Gitee