From a971d0c13ab9cd5107152f6eba5e1e724a37fa0b Mon Sep 17 00:00:00 2001 From: 杨磊 <505174330@qq.com> Date: 星期五, 07 六月 2024 17:20:31 +0800 Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary --- src/pages/changePassword/changePassword.vue | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/pages/changePassword/changePassword.vue b/src/pages/changePassword/changePassword.vue index 61a81bc..5570fa5 100644 --- a/src/pages/changePassword/changePassword.vue +++ b/src/pages/changePassword/changePassword.vue @@ -30,21 +30,24 @@ justify-content: space-between; margin-bottom: 0.47rem; align-items: center; + padding-top: 0.6rem; " > <!-- <view style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">鐢ㄦ埛娉ㄥ唽</view> --> <view class="LoginBg"></view> <view - @click="BacktoLogin" style=" cursor: pointer; font-size: 0.14rem; color: #244a7b; font-weight: normal; + position: absolute; + left: 0.1rem; + top: 0.1rem; " > - 杩斿洖 + < 杩斿洖 </view> </view> <el-form @@ -264,12 +267,8 @@ this.getElementWidth(); }, methods: { - // 杩斿洖鐧诲綍 BacktoLogin() { - // uni.redirectTo({ - // url: '/pages/Login/Login' - // }) - uni.navigateBack(); + this.$router.go(-1); }, getElementWidth() { this.$nextTick(() => { @@ -278,26 +277,25 @@ }); }, // 蹇樿瀵嗙爜 - async Login2(formName) { + Login2(formName) { let Obj = { username: this.amendDataPass.loginID, password: encryptAES(this.amendDataPass.rawPass), newPassword: encryptAES(this.amendDataPass.newPass) }; - this.$refs[formName].validate(async (valid) => { + this.$refs[formName].validate((valid) => { if (valid) { // alert('submit!鎴愬姛'); getchangePassword(Obj).then((res) => { if (res.success == true) { this.$message.success('淇敼鎴愬姛'); - uni.navigateBack(); + uni.navigateTo({ + url: "/pages/Login/Login" + }); } else { this.$message.error(res.errorText); } }); - // uni.redirectTo({ encryptAES - // url: '/pages/Login/Login' - // }) } else { console.log("error submit!!澶辫触"); return false; -- Gitblit v1.9.1