From ef5c66448edb1b16edb046a65eb33b4e81c35330 Mon Sep 17 00:00:00 2001 From: QM303176530 <303176530@qq.com> Date: Sun, 8 Nov 2020 14:15:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E8=87=B3=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E5=86=85?= =?UTF-8?q?=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/api/v1/sys_user.go | 2 +- server/cmd/datas/users.go | 2 +- server/core/server.go | 3 +- web/src/main.js | 3 +- web/src/style/main.scss | 4 +- web/src/view/layout/index.vue | 71 +------ web/src/view/layout/search/search.vue | 30 +-- web/src/view/person/person.vue | 271 +++++++++++++++++--------- 8 files changed, 211 insertions(+), 175 deletions(-) diff --git a/server/api/v1/sys_user.go b/server/api/v1/sys_user.go index b7d61c83..e55214de 100644 --- a/server/api/v1/sys_user.go +++ b/server/api/v1/sys_user.go @@ -144,7 +144,7 @@ func ChangePassword(c *gin.Context) { U := &model.SysUser{Username: user.Username, Password: user.Password} if err, _ := service.ChangePassword(U, user.NewPassword); err != nil { global.GVA_LOG.Error("修改失败", zap.Any("err", err)) - response.FailWithMessage("修改失败，请检查用户名密码", c) + response.FailWithMessage("修改失败，原密码与当前账户不符", c) } else { response.OkWithMessage("修改成功", c) } diff --git a/server/cmd/datas/users.go b/server/cmd/datas/users.go index 55677985..c2353ab6 100644 --- a/server/cmd/datas/users.go +++ b/server/cmd/datas/users.go @@ -11,7 +11,7 @@ import ( ) var Users = []model.SysUser{ - {GVA_MODEL: global.GVA_MODEL{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, UUID: uuid.NewV4(), Username: "admin", Password: "e10adc3949ba59abbe56e057f20f883e", NickName: "超级管理员", HeaderImg: "http://qmplusimg.henrongyi.top/1571627762timg.jpg", AuthorityId: "888"}, + {GVA_MODEL: global.GVA_MODEL{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, UUID: uuid.NewV4(), Username: "admin", Password: "e10adc3949ba59abbe56e057f20f883e", NickName: "超级管理员", HeaderImg: "http://qmplusimg.henrongyi.top/gva_header.jpg", AuthorityId: "888"}, {GVA_MODEL: global.GVA_MODEL{ID: 2, CreatedAt: time.Now(), UpdatedAt: time.Now()}, UUID: uuid.NewV4(), Username: "a303176530", Password: "3ec063004a6f31642261936a379fde3d", NickName: "QMPlusUser", HeaderImg: "http://qmplusimg.henrongyi.top/1572075907logo.png", AuthorityId: "9528"}, } diff --git a/server/core/server.go b/server/core/server.go index 49f2ecb3..78c2a325 100644 --- a/server/core/server.go +++ b/server/core/server.go @@ -29,9 +29,10 @@ func RunWindowsServer() { fmt.Printf(` 欢迎使用 Gin-Vue-Admin - 当前版本:V2.3.4 + 当前版本:V2.3.5 默认自动化文档地址:http://127.0.0.1%s/swagger/index.html 默认前端文件运行地址:http://127.0.0.1:8080 + 如果项目让您获得了收益，希望您能请团队喝杯可乐:https://www.gin-vue-admin.com/docs/coffee `, address) global.GVA_LOG.Error(s.ListenAndServe().Error()) } diff --git a/web/src/main.js b/web/src/main.js index 872812d2..04992b83 100644 --- a/web/src/main.js +++ b/web/src/main.js @@ -66,7 +66,8 @@ Vue.prototype.$echarts = echarts; console.log(` 欢迎使用 Gin-Vue-Admin - 当前版本:V2.3.4 + 当前版本:V2.3.5 默认自动化文档地址:http://127.0.0.1%s/swagger/index.html 默认前端文件运行地址:http://127.0.0.1:8080 + 如果项目让您获得了收益，希望您能请团队喝杯可乐:https://www.gin-vue-admin.com/docs/coffee `) \ No newline at end of file diff --git a/web/src/style/main.scss b/web/src/style/main.scss index 30ab9e90..ce9248d5 100644 --- a/web/src/style/main.scss +++ b/web/src/style/main.scss @@ -1191,7 +1191,7 @@ $mainHight: 100vh; display: inline-block; overflow: hidden; height: 60px; - width: 40px; + width: 120px; text-align: center; .el-input__inner { border: none; @@ -1215,7 +1215,7 @@ $mainHight: 100vh; .transition-box { overflow: hidden; - width: 40px; + width: 120px; text-align: center; } diff --git a/web/src/view/layout/index.vue b/web/src/view/layout/index.vue index d7e6833c..ad5ad72e 100644 --- a/web/src/view/layout/index.vue +++ b/web/src/view/layout/index.vue @@ -43,7 +43,6 @@ - 修改密码 个人信息 登 出 @@ -67,23 +66,7 @@ - - - - - - - - - - - - -
- 取 消 - 确 定 -
- + @@ -94,7 +77,6 @@ import Screenfull from '@/view/layout/screenfull' import Search from '@/view/layout/search/search' import BottomInfo from '@/view/layout/bottomInfo/bottomInfo' import { mapGetters, mapActions } from 'vuex' -import { changePassword } from '@/api/user' import CustomPic from '@/components/customPic' export default { name: 'Layout', @@ -105,33 +87,8 @@ export default { isSider: true, isMobile: false, isShadowBg: false, - showPassword: false, loadingFlag:false, - pwdModify: {}, - rules: { - password: [ - { required: true, message: '请输入密码', trigger: 'blur' }, - { min: 6, message: '最少6个字符', trigger: 'blur' } - ], - newPassword: [ - { required: true, message: '请输入新密码', trigger: 'blur' }, - { min: 6, message: '最少6个字符', trigger: 'blur' } - ], - confirmPassword: [ - { required: true, message: '请输入确认密码', trigger: 'blur' }, - { min: 6, message: '最少6个字符', trigger: 'blur' }, - { - validator: (rule, value, callback) => { - if (value !== this.pwdModify.newPassword) { - callback(new Error('两次密码不一致')) - } else { - callback() - } - }, - trigger: 'blur' - } - ] - }, + value: '' } }, @@ -159,30 +116,6 @@ export default { this.isSider = !!this.isCollapse this.totalCollapse() }, - savePassword() { - this.$refs.modifyPwdForm.validate(valid => { - if (valid) { - changePassword({ - username: this.userInfo.userName, - password: this.pwdModify.password, - newPassword: this.pwdModify.newPassword - }).then(() => { - this.$message.success('修改密码成功！') - this.showPassword = false - }) - } else { - return false - } - }) - }, - clearPassword() { - this.pwdModify = { - password: '', - newPassword: '', - confirmPassword: '' - } - this.$refs.modifyPwdForm.clearValidate() - } }, computed: { ...mapGetters('user', ['userInfo']), diff --git a/web/src/view/layout/search/search.vue b/web/src/view/layout/search/search.vue index 4a3298b0..abc7dfa4 100644 --- a/web/src/view/layout/search/search.vue +++ b/web/src/view/layout/search/search.vue @@ -3,6 +3,7 @@
-
- +
+
\ No newline at end of file diff --git a/web/src/view/person/person.vue b/web/src/view/person/person.vue index d8eb48d1..9be6d49d 100644 --- a/web/src/view/person/person.vue +++ b/web/src/view/person/person.vue @@ -2,12 +2,18 @@
-
+
- +

{{userInfo.nickName}}

-

我是个性签名

+

这个家伙很懒，什么都没有留下

    @@ -35,15 +41,31 @@

    • 密保手机

      -

      已绑定手机:1245678910 立即修改

      +

      + 已绑定手机:1245678910 + 立即修改 +

    • 密保邮箱

      -

      已绑定邮箱：gin-vue-admin@google.com.cn立即修改

      +

      + 已绑定邮箱：gin-vue-admin@google.com.cn + 立即修改 +

    • 密保问题

      -

      未设置密保问题 去设置

      +

      + 未设置密保问题 + 去设置 +

      +
      • +
    • +

      修改密码

      +

      + 修改个人密码 + 修改密码 +

    @@ -52,53 +74,119 @@ - - - - + + + + + + + + + + + + + + +
    + 取 消 + 确 定 +
    +
\ No newline at end of file -- GitLab