From 29d8f968bf84e9c89a24fe33ef51fb5c0aed0ab1 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期二, 11 六月 2024 15:33:15 +0800
Subject: [PATCH] docs:密码轻度细节问题

---
 pages/login/userPassword.vue |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index b39078a..44a8939 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);
@@ -89,15 +93,23 @@
 										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();
-										});
+                    if(res.data.forcePassword == 1) {  //forcePassword涓�1寮哄埗淇敼瀵嗙爜
+                      uni.navigateTo({
+                        url: '/pages/login/resetPassword/resetPassword'
+                      })
+                    }else {
+                      //璺宠浆椤甸潰
+                      this.$nextTick(() => {
+                        redirectHome();
+                      });
+                    }
 									})
 									.catch(err => {
+										this.submitLoading = false
 										this.$u.toast('鐧诲綍寮傚父锛�');
 										console.log(err);
 									});
@@ -128,10 +140,11 @@
 								});
 							}
 						}
-					})
-					.catch(e => {
+					}).catch(e => {
+						this.submitLoading = false
 						this.$u.toast(e);
 					});
+
 			}
 		}
 	};
@@ -143,4 +156,4 @@
 	.dengluBtn {
 		margin-top: 80rpx;
 	}
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.1