From 66638e4bbd1ada41187dcf257d36c343ddd3ed4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=96=BB=E9=B9=8F?= <1242402566@qq.com>
Date: Mon, 25 May 2020 17:24:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=92=8C=E6=96=B0=E5=A2=9E=E9=AA=8C=E5=85=89=E5=8D=95=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/cart/cart.vue                   | 254 ++++++++++++++++--------------
 src/pages/newOpticsData/newOpticsData.vue | 194 ++++++++++++-----------
 2 files changed, 239 insertions(+), 209 deletions(-)

diff --git a/src/pages/cart/cart.vue b/src/pages/cart/cart.vue
index 6e41b46..8d7c47e 100644
--- a/src/pages/cart/cart.vue
+++ b/src/pages/cart/cart.vue
@@ -7,7 +7,7 @@
 			<view class="card">
 				<view class="cardHeader">
 					<view v-bind:class="pIsoPen? 'partentChecked' : 'partentCheck'"
-					@click="pChange(pIsoPen)">
+					@tap="pChange(pIsoPen)">
 						<span class="correct"></span>
 					</view>
 					<image src="../../static/store.png" mode="aspectFill"></image>
@@ -17,32 +17,45 @@
 				<view class="cardBody" v-for="(item,index) in cartList" :key="item.cart_id" 
 				@longpress="delCart(item.cart_id,index)">
 					<view v-bind:class="childIsOpen[index]? 'partentChecked':'partentCheck'" 
-					@click="Change(childIsOpen[index],index)">
+					 @tap="Change(childIsOpen[index],index)">
 						<span class="correct"></span>
 					</view>
+					<view class="imageWrap">
+						<image :src="item.img_index_url" mode="aspectFit" style="width: 188rpx;height: 168rpx;"></image>
+					</view>
 					<view class="goodInfo">
-						<view class="imageWrap">
+<!-- 						<view class="imageWrap">
 							<image :src="item.img_index_url" mode="aspectFit" style="width: 188rpx;height: 168rpx;"></image>
-						</view>
+						</view> -->
 						<view class="infoRight">
 							<view class="goodName" @tap="toGoods(item.pid,item.p_root_index)">{{item.p_name}}</view>
-							<view class="describ" @tap="toshop(item.pid,item.p_root_index)">
-								<text>
-									<block v-for="tag in item.tag.prod_tag_fun" :key="tag.value">
-										{{tag.label+`&nbsp;&nbsp;`}}
-									</block>
-								</text>
-							<view class="icon"></view>
-							</view>
+							<!-- <view class="describ"> -->
+								<uni-collapse accordion="true" >
+									<uni-collapse-item showAnimation='true' 
+									:title="item.tag.prod_tag_fun[0].label+'/'+item.tag.prod_tag_fun[1].label+'/'+item.tag.prod_tag_fun[2].label+'...'" >
+										<text class="describ">
+											<block v-for="tag in item.tag.prod_tag_fun" :key="tag.value">
+												{{tag.label+`&nbsp;&nbsp;`}}
+											</block>
+										</text>
+<!-- 										<text>
+											<block v-for="tag in item.tag.prod_tag_style" :key="tag.value">
+												{{tag.label+`&nbsp;&nbsp;`}}
+											</block>
+										</text> -->
+									</uni-collapse-item>
+								</uni-collapse>
+							<!-- <view v-bind:class="collapseList[index]? 'icon':'iconed'"></view> -->
+							<!-- </view> -->
 							<view class="priceBox">
 								<view class="price">￥{{item.nowPrice*item.num}}</view>
-								<text>(限购{{maxCount}}副)</text>
+								<text class="maxCount">(限购{{maxCount}}副)</text>
 								<view class="counter">
 									<view class="btn" disabled="this.addDisabled" type="default" 
-									@click="counter(index,false,item.mp_id,item.sk_id,item.num,item.cart_id)">-</view>
+									@tap="counter(index,false,item.mp_id,item.sk_id,item.num,item.cart_id)">-</view>
 									<text>{{item.num}}</text>
 									<view class="btn" disabled="this.desDisabled" type="default" 
-									@click="counter(index,true,item.mp_id,item.sk_id,item.num,item.cart_id)">+</view>
+									@tap="counter(index,true,item.mp_id,item.sk_id,item.num,item.cart_id)">+</view>
 								</view>
 							</view>
 						</view>
@@ -63,10 +76,12 @@
 </template>
 
 <script>
+	import UniCollapse from '@/components/UniCollapse/UniCollapse.vue'
+	import UniCollapseItem from '@/components/UniCollapseItem/UniCollapseItem.vue'
 	import store from '@/store';
 	
 	export default {
-
+		components: {UniCollapse,UniCollapseItem},
 		data() {
 			return {
 				totalPrice: 0,
@@ -137,52 +152,52 @@
 
 		methods: {
 			// 跳转到对应的选购页面
-			toshop(id,type){
-				console.log('===',id,type)
-				switch(type){
-					case 1:
-						uni.navigateTo({
-							url:  `../detailsChoiceArgs/detailsChoiceArgs?oderId=`+id+`&goodType=`+type,
-							success: res => {},
-							fail: () => {},
-							complete: () => {}
-						});
-					break;
-					case 2:
-						uni.navigateTo({
-							url: `../detailStandard/detailStandard_k?oderId=`+id+`&goodType=`+type,
-							success: res => {},
-							fail: () => {},
-							complete: () => {}
-						});
-					break;
-					case 3||4:
-						uni.navigateTo({
-							url: `../detailStandard/detailStandard_sun?oderId=`+id+`&goodType=`+type,
-							success: res => {},
-							fail: () => {},
-							complete: () => {}
-						});
-					break;
-					// case 4:
-					// 	uni.navigateTo({
-					// 		url: `../detailStandard/detailStandard_sun?oderId=`+id+`&goodType=`+type,
-					// 		success: res => {},
-					// 		fail: () => {},
-					// 		complete: () => {}
-					// 	});
-					case 5:
-						uni.navigateTo({
-							url: `../purchaseLenses/purchaseLenses?oderId=`+id+`&goodType=`+type,
-							success: res => {},
-							fail: () => {},
-							complete: () => {}
-						});
-					break;
-					default :
-						break
-				}
-			},
+			// toshop(id,type){
+			// 	console.log('===',id,type)
+			// 	switch(type){
+			// 		case 1:
+			// 			uni.navigateTo({
+			// 				url:  `../detailsChoiceArgs/detailsChoiceArgs?oderId=`+id+`&goodType=`+type,
+			// 				success: res => {},
+			// 				fail: () => {},
+			// 				complete: () => {}
+			// 			});
+			// 		break;
+			// 		case 2:
+			// 			uni.navigateTo({
+			// 				url: `../detailStandard/detailStandard_k?oderId=`+id+`&goodType=`+type,
+			// 				success: res => {},
+			// 				fail: () => {},
+			// 				complete: () => {}
+			// 			});
+			// 		break;
+			// 		case 3||4:
+			// 			uni.navigateTo({
+			// 				url: `../detailStandard/detailStandard_sun?oderId=`+id+`&goodType=`+type,
+			// 				success: res => {},
+			// 				fail: () => {},
+			// 				complete: () => {}
+			// 			});
+			// 		break;
+			// 		// case 4:
+			// 		// 	uni.navigateTo({
+			// 		// 		url: `../detailStandard/detailStandard_sun?oderId=`+id+`&goodType=`+type,
+			// 		// 		success: res => {},
+			// 		// 		fail: () => {},
+			// 		// 		complete: () => {}
+			// 		// 	});
+			// 		case 5:
+			// 			uni.navigateTo({
+			// 				url: `../purchaseLenses/purchaseLenses?oderId=`+id+`&goodType=`+type,
+			// 				success: res => {},
+			// 				fail: () => {},
+			// 				complete: () => {}
+			// 			});
+			// 		break;
+			// 		default :
+			// 			break
+			// 	}
+			// },
 			toGoods(id,type){
 					uni.navigateTo({
 						url: `../frameDetail/frameDetail?oderId=`+id,
@@ -353,17 +368,19 @@
 		box-sizing: border-box;
 		
 		.partentCheck{
-			width: 16px;
-			height: 16px;
-			border-radius: 18px;
-			border: 1px solid #CFCFCF;
-			background-color: #FFFFFF;
+			width: 16px;
+			height: 16px;
+			border-radius: 22px;
+			border: 1px solid #CFCFCF;
+			background-color: #FFFFFF;
+			margin: 6px;
 		}
 		.partentChecked{
-			width: 18px;
-			height: 18px;
-			border-radius: 18px;
-			background-color: #FF6B4A;
+				width: 18px;
+				height: 18px;
+				border-radius: 22px;
+				background-color: #FF6B4A;
+				margin: 6px;
 			.correct {
 				display: inline-block;
 				position: relative;
@@ -403,6 +420,7 @@
 				display: flex;
 				align-items: center;
 				justify-content: flex-start;
+				margin-bottom: 20rpx;
 				image{
 					height: 32rpx;
 					width: 32rpx;
@@ -418,20 +436,22 @@
 			}
 			.cardBody{
 				width: 100%;
-				height: 300rpx;
+				min-height: 300rpx;
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
 				.goodInfo{
-					width: 95%;
+					width: 390rpx;
 					display: flex;
 					flex-direction: row;
 					justify-content: flex-start;
 					padding-left: 6px;
+
 					.imageWrap{
 						height: 188rpx;
 						width: 188rpx;
 						margin-right: 28rpx;
+
 						image{
 							border-radius: 4px;
 							height: 188rpx;
@@ -443,7 +463,7 @@
 						flex-direction: column;
 						align-items: flex-start;
 						justify-content: space-between;
-						height: 240rpx;
+						min-height: 240rpx;
 						.goodName{
 							display: -webkit-box;
 							-webkit-box-orient: vertical;
@@ -455,55 +475,49 @@
 						}
 						.describ{
 							width: 100%;
-							height: 80rpx;
-							box-sizing: border-box;
-							padding: 10rpx;
+							// min-height: 80rpx;
+							// box-sizing: border-box;
+							// padding: 10rpx;
 							font-size: 20rpx;
 							letter-spacing: -0.23px;
 							text-align: justify;
 							color: #999999;
-							background: #F9F9F9;
-							display: flex;
-							justify-content: center;
-							align-items: center;
-							text{
-								 text-overflow: -o-ellipsis-lastline;
-								  overflow: hidden;
-								  text-overflow: ellipsis;
-								  display: -webkit-box;
-								  -webkit-line-clamp: 2;
-								  line-clamp: 2;
-								  -webkit-box-orient: vertical;
-							}
-							// .icon{
-							// 	transform: rotate(90deg);
-							// 	height: 13px;
-							// 	width: 20px;
-
+							// background: #F9F9F9;
+							// display: flex;
+							// justify-content: center;
+							// align-items: center;
+							// text{
+							// 	 text-overflow: -o-ellipsis-lastline;
+							// 	  overflow: hidden;
+							// 	  text-overflow: ellipsis;
+							// 	  display: -webkit-box;
+							// 	  -webkit-line-clamp: 2;
+							// 	  line-clamp: 2;
+							// 	  -webkit-box-orient: vertical;
+							// }
+							// .icon {
+							// width: 0;
+							// height: 0;
+							// border-left: 5px transparent;
+							// border-right: 5px transparent;
+							// border-top: 5px #979797;
+							// border-bottom: 0 transparent;
+							// border-style: solid;
+							// position: relative;
+							// margin-left: 10px;
+							// // transform: scaleY(-1);
+							// }
+							// .icon::after{
+							//     content: '';
+							//     position: absolute;
+							//     top: -6.5px;
+							//     left: -5px;
+							// 	border-left: 5px transparent;
+							// 	border-right: 5px transparent;
+							// 	border-top: 5px #FFFFFF;
+							// 	border-bottom: 0 transparent;
+							// 	border-style: solid;
 							// }
-							.icon{
-							width: 0;
-							height: 0;
-							border-left: 5px transparent;
-							border-right: 5px transparent;
-							border-top: 5px #979797;
-							border-bottom: 0 transparent;
-							border-style: solid;
-							position: relative;
-							margin-left: 10px;
-							// transform: scaleY(-1);
-							}
-							.icon::after{
-							    content: '';
-							    position: absolute;
-							    top: -6.5px;
-							    left: -5px;
-								border-left: 5px transparent;
-								border-right: 5px transparent;
-								border-top: 5px #FFFFFF;
-								border-bottom: 0 transparent;
-								border-style: solid;
-							}
 						}
 						.priceBox{
 							display: flex;
@@ -513,6 +527,10 @@
 							width: 100%;
 							font-size: 14px;
 							color: #999999;
+							.maxCount{
+								color: #999999;
+								font-size: 24rpx;
+							}
 							.price{
 								color: #FF6B4A;
 								font-size: 28rpx;
diff --git a/src/pages/newOpticsData/newOpticsData.vue b/src/pages/newOpticsData/newOpticsData.vue
index 97e373d..afec571 100644
--- a/src/pages/newOpticsData/newOpticsData.vue
+++ b/src/pages/newOpticsData/newOpticsData.vue
@@ -4,19 +4,18 @@
 			<template >
 				<view class="goods-form">
 					<view class="p1">
-						<image src="../../static/img/myOpticsData/dataWrite.png" mode="aspectFit"></image>
+						<image class="image2" src="../../static/img/myOpticsData/dataWrite.png" mode="aspectFit"></image>
 						填写验光数据
 					</view>
 					<text class="p2">没有验光数据？请到线下眼镜店验光哦～</text>
-					<view class="use_name">
-						<text>验光单取名:</text>
-						<input type="text" @change="handleInput" 
-						placeholder="请输入名称" maxlength="30" :value="name" />
-					</view>
-					<view class="use_pd">
-						<text>瞳距:</text>
-						<input type="number" @change="handleInputPd" 
-						placeholder="请输入瞳距,单位cm" maxlength="20" :value="pd" />
+					<view class="picker">
+						<view class="picker-choice">
+							<view class="choice-left">
+								<text class="pd">验光单取名:</text>
+							</view>
+							<input type="text" @change="handleInput" class="input"
+							placeholder="请输入名称" maxlength="20" :value="name" />
+						</view>
 					</view>
 					<view class="picker" >
 						<view class="picker-choice">
@@ -25,14 +24,22 @@
 								<text class="p12">{{pickerInfoList[0].nameE}}</text>
 							</view>
 							<text class="p13">左&nbsp;&nbsp;&nbsp;(OD)</text>
-							<text class="p14">{{pickerInfoList[0].nameArray1[pickerInfoList[0].nameIndex1]}}</text>
-							<picker @change="bindPickerChange01" :value="pickerInfoList[0].nameIndex1" :range="pickerInfoList[0].nameArray1">
+							<!-- <text class="p14">{{pickerInfoList[0].nameArray1[pickerInfoList[0].nameIndex1]}}</text> -->
+							<picker  @change="bindPickerChange01" :value="pickerInfoList[0].nameIndex1" :range="pickerInfoList[0].nameArray1">
+								<view class="p14">
+								{{pickerInfoList[0].nameArray1[pickerInfoList[0].nameIndex1]}}
 								<image src="../../static/detail-tabicon.png" ></image>
+								</view>
+								<!-- <image src="../../static/detail-tabicon.png" ></image> -->
 							</picker>
 							<text class="p13">右&nbsp;&nbsp;&nbsp;(OS)</text>
-							<text class="p14">{{pickerInfoList[0].nameArray2[pickerInfoList[0].nameIndex2]}}</text>
+							<!-- <text class="p14">{{pickerInfoList[0].nameArray2[pickerInfoList[0].nameIndex2]}}</text> -->
 							<picker @change="bindPickerChange02" :value="pickerInfoList[0].nameIndex2" :range="pickerInfoList[0].nameArray2">
+								<view class="p14">
+								{{pickerInfoList[0].nameArray2[pickerInfoList[0].nameIndex2]}}
 								<image src="../../static/detail-tabicon.png" ></image>
+								</view>
+								<!-- <image src="../../static/detail-tabicon.png" ></image> -->
 							</picker>
 						</view>
 					</view>
@@ -43,14 +50,22 @@
 								<text class="p12">{{pickerInfoList[1].nameE}}</text>
 							</view>
 							<text class="p13">左&nbsp;&nbsp;&nbsp;(OD)</text>
-							<text class="p14">{{pickerInfoList[1].nameArray1[pickerInfoList[1].nameIndex1]}}</text>
+							<!-- <text class="p14">{{pickerInfoList[1].nameArray1[pickerInfoList[1].nameIndex1]}}</text> -->
 							<picker @change="bindPickerChange11" :value="pickerInfoList[1].nameIndex1" :range="pickerInfoList[1].nameArray1">
-								<image src="../../static/detail-tabicon.png" ></image>
+								<view class="p14">
+									{{pickerInfoList[1].nameArray1[pickerInfoList[1].nameIndex1]}}
+									<image src="../../static/detail-tabicon.png" ></image>
+								</view>
+								<!-- <image src="../../static/detail-tabicon.png" ></image> -->
 							</picker>
 							<text class="p13">右&nbsp;&nbsp;&nbsp;(OS)</text>
-							<text class="p14">{{pickerInfoList[1].nameArray2[pickerInfoList[1].nameIndex2]}}</text>
+							<!-- <text class="p14">{{pickerInfoList[1].nameArray2[pickerInfoList[1].nameIndex2]}}</text> -->
 							<picker @change="bindPickerChange12" :value="pickerInfoList[1].nameIndex2" :range="pickerInfoList[1].nameArray2">
-								<image src="../../static/detail-tabicon.png" ></image>
+								<view class="p14">
+									{{pickerInfoList[1].nameArray2[pickerInfoList[1].nameIndex2]}}
+									<image src="../../static/detail-tabicon.png" ></image>
+								</view>
+								<!-- <image src="../../static/detail-tabicon.png" ></image> -->
 							</picker>
 						</view>
 					</view>
@@ -61,59 +76,62 @@
 								<text class="p12">{{pickerInfoList[2].nameE}}</text>
 							</view>
 							<text class="p13">左&nbsp;&nbsp;&nbsp;(OD)</text>
-							<text class="p14">{{pickerInfoList[2].nameArray1[pickerInfoList[2].nameIndex1]}}</text>
 							<picker @change="bindPickerChange21" :value="pickerInfoList[2].nameIndex1" :range="pickerInfoList[2].nameArray1">
-								<image src="../../static/detail-tabicon.png" ></image>
+								<view class="p14">
+									{{pickerInfoList[2].nameArray1[pickerInfoList[2].nameIndex1]}}
+									<image src="../../static/detail-tabicon.png" ></image>
+								</view>
 							</picker>
 							<text class="p13">右&nbsp;&nbsp;&nbsp;(OS)</text>
-							<text class="p14">{{pickerInfoList[2].nameArray2[pickerInfoList[2].nameIndex2]}}</text>
+							<!-- <text class="p14">{{pickerInfoList[2].nameArray2[pickerInfoList[2].nameIndex2]}}</text> -->
 							<picker @change="bindPickerChange22" :value="pickerInfoList[2].nameIndex2" :range="pickerInfoList[2].nameArray2">
-								<image src="../../static/detail-tabicon.png" ></image>
+								<view class="p14">
+									{{pickerInfoList[2].nameArray2[pickerInfoList[2].nameIndex2]}}
+									<image src="../../static/detail-tabicon.png" ></image>
+								</view>
+								<!-- <image src="../../static/detail-tabicon.png" ></image> -->
 							</picker>
 						</view>
 					</view>
-<!-- 					<view class="picker" >
+					<view class="picker">
 						<view class="picker-choice">
 							<view class="choice-left">
-								<text class="p11">{{pickerInfoList[3].nameC}}</text>
-								<text class="p12">{{pickerInfoList[3].nameE}}</text>
+								<text class="pd">瞳距:</text>
 							</view>
-							<text class="p13">左&nbsp;&nbsp;&nbsp;(OD)</text>
-							<text class="p14">{{pickerInfoList[3].nameArray1[pickerInfoList[3].nameIndex1]}}</text>
-							<picker @change="bindPickerChange31" :value="pickerInfoList[3].nameIndex1" :range="pickerInfoList[3].nameArray1">
-								<image src="../../static/detail-tabicon.png" ></image>
-							</picker>
-							<text class="p13">右&nbsp;&nbsp;&nbsp;(OS)</text>
-							<text class="p14">{{pickerInfoList[3].nameArray2[pickerInfoList[3].nameIndex2]}}</text>
-							<picker @change="bindPickerChange32" :value="pickerInfoList[3].nameIndex2" :range="pickerInfoList[3].nameArray2">
-								<image src="../../static/detail-tabicon.png" ></image>
-							</picker>
+							<input type="digit" @change="handleInputPd" class="input"
+							placeholder="请输入瞳距,单位cm" maxlength="20" :value="pd" />
 						</view>
-					</view> -->
+					</view>
 					<view class="picker" >
 						<view class="picker-choice">
 							<view class="choice-left">
 								<text class="p11">{{pickerInfoList[3].nameC}}</text>
 							</view>
 							<text class="p13-date">年&nbsp;&nbsp;&nbsp;(Y)</text>
-							<text class="p14" style="width: 34px;">{{pickerInfoList[3].nameArray1[pickerInfoList[3].nameIndex1]}}</text>
 							<picker @change="bindPickerChange41" :value="pickerInfoList[3].nameIndex1" :range="pickerInfoList[3].nameArray1">
-								<image src="../../static/detail-tabicon.png" ></image>
+								<view class="p14" style="width: 30px;">
+									{{pickerInfoList[3].nameArray1[pickerInfoList[3].nameIndex1]}}
+									<image src="../../static/detail-tabicon.png" ></image>
+								</view>
 							</picker>
 							<text class="p13-date">月&nbsp;&nbsp;&nbsp;(M)</text>
-							<text class="p14" style="width: 30px;">{{pickerInfoList[3].nameArray2[pickerInfoList[3].nameIndex2]}}</text>
 							<picker @change="bindPickerChange42" :value="pickerInfoList[3].nameIndex2" :range="pickerInfoList[3].nameArray2">
-								<image src="../../static/detail-tabicon.png" ></image>
+								<view class="p14" style="width: 30px;">
+									{{pickerInfoList[3].nameArray2[pickerInfoList[3].nameIndex2]}}
+									<image src="../../static/detail-tabicon.png" ></image>
+								</view>
 							</picker>
 							<text class="p13-date">日&nbsp;&nbsp;&nbsp;(D)</text>
-							<text class="p14" style="width: 30px;">{{pickerInfoList[3].nameArray3[pickerInfoList[3].nameIndex3]}}</text>
 							<picker @change="bindPickerChange43" :value="pickerInfoList[3].nameIndex3" :range="pickerInfoList[3].nameArray3">
-								<image src="../../static/detail-tabicon.png" ></image>
+								<view class="p14" style="width: 30px;">
+									{{pickerInfoList[3].nameArray3[pickerInfoList[3].nameIndex3]}}
+									<image src="../../static/detail-tabicon.png" ></image>
+								</view>
 							</picker>
 						</view>
 					</view>
 					<view class="confirm">
-						<image :src="confirm ? tabicon[0] : tabicon[1]" @click="changeConfirm"></image>
+						<image class="image1" :src="confirm ? tabicon[0] : tabicon[1]" @tap="changeConfirm"></image>
 						<text>确认以上输入信息来源于我的验光数据!</text>
 					</view>
 				</view>
@@ -428,47 +446,18 @@
 		        text-align: justify;
 		        line-height: 24px;
 		        margin: 4px 0;
-		
+				
 		    }
 		    .p2 {
 		        font-size: 12px;
 		        color: #999999;
 		        letter-spacing: -0.23px;
-		        margin-bottom: 18rpx;
+		        margin-bottom: 32rpx;
 		    }
-			.use_pd{
-				display: flex;
-				height: 48rpx;
-				line-height: 48rpx;
-				margin-left: -298rpx;
-				margin-top: 30rpx;
-				margin-bottom: 40rpx;
-				align-items: center;
-				justify-content: center;
-				text{
-					font-size: 14px;
-					color: #333333;
-					margin-right: 44rpx;
-				}
-			}
-			.use_name{
-				display: flex;
-				height: 48rpx;
-				line-height: 48rpx;
-				margin-left: -220rpx;
-				margin-top: 20rpx;
-				align-items: center;
-				justify-content: center;
-				// text-align: center;
-				text{
-					font-size: 14px;
-					color: #333333;
-					margin-right: 44rpx;
-				}
-			}
-		    image{
-		        width: 28rpx;
-		        height: 26rpx;
+		    .image2{
+		        width: 42rpx;
+		        height: 34rpx;
+				margin-right: 12rpx;
 		    }
 		    .confirm {
 		        display: flex;
@@ -477,8 +466,10 @@
 		        color: #666666;
 		        letter-spacing: -0.23px;
 		        width: 684rpx;
-		        image{
+		        .image1{
 		            margin-right:25rpx;
+					width: 42rpx;
+					height: 38rpx;
 		        }
 		    }
 		    .picker{
@@ -487,18 +478,26 @@
 			justify-content: center;
 			align-items: center;
 			width: 100%;
-			image{
-				width: 10px;
-				height: 10px;
-				margin-right: 5px;
-			}
+
 			.picker-choice{
 				display: flex;
 				width: 684rpx;
 				align-items: center;
 		        margin-bottom: 40rpx;
+				.input{
+					border-bottom: 1px solid #CFCFCF;
+					height: 40rpx;
+				}
 				.choice-left{
 					width: 210rpx;
+					.pd{
+						font-size: 14px;
+						color: #333333;
+						letter-spacing: -0.26px;
+						text-align: justify;
+						line-height: 24px;
+						margin-right: 44rpx;
+					}
 					.p11 {
 						font-size: 14px;
 						color: #333333;
@@ -529,16 +528,29 @@
 					letter-spacing: -0.19px;
 					margin-right: 5px;
 		        }
-				.p14 {
-					font-size: 14px;
-					color: #666666;
-					letter-spacing: -0.26px;
-					text-align: center;
-					width: 124rpx;
-					border-bottom: 1px solid #CFCFCF;
+				picker{
+					width: 144rpx;
 					height: 40rpx;
-
+					display: flex;
+					position: relative;
+					.p14 {
+						font-size: 14px;
+						color: #666666;
+						letter-spacing: -0.26px;
+						text-align: center;
+						width: 124rpx;
+						border-bottom: 1px solid #CFCFCF;
+						height: 38rpx;
+					}
+					image{
+						width: 20rpx;
+						height: 20rpx;
+						position: absolute;
+						right: 20rpx;
+						top: 8rpx;
+					}
 				}
+
 		        
 			}
 		}
-- 
2.0.0