From e932b79fb1aa22135416f8dceec7cdf67016fab0 Mon Sep 17 00:00:00 2001 From: lijingyu007 <904564792@qq.com> Date: Wed, 12 Jun 2024 14:03:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81+=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=AA=8C=E8=AF=81=E7=A0=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 6 +- src/api/system/user.js | 5 +- src/page/logpage/log/login.vue | 1370 +++++++++-------- src/page/personalpage/home/personalcenter.vue | 98 +- 5 files changed, 839 insertions(+), 642 deletions(-) diff --git a/.env.development b/.env.development index 5c40f41..fde21e5 100644 --- a/.env.development +++ b/.env.development @@ -5,8 +5,8 @@ ENV = 'development' VUE_APP_BASE_API = '/prod-api' +# VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999' VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999' -# VUE_APP_BASE_TARGET = 'http://192.168.0.129:9999' # VUE_APP_BASE_TARGET = 'http://172.16.36.180:9999' # VUE_APP_BASE_TARGET = 'http://172.16.36.176:9998' diff --git a/.env.production b/.env.production index d0b67b6..682aae5 100644 --- a/.env.production +++ b/.env.production @@ -4,10 +4,10 @@ ENV = 'production' # KeySaas测试云平台/生产环境 # VUE_APP_BASE_API = 'https://www.keyitest.cn/prod-api' # VUE_APP_BASE_API = '/test-api' -VUE_APP_BASE_API = '/test-api' +VUE_APP_BASE_API = '/prod-api' # VUE_APP_BASE_TARGET = 'https://www.keyitest.cn/prod-api' -VUE_APP_BASE_TARGET = 'https://www.keyitest.cn/test-api' +# VUE_APP_BASE_TARGET = 'https://www.keyitest.cn/test-api' -# VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999' \ No newline at end of file +VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999' \ No newline at end of file diff --git a/src/api/system/user.js b/src/api/system/user.js index a698b99..756e8f8 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -41,7 +41,10 @@ export function changePasswd(data) { return request({ url: '/system/user/changePasswd', method: 'post', - data: data + data: data, + headers: { + isToken: false + }, }) } diff --git a/src/page/logpage/log/login.vue b/src/page/logpage/log/login.vue index 5e1a794..2ee3ea7 100644 --- a/src/page/logpage/log/login.vue +++ b/src/page/logpage/log/login.vue @@ -1,645 +1,813 @@ diff --git a/src/page/personalpage/home/personalcenter.vue b/src/page/personalpage/home/personalcenter.vue index 0c30232..4b5049a 100644 --- a/src/page/personalpage/home/personalcenter.vue +++ b/src/page/personalpage/home/personalcenter.vue @@ -127,6 +127,7 @@ :rules="rules" label-width="80px" style="padding: 0 20px" + class="changePassword" > @@ -145,12 +146,12 @@ 保存 - 关闭 + > --> @@ -168,12 +169,12 @@ 保存 - 关闭 + > --> @@ -184,26 +185,24 @@ :rules="passrules" label-width="80px" style="padding: 0 20px" + class="changePassword" > - + + + + - - + + - - + + 保存 - 关闭 + > --> @@ -272,10 +271,11 @@ import userUpgrade from './userUpgrade' import { updateUserProfile, updateUserPwd, getUserProfile, saveCompanyInfo } from '@/api/system/user' import { encrypt, decrypt } from '@/util/encrypt' import { getCodeUserLogin } from '@/api/system/login' +import { changePasswd } from '@/api/system/user' export default { data() { const equalToPassword = (rule, value, callback) => { - if (this.passform.newPassword !== value) { + if (this.passform.password !== value) { callback(new Error('两次输入的密码不一致')) } else { callback() @@ -294,7 +294,7 @@ export default { userGetFlag: false, userType: '普通用户', // userinform:{nickName:'',phonenumber:'',email:'',sex:''}, - passform: { oldPassword: '', newPassword: '', confirmPassword: '' }, + passform: {}, // 修改信息表单校验 rules: { nickName: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }], @@ -309,12 +309,14 @@ export default { }, // 修改密码表单校验 passrules: { - oldPassword: [{ required: true, message: '旧密码不能为空', trigger: 'blur' }], - newPassword: [ + phonenumber: [{ required: true, message: '请输入手机号', trigger: 'blur' }], + remark: [{ required: true, message: '请输入验证码', trigger: 'blur' }], + // oldPassword: [{ required: true, message: '旧密码不能为空', trigger: 'blur' }], + password: [ { required: true, message: '新密码不能为空', trigger: 'blur' }, { min: 6, max: 20, message: '长度在 6 到 20 个字符', trigger: 'blur' }, ], - confirmPassword: [ + checkPass: [ { required: true, message: '确认密码不能为空', trigger: 'blur' }, { required: true, validator: equalToPassword, trigger: 'blur' }, ], @@ -390,11 +392,21 @@ export default { this.$refs.passform.validate((valid) => { if (valid) { // updateUserPwd(this.passform.oldPassword, this.passform.newPassword).then(response => { - updateUserPwd(encrypt(this.passform.oldPassword), encrypt(this.passform.newPassword)).then( - (response) => { + const data = { + phonenumber: this.passform.phonenumber, + remark: this.passform.remark, + password: encrypt(this.passform.password), + checkPass: encrypt(this.passform.checkPass), + sex: this.passform.sex, + nickName: this.$store.getters.userinform.nickName, + userName: this.$store.getters.userinform.userName, + } + changePasswd(data).then((response) => { + if (response.code == 200) { this.$message.success('修改成功') - }, - ) + this.passform = {} + } + }) } }) }, @@ -415,7 +427,7 @@ export default { }) }, sendCode() { - if (!/^1[34578]\d{9}$/.test(this.passform.mobile)) { + if (!/^1[34578]\d{9}$/.test(this.passform.phonenumber)) { return this.$message.error('请输入正确的手机号码') } if (this.countdown > 0 || this.isSending) { @@ -429,13 +441,13 @@ export default { this.isSending = false }, 100) // 这里使用2秒的延迟来模拟发送过程，你需要替换为实际的发送逻辑 // 验证码接口 - getCodeUserLogin(this.passform.mobile).then((res) => { + getCodeUserLogin(this.passform.phonenumber).then((res) => { this.isSending = false if (res.code == 200) { - this.passform.uuid = res.uuid + this.passform.sex = res.uuid this.$message.success('短信发送成功，请注意查收') } - }) + }) }, startCountdown() { this.countdown = 60 @@ -450,6 +462,20 @@ export default { }