From 4c25900e835fbbf5c69deef120ca90c575fdd28f Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Thu, 27 Jun 2024 20:02:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/hongbao/youhuijuanList.vue | 19 +++++++--
 my/order/payModify.vue        | 73 +++++++++++++++++++++++++----------
 2 files changed, 69 insertions(+), 23 deletions(-)

diff --git a/my/hongbao/youhuijuanList.vue b/my/hongbao/youhuijuanList.vue
index a15b7b2..25bea55 100644
--- a/my/hongbao/youhuijuanList.vue
+++ b/my/hongbao/youhuijuanList.vue
@@ -7,7 +7,7 @@
 				<view class="" :class="tabIndex == index?'line':''"></view>
 			</view>
 		</view> -->
-		<view @tap="queding()">确定</view>
+		<view @tap="queding()" class="ticket-button">确定</view>
 		<checkbox-group @change="checkboxChange">
 			<view class="youhui-weiyong youhui-list" v-for="(item,index) in hongbao" :key="index">
 				<view class="youhui-view-left">
@@ -25,7 +25,7 @@
 						<view class="youhui-view-right-time">{{item.endDate}}</view>
 					</view>
 					<label class="tui-radio">
-						<checkbox activeBackgroundColor="#096f4b" color="#096f4b" :value="item.id.toString()" :checked="checkbox"/>
+						<checkbox activeBackgroundColor="#029d88" color="#029d88" :value="item.id.toString()" :checked="checkbox"/>
 					</label>
 					<!-- <view class="youhui-view-right-btn" @tap="shiYong()">立即使用</view> -->
 				</view>
@@ -138,6 +138,19 @@
 	/deep/uni-checkbox .uni-checkbox-input{
 		border-radius: 50%;
 	}
+	.ticket-button{
+		display: flex;
+		width: 130rpx;
+		grid-gap:8rpx;
+		gap:8px;
+		align-items: center;
+		justify-content:center;
+		background: #029d88;
+		color: #fff;
+		height:60rpx;
+		border-radius: 30rpx;
+		margin: 15rpx;
+	}
 	.checkbox-data{
 		padding: 0px 11px;
 		margin: 15px 0px;
@@ -222,7 +235,7 @@
 		height: 242rpx;
 		border-radius: 21rpx;
 		background-size: 100%;
-		margin: 20px auto;
+		margin: 6px auto;
 		justify-content: space-between;
 	}
 	.you-nav{
diff --git a/my/order/payModify.vue b/my/order/payModify.vue
index 4027f2b..8e591cf 100644
--- a/my/order/payModify.vue
+++ b/my/order/payModify.vue
@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="padding-bottom u-skeleton">
 			<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
-				<view class="padding margin-top-sm header-view">
+				<view class="ske-padding margin-top-sm header-view">
 					<view v-if="!detailaddress">请选择地址</view>
 					<view class="margin-right-xs">
 						<view class="flex justify-between margin-top-lg">
@@ -24,7 +24,7 @@
 									<span>
 										{{province}}/{{city}}/{{district}}/{{detailaddress}}
 									</span>
-									<image src="../../static/shezhi-jiantou.png" mode=""></image>
+									<span class="view-more"></span>
 							</view>
 						</view>
 						<view class="flex justify-between margin-top-lg" v-if="order.remark">
@@ -37,7 +37,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="padding margin-top-sm header-view">
+				<view class="ske-padding margin-top-sm header-view">
 					<view class="fuwu-time">
 						<view class="fuwu-title">
 							服务时间
@@ -50,12 +50,23 @@
 							style="height: 100rpx;line-height: 100rpx;padding: 0rpx 10rpx;">
 							<view class="flex justify-between margin-tb-sm" @click="openData()">
 								<view v-if="startTime">{{startTime}}</view>
-								<view class="tetx-sm" style="color:#999999;" v-else>请选择预约时间</view>
-								<u-icon name="arrow-right" color="#999999"></u-icon>
-							</view>
+								<view class="tetx-sm" v-else>请选择预约时间<span class="view-more"></span></view>
+								<!---<u-icon name="arrow-right" color="#999999"></u-icon>-->
+								</view>
 						</view>
 					</view>
-					<view class="liliao" @click="liliaoshi">
+					<view class="fuwu-time" @click="liliaoshi">
+					 	<view  class="fuwu-title" >
+							<span>理疗师</span>
+							<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
+						</view>
+						<view class="liliao-bottom" style="margin-right: 6px;">
+								<span v-if="jishiName">{{jishiName.artificerName}}</span>
+								<span v-else>选择不同技师价格可能不一样哦~</span>
+								<span class="view-more"></span>
+						</view>
+					</view>
+					<!--<view class="liliao">
 						<view class="liliao-top" style="width: 30%;">
 							<span>理疗师</span>
 							<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
@@ -63,11 +74,10 @@
 						<view class="liliao-bottom">
 							<span v-if="jishiName">{{jishiName.artificerName}}</span>
 							<span v-else>选择不同技师价格可能不一样哦~</span>
-							<image class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
 						</view>
-					</view>
+					</view>-->
 					<view class="liliao" @click="youhuijuan">
-						<view class="liliao-top" style="width: 30%;">
+						<view  class="fuwu-title">
 							<span>平台优惠劵</span>
 						</view>
 						<view class="header-bottom-money-zhen">
@@ -75,7 +85,7 @@
 								<span>-￥{{couponDataList}}</span>
 							</view>
 							<span v-else>选择优惠劵</span>
-							<image class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
+							<span class="view-more"></span>
 						</view>
 					</view>
 				</view>
@@ -1333,10 +1343,28 @@
 </script>
 
 <style lang="scss" scoped>
+	.view-more{
+		display:inline-block;
+		border-top:1px solid;
+		border-right:1px solid;
+		width: 15rpx;
+		height: 15rpx;
+		border-color:#999;
+		transform:rotate(45deg);
+		margin-top: 14rpx;
+		}
+	.tetx-sm{
+		font-size: 30rpx;
+		color:#888;
+	}
+	.ske-padding{
+		padding: 5rpx 30rpx 36rpx 30rpx;
+		
+	}
 	.header-bottom-money-zhen span{
 		color: #F95900 !important;
 		font-weight: bold !important;
-		font-size: 22rpx !important;
+		font-size: 26rpx !important;
 	}
 	.header-bottom-money-zhen{
 		display: flex;
@@ -1489,8 +1517,7 @@
 		font-weight: 400;
 		font-size: 29rpx;
 		color: #888;
-		margin-right: 5px;
-	}
+		}
 	.fuwu-time-view,.liliao-top{
 		width: 70%;
 		display: flex;
@@ -1512,8 +1539,13 @@
 		margin-top: 5px;
 	}
 	.xuanzhe{
+		background: #e5e7eb;
+		color: #666;
 		margin-left: 5px;
-		border: 1px solid;
+		border: 1px solid #cdd2db;
+		border-radius: 30rpx;
+		padding: 4rpx 15rpx;
+		font-size: 26rpx;
 	}
 	.header-view-data{
 		display: flex;
@@ -1537,7 +1569,7 @@
 	}
 	.header-view{
 		background-color: #fff;
-		margin-bottom: 10px;
+		margin-bottom: 12px;
 		border-radius: 11px;
 	}
 	.head-foot span:nth-child(1){
@@ -1615,7 +1647,7 @@
 		font-weight: 400;
 		font-size: 29rpx;
 		color: #222;
-		padding: 10px 15px 0px 15px;
+		padding: 16px 15px 0px 15px;
 		width: 100%;
 	}
 	.checkbox-data{
@@ -1933,10 +1965,11 @@
 		margin: 0 auto;
 		text-align: center;
 		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
-		height:68rpx;
-		border-radius: 60rpx;
+		height:80rpx;
+		border-radius: 80rpx;
 		color: #ffffff;
-		line-height: 68rpx;
+		line-height: 80rpx;
+		font-size: 32rpx;
 	}
 
 	.serverAddress {