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/driver-page/drvier-my/drvier-my.vue |   48 +++++++++++++++++++++++++++++-------------------
 1 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue
index aa4be44..af770c2 100644
--- a/pages/driver-page/drvier-my/drvier-my.vue
+++ b/pages/driver-page/drvier-my/drvier-my.vue
@@ -40,7 +40,7 @@
 								<view class="label-text">韬唤璇佸彿</view>
 							</view>
 							<view class="information-value">
-								{{ userInfo.idCard || '' }}
+								{{ idCard || '' }}
 							</view>
 						</view>
 						<view class="information-line">
@@ -247,14 +247,14 @@
 								border="none"
 								inputAlign="left"></u--input>
 						</u-form-item> -->
-						<u-form-item labelWidth="20%"
+						<!-- <u-form-item labelWidth="20%"
 							label="韬唤璇佸彿"
 							prop="idCard"
 							required>
 							<u--input v-model="editUserInfo.idCard"
 								border="none"
 								inputAlign="left"></u--input>
-						</u-form-item>
+						</u-form-item> -->
 						<u-form-item labelWidth="20%"
 							label="鎵嬫満鍙�"
 							prop="phone"
@@ -291,7 +291,7 @@
 						<u-form-item labelWidth="20%"
 							label="杞﹁締绫诲瀷"
 							borderBottom
-							required=""
+							required
 							prop="countryNumberCar">
 							<u-radio-group v-model="editUserInfo.countryNumberCar"
 								placement="row"
@@ -529,10 +529,11 @@
 							return Number(value);
 						},
 						validator: (rule, value, callback) => {
-							return value <= 10;
+							return value <= 10 && value > 0;
 						},
 						message: '璇疯緭鍏ユ纭殑杞﹁酱鏁�',
-						trigger: ['change', 'blur']
+						trigger: ['change', 'blur'],
+						required: true,
 					}],
 					carImg: {
 						type: 'string',
@@ -551,7 +552,19 @@
 						required: true,
 						message: '璇烽�夋嫨杞﹁締绫诲瀷',
 						trigger: ['blur', 'change']
-					}
+					},
+					roadTransportImg: {
+						type: 'string',
+						required: true,
+						message: '璇蜂笂浼犻亾璺繍杈撹瘉鐓х墖',
+						trigger: ['blur', 'change']
+					},
+					tradeQualificationImg: {
+						type: 'string',
+						required: true,
+						message: '璇蜂笂浼犱粠涓氳祫鏍艰瘉鐓х墖',
+						trigger: ['blur', 'change']
+					},
 				},
 				src: '',
 				fileList1: [],
@@ -575,6 +588,9 @@
 		computed: {
 			currentSelectedPrintStyle() {
 				return this.selectedPrintStyle ? this.selectedPrintStyle : uni.getStorageSync('selectedPrintStyle')
+			},
+			idCard() {
+				return this.userInfo.idCard.slice(0, 6) + '********' + this.userInfo.idCard.slice(-4)
 			}
 		},
 		onShow() {
@@ -595,8 +611,8 @@
 				this.$reqGet('getUserEntity').then(res => {
 					uni.hideLoading();
 					this.userInfo = res.data;
-					this.userInfo.idCard = this.userInfo.idCard.slice(0, 6) + '********' + this.userInfo.idCard
-						.slice(-4)
+					// this.userInfo.idCard = this.userInfo.idCard.slice(0, 6) + '********' + this.userInfo.idCard
+					// 	.slice(-4)
 					uni.setStorageSync('carImg', this.userInfo.carImg);
 					uni.setStorageSync('drivingImg', this.userInfo.drivingImg);
 					uni.setStorageSync('roadTransportImg', this.userInfo.roadTransportImg);
@@ -626,14 +642,8 @@
 							url: `${BaseUrl}${this.userInfo.inventoryImg}`
 						});
 					}
-					Object.keys(this.editUserInfo).map(item => {
-						if (res.data[item]) {
-							this.editUserInfo[item] = res.data[item];
-							this.editUserInfo.idCard = this.userInfo.idCard.slice(0, 6) + '********' + this
-								.editUserInfo.idCard
-								.slice(-4)
-						}
-					});
+					Object.assign(this.editUserInfo, res.data)
+					console.log(this.editUserInfo);
 					this.editUserInfo.password = ''
 				});
 			},
@@ -743,7 +753,7 @@
 				this.$store.commit('changeisLogin', false)
 				this.$store.dispatch('websocketOnClose')
 				uni.reLaunch({
-					url: '/pages/login/forgetPassword/forgetPassword'
+					url: `/pages/login/resetPassword/resetPassword?phone=${this.userInfo.phone}&idcard=${this.userInfo.idcard}`
 				})
 			},
 			// 淇敼鐢ㄦ埛淇℃伅
@@ -1096,4 +1106,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.1