diff --git a/my/order/payModifyCi.vue b/my/order/payModifyCi.vue
index aa08307..235b2da 100644
--- a/my/order/payModifyCi.vue
+++ b/my/order/payModifyCi.vue
@@ -5,7 +5,7 @@
 				<view class="head-top">
 					<view class="pay-title">项目次卡</view>
 					<view class="flex">
-						<view class="" style="width: 160upx;height: 160upx;">
+						<view style="width: 160upx;height: 160upx;">
 							<image :src="orderXm.packageImg"
 								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
 						</view>
@@ -18,12 +18,15 @@
 							</view>
 							<view class="flex align-center">
 								<view style="width: 100%;">
-									<view class="money-pay">
+									<view class="flex justify-between margin-tb-sm">
 										<view class="money-pay-zhen">
+											<text class="title-font">次卡价格：</text>
 											<span>￥</span>
-											<span>{{orderXm.price}}/次</span>
+											<span>{{orderXm.price}} / 次</span>
 										</view>
-
+									</view>
+									<view class="money-pay justify-between margin-tb-sm">
+										<view class="money-pay-zhen"></view>
 										<view>
 											<uni-number-box :width='27' :min="1" @change="changeValue" />
 										</view>
@@ -33,10 +36,7 @@
 						</view>
 					</view>
 				</view>
-
 			</view>
-
-
 			<view class="detail-foot">
 				<view class="detail-foot-nav">
 					<span class="detail-foot-nav-text">次卡详情</span>
@@ -65,30 +65,36 @@
 								</view>
 							</view>
 						</view>
-
 						<view class="detail-foot-title">
 							项目次卡
 						</view>
 					</view>
 				</view>
 			</view>
-			<view class="padding margin-top-sm header-view" style="width: 95%;margin: 0 auto;">
-
-				<view class="liliao" @click="youhuijuan" style="margin-top: 0px;">
-					<view class="liliao-top" style="width: 30%;">
-						<span>平台优惠劵</span>
-					</view>
-					<view class="header-bottom-money-zhen">
-						<view v-if="couponDataList" class="" style="margin-right: 5px;">
-							<span>-￥{{couponDataList}}</span>
+			<view class="detail-foot">
+				<view class="detail-foot-nav">
+					<span class="detail-foot-nav-text">优惠券</span>
+					<span class="detail-foot-nav-bor2"></span>
+				</view>
+				<view class="detail-foot-mian">
+					<view class="padding margin-top-sm header-view" style="width: 95%;margin: 0 auto;">
+						<view class="liliao" @click="youhuijuan" style="margin-top: 0px;">
+							<view class="liliao-top" style="width: 30%;">
+								<span>平台优惠券</span>
+							</view>
+							<view class="header-bottom-money-zhen">
+								<view v-if="couponDataList" class="value-font" style="margin-right: 5px;">
+									<span>-￥{{couponDataList}}</span>
+								</view>
+								<span v-else class="value-font">选择优惠券</span>
+							</view>
 						</view>
-						<span v-else >选择优惠劵</span>
 					</view>
 				</view>
 			</view>
-
-			<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view>
-
+			<view class="push-button">
+				<view class="pay_btn" @click="openpay()">去支付</view>			
+			</view>			
 		</view>
 		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
 		<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
@@ -1294,21 +1300,6 @@
 		text-decoration-line: line-through;
 		margin-left: 5px;
 	}
-	.money-pay-zhen span{
-		color: #FF6000;
-	}
-	.money-pay-zhen span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.money-pay-zhen span:nth-child(2){
-		font-size: 31.25rpx;
-		font-weight: bold;
-	}
-	.money-pay-zhen{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
 	.money-pay{
 		width: 100%;
 		display: flex;
@@ -1325,12 +1316,12 @@
 
 	.pay-title{
 		font-weight: bold;
-		font-size: 31rpx;
+		font-size: 32rpx;
 		color: #333333;
-		margin-bottom: 8px;
+		margin-bottom: 12px;
 	}
 	.header-bottom-money-zhen span{
-		color: #F95900 ;
+		color: #FF6000 ;
 		}
 	.header-bottom-money-zhen{
 		display: flex;
@@ -1346,6 +1337,14 @@
 		bottom: 0;
 		background: linear-gradient(90deg,rgba(234, 248, 245,0.7),rgba(132, 211, 196,0.7));
 	}
+	.detail-foot-nav-bor2{
+		width: 45px;
+		height: 11rpx;
+		border-radius: 6rpx;
+		position: absolute;
+		bottom: 0;
+		background: linear-gradient(90deg,rgba(234, 248, 245,0.7),rgba(132, 211, 196,0.7));
+	}
 	.detail-foot-nav-text{
 		font-weight: bold;
 		font-size: 32rpx;
@@ -1356,7 +1355,7 @@
 		display: flex;
 		flex-direction: column;
 		position: relative;
-		margin: 8px auto;
+		margin: 10px 0;
 	}
 	.detail-foot-title{
 		    width: 115px;
@@ -1365,7 +1364,7 @@
 		    background-repeat: no-repeat;
 		    background-size: 100% 100%;
 		    font-weight: 400;
-		    font-size: 13px;
+		    font-size: 15px;
 		    color: #FFFFFF;
 		    text-align: right;
 		    line-height: 32px;
@@ -1601,8 +1600,8 @@
 		align-items: center;
 	}
 	.fuwu-title,.liliao-top span:nth-child(1){
-		font-size: 29rpx;
-		color: #222222;
+		font-size: 30rpx;
+		color: #666666;
 	}
 	.fuwu-time,.liliao{
 		width: 100%;
@@ -1837,12 +1836,7 @@
 	}
 	.money-pay-zhen span{
 		color: #FF6000;
-	}
-	.money-pay-zhen span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.money-pay-zhen span:nth-child(2){
-		font-size: 31.25rpx;
+		font-size: 32rpx;
 		font-weight: bold;
 	}
 	.money-pay-zhen{
@@ -2039,4 +2033,27 @@
 		justify-content: space-between;
 		align-items: center;
 	}
+	.head-title{
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.push-button{
+		width: 100%;
+		height: 48px;
+		position: fixed;
+		bottom: 0px;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin: 0 auto;
+	}
+	.title-font{
+		font-size: 30rpx;
+		color: #666666;
+	}
+	.value-font{
+		font-size: 30rpx;
+		color: #333333;
+	}
 </style>
diff --git a/my/order/payModifyLiao.vue b/my/order/payModifyLiao.vue
index a495c37..7894133 100644
--- a/my/order/payModifyLiao.vue
+++ b/my/order/payModifyLiao.vue
@@ -5,7 +5,7 @@
 				<view class="head-top">
 					<view class="pay-title">服务疗程</view>
 					<view class="flex">
-						<view class="" style="width: 160upx;height: 160upx;">
+						<view style="width: 160upx;height: 160upx;">
 							<image :src="orderXm.packageImg"
 								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
 						</view>
@@ -18,11 +18,15 @@
 							</view>
 							<view class="flex align-center">
 								<view style="width: 100%;">
-									<view class="money-pay">
+									<view class="flex justify-between margin-tb-sm">
 										<view class="money-pay-zhen">
+											<text class="title-font">疗程价格：</text>
 											<span>￥</span>
-											<span style="font-size: 36rpx;">{{orderXm.price}}/{{orderXm.serviceCount}}次</span>
+											<span>{{orderXm.price}} / {{orderXm.serviceCount}}次</span>
 										</view>
+									</view>
+									<view class="money-pay justify-between margin-tb-sm">
+										<view class="money-pay-zhen"></view>
 										<view>
 											<uni-number-box :width='27' :min="1" @change="changeValue" />
 										</view>
@@ -32,10 +36,7 @@
 						</view>
 					</view>
 				</view>
-
 			</view>
-
-
 			<view class="detail-foot">
 				<view class="detail-foot-nav">
 					<span class="detail-foot-nav-text">疗程详情</span>
@@ -64,30 +65,36 @@
 								</view>
 							</view>
 						</view>
-
 						<view class="detail-foot-title">
 							服务疗程
 						</view>
 					</view>
 				</view>
 			</view>
-			<view class="padding margin-top-sm header-view" style="width: 95%;margin: 0 auto;">
-
-				<view class="liliao" @click="youhuijuan" style="margin-top: 0px;">
-					<view class="liliao-top" style="width: 30%;">
-						<span>平台优惠劵</span>
-					</view>
-					<view class="header-bottom-money-zhen">
-						<view v-if="couponDataList" class="" style="margin-right: 5px;">
-							<span>-￥{{couponDataList}}</span>
+			<view class="detail-foot">
+				<view class="detail-foot-nav">
+					<span class="detail-foot-nav-text">优惠券</span>
+					<span class="detail-foot-nav-bor2"></span>
+				</view>
+				<view class="detail-foot-mian">
+					<view class="padding margin-top-sm header-view" style="width: 95%;margin: 0 auto;">
+						<view class="liliao" @click="youhuijuan" style="margin-top: 0px;">
+							<view class="liliao-top" style="width: 30%;">
+								<span>平台优惠券</span>
+							</view>
+							<view class="header-bottom-money-zhen">
+								<view v-if="couponDataList" class="value-font" style="margin-right: 5px;">
+									<span>-￥{{couponDataList}}</span>
+								</view>
+								<span v-else class="value-font">选择优惠券</span>
+								<!---<image class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>-->
+							</view>
 						</view>
-						<span v-else >选择优惠劵</span>
-						<!---<image class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>-->
 					</view>
 				</view>
-			</view>
+			</view>		
 			<view class="push-button">
-			<view class="pay_btn"  @click="openpay()">去支付</view>
+				<view class="pay_btn"  @click="openpay()">去支付</view>
 			</view>
 		</view>
 		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
@@ -1295,21 +1302,6 @@
 		text-decoration-line: line-through;
 		margin-left: 5px;
 	}
-	.money-pay-zhen span{
-		color: #FF6000;
-	}
-	.money-pay-zhen span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.money-pay-zhen span:nth-child(2){
-		font-size: 36rpx;
-		font-weight: bold;
-	}
-	.money-pay-zhen{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
 	.money-pay{
 		width: 100%;
 		display: flex;
@@ -1326,12 +1318,12 @@
 
 	.pay-title{
 		font-weight: bold;
-		font-size: 31rpx;
+		font-size: 32rpx;
 		color: #333333;
-		margin-bottom: 8px;
+		margin-bottom: 12px;
 	}
 	.header-bottom-money-zhen span{
-		color: #F95900 ;
+		color: #FF6000 ;
 		}
 	.header-bottom-money-zhen{
 		display: flex;
@@ -1347,6 +1339,14 @@
 		bottom: 0;
 		background: linear-gradient(90deg,rgba(234, 248, 245,0.7),rgba(132, 211, 196,0.7));
 	}
+	.detail-foot-nav-bor2{
+		width: 45px;
+		height: 11rpx;
+		border-radius: 6rpx;
+		position: absolute;
+		bottom: 0;
+		background: linear-gradient(90deg,rgba(234, 248, 245,0.7),rgba(132, 211, 196,0.7));
+	}
 	.detail-foot-nav-text{
 		font-weight: bold;
 		font-size: 32rpx;
@@ -1357,7 +1357,7 @@
 		display: flex;
 		flex-direction: column;
 		position: relative;
-		margin: 8px auto;
+		margin: 10px 0;
 	}
 	.detail-foot-title{
 		    width: 115px;
@@ -1366,7 +1366,7 @@
 		    background-repeat: no-repeat;
 		    background-size: 100% 100%;
 		    font-weight: 400;
-		    font-size: 13px;
+		    font-size: 15px;
 		    color: #FFFFFF;
 		    text-align: right;
 		    line-height: 32px;
@@ -1602,8 +1602,8 @@
 		align-items: center;
 	}
 	.fuwu-title,.liliao-top span:nth-child(1){
-		font-size: 29rpx;
-		color: #222222;
+		font-size: 30rpx;
+		color: #666666;
 	}
 	.fuwu-time,.liliao{
 		width: 100%;
@@ -1838,12 +1838,7 @@
 	}
 	.money-pay-zhen span{
 		color: #FF6000;
-	}
-	.money-pay-zhen span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.money-pay-zhen span:nth-child(2){
-		font-size: 31.25rpx;
+		font-size: 32rpx;
 		font-weight: bold;
 	}
 	.money-pay-zhen{
@@ -2041,4 +2036,17 @@
 		justify-content: space-between;
 		align-items: center;
 	}
+	.head-title{
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.title-font{
+		font-size: 30rpx;
+		color: #666666;
+	}
+	.value-font{
+		font-size: 30rpx;
+		color: #333333;
+	}
 </style>
diff --git a/my/order/payModifyMs.vue b/my/order/payModifyMs.vue
index 84b9bfd..880af2f 100644
--- a/my/order/payModifyMs.vue
+++ b/my/order/payModifyMs.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="content">
 		<view class="padding-bottom u-skeleton">
-			<view class="bgImg u-skeleton-fillet">
+			<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
 				<view class="head-top">
-					<view class="pay-title" style="">服务项目</view>
+					<view class="pay-title">服务项目</view>
 					<view class="flex">
-						<view class="" style="width: 160upx;height: 160upx;">
+						<view style="width: 160upx;height: 160upx;">
 							<image :src="orderXm.packageImg"
 								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
 						</view>
@@ -14,15 +14,18 @@
 								<view class="margin-right-xs u-skeleton-fillet head-title">
 									{{orderXm.title}}
 								</view>
-
 							</view>
 							<view class="flex align-center">
 								<view style="width: 100%;">
-									<view class="money-pay">
+									<view class="flex justify-between margin-tb-sm">
 										<view class="money-pay-zhen">
+											<text class="title-font">秒杀价格：</text>
 											<span>￥</span>
 											<span>{{orderXm.price}}</span>
 										</view>
+									</view>
+									<view class="money-pay justify-between margin-tb-sm">
+										<view class="money-pay-zhen"></view>
 										<view>
 											<uni-number-box :width='27' :min="1" @change="changeValue" />
 										</view>
@@ -32,33 +35,66 @@
 						</view>
 					</view>
 				</view>
-
 			</view>
-
 			<view class="detail-foot">
 				<view class="detail-foot-nav">
-					<span class="detail-foot-nav-text">优惠劵</span>
+					<span class="detail-foot-nav-text">项目详情</span>
 					<span class="detail-foot-nav-bor"></span>
 				</view>
-			</view>
-			<view class="padding margin-top-sm header-view" style="width: 95%;margin: 0 auto;">
-				<view class="liliao" @click="youhuijuan" style="margin-top: 0px;">
-					<view class="liliao-top" style="width: 30%;">
-						<span>平台优惠劵</span>
+				<view class="detail-foot-mian">
+					<view class="detail-foot-list" v-for="(item,index) in detailData" :key="index" @click="detail(item)">
+						<view class="pay-title">
+							<span style="margin-right: 5px;">{{item.title}}</span>
+							<span style="display: none;">详情</span>
+						</view>
+						<view class="detail-view">
+							<image class="detail-view-img" :src="item.massageImg" mode=""></image>
+							<view class="detail-view-mina">
+								<view class="header-bottom-money">
+									<view class="header-bottom-money-zhen">
+										<span>￥</span>
+										<span style="font-size: 36rpx; font-weight: bold;">{{item.packagePrice}}</span>
+										<span style="margin-left:5px;color: #999;text-decoration: line-through;">￥{{item.oldPrice}}</span>
+									</view>
+								</view>
+								<view style="color: #019c88;margin: 7px 0px;">服务时长:{{item.duration}}分钟</view>
+								<view class="tese">
+									<span>项目特色: </span>
+									<span>{{item.jianjie}}</span>
+								</view>
+							</view>
+						</view>
+						<view class="detail-foot-title">
+							限时秒杀
+						</view>
 					</view>
-					<view class="header-bottom-money-zhen">
-						<view v-if="couponDataList" class="" style="margin-right: 5px;">
-							<span>-￥{{couponDataList}}</span>
-						</view>
-						<span v-else >选择优惠劵</span>
+				</view>
+			</view>
+			<view class="detail-foot">
+				<view class="detail-foot-nav">
+					<span class="detail-foot-nav-text">优惠券</span>
+					<span class="detail-foot-nav-bor2"></span>
+				</view>
+				<view class="detail-foot-mian">
+					<view class="padding margin-top-sm header-view" style="width: 95%;margin: 0 auto;">
+						<view class="liliao" @click="youhuijuan" style="margin-top: 0px;">
+							<view class="liliao-top" style="width: 30%;">
+								<span>平台优惠券</span>
+							</view>
+							<view class="header-bottom-money-zhen">
+								<view v-if="couponDataList" class="value-font" style="margin-right: 5px;">
+									<span>-￥{{couponDataList}}</span>
+								</view>
+								<span v-else class="value-font">选择优惠券</span>
+								</view>
 						</view>
+					</view>
 				</view>
 			</view>
 			<view class="push-button">
 				<view class="pay_btn" @click="openpay()">去支付</view>
 			</view>
 
-
 		</view>
 		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
 		<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
@@ -221,6 +257,7 @@
 			}
 			this.orderXm=this.$queue.getData('mainData');
 			console.log("this.orderXm",this.orderXm)
+			this.detailData=this.$queue.getData('detailData');
 			var date = new Date();
 			var year = date.getFullYear();
 			let month = (parseInt(date.getMonth()) + 1) > 9 ? (parseInt(date.getMonth()) + 1) : "0" + (parseInt(
@@ -1321,21 +1358,6 @@
 		text-decoration-line: line-through;
 		margin-left: 5px;
 	}
-	.money-pay-zhen span{
-		color: #FF6000;
-	}
-	.money-pay-zhen span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.money-pay-zhen span:nth-child(2){
-		font-size: 31.25rpx;
-		font-weight: bold;
-	}
-	.money-pay-zhen{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
 	.money-pay{
 		width: 100%;
 		display: flex;
@@ -1344,22 +1366,20 @@
 		justify-content: space-between;
 	}
 	.head-top{
-		width: 95%;
-		margin: 0 auto;
+		width: 100%;
 		background-color: #ffffff;
 		border-radius: 24rpx;
 		padding: 29rpx;
 		margin-top: 10px;
 	}
-
 	.pay-title{
 		font-weight: bold;
-		font-size: 31rpx;
+		font-size: 32rpx;
 		color: #333333;
-		margin-bottom: 8px;
+		margin-bottom: 12px;
 	}
 	.header-bottom-money-zhen span{
-		color: #F95900 ;
+		color: #FF6000 ;
 	}
 	.header-bottom-money-zhen{
 		display: flex;
@@ -1375,6 +1395,14 @@
 
 	}
 	.detail-foot-nav-bor{
+		width: 64px;
+		height: 11rpx;
+		border-radius: 6rpx;
+		position: absolute;
+		bottom: 0;
+		background: linear-gradient(90deg,rgba(234, 248, 245,0.7),rgba(132, 211, 196,0.7));
+	}
+	.detail-foot-nav-bor2{
 		width: 45px;
 		height: 11rpx;
 		border-radius: 6rpx;
@@ -1392,7 +1420,7 @@
 		display: flex;
 		flex-direction: column;
 		position: relative;
-		margin: 8px auto;
+		margin: 10px 0;
 	}
 	.detail-foot-title{
 		    width: 115px;
@@ -1401,7 +1429,7 @@
 		    background-repeat: no-repeat;
 		    background-size: 100% 100%;
 		    font-weight: 400;
-		    font-size: 13px;
+		    font-size: 15px;
 		    color: #FFFFFF;
 		    text-align: right;
 		    line-height: 32px;
@@ -1638,8 +1666,8 @@
 		align-items: center;
 	}
 	.fuwu-title,.liliao-top span:nth-child(1){
-		font-size: 29rpx;
-		color: #222222;
+		font-size: 30rpx;
+		color: #666666;
 	}
 	.fuwu-time,.liliao{
 		width: 100%;
@@ -1868,12 +1896,7 @@
 	}
 	.money-pay-zhen span{
 		color: #FF6000;
-	}
-	.money-pay-zhen span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.money-pay-zhen span:nth-child(2){
-		font-size: 31.25rpx;
+		font-size: 32rpx;
 		font-weight: bold;
 	}
 	.money-pay-zhen{
@@ -2093,9 +2116,19 @@
 		align-items: center;
 	}
 	.head-title{
-		font-size: 30rpx;
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
 	}
 	.zhuangtai{
 		color: #029D88;
 	}
+	.title-font{
+		font-size: 30rpx;
+		color: #666666;
+	}
+	.value-font{
+		font-size: 30rpx;
+		color: #333333;
+	}
 </style>
diff --git a/my/order/payModifyPt.vue b/my/order/payModifyPt.vue
index c2679ae..aaa8bf4 100644
--- a/my/order/payModifyPt.vue
+++ b/my/order/payModifyPt.vue
@@ -3,9 +3,9 @@
 		<view class="padding-bottom u-skeleton">
 			<view class="bgImg u-skeleton-fillet">
 				<view class="head-top">
-					<view class="pay-title" style="">服务项目</view>
+					<view class="pay-title">服务项目</view>
 					<view class="flex">
-						<view class="" style="width: 160upx;height: 160upx;">
+						<view style="width: 160upx;height: 160upx;">
 							<image :src="orderXm.packageImg"
 								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
 						</view>
@@ -18,11 +18,15 @@
 							</view>
 							<view class="flex align-center">
 								<view style="width: 100%;">
-									<view class="money-pay">
+									<view class="flex justify-between margin-tb-sm">
 										<view class="money-pay-zhen">
+											<text class="title-font">拼团价格：</text>
 											<span>￥</span>
 											<span>{{orderXm.price}}</span>
 										</view>
+									</view>
+									<view class="money-pay justify-between margin-tb-sm">
+										<view class="money-pay-zhen"></view>
 										<view>
 											<uni-number-box :width='27' :min="1" @change="changeValue" />
 										</view>
@@ -31,34 +35,66 @@
 							</view>
 						</view>
 					</view>
-				</view>
-				
+				</view>		
 			</view>
-			
 			<view class="detail-foot">
 				<view class="detail-foot-nav">
-					<span class="detail-foot-nav-text">优惠劵</span>
+					<span class="detail-foot-nav-text">项目详情</span>
 					<span class="detail-foot-nav-bor"></span>
 				</view>
-			</view>
-			<view class="padding margin-top-sm header-view" style="width: 95%;margin: 0 auto;">
-				<view class="liliao" @click="youhuijuan" style="margin-top: 0px;">
-					<view class="liliao-top" style="width: 30%;">
-						<span>平台优惠劵</span>
+				<view class="detail-foot-mian">
+					<view class="detail-foot-list" v-for="(item,index) in detailData" :key="index" @click="detail(item)">
+						<view class="pay-title">
+							<span style="margin-right: 5px;">{{item.title}}</span>
+							<span style="display: none;">详情</span>
+						</view>
+						<view class="detail-view">
+							<image class="detail-view-img" :src="item.massageImg" mode=""></image>
+							<view class="detail-view-mina">
+								<view class="header-bottom-money">
+									<view class="header-bottom-money-zhen">
+										<span>￥</span>
+										<span style="font-size: 36rpx; font-weight: bold;">{{item.packagePrice}}</span>
+										<span style="margin-left:5px;color: #999;text-decoration: line-through;">￥{{item.oldPrice}}</span>
+									</view>
+								</view>
+								<view style="color: #019c88;margin: 7px 0px;">服务时长:{{item.duration}}分钟</view>
+								<view class="tese">
+									<span>项目特色: </span>
+									<span>{{item.jianjie}}</span>
+								</view>
+							</view>
+						</view>
+						<view class="detail-foot-title">
+							团购
+						</view>
 					</view>
-					<view class="header-bottom-money-zhen">
-						<view v-if="couponDataList" class="" style="margin-right: 5px;">
-							<span>-￥{{couponDataList}}</span>
-						</view>
-						<span v-else >选择优惠劵</span>
-						</view>
 				</view>
 			</view>
+			<view class="detail-foot">
+				<view class="detail-foot-nav">
+					<span class="detail-foot-nav-text">优惠券</span>
+					<span class="detail-foot-nav-bor2"></span>
+				</view>
+				<view class="detail-foot-mian">
+					<view class="padding margin-top-sm header-view" style="width: 95%;margin: 0 auto;">
+						<view class="liliao" @click="youhuijuan" style="margin-top: 0px;">
+							<view class="liliao-top" style="width: 30%;">
+								<span>平台优惠券</span>
+							</view>
+							<view class="header-bottom-money-zhen">
+								<view v-if="couponDataList" class="value-font" style="margin-right: 5px;">
+									<span>-￥{{couponDataList}}</span>
+								</view>
+								<span v-else class="value-font">选择优惠券</span>
+								</view>
+						</view>
+					</view>
+				</view>
+			</view>		
 			<view class="push-button">
 				<view class="pay_btn" @click="openpay()">去支付</view>
-			</view>
-			
-		
+			</view>	
 		</view>
 		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
 	</view>
@@ -85,9 +121,10 @@
 			}
 		},
 		onLoad(e) {
-			
 			this.orderXm=this.$queue.getData('mainData');
 			console.log("this.orderXm",this.orderXm)
+			this.detailData=this.$queue.getData('detailData');
+			console.log("this.orderXm",this.detailData)
 			this.couponId=this.$queue.getData('youhui');
 			if(this.couponId){
 				this.youhuiF(this.couponId)
@@ -269,21 +306,6 @@
 		text-decoration-line: line-through;
 		margin-left: 5px;
 	}
-	.money-pay-zhen span{
-		color: #FF6000;
-	}
-	.money-pay-zhen span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.money-pay-zhen span:nth-child(2){
-		font-size: 31.25rpx;
-		font-weight: bold;
-	}
-	.money-pay-zhen{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
 	.money-pay{
 		width: 100%;
 		display: flex;
@@ -302,12 +324,12 @@
 	
 	.pay-title{
 		font-weight: bold;
-		font-size: 31rpx;
+		font-size: 32rpx;
 		color: #333333;
-		margin-bottom: 8px;
+		margin-bottom: 12px;
 	}
 	.header-bottom-money-zhen span{
-		color: #F95900 ;
+		color: #FF6000 ;
 	}
 	.header-bottom-money-zhen{
 		display: flex;
@@ -323,6 +345,14 @@
 		
 	}
 	.detail-foot-nav-bor{
+		width: 64px;
+		height: 11rpx;
+		border-radius: 6rpx;
+		position: absolute;
+		bottom: 0;
+		background: linear-gradient(90deg,rgba(234, 248, 245,0.7),rgba(132, 211, 196,0.7));
+	}
+	.detail-foot-nav-bor2{
 		width: 45px;
 		height: 11rpx;
 		border-radius: 6rpx;
@@ -340,7 +370,7 @@
 		display: flex;
 		flex-direction: column;
 		position: relative;
-		margin: 8px auto;
+		margin: 10px 0;
 	}
 	.detail-foot-title{
 		    width: 115px;
@@ -349,11 +379,11 @@
 		    background-repeat: no-repeat;
 		    background-size: 100% 100%;
 		    font-weight: 400;
-		    font-size: 13px;
+		    font-size: 15px;
 		    color: #FFFFFF;
 		    text-align: right;
 		    line-height: 32px;
-		    padding-right: 15px;
+		    padding-right: 30px;
 			position: absolute;
 			    right: 0;
 			    top: 0;
@@ -586,8 +616,8 @@
 		align-items: center;
 	}
 	.fuwu-title,.liliao-top span:nth-child(1){
-		font-size: 29rpx;
-		color: #222222;
+		font-size: 30rpx;
+		color: #666666;
 	}
 	.fuwu-time,.liliao{
 		width: 100%;
@@ -818,12 +848,7 @@
 	}
 	.money-pay-zhen span{
 		color: #FF6000;
-	}
-	.money-pay-zhen span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.money-pay-zhen span:nth-child(2){
-		font-size: 31.25rpx;
+		font-size: 32rpx;
 		font-weight: bold;
 	}
 	.money-pay-zhen{
@@ -1043,9 +1068,19 @@
 		align-items: center;
 	}
 	.head-title{
-		font-size: 30rpx;
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
 	}
 	.zhuangtai{
 		color: #029D88;
 	}
+	.title-font{
+		font-size: 30rpx;
+		color: #666666;
+	}
+	.value-font{
+		font-size: 30rpx;
+		color: #333333;
+	}
 </style>
\ No newline at end of file
diff --git a/my/order/payModifyTc.vue b/my/order/payModifyTc.vue
index bddd69b..6d99e9c 100644
--- a/my/order/payModifyTc.vue
+++ b/my/order/payModifyTc.vue
@@ -3,9 +3,9 @@
 		<view class="padding-bottom u-skeleton">
 			<view class="bgImg u-skeleton-fillet">
 				<view class="head-top">
-					<view class="pay-title" style="">{{orderXm.type=='104'?'服务套餐':orderXm.type=='105'?'项目次卡':'服务疗程'}}</view>
+					<view class="pay-title">{{orderXm.type=='104'?'服务套餐':orderXm.type=='105'?'项目次卡':'服务疗程'}}</view>
 					<view class="flex">
-						<view class="" style="width: 160upx;height: 160upx;">
+						<view style="width: 160upx;height: 160upx;">
 							<image :src="orderXm.packageImg"
 								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
 						</view>
@@ -18,11 +18,15 @@
 							</view>
 							<view class="flex align-center">
 								<view style="width: 100%;">
-									<view class="money-pay">
+									<view class="flex justify-between margin-tb-sm">
 										<view class="money-pay-zhen">
+											<text class="title-font">套餐价格：</text>
 											<span>￥</span>
-											<span>{{orderXm.price}}/套</span>
+											<span>{{orderXm.price}} / 套</span>
 										</view>
+									</view>
+									<view class="money-pay justify-between margin-tb-sm">
+										<view class="money-pay-zhen"></view>
 										<view>
 											<uni-number-box :width='27' :min="1" @change="changeValue" />
 										</view>
@@ -32,7 +36,6 @@
 						</view>
 					</view>
 				</view>
-
 			</view>
 
 			<view class="detail-foot">
@@ -70,24 +73,30 @@
 					</view>
 				</view>
 			</view>
-			<view class="padding margin-top-sm header-view" style="width: 95%;margin: 0 auto;">
-				<view class="liliao" @click="youhuijuan" style="margin-top: 0px;">
-					<view class="liliao-top" style="width: 30%;">
-						<span>平台优惠劵</span>
-					</view>
-					<view class="header-bottom-money-zhen">
-						<view v-if="couponDataList" class="" style="margin-right: 5px;">
-							<span>-￥{{couponDataList}}</span>
-						</view>
-						<span v-else >选择优惠劵</span>
-						</view>
+			<view class="detail-foot">
+				<view class="detail-foot-nav">
+					<span class="detail-foot-nav-text">优惠券</span>
+					<span class="detail-foot-nav-bor2"></span>
 				</view>
-			</view>
+				<view class="detail-foot-mian">
+					<view class="padding margin-top-sm header-view" style="width: 95%;margin: 0 auto;">
+						<view class="liliao" @click="youhuijuan" style="margin-top: 0px;">
+							<view class="liliao-top" style="width: 30%;">
+								<span>平台优惠券</span>
+							</view>
+							<view class="header-bottom-money-zhen">
+								<view v-if="couponDataList" class="value-font" style="margin-right: 5px;">
+									<span>-￥{{couponDataList}}</span>
+								</view>
+								<span v-else class="value-font">选择优惠券</span>
+								</view>
+						</view>
+					</view>
+				</view>
+			</view>		
 			<view class="push-button">
 				<view class="pay_btn" @click="openpay()">去支付</view>
 			</view>
-
-
 		</view>
 		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
 		<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
@@ -1348,21 +1357,6 @@
 		text-decoration-line: line-through;
 		margin-left: 5px;
 	}
-	.money-pay-zhen span{
-		color: #FF6000;
-	}
-	.money-pay-zhen span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.money-pay-zhen span:nth-child(2){
-		font-size: 31.25rpx;
-		font-weight: bold;
-	}
-	.money-pay-zhen{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
 	.money-pay{
 		width: 100%;
 		display: flex;
@@ -1381,22 +1375,12 @@
 
 	.pay-title{
 		font-weight: bold;
-		font-size: 31rpx;
+		font-size: 32rpx;
 		color: #333333;
-		margin-bottom: 8px;
+		margin-bottom: 12px;
 	}
 	.header-bottom-money-zhen span{
-		color: #F95900;
-	}
-	.header-bottom-money-zhen span:nth-child(1){
-		font-size: 26rpx;
-	}
-	.header-bottom-money-zhen span:nth-child(2){
-		font-size:38rpx;
-		font-weight: bold;
-	}
-	.header-bottom-money-zhen span:nth-child(3){
-		font-size: 26rpx;
+		color: #FF6000;
 	}
 	.header-bottom-money-zhen{
 		display: flex;
@@ -1419,6 +1403,14 @@
 		bottom: 0;
 		background: linear-gradient(90deg,rgba(234, 248, 245,0.7),rgba(132, 211, 196,0.7));
 	}
+	.detail-foot-nav-bor2{
+		width: 45px;
+		height: 11rpx;
+		border-radius: 6rpx;
+		position: absolute;
+		bottom: 0;
+		background: linear-gradient(90deg,rgba(234, 248, 245,0.7),rgba(132, 211, 196,0.7));
+	}
 	.detail-foot-nav-text{
 		font-weight: bold;
 		font-size: 32rpx;
@@ -1429,7 +1421,7 @@
 		display: flex;
 		flex-direction: column;
 		position: relative;
-		margin: 8px auto;
+		margin: 10px 0;
 	}
 	.detail-foot-title{
 		    width: 115px;
@@ -1438,7 +1430,7 @@
 		    background-repeat: no-repeat;
 		    background-size: 100% 100%;
 		    font-weight: 400;
-		    font-size: 13px;
+		    font-size: 15px;
 		    color: #FFFFFF;
 		    text-align: right;
 		    line-height: 32px;
@@ -1675,8 +1667,8 @@
 		align-items: center;
 	}
 	.fuwu-title,.liliao-top span:nth-child(1){
-		font-size: 29rpx;
-		color: #222222;
+		font-size: 30rpx;
+		color: #666666;
 	}
 	.fuwu-time,.liliao{
 		width: 100%;
@@ -1905,12 +1897,7 @@
 	}
 	.money-pay-zhen span{
 		color: #FF6000;
-	}
-	.money-pay-zhen span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.money-pay-zhen span:nth-child(2){
-		font-size: 31.25rpx;
+		font-size: 32rpx;
 		font-weight: bold;
 	}
 	.money-pay-zhen{
@@ -2130,9 +2117,19 @@
 		align-items: center;
 	}
 	.head-title{
-		font-size: 30rpx;
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
 	}
 	.zhuangtai{
 		color: #029D88;
 	}
+	.title-font{
+		font-size: 30rpx;
+		color: #666666;
+	}
+	.value-font{
+		font-size: 30rpx;
+		color: #333333;
+	}
 </style>
diff --git a/pages/my/cikarDrtail.vue b/pages/my/cikarDrtail.vue
index 9628968..475d6c6 100644
--- a/pages/my/cikarDrtail.vue
+++ b/pages/my/cikarDrtail.vue
@@ -1180,7 +1180,7 @@
 		text-decoration: line-through;
 	}
 	.header-bottom-money-zhen span{
-		color: #F95900;
+		color: #FF1200;
 	}
 	.header-bottom-money-zhen span:nth-child(1){
 		font-size: 25rpx;
diff --git a/pages/my/cureOderDrtail.vue b/pages/my/cureOderDrtail.vue
index 89de3b7..617da7d 100644
--- a/pages/my/cureOderDrtail.vue
+++ b/pages/my/cureOderDrtail.vue
@@ -542,7 +542,7 @@
 		margin-left: 5px;
 	}
 	.header-bottom-money-zhen span{
-		color: #F95900;
+		color: #FF1200;
 	}
 	.header-bottom-money-zhen span:nth-child(1){
 		font-size: 25rpx;
diff --git a/pages/my/fuwuDateil.vue b/pages/my/fuwuDateil.vue
index 5fc9831..83f63f5 100644
--- a/pages/my/fuwuDateil.vue
+++ b/pages/my/fuwuDateil.vue
@@ -548,7 +548,7 @@
 		margin-left: 5px;
 	}
 	.header-bottom-money-zhen span{
-		color: #F95900;
+		color: #FF1200;
 	}
 	.header-bottom-money-zhen span:nth-child(1){
 		font-size: 25rpx;
diff --git a/pages/my/fuwuGengduo.vue b/pages/my/fuwuGengduo.vue
index 21eb131..f5cdabe 100644
--- a/pages/my/fuwuGengduo.vue
+++ b/pages/my/fuwuGengduo.vue
@@ -187,7 +187,7 @@
 		margin-top: 10rpx;
 	}
 	.shop_label span{
-		background: #f3f3f3;
+		background: linear-gradient(90deg, #ffefde, #fff7ef);
 		height: 34rpx;
 		line-height: 34rpx;
 		border-radius: 8rpx;
@@ -195,6 +195,7 @@
 		font-size: 22rpx;
 		margin-right: 8rpx;
 		margin-bottom: 8rpx;
+		color: #f68607;
 	}
 	/deep/.refresh-body{
 		height: 845px !important;
@@ -208,35 +209,33 @@
 	.item-view-bottom-btn{
 		text-align: center;
 		width: 131rpx;
-		height: 50rpx;
-		line-height: 50rpx;
+		height: 55rpx;
+		line-height: 55rpx;
 		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
 		border-radius: 10rpx;
 		font-weight: bold;
-		font-size: 26rpx;
+		font-size: 28rpx;
 		color: #FFFFFF;
-		margin-top: 8rpx;
 	}
 	.item-view-bottom-qian span:nth-child(4){
-		 font-size: 28rpx;
-		 color: #848484;
-		 text-decoration-line: line-through;
-		 margin-left: 5px;
+		font-size: 26rpx;
+		color: #848484;
+		text-decoration-line: line-through;
+		margin-left: 5px;
 	}
 	.item-view-bottom-qian span:nth-child(1){
-		 font-weight: 400;
-		 font-size: 25rpx;
-		 color: #F95900;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #F95900;
 	}
 	.item-view-bottom-qian span:nth-child(2){
-		 font-weight: bold;
-		 font-size: 36.81rpx;
-		  color: #F95900;
+		font-weight: bold;
+		font-size: 36.81rpx;
+		color: #FF1200;
 	}
 	.item-view-bottom-qian span:nth-child(3){
-		 font-weight: 400;
-		 font-size: 25rpx;
-		 color: #F95900;
+		font-size: 26rpx;
+		color: #FF1200;
 	}
 	.item-view-bottom{
 		width: 100%;
diff --git a/pages/my/fuwuliaochengDetail.vue b/pages/my/fuwuliaochengDetail.vue
index 215e8a9..5b28b98 100644
--- a/pages/my/fuwuliaochengDetail.vue
+++ b/pages/my/fuwuliaochengDetail.vue
@@ -1212,7 +1212,7 @@
 		text-decoration: line-through;
 	}
 	.header-bottom-money-zhen span{
-		color: #F95900;
+		color: #FF1200;
 	}
 	.header-bottom-money-zhen span:nth-child(1){
 		font-size: 25rpx;
diff --git a/pages/my/fuwuxiangm.vue b/pages/my/fuwuxiangm.vue
index 900178f..500d1ea 100644
--- a/pages/my/fuwuxiangm.vue
+++ b/pages/my/fuwuxiangm.vue
@@ -29,15 +29,16 @@
 					<view class="item-view">
 						<view class="view-cata">
 							<span class="item-view-title">{{item.title}}</span>
-							<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
+							<!-- <span class="xiaoer item-view-biao">{{item.classifyName}}</span> -->
 						</view>
 						<view class="item-view-xiangmu">
 							
 							<view class="item-view-bottom-qian">
 								<span>￥</span>
-								<span style="color: #F95900;">{{item.price}}</span>
-								<!-- <span>元/套</span> -->
-								<span style="text-decoration: line-through; color: #999;margin-left: 5px;">￥{{item.oldPrice}}</span>
+								<span>{{item.price}}</span>
+								<span></span>
+								<span>￥</span>
+								<span>{{item.oldPrice}}</span>
 							</view>
 						</view>
 						<view class="shop_label" v-if="tagsData">
@@ -191,7 +192,7 @@
 		margin-top: 10rpx;
 	}
 	.shop_label span{
-		background: #f3f3f3;
+		background: linear-gradient(90deg, #ffefde, #fff7ef);
 		height: 34rpx;
 		line-height: 34rpx;
 		border-radius: 8rpx;
@@ -199,6 +200,7 @@
 		font-size: 22rpx;
 		margin-right: 8rpx;
 		margin-bottom: 8rpx;
+		color: #f68607;
 	}
 	/deep/.z-tabs-item-title{
 		color: #222;
@@ -218,15 +220,14 @@
 	}
 	.item-view-bottom-btn{
 		text-align: center;
-		width: 160rpx;
+		width: 131rpx;
 		height: 55rpx;
 		line-height: 55rpx;
 		background: linear-gradient(90deg, #019c88, #0FA78B, #35C495);
-		border-radius: 30rpx;
+		border-radius: 10rpx;
 		font-weight: bold;
 		font-size: 28rpx;
 		color: #FFFFFF;
-		margin-top: 5px;
 	}
 	.item-view-bottom-qian span:nth-child(4){
 		 font-size: 26rpx;
@@ -241,12 +242,12 @@
 	.item-view-bottom-qian span:nth-child(1){
 		 font-weight: 400;
 		 font-size: 25rpx;
-		 color: #F95900;
+		 color: #FF1200;
 	}
 	.item-view-bottom-qian span:nth-child(2){
-		 font-weight: bold;
-		 font-size: 36.81rpx;
-		  color: #F95900;
+		 font-weight: bold !important;
+		 font-size: 36.81rpx !important;
+		  color: #FF1200 !important;
 	}
 	.item-view-bottom-qian span:nth-child(3){
 		 font-weight: 400;
diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue
index 58da418..a99f08b 100644
--- a/pages/my/indextaociliaoList.vue
+++ b/pages/my/indextaociliaoList.vue
@@ -12,6 +12,7 @@
 					 @clear="clear">
 					</uni-search-bar>
 					<view class="search-btn" @click="searchBtn">
+						<image style="width:30rpx; height:30rpx; margin-right: 10rpx;" src="../../static/search.png"></image>
 						搜索
 					</view>
 				</view>
@@ -20,7 +21,7 @@
 				<z-tabs class="z-tabs-fenlei":list="tabList" @change="tabChange" @changeClick="changeClick"/>
 			</view>
 		</view>
-		<t-refresh ref="refresh"  v-if="dataList.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
+		<t-refresh ref="refresh" v-if="dataList.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0" style="padding-bottom: 100px;">
 			<template slot="content">
 				<view style="height: 10rpx;"></view>
 				<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
@@ -29,7 +30,7 @@
 					<view class="item-view">
 						<view class="view-cata">
 							<view class="item-view-title">{{item.title}}</view>
-							<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
+							<!-- <span class="xiaoer item-view-biao">{{item.classifyName}}</span> -->
 						</view>
 						<view class="item-view-bottom-qian">
 							<span>￥</span>
@@ -38,8 +39,8 @@
 							<span>￥</span>
 							<span>{{item.oldPrice}}<text  v-if="item.type!='104'">/{{item.serviceCount}}</text>{{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span>
 						</view>
-						<view class="shop_label" v-if="tagsData">
-							<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
+						<view class="shop_label" v-if="item.tagsData">
+							<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
 						</view>
 						<view class="item-view-bottom">
 							<view class="item-view-xiangmu">
@@ -77,7 +78,6 @@
 				titleNmae:'',
 				classifyId:'',
 				getName:'',
-				tagsData:[],
 				tabList: [],
 			}
 		},
@@ -137,6 +137,7 @@
 			},
 			searchBtn(){//搜索按钮
 				if(this.searchValue!=""){
+					this.page = 1;
 					this.getData()
 				}
 			},
@@ -154,7 +155,8 @@
 								if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
 								this.dataList = [...this.dataList, ...res.data.list]; //追加新数据
 								for(var i=0;i<this.dataList.length;i++){
-									this.tagsData=this.dataList[i].labels.split(',');
+									var tagsData=this.dataList[i].labels.split(',');
+									this.dataList[i].tagsData = tagsData;
 								}
 								uni.stopPullDownRefresh()
 							}
@@ -213,7 +215,7 @@
 		margin-top: 10rpx;
 	}
 	.shop_label span{
-		background: #f3f3f3;
+		background: linear-gradient(90deg, #ffefde, #fff7ef);
 		height: 34rpx;
 		line-height: 34rpx;
 		border-radius: 8rpx;
@@ -221,6 +223,7 @@
 		font-size: 22rpx;
 		margin-right: 8rpx;
 		margin-bottom: 8rpx;
+		color: #f68607;
 	}
 	.item-view-bottom-qian{
 		margin-top: 5px;
@@ -242,8 +245,8 @@
 	.item-view-bottom-btn{
 		text-align: center;
 		width: 131rpx;
-		height: 56rpx;
-		line-height: 56rpx;
+		height: 55rpx;
+		line-height: 55rpx;
 		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
 		border-radius: 10rpx;
 		font-weight: bold;
@@ -264,12 +267,12 @@
 	.item-view-bottom-qian span:nth-child(1){
 		 font-weight: 400;
 		 font-size: 26rpx;
-		 color: #F95900;
+		 color: #FF1200;
 	}
 	.item-view-bottom-qian span:nth-child(2){
 		 font-weight: bold;
 		 font-size: 36.81rpx;
-		  color: #F95900;
+		  color: #FF1200;
 	}
 	.item-view-bottom-qian span:nth-child(3){
 		 font-size: 26rpx;
@@ -334,7 +337,7 @@
 	.item-view-title{
 		width: 76%;
 		font-weight: bold;
-		font-size: 31rpx;
+		font-size: 32rpx;
 		color: #333333;
 		overflow: hidden;
 		text-overflow: ellipsis;
@@ -439,11 +442,11 @@
 	/deep/.uni-searchbar__box-icon-search,.search-btn{
 		width: 110rpx;
 		height: 50rpx;
-		background: #18A689;
-		border-radius: 31rpx;
+	/* 	background: #18A689;
+		border-radius: 31rpx; */
 	}
 	/deep/.uni-searchbar__box{
-		height: 30px;
+		height:34px;
 		border-radius: 30px !important;
 		background-color: #fff !important;
 		border: 1px solid #09a28a;
@@ -453,18 +456,19 @@
 		position: relative;
 	}
 	/deep/.uni-searchbar{
-		width: 230px;
+		width:240px;
 		border-radius: 31rpx;
-		margin-right: 20rpx;
 	}
 	.search-btn{
 		text-align: center;
-		line-height: 56rpx;
-		color: #fff;
+		color: #111;
+		font-weight: bold;
 		position: absolute;
-		right:30rpx;
-		top: 22rpx;
-		height: 56rpx !important;
+		right:50rpx;
+		top: 26rpx;
+		font-size: 30rpx;
+		display: flex;
+		align-items: center;
 	}
 	/deep/.uni-input-input {
 	    display: block;
diff --git a/pages/my/newTeaml.vue b/pages/my/newTeaml.vue
index 795ee70..cdc547d 100644
--- a/pages/my/newTeaml.vue
+++ b/pages/my/newTeaml.vue
@@ -51,17 +51,17 @@
 					<view class="view-cata">
 						<view class="item-view-title">{{item.title}}</view>
 					</view>
-					<view class="shop_label" v-if="tagsData">
-						<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
+					<view class="shop_label" v-if="item.tagsData">
+						<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
 					</view>
 					<view class="pace-plan">
 						<view class="pace-text"><span>{{item.duration}}</span><span>分钟</span></view>
 					</view>
 					<view class="seckill-entry">
 						<view class="seckill-money">
-							<span>￥{{item.price}}</span>
+							<span>￥{{item.oldPrice}}</span>
 							<span>去拼团￥</span>
-							<span>{{item.oldPrice}}</span>
+							<span>{{item.price}}</span>
 						</view>
 						<view class="seckill-rob ">
 							<span class="seckill-text">去拼团</span>
@@ -71,7 +71,7 @@
 				<view class="item-view" v-else>
 					<view class="view-cata">
 						<view class="item-view-title">{{item.title}}</view>
-						<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
+						<!-- <span class="xiaoer item-view-biao">{{item.classifyName}}</span> -->
 					</view>
 					<view class="item-view-bottom-qian">
 						<span>￥</span>
@@ -80,8 +80,8 @@
 						<span>￥</span>
 						<span>{{item.oldPrice}}</span>
 					</view>
-					<view class="shop_label" v-if="tagsData">
-						<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
+					<view class="shop_label" v-if="item.tagsData">
+						<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
 					</view>
 					<view class="item-view-bottom">
 						<view class="item-view-xiangmu">
@@ -120,12 +120,11 @@
 		onLoad(e){
 			this.myId = uni.getStorageSync('userId');
 			this.text=e.text
-			this.getData()
+			// this.getData()
 		},
 		methods: {
 			input(res) {//搜索 输入框
 				this.searchValue=res;
-				console.log('----input:', res)
 			},
 			searchBtn(){//搜索按钮
 				if(this.searchValue!=""){
@@ -133,33 +132,33 @@
 				}
 			},
 			getData(){
-				let data = {
-						  userId: this.myId,
-						  type: '111',
-						  page: this.page,
-						  limit:  this.limit,
-						  title:this.searchValue,
-						}
-						if(this.text=='index'){//首页进来的秒杀列表接口
-							this.$Request.get('/app/massage/package/findAppActivityPage', data).then(res => {
-								if (res.code == 0) {
-									this.dataList=res.data.list;
-									for(var i=0;i<this.dataList.length;i++){
-										this.tagsData=this.dataList[i].labels.split(',');
-									}
-								}
-							})
-						}else{
-							this.$Request.get('/app/user/package/findMyPackageList', data).then(res => {
-								if (res.code == 0) {
-									this.dataList=res.data.records;
-									for(var i=0;i<this.dataList.length;i++){
-										this.tagsData=this.dataList[i].labels.split(',');
-									}
-								}
-							})
-						}
-				
+				// let data = {
+				// 		  userId: this.myId,
+				// 		  type: '111',
+				// 		  page: this.page,
+				// 		  limit:  this.limit,
+				// 		  title:this.searchValue,
+				// 		}
+				// 		if(this.text=='index'){//首页进来的秒杀列表接口
+				// 			this.$Request.get('/app/massage/package/findAppActivityPage', data).then(res => {
+				// 				if (res.code == 0) {
+				// 					this.dataList=res.data.list;
+				// 					for(var i=0;i<this.dataList.length;i++){
+				// 						this.tagsData=this.dataList[i].labels.split(',');
+				// 					}
+				// 				}
+				// 			})
+				// 		}else{
+				// 			this.$Request.get('/app/user/package/findMyPackageList', data).then(res => {
+				// 				if (res.code == 0) {
+				// 					this.dataList=res.data.records;
+				// 					for(var i=0;i<this.dataList.length;i++){
+				// 						this.tagsData=this.dataList[i].labels.split(',');
+				// 					}
+				// 				}
+				// 			})
+				// 		}
+				this.$refs.paging.reload(true);	
 			},
 			tabChange(index) {
 				this.tabIndex = index;
@@ -177,11 +176,15 @@
 					page: pageNo,
 					limit: pageSize,
 					type: '111',
-					title:''
+					title:this.searchValue,
 				}
 				if(this.text=='index'){//首页进来的秒杀列表接口
 					this.$Request.get('/app/massage/package/findAppActivityPage',params).then(res => {
-						this.$refs.paging.complete(res.data.list);
+						for(var i=0;i<res.data.list.length;i++){
+							var tagsData=res.data.list[i].labels.split(',');
+							res.data.list[i].tagsData = tagsData;
+						}
+						this.$refs.paging.complete(res.data.list);	
 					}).catch(res => {
 						this.$refs.paging.complete(false);
 					})
@@ -230,7 +233,7 @@
 		margin-top: 10rpx;
 	}
 	.shop_label span{
-		background: #f3f3f3;
+		background: linear-gradient(90deg, #ffefde, #fff7ef);
 		height: 34rpx;
 		line-height: 34rpx;
 		border-radius: 8rpx;
@@ -238,6 +241,7 @@
 		font-size: 22rpx;
 		margin-right: 8rpx;
 		margin-bottom: 8rpx;
+		color: #f68607;
 	}
 	.shop-arrow{
 		display: inline-block;
@@ -347,12 +351,12 @@
 	.item-view-bottom-qian span:nth-child(1){
 		 font-weight: 400;
 		 font-size: 25rpx;
-		 color: #F95900;
+		 color: #FF1200;
 	}
 	.item-view-bottom-qian span:nth-child(2){
 		 font-weight: bold;
 		 font-size: 36.81rpx;
-		  color: #F95900;
+		  color: #FF1200;
 	}
 	
 	.item-view-bottom{
@@ -415,6 +419,8 @@
 		font-size: 32rpx;
 		color: #333333;
 		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
 	}
 	.item-view{
 		width: 66%;
diff --git a/pages/my/newTeamlDetail.vue b/pages/my/newTeamlDetail.vue
index e6f6d97..4fbddfa 100644
--- a/pages/my/newTeamlDetail.vue
+++ b/pages/my/newTeamlDetail.vue
@@ -92,7 +92,7 @@
 				
 			</view>
 		</view>
-		<view class="detail-btn" :class="[newTime<=0?'hBtn':'aBtn']" @click="goumai(mainData,'null')" v-if="mainData.isNewer!='1'&&newTime>0">
+		<view class="detail-btn" :class="[newTime<=0?'hBtn':'aBtn']" @click="goumai(mainData,'null',detailData)" v-if="mainData.isNewer!='1'&&newTime>0">
 			<span>￥{{mainData.price}}</span>
 			<span> 一键开团</span>
 		</view>
@@ -155,9 +155,10 @@
 			onCountdownChange(e) {
 				this.newTime=e
 			},
-			goumai(item,groupNo){//立即购买
+			goumai(item,groupNo,detailData){//立即购买
 				this.mainData.groupNo=groupNo
 				this.$queue.setData('mainData',this.mainData);
+				this.$queue.setData('detailData',this.detailData);
 				this.$queue.setData('youhui','');
 				if(this.newTime<=0){
 					uni.showToast({
@@ -215,8 +216,10 @@
 							  limit:  that.limit,
 							}
 					that.$Request.get('/app/massage/package/getAppGroupDetail', data).then(res => {
+						console.log(res);
 						if (res.code == 0) {
 							that.mainData=res.groupData;
+							
 							that.ordersData=res.ordersData;
 							that.backgroundImageUrl=res.groupData.packageImg
 							that.contentImg=res.groupData.contentImg.split(",");
@@ -231,6 +234,7 @@
 							// var serTime=endTime-starTime;
 							// that.countdown = serTime; // 转换为时分秒
 							// that.toHMS(serTime); // 转换为时分秒
+							that.detailData=res.detailData.list;
 						}
 					})
 				}else{
@@ -537,15 +541,15 @@
 		width: 94%;
 		height: 40px;
 		line-height: 40px;
-		border-radius: 23px;
+		border-radius: 28px;
 		margin: 0 auto;
 		text-align: center;
-		font-weight: 400;
-		font-size: 18px;
+		font-size: 30rpx;
 		color: #FFFFFF;
 		position: fixed;
 		bottom: 0px;
-		margin-bottom: 10px;
+		margin-bottom: 4px;
+		padding-top: 2px;
 		margin-left:3%;
 	}
 	.detail-btn span:nth-child(2){
diff --git a/pages/my/newseckill.vue b/pages/my/newseckill.vue
index 5da9af2..c6e06d9 100644
--- a/pages/my/newseckill.vue
+++ b/pages/my/newseckill.vue
@@ -50,12 +50,11 @@
 				<view class="item-view">
 					<view class="view-cata">
 						<view class="item-view-title">{{item.title}}</view>
-						<view class="xiaoer item-view-biao">{{item.classifyName}}</view>
+						<!-- <view class="xiaoer item-view-biao">{{item.classifyName}}</view> -->
 					</view>
 					<view class="flex" style="margin-top: 10rpx;">
-					
-						<view class="shop_label" v-if="tagsData">
-							<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
+						<view class="shop_label" v-if="item.tagsData">
+							<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
 						</view>
 					</view>
 					<view class="item-view-bottom-qian">
@@ -69,7 +68,10 @@
 						<view class="item-view-xiangmu">
 							<span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span>
 						</view>
-						<view class="item-view-bottom-btn">
+						<view class="item-view-bottom-btn" v-if="item.isStart=='true'">
+							开抢
+						</view>
+						<view class="item-view-bottom-btn-un" v-else>
 							开抢
 						</view>
 					</view>
@@ -88,7 +90,7 @@
 				// v-model绑定的这个变量不要在分页请求结束中自己赋值！！！
 				dataList: [],
 				tabList: [],
-				typeData:'105',
+				typeData:'112',
 				tabIndex: 0,
 				searchValue:'',
 				serviceTrue:true,
@@ -102,12 +104,11 @@
 		onLoad(e){
 			this.myId = uni.getStorageSync('userId')
 			this.text=e.text
-			this.getData()
+			// this.getData()
 		},
 		methods: {
 			input(res) {//搜索 输入框
 				this.searchValue=res;
-				console.log('----input:', res)
 			},
 			searchBtn(){//搜索按钮
 				if(this.searchValue!=""){
@@ -115,33 +116,35 @@
 				}
 			},
 			getData(){
-				let data = {
-					  userId: this.myId,
-					  type: '112',
-					  page: this.page,
-					  limit:  this.limit,
-					  title:this.searchValue,
-					}
-				if(this.text=='index'){//首页进来的秒杀列表接口
-					this.$Request.get('/app/massage/package/findAppActivityPage', data).then(res => {
-						if (res.code == 0) {
-							this.dataList=res.data.list;
-							for(var i=0;i<this.dataList.length;i++){
-								this.tagsData=this.dataList[i].labels.split(',');
-							}
-						}
-					})
-				}else{
-					this.$Request.get('/app/user/package/findMyPackageList', data).then(res => {
-						if (res.code == 0) {
-							this.dataList=res.data.records;
-							for(var i=0;i<this.dataList.length;i++){
-								this.tagsData=this.dataList[i].labels.split(',');
-							}
-						}
-					})
-				}
-				
+				// console.log("getData");
+				// let data = {
+				// 	  userId: this.myId,	  
+				// 	  page: this.page,
+				// 	  limit:  this.limit,
+				// 	  type: '112',
+				// 	  title:this.searchValue,
+				// 	}
+				// if(this.text=='index'){//首页进来的秒杀列表接口
+				// 	this.$Request.get('/app/massage/package/findAppActivityPage', data).then(res => {
+				// 		for(var i=0;i<res.data.list.length;i++){
+				// 			var tagsData=res.data.list[i].labels.split(',');
+				// 			res.data.list[i].tagsData = tagsData;
+				// 		}
+				// 		this.$refs.paging.complete(res.data.list);
+				// 	}).catch(res => {
+				// 		this.$refs.paging.complete(false);
+				// 	})
+				// }else{
+				// 	this.$Request.get('/app/user/package/findMyPackageList', data).then(res => {
+				// 		if (res.code == 0) {
+				// 			this.dataList=res.data.records;
+				// 			for(var i=0;i<this.dataList.length;i++){
+				// 				this.tagsData=this.dataList[i].labels.split(',');
+				// 			}
+				// 		}
+				// 	})
+				// }
+				this.$refs.paging.reload(true);	
 			},
 			tabChange(index) {
 				this.tabIndex = index;
@@ -150,15 +153,27 @@
 				this.$refs.paging.reload(true);
 			},
 			queryList(pageNo, pageSize) {
+				console.log("queryList");
 				const params = {
 					userId: this.myId,
 					page: pageNo,
 					limit: pageSize,
 					type: '112',
-					title:''
+					title: this.searchValue
 				}
 				if(this.text=='index'){//首页进来的秒杀列表接口
 					this.$Request.get('/app/massage/package/findAppActivityPage',params).then(res => {
+						var timestamp = (new Date()).getTime();
+						for(var i=0;i<res.data.list.length;i++){
+							var tagsData=res.data.list[i].labels.split(',');
+							res.data.list[i].tagsData = tagsData;
+							var time= new Date(res.data.list[i].startTime).getTime();
+							if(time < timestamp){
+								res.data.list[i].isStart = 'true';
+							}else{
+								res.data.list[i].isStart = 'false';
+							}
+						}
 						this.$refs.paging.complete(res.data.list);
 					}).catch(res => {
 						this.$refs.paging.complete(false);
@@ -169,8 +184,7 @@
 					}).catch(res => {
 						this.$refs.paging.complete(false);
 					})
-				}
-				
+				}	
 			},
 			
 			backImg(){//返回上一页
@@ -183,7 +197,6 @@
 						url:'/pages/index/index'
 					})
 				}
-				
 			},	
 			clear(res) {
 				this.getData()
@@ -197,8 +210,7 @@
 					uni.navigateTo({
 						url:'/pages/my/miaoShaOderDrtail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+this.text
 					})
-				}
-				
+				}			
 			}
 		}
 	}
@@ -293,6 +305,17 @@
 		font-size: 28rpx;
 		color: #FFFFFF;
 	}
+	.item-view-bottom-btn-un{
+		text-align: center;
+		width: 131rpx;
+		height: 55rpx;
+		line-height: 55rpx;
+		background: linear-gradient(90deg, #ccc, #ccc, #ccc);
+		border-radius: 10rpx;
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #FFFFFF;
+	}
 	.item-view-bottom-qian span:nth-child(5){
 		 font-size: 28rpx;
 		 color: #848484;
@@ -307,12 +330,12 @@
 	.item-view-bottom-qian span:nth-child(1){
 		 font-weight: 400;
 		 font-size: 25rpx;
-		 color: #F95900;
+		 color: #FF1200;
 	}
 	.item-view-bottom-qian span:nth-child(2){
 		 font-weight: bold;
 		 font-size: 36.81rpx;
-		  color: #F95900;
+		  color: #FF1200;
 	}
 	
 	.item-view-bottom{
@@ -367,11 +390,20 @@
 		margin-right: 5rpx;
 	}
 	.shop_label{
-		padding: 1rpx 8rpx;
-		background:#d9ffee ;
-		color: #019C88;
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 10rpx;
+	}
+	.shop_label span{
+		background: linear-gradient(90deg, #ffefde, #fff7ef);
+		height: 34rpx;
+		line-height: 34rpx;
+		border-radius: 8rpx;
+		padding: 0 10rpx;
 		font-size: 22rpx;
-		border-radius: 30rpx;
+		margin-right: 8rpx;
+		margin-bottom: 8rpx;
+		color: #f68607;
 	}
 	.item-view-xiangmu{
 		width: 100%;
@@ -383,9 +415,11 @@
 	}
 	.item-view-title{
 		font-weight: bold;
-		font-size: 31rpx;
+		font-size: 32rpx;
 		color: #333333;
 		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
 	}
 	.item-view{
 		width: 55%;
diff --git a/pages/my/newseckilldetails.vue b/pages/my/newseckilldetails.vue
index f9ecb56..4035eb6 100644
--- a/pages/my/newseckilldetails.vue
+++ b/pages/my/newseckilldetails.vue
@@ -177,6 +177,7 @@
 		methods:{
 			goumai(item){//立即购买
 				this.$queue.setData('mainData',item)
+				this.$queue.setData('detailData',this.detailData)
 				this.$queue.setData('youhui','');
 				console.log("item",item)
 				if(item.btnShow==false){
@@ -608,6 +609,7 @@
 						}
 				if(that.dataList.name=='index'){
 					that.$Request.get('/app/massage/package/getAppFlashDetail', data).then(res => {
+						console.log(res);
 						if (res.code == 0) {
 							var newTime = new Date().getTime();
 							var starTime=this.getTimeInMilliseconds(res.data.startTime);
@@ -621,10 +623,10 @@
 							that.backgroundImageUrl=res.data.packageImg
 							that.contentImg=res.data.contentImg.split(",");
 							that.labels=res.data.labels.split(',');
+							that.detailData=res.detailData.list;
 						}
 					})
-				}else{
-					
+				}else{				
 					that.$Request.get('/app/user/package/detail/getMyPackageDetail', data).then(res => {
 						if (res.code == 0) {
 							var newTime = new Date().getTime();
@@ -665,15 +667,15 @@
 	}
 	.detail-btn{
 		display: inline-block;
-		width: 92%;
+		width: 94%;
 		text-align: center;
-		
 		height: 40px;
 		border-radius: 28px;
 		color: #ffffff;
 		line-height: 40px;
 		margin-top: 4px;
-		font-size: 16px;
+		font-size: 30rpx;
+		padding-top: 2px;
 	}
 	.group-buy-img{
 		margin-bottom: 10rpx;
diff --git a/pages/my/serviceOderDrtail.vue b/pages/my/serviceOderDrtail.vue
index 96b290d..a8ca5f0 100644
--- a/pages/my/serviceOderDrtail.vue
+++ b/pages/my/serviceOderDrtail.vue
@@ -829,7 +829,8 @@
 	color: #ffffff;
 	line-height: 40px;
 	margin-top: 4px;
-	font-size: 34rpx;
+	font-size: 30rpx;
+	padding-top: 2px;
 	}
 	.header-top image{
 		width: 706.25rpx;
@@ -1041,7 +1042,7 @@
 		margin-left: 5px;
 	}
 	.header-bottom-money-zhen span{
-		color: #F95900;
+		color: #FF1200;
 	}
 	.header-bottom-money-zhen span:nth-child(1){
 		font-size: 26rpx;
diff --git a/static/search.png b/static/search.png
new file mode 100644
index 0000000..4b8021e
Binary files /dev/null and b/static/search.png differ
diff --git a/static/vip/grade3.gif b/static/vip/grade3.gif
index 62ac7d0..6be6070 100644
Binary files a/static/vip/grade3.gif and b/static/vip/grade3.gif differ