From a54597994e1a2112cddcc356de93174525dd1710 Mon Sep 17 00:00:00 2001 From: yangan <yangan0921@163.com> Date: 星期三, 12 六月 2024 09:51:48 +0800 Subject: [PATCH] fix:修改密码页面加载失败错误弹窗 --- pages/login/userPassword.vue | 46 +++++++++++++++++++++++++++++----------------- 1 files changed, 29 insertions(+), 17 deletions(-) diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue index 73b5cfc..224a26a 100644 --- a/pages/login/userPassword.vue +++ b/pages/login/userPassword.vue @@ -22,7 +22,8 @@ </view> <view class="loginBtn"><u-button type="primary" :text="btnText == 1 ? '缁戝畾' : '鐧诲綍'" - @click="submit()"></u-button></view> + @click="submit()" + :loading="submitLoading"></u-button></view> </view> </template> @@ -46,7 +47,8 @@ // username: '13333333332',// 鍙告満 password: '', remember: true, - baseUrl: '' + baseUrl: '', + submitLoading: false }; }, methods: { @@ -67,6 +69,7 @@ } let grant_type = 'password'; //鐧诲綍鎺ュ彛 + this.submitLoading = true await apiLoginPassword({ username: this.username, password: this.password, @@ -77,6 +80,7 @@ setToken(res.access_token); setRefreshToken(res.refresh_token); if (this.btnText == 0) { + this.submitLoading = false if (res.code != 1) { // 鐧婚檰鎴愬姛锛屽瓨鍌ㄧ浉鍏充俊鎭� setToken(res.access_token); @@ -85,20 +89,27 @@ //鏌ヨ鐢ㄦ埛璇︾粏淇℃伅骞跺偍瀛� this.$reqGet('getUserEntity') .then(res => { - this.$u.toast('鐧诲綍鎴愬姛'); - this.setUserTabbar(res.data.type); - uni.setStorageSync('roleType', res.data.type); - uni.setStorageSync("userId", res.data.userId) - uni.setStorageSync("carNo", res.data.carNo) - setCustomerId(res.data.customerid); - setName(res.name); - uni.hideLoading(); - //璺宠浆椤甸潰 - this.$nextTick(() => { - redirectHome(); - }); + this.$u.toast('鐧诲綍鎴愬姛'); + this.setUserTabbar(res.data.type); + uni.setStorageSync('roleType', res.data.type); + uni.setStorageSync("userId", res.data.userId) + uni.setStorageSync("carNo", res.data.carNo) + setCustomerId(res.data.customerid); + setName(res.name); + uni.hideLoading(); + if(res.data.forcePassword == 1) { + uni.navigateTo({ + url: '/pages/login/resetPassword/resetPassword' + }) + }else { + //璺宠浆椤甸潰 + this.$nextTick(() => { + redirectHome(); + }); + } }) .catch(err => { + this.submitLoading = false this.$u.toast('鐧诲綍寮傚父锛�'); console.log(err); }); @@ -129,10 +140,11 @@ }); } } - }) - .catch(e => { + }).catch(e => { + this.submitLoading = false this.$u.toast(e); }); + } } }; @@ -144,4 +156,4 @@ .dengluBtn { margin-top: 80rpx; } -</style> \ No newline at end of file +</style> -- Gitblit v1.9.1