diff --git a/src/router/index.js b/src/router/index.js index 9a22fcc..0fd3385 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -121,6 +121,11 @@ export const constantRoutes = [ component: resolve => require(['@/views/result'], resolve), name: 'result' }, + { + path: '/about', + component: resolve => require(['@/views/about'], resolve), + name: 'about' + }, { path: '/portrait', component: resolve => require(['@/views/portrait'], resolve), diff --git a/src/views/about.vue b/src/views/about.vue new file mode 100644 index 0000000..15b881d --- /dev/null +++ b/src/views/about.vue @@ -0,0 +1,305 @@ + + + + + diff --git a/src/views/home/account.vue b/src/views/home/account.vue index 159e961..58a6b5b 100644 --- a/src/views/home/account.vue +++ b/src/views/home/account.vue @@ -20,7 +20,7 @@
修改密码 - 忘记密码时可通过手机验证码登录 + 修改账户登录密码 - + - + ({{ count }}s) + + + - 取 消 - 确 定 + 取 消 + 确 定 @@ -106,7 +122,12 @@ export default { username: [ { required: true, trigger: 'blur', message: '手机号不能为空' } ], - password: [{ required: true, trigger: 'blur', message: '密码不能为空' }] + oldPassword: [ + { required: true, trigger: 'blur', message: '原密码不能为空' } + ], + password: [ + { required: true, trigger: 'blur', message: '新密码不能为空' } + ] } }; }, @@ -145,18 +166,26 @@ export default { } }); }, - submitForm() { - if (this.title == '修改密码') { - if (this.form.password !== this.password) - return this.msgError('新旧密码不一致'); - } - updateInfo(this.form).then(({ message }) => { - this.msgSuccess(message); - // store.commit('SET_NAME', this.form.username); - // this.dialogVisible = false; - this.$store.dispatch('LogOut').then(() => { - location.href = '/'; - }); + resetForm(formName) { + this.dialogVisible = false; + this.$refs[formName].resetFields(); + }, + submitForm(formName) { + this.$refs[formName].validate(valid => { + if (valid) { + if (this.title == '修改密码') { + if (this.form.password !== this.password) + return this.msgError('新旧密码不一致'); + } + updateInfo(this.form).then(({ message }) => { + this.msgSuccess(message); + // store.commit('SET_NAME', this.form.username); + // this.dialogVisible = false; + this.$store.dispatch('LogOut').then(() => { + location.href = '/'; + }); + }); + } }); // if(this.title=='修改登录手机号'){ diff --git a/src/views/home/home.vue b/src/views/home/home.vue index 555dae4..d77cf5a 100644 --- a/src/views/home/home.vue +++ b/src/views/home/home.vue @@ -357,9 +357,17 @@ 合肥嘉策信息技术服务有限公司于2018年05月2日成立。法定代表人时加红，公司经营范围包括：信息系统集成咨询...

- + + 更多 @@ -437,6 +445,9 @@ export default { }; }, methods: { + handlePageAbout() { + return alert('请提供更多信息，以图文格式展示！！！'); + }, // 政策列表 handleClick(tab, event) { getPolicy(this.queryParams).then(({ data }) => { diff --git a/src/views/home/ollection.vue b/src/views/home/ollection.vue index 7fef1e2..e63dfca 100644 --- a/src/views/home/ollection.vue +++ b/src/views/home/ollection.vue @@ -19,7 +19,8 @@
来源：{{ item.source }}
-
发布：{{ parseTime(item.textDate, '{y}-{m}-{d}') }}
+
发布：{{ parseTime(item.listDate, '{y}-{m}-{d}') }}
+
diff --git a/src/views/login.vue b/src/views/login.vue index f0076b5..32e2ca9 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -14,7 +14,11 @@ >
- 欢迎登录 + 欢迎登录
{ - this.$router.push({ path: this.redirect || '/' }); - // this.$router.go(-1); - }) - .catch(() => { - this.loading = false; - }); + debugger; + // this.$store + // .dispatch('Register', this.loginForm) + // .then(() => { + // this.$router.push({ path: this.redirect || '/' }); + // // this.$router.go(-1); + // }) + // .catch(() => { + // this.loading = false; + // }); } } }); @@ -461,7 +468,7 @@ export default { this.$refs.registerForm.validate(valid => { if (valid) { this.loading = true; - // 验证码登录 + // 注册 this.$store .dispatch('Register', this.registerForm) .then(() => { @@ -660,7 +667,7 @@ $loginForm: 383px; color: #209cff; } .el-dialog { - height: 700px; + max-height: 700px; overflow: auto; }