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

---
 sub_pages/customer/self/member-center.vue |    5 +++--
 sub_pages/customer/trade/list.vue         |    2 +-
 pages/user/user-pwd/user-pwd.vue          |   31 ++++++++++++++++++++++---------
 sub_pages/customer/trade/trade.vue        |    2 +-
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/pages/user/user-pwd/user-pwd.vue b/pages/user/user-pwd/user-pwd.vue
index a658a18..9fc72d6 100644
--- a/pages/user/user-pwd/user-pwd.vue
+++ b/pages/user/user-pwd/user-pwd.vue
@@ -9,8 +9,8 @@
 					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'"
+			<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"
@@ -18,11 +18,17 @@
 								showPassword1=!showPassword1;
 							}"></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'"
+			<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"
@@ -31,6 +37,13 @@
 							}"></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> -->
@@ -162,9 +175,9 @@
 					}, 1500)
 				}
 			},
-  
-			 
-		 
+
+
+
 			// 选择地区回调
 			regionConfirm(e) {
 				this.model.region = e.province.label + '-' + e.city.label + '-' + e.area.label;
@@ -179,7 +192,7 @@
 			borderChange(index) {
 				this.border = !index;
 			},
-	 
+
 			labelPositionChange(index) {
 				this.labelPosition = index == 0 ? 'left' : 'top';
 			},
diff --git a/sub_pages/customer/self/member-center.vue b/sub_pages/customer/self/member-center.vue
index 1e36a79..5da2430 100644
--- a/sub_pages/customer/self/member-center.vue
+++ b/sub_pages/customer/self/member-center.vue
@@ -182,15 +182,16 @@
 
 					}
 					//重新排序,当前等级第一个
+					console.log('会员列表v0',this.bannerList)
 					var newBannerSort = []
-					for (var i = currentindex; i < 2 * j; i++) {
+					for (var i = currentindex; i <= 2 * j; i++) {
 						newBannerSort.push(this.bannerList[i % (j + 1)])
 						if (newBannerSort.length >= this.bannerList.length) {
 							break
 						}
 					}
 					this.bannerList = newBannerSort
-
+					console.log('会员列表',this.bannerList)
 					// if (this.currentInfo.customerDTO.userGrowthRecord.targetMemberInfos) {
 					// 	var t = -1
 					// 	for (var tmp of this.bannerList) {
diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index f387a8a..ed7114d 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;word-break: break-all;">{{item.name||'-'}}</view>
+							<view style="max-width: 200rpx;word-break: break-all;">{{item.name||'-'}}</view>
 							
 							<view class="price component-price-new">
 								<span class="tip">会员价</span>¥<span class="p">{{item.priceMember||item.price}}</span>/扎
diff --git a/sub_pages/customer/trade/trade.vue b/sub_pages/customer/trade/trade.vue
index c3a7722..f0821ba 100644
--- a/sub_pages/customer/trade/trade.vue
+++ b/sub_pages/customer/trade/trade.vue
@@ -60,7 +60,7 @@
 						<view class="flex1">
 							<view class="cateen_infos list">
 								<view class="title flex">
-									<view style="max-width: 200rpx;text-align: left;">{{item.name}}</view>
+									<view style="max-width: 190rpx;text-align: left;word-break: break-all;">{{item.name}}</view>
 									<view class="desc m-l-a m-r-0">在售 {{item.stock||'0'}} 扎</view>
 								</view>
 								<view class="price">

--
Gitblit v1.9.3