diff --git a/src/components/modules/link.vue b/src/components/modules/link.vue index cc6426f..d6bb257 100644 --- a/src/components/modules/link.vue +++ b/src/components/modules/link.vue @@ -91,6 +91,7 @@ \ No newline at end of file diff --git a/src/pages/role/list/index.vue b/src/pages/role/list/index.vue index 0e95892..dde593c 100644 --- a/src/pages/role/list/index.vue +++ b/src/pages/role/list/index.vue @@ -48,6 +48,7 @@ type="text" @click="showRole(scope.row)">查看 编辑 { - // const list = data.records.filter(e => e.id !== 1) // 不显示超管 - const list = data.records + const list = data.records.filter(e => e.id !== 1) // 不显示超管 + // const list = data.records this.list = list this.total = data.total == 0 ? 0 : +data.total - 1 }).catch(res => { }) diff --git a/src/pages/setting/list/info.vue b/src/pages/setting/list/info.vue index 2809293..98b92f4 100644 --- a/src/pages/setting/list/info.vue +++ b/src/pages/setting/list/info.vue @@ -324,14 +324,14 @@ export default { if (!data.password) return Util.warningMsg("请输入原密码") if (!data.newPassword) return Util.warningMsg("请输入新密码") if (!data.reNewPassword) return Util.warningMsg("请确认新密码") - if (data.newPassword.length < 6 || data.reNewPassword.length < 6) return Util.warningMsg("请输入6位数以上的密码") + if (data.newPassword.length < 8 || data.reNewPassword.length < 8) return Util.warningMsg("密码不得小于8位,并且至少包含数字、字母和特殊字符中两种") if (data.newPassword !== data.reNewPassword) return Util.warningMsg("输入的新密码不一致,请重新确认") if (data.password === data.newPassword) return Util.warningMsg("原密码跟新密码不能一致") - this.$put(this.api.pwd, { + this.$post(this.api.pwd, Util.rsa({ id: this.form.id, oldPwd: data.password, newPwd: data.newPassword - }).then(res => { + })).then(res => { Util.successMsg("更换成功") this.pwdVisible = false }).catch(err => { }) diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue index 1d41f43..2e7d23f 100644 --- a/src/pages/user/list/index.vue +++ b/src/pages/user/list/index.vue @@ -741,7 +741,7 @@ export default { }, // 重置密码 resetPassword (row) { - this.$confirm(`确定重置密码?重置后密码为111aaa。`, "提示", { type: "warning" }).then(() => { + this.$confirm(`确定重置密码?重置后密码为Iasf#2024。`, "提示", { type: "warning" }).then(() => { this.$post(this.api.resetPwd, Util.rsa(+row.id)).then(res => { Util.successMsg("重置成功") }).catch(res => { }) diff --git a/src/setting.js b/src/setting.js index 12ccf79..7017260 100644 --- a/src/setting.js +++ b/src/setting.js @@ -6,7 +6,6 @@ let host = `${location.origin}/` if (isDev) { host = 'http://192.168.31.51:10000/' } - const Setting = { /** * 基础配置