From 6f7c9ef272906bbd5d905ee069bc5d6d1bf55614 Mon Sep 17 00:00:00 2001 From: YM <479443481@qq.com> Date: 星期四, 06 六月 2024 21:41:27 +0800 Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary --- src/pages/changePassword/changePassword.vue | 44 ++++++++++++++++---------------------------- 1 files changed, 16 insertions(+), 28 deletions(-) diff --git a/src/pages/changePassword/changePassword.vue b/src/pages/changePassword/changePassword.vue index f09b69d..5570fa5 100644 --- a/src/pages/changePassword/changePassword.vue +++ b/src/pages/changePassword/changePassword.vue @@ -5,8 +5,8 @@ class="Ttop flex flex-center flex-wrap" style="flex-direction: column" > - <view class=""></view> - <view class="" ref="Rtop"> + <view ></view> + <view ref="Rtop"> <text class="login"></text> <text style=" @@ -30,21 +30,24 @@ justify-content: space-between; margin-bottom: 0.47rem; align-items: center; + padding-top: 0.6rem; " > - <!-- <view class="" style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">鐢ㄦ埛娉ㄥ唽</view> --> + <!-- <view style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">鐢ㄦ埛娉ㄥ唽</view> --> <view class="LoginBg"></view> <view - class="" @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,50 +267,35 @@ this.getElementWidth(); }, methods: { - // 杩斿洖鐧诲綍 BacktoLogin() { - // uni.redirectTo({ - // url: '/pages/Login/Login' - // }) - uni.navigateBack(); + this.$router.go(-1); }, getElementWidth() { this.$nextTick(() => { var width = this.$refs.Rtop.$el.clientWidth; this.Rtop1 = width + 50; - console.log("Element width:", width); }); }, // 蹇樿瀵嗙爜 - async Login2(formName) { + Login2(formName) { let Obj = { username: this.amendDataPass.loginID, password: encryptAES(this.amendDataPass.rawPass), newPassword: encryptAES(this.amendDataPass.newPass) }; - console.log(Obj); - this.$refs[formName].validate(async (valid) => { + this.$refs[formName].validate((valid) => { if (valid) { // alert('submit!鎴愬姛'); - await getchangePassword(Obj).then((res) => { - // console.log(res,'淇敼瀵嗙爜鎴愬姛'); + getchangePassword(Obj).then((res) => { if (res.success == true) { - uni.showToast({ - title: res.object, - icon: "none" + this.$message.success('淇敼鎴愬姛'); + uni.navigateTo({ + url: "/pages/Login/Login" }); - uni.navigateBack(); - console.log("淇敼鎴愬姛", res); } else { - uni.showToast({ - title: res.errorText, - icon: "none" - }); + this.$message.error(res.errorText); } }); - // uni.redirectTo({ encryptAES - // url: '/pages/Login/Login' - // }) } else { console.log("error submit!!澶辫触"); return false; -- Gitblit v1.9.1