From a82b34f3dad88a826b459660aecc0af77e353080 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 27 九月 2024 16:48:21 +0800
Subject: [PATCH] update

---
 pages/user/user-pwd/user-pwd.vue |   91 +++++++++++++++++++++------------------------
 1 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/pages/user/user-pwd/user-pwd.vue b/pages/user/user-pwd/user-pwd.vue
index bb3566e..9fc72d6 100644
--- a/pages/user/user-pwd/user-pwd.vue
+++ b/pages/user/user-pwd/user-pwd.vue
@@ -9,31 +9,41 @@
 					placeholder="请输入旧密码"></u-input>
 			</u-form-item>
 			<u-divider></u-divider> -->
-			<u-form-item :label-position="labelPosition" label="新密码" prop="password" label-width="150">
-				<u-input :password-icon="false" :border="border" :type="showPassword1?'text':'password'"
-					v-model="model.password" placeholder="请输入新密码">
+			<u-form-item :label-position="labelPosition" label="新密码" required prop="password" label-width="150">
+				<!-- <u-input :password-icon="false" :border="border" :type="showPassword1?'text':'password'"
+					v-model="password" placeholder="请输入新密码">
 					<template slot="suffix">
 						<uni-icons color="#20613D" :type="showPassword1 ? 'eye-filled' : 'eye-slash-filled'" size="24"
 							@click="()=>{
 								showPassword1=!showPassword1;
-								$forceUpdate()
 							}"></uni-icons>
 					</template>
-				</u-input>
+				 </u-input>-->
+				<view class="flex">
+					<input v-model="password" :password="showPassword1" placeholder="请输入新密码" />
+					<uni-icons class="m-l-a m-r-20" color="#20613D" :type="showPassword1 ? 'eye-filled' : 'eye-slash-filled'" size="24" @click="()=>{
+							showPassword1=!showPassword1;
+						}"></uni-icons>
+				</view>
 			</u-form-item>
 			<u-divider></u-divider>
-			<u-form-item :label-position="labelPosition" label="确认密码" label-width="150" prop="rePassword">
-				<u-input :password-icon="false" :border="border" :type="showPassword2?'text':'password'" 
-				v-model="model.rePassword"
-					placeholder="请确认密码">
+			<u-form-item :label-position="labelPosition" label="确认密码" required label-width="150" prop="rePassword">
+				<!-- <u-input :password-icon="false" :border="border" :type="showPassword2?'text':'password'"
+					v-model="rePassword" placeholder="请确认密码">
 					<template slot="suffix">
 						<uni-icons color="#20613D" :type="showPassword2 ? 'eye-filled' : 'eye-slash-filled'" size="24"
 							@click="()=>{
 								showPassword2=!showPassword2;
-								$forceUpdate()
 							}"></uni-icons>
 					</template>
 				</u-input>
+				 -->
+				<view class="flex">
+					<input v-model="rePassword" :password="showPassword2" placeholder="请确认密码" />
+					<uni-icons class="m-l-a m-r-20" color="#20613D" :type="showPassword2 ? 'eye-filled' : 'eye-slash-filled'" size="24" @click="()=>{
+							showPassword2=!showPassword2;
+						}"></uni-icons>
+				</view>
 			</u-form-item>
 		</u-form>
 		<!-- <u-button @click="submit">提交</u-button> -->
@@ -54,8 +64,10 @@
 					password: '',
 					rePassword: ''
 				},
+				password: '',
+				rePassword: '',
 				showPassword1: false,
-				showPassword2:false,
+				showPassword2: false,
 				rules: {
 					// oldpassword: [
 					// 	{
@@ -87,7 +99,8 @@
 						},
 						{
 							validator: (rule, value, callback) => {
-								return value === this.model.password;
+								// return value === this.model.password;
+								return value === this.password;
 							},
 							message: '两次输入的密码不相等',
 							trigger: ['change', 'blur']
@@ -117,12 +130,12 @@
 				})
 			},
 			submit() {
-				if (!this.model.password) {
+				if (!this.password) {
 					this.$message.showToast('密码未填写');
 
 					return
 				}
-				if (this.model.rePassword === this.model.password) {
+				if (this.rePassword === this.password) {
 					this.updatePwd();
 				} else {
 					this.$message.showToast('两次密码不一样');
@@ -144,34 +157,27 @@
 					data: {
 						// password: this.model.oldpassword,
 						// newpassword: this.model.password
-						oldPassword: this.model.oldPassword,
-						password: this.model.password
+						oldPassword: this.oldPassword,
+						password: this.password
 					}
 				});
 				if (resp && resp.code == 0) {
-					this.model.password = ''
-					this.model.rePassword = ''
-					this.model.oldPassword = ''
+					this.password = ''
+					this.rePassword = ''
+					this.oldPassword = ''
 					this.$message.showToast('修改成功');
+					let tmp = this
+					setTimeout(() => {
+						tmp.$store.commit('updateLogin', false)
+						uni.reLaunch({
+							url: '/pages/login/supplier-login'
+						})
+					}, 1500)
 				}
 			},
-			// 点击actionSheet回调
-			actionSheetCallback(index) {
-				uni.hideKeyboard();
-				this.model.sex = this.actionSheetList[index].text;
-			},
-			// checkbox选择发生变化
-			checkboxGroupChange(e) {
-				this.model.likeFruit = e;
-			},
-			// radio选择发生变化
-			radioGroupChange(e) {
-				this.model.payType = e;
-			},
-			// 勾选版权协议
-			checkboxChange(e) {
-				this.model.agreement = e.value;
-			},
+
+
+
 			// 选择地区回调
 			regionConfirm(e) {
 				this.model.region = e.province.label + '-' + e.city.label + '-' + e.area.label;
@@ -186,18 +192,7 @@
 			borderChange(index) {
 				this.border = !index;
 			},
-			radioCheckboxChange(index) {
-				if (index == 0) {
-					this.radioCheckWrap = false;
-					this.radioCheckWidth = 'auto';
-				} else if (index == 1) {
-					this.radioCheckWrap = true;
-					this.radioCheckWidth = 'auto';
-				} else if (index == 2) {
-					this.radioCheckWrap = false;
-					this.radioCheckWidth = '50%';
-				}
-			},
+
 			labelPositionChange(index) {
 				this.labelPosition = index == 0 ? 'left' : 'top';
 			},

--
Gitblit v1.9.3