From c1ebda9cbe1d112522b5c219d4af065a52630633 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 27 九月 2024 15:31:29 +0800
Subject: [PATCH] update

---
 sub_pages/customer/trade/list.vue |    2 
 pages/user/user-pwd/user-pwd.vue  |   58 ++++++++--------------------
 manifest.json                     |    2 
 3 files changed, 19 insertions(+), 43 deletions(-)

diff --git a/manifest.json b/manifest.json
index f2448bf..782394c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -49,7 +49,7 @@
     "quickapp" : {},
     /* 快应用特有相关 */
     "mp-weixin" : {
-        "appid" : "wx3203fd935a6ffe09",
+        "appid" : "wx6d0ecc4e18710458",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,
diff --git a/pages/user/user-pwd/user-pwd.vue b/pages/user/user-pwd/user-pwd.vue
index d946fe3..a658a18 100644
--- a/pages/user/user-pwd/user-pwd.vue
+++ b/pages/user/user-pwd/user-pwd.vue
@@ -11,12 +11,11 @@
 			<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="请输入新密码">
+					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>
@@ -24,12 +23,11 @@
 			<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="请确认密码">
+					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>
@@ -53,6 +51,8 @@
 					password: '',
 					rePassword: ''
 				},
+				password: '',
+				rePassword: '',
 				showPassword1: false,
 				showPassword2: false,
 				rules: {
@@ -86,7 +86,8 @@
 						},
 						{
 							validator: (rule, value, callback) => {
-								return value === this.model.password;
+								// return value === this.model.password;
+								return value === this.password;
 							},
 							message: '两次输入的密码不相等',
 							trigger: ['change', 'blur']
@@ -116,12 +117,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('两次密码不一样');
@@ -143,14 +144,14 @@
 					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(() => {
@@ -161,23 +162,9 @@
 					}, 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;
@@ -192,18 +179,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';
 			},
diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index 6c5891e..e6b9d91 100644
--- a/sub_pages/customer/trade/list.vue
+++ b/sub_pages/customer/trade/list.vue
@@ -72,7 +72,7 @@
 				<view class="m-l-12 info-container flex1">
 					<view @click.stop="toDetail(item)">
 						<view class="title">
-							<view style="max-width: 240rpx;">{{item.name||'-'}}</view>
+							<view style="max-width: 230rpx;">{{item.name||'-'}}</view>
 							
 							<view class="price component-price-new">
 								<span class="tip">会员价</span>¥<span class="p">{{item.priceMember||item.price}}</span>/扎

--
Gitblit v1.9.3