From 3fef62b03c16aa69c109c355150cdb698b777feb Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 28 六月 2024 17:39:20 +0800
Subject: [PATCH] Merge branch 'develop/steels' into feature/steels/yangan
---
pages/login/userPassword.vue | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index 9ddd00a..74029aa 100644
--- a/pages/login/userPassword.vue
+++ b/pages/login/userPassword.vue
@@ -25,6 +25,7 @@
<view class="loginBtn"><u-button type="primary"
:text="btnText == 1 ? '缁戝畾' : '鐧诲綍'"
@click="submit()"
+ :loading="submitLoading"
></u-button></view>
</view>
</template>
@@ -49,7 +50,8 @@
// username: '13333333332',// 鍙告満
password: '',
remember: true,
- baseUrl: ''
+ baseUrl: '',
+ submitLoading: false
};
},
methods: {
@@ -70,6 +72,7 @@
}
let grant_type = 'password';
//鐧诲綍鎺ュ彛
+ this.submitLoading = true
await apiLoginPassword({
username: this.username,
password: this.password,
@@ -80,6 +83,7 @@
setToken(res.access_token);
setRefreshToken(res.refresh_token);
if (this.btnText == 0) {
+ this.submitLoading = false
if (res.code != 1) {
// 鐧婚檰鎴愬姛锛屽瓨鍌ㄧ浉鍏充俊鎭�
setToken(res.access_token);
@@ -91,14 +95,22 @@
this.$u.toast('鐧诲綍鎴愬姛');
this.setUserTabbar(res.data.type);
uni.setStorageSync('roleType', res.data.type);
+ uni.setStorageSync("userId", res.data.userId)
+ uni.setStorageSync("userInfo", res.data)
setCustomerId(res.data.customerid);
setUserId(res.data.userId);
setName(res.name);
uni.hideLoading();
- //璺宠浆椤甸潰
- this.$nextTick(() => {
- redirectHome();
- });
+ if(res.data.forcePassword == 1) { //forcePassword涓�1寮哄埗淇敼瀵嗙爜
+ uni.navigateTo({
+ url: `/pages/login/resetPassword/resetPassword?userInfo=${JSON.stringify(res.data)}`
+ })
+ }else {
+ //璺宠浆椤甸潰
+ this.$nextTick(() => {
+ redirectHome();
+ });
+ }
})
.catch(err => {
this.$u.toast('鐧诲綍寮傚父锛�');
@@ -133,6 +145,7 @@
}
})
.catch(e => {
+ this.submitLoading = false
this.$u.toast(e);
});
}
@@ -154,4 +167,4 @@
letter-spacing: 10rpx;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1