From af5303d758ffc85b58c2fc3b0072ff8dc2c89de0 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Mon, 22 Jul 2024 19:41:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=92=E6=9D=80=20=E5=9B=A2=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/hongbao/youhuijuanList.vue                 |    4 +
 my/order/payModifyMs.vue                      |    3 +-
 my/order/payModifyPt.vue                      | 1051 +++++++++
 my/order/paydingMs.vue                        |    8 +-
 my/order/paydingPt.vue                        | 1646 ++++++++++++++
 pages.json                                    |   53 +-
 pages/index/index.vue                         |    2 +-
 pages/my/index.vue                            |    7 +-
 pages/my/miaoShaOderDrtail.vue                |    8 +-
 pages/my/myMsOderDrtail.vue                   |    6 +-
 pages/my/newTeaml.vue                         | 1901 +++++------------
 pages/my/newTeamlDetail.vue                   | 1365 ++++++++----
 pages/my/newseckill.vue                       |   15 +-
 pages/my/newseckilldetails.vue                |   17 +-
 pages/my/pTuanOderDrtail.vue                  |  606 ++++++
 pages/my/pinTuanOderDrtail.vue                |  690 ++++++
 uni_modules/uni-countdown/changelog.md        |   26 +
 .../components/uni-countdown/i18n/en.json     |    6 +
 .../components/uni-countdown/i18n/index.js    |    8 +
 .../uni-countdown/i18n/zh-Hans.json           |    6 +
 .../uni-countdown/i18n/zh-Hant.json           |    6 +
 .../uni-countdown/uni-countdown.vue           |  288 +++
 uni_modules/uni-countdown/package.json        |   83 +
 uni_modules/uni-countdown/readme.md           |   10 +
 .../components/u-count-down/u-count-down.vue  |    2 +-
 25 files changed, 5934 insertions(+), 1883 deletions(-)
 create mode 100644 my/order/payModifyPt.vue
 create mode 100644 my/order/paydingPt.vue
 create mode 100644 pages/my/pTuanOderDrtail.vue
 create mode 100644 pages/my/pinTuanOderDrtail.vue
 create mode 100644 uni_modules/uni-countdown/changelog.md
 create mode 100644 uni_modules/uni-countdown/components/uni-countdown/i18n/en.json
 create mode 100644 uni_modules/uni-countdown/components/uni-countdown/i18n/index.js
 create mode 100644 uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hans.json
 create mode 100644 uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hant.json
 create mode 100644 uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
 create mode 100644 uni_modules/uni-countdown/package.json
 create mode 100644 uni_modules/uni-countdown/readme.md

diff --git a/my/hongbao/youhuijuanList.vue b/my/hongbao/youhuijuanList.vue
index d44ccdc..dad9471 100644
--- a/my/hongbao/youhuijuanList.vue
+++ b/my/hongbao/youhuijuanList.vue
@@ -131,6 +131,10 @@
 					uni.navigateTo({//返回项目订单
 						url:'/my/order/payModifyMs'
 					})
+				}else if(this.content=='拼团'){
+					uni.navigateTo({//返回项目订单
+						url:'/my/order/payModifyPt'
+					})
 				}
 				
 			},
diff --git a/my/order/payModifyMs.vue b/my/order/payModifyMs.vue
index 36457fe..7c52523 100644
--- a/my/order/payModifyMs.vue
+++ b/my/order/payModifyMs.vue
@@ -3,7 +3,7 @@
 		<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" style="">服务项目</view>
 					<view class="flex">
 						<view class="" style="width: 160upx;height: 160upx;">
 							<image :src="orderXm.packageImg"
@@ -296,7 +296,6 @@
 				  startTime:that.orderXm.startTime,
 				  endTime:that.orderXm.endTime,
 				  couponId: that.couponId,
-				  orders:'',
 				  ordersPackageList:[
 				    {packageId: that.orderXm.id,num: that.number},
 				  ],
diff --git a/my/order/payModifyPt.vue b/my/order/payModifyPt.vue
new file mode 100644
index 0000000..8676543
--- /dev/null
+++ b/my/order/payModifyPt.vue
@@ -0,0 +1,1051 @@
+<template>
+	<view class="content">
+		<view class="padding-bottom u-skeleton">
+			<view class="bgImg u-skeleton-fillet">
+				<view class="head-top">
+					<view class="pay-title" style="">服务项目</view>
+					<view class="flex">
+						<view class="" style="width: 160upx;height: 160upx;">
+							<image :src="orderXm.packageImg"
+								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+						</view>
+						<view class="head-bottom  margin-left-sm">
+							<view class="flex head-title-right">
+								<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="money-pay-zhen">
+											<span>￥</span>
+											<span>{{orderXm.price}}</span>
+										</view>
+										<view>
+											<uni-number-box :width='27' :min="1" @change="changeValue" />
+										</view>
+									</view>
+								</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-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>
+					<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="push-button">
+				<view class="pay_btn" @click="openpay()">去支付</view>
+			</view>
+			
+		
+		</view>
+		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				startTime: '',
+				tordersId: '',
+				tpayMoney: '',
+				orderList: [],
+				loading: true,
+				id: '',
+				isVip: false,
+				couponData:[],
+				couponId:'',
+				ordersId:'',
+				couponDataList:'',
+				orderXm:[],
+				detailData:[],
+				number:1,
+			}
+		},
+		onLoad(e) {
+			
+			this.orderXm=this.$queue.getData('mainData');
+			console.log("this.orderXm",this.orderXm)
+			this.couponId=this.$queue.getData('youhui');
+			if(this.couponId){
+				this.youhuiF(this.couponId)
+			}
+			this.youhui()
+		},
+		methods: {
+			goOrder() {//生成orderId
+				let that = this
+				console.log('asdasd',that.couponId)
+				let data = {
+				  userId: uni.getStorageSync('userId'),
+				  groupNo:that.orderXm.groupNo,
+				  isNewer:that.orderXm.isNewer==null?'0':that.orderXm.isNewer,
+				  startTime:that.orderXm.startTime,
+				  endTime:that.orderXm.endTime,
+				  couponId: that.couponId,
+				  ordersPackageList:[
+				    {packageId: that.orderXm.id,num: that.number},
+				  ],
+				  // oldSumMoney: that.orderXm.oldPrice,
+				  // sumMoney: that.orderXm.price,
+				  // oldSumMoney: that.mainData.oldPrice*that.detailData.length,
+				  // sumMoney: that.mainData.price*that.detailData.length,
+				 
+				}
+				that.$Request.postJson("/app/user/package/order/insertGroupOrders", data).then(res => {
+					if (res.code == 0) {
+						that.tordersId = res.data.ordersId;
+						that.tpayMoney = res.data.payMoney;
+						// uni.navigateTo({
+						// 	url:'/my/order/paydingPt?ordersId='+ res.data.ordersId
+						// })
+					} else {
+						that.$queue.showToast(res.msg)
+					}
+							
+				});
+			},
+			changeValue(value){
+				this.number=value
+			},
+			youhuijuan(){
+				var moeny=(this.orderXm.price*this.number).toFixed(2)
+				uni.navigateTo({
+					url:'/my/hongbao/youhuijuanList?price='+moeny+'&text='+'拼团'
+				})
+			},
+			openpay() {//验证
+					this.goOrder()
+			},
+			checkboxChange(e){
+				this.couponId=e.detail.value.join(",")
+			},
+			youhuiF(couponId){//获取优惠卷
+				let that = this;
+				let data = {
+							  page: 1,
+							  limit: 10,
+							  id:couponId,
+							}
+				that.$Request.get("/app/coupon/selectCouponUserList", data).then(res => {
+					if (res.code == 0) {
+						var list=res.data.list;
+						that.couponDataList=list.reduce((sum, item) => sum + item.money, 0)
+						console.log("asdasdasdasd",that.couponDataList)
+					} else {
+						that.$queue.showToast(res.msg)
+					}
+							
+				});
+			},
+			youhui(){//获取优惠卷
+				let that = this
+				let data = {
+							  status: 0,
+							  page: 1,
+							  limit: 10
+							}
+				that.$Request.get("/app/coupon/selectCouponUserList", data).then(res => {
+					if (res.code == 0) {
+						that.couponData=res.data.list
+					} else {
+						that.$queue.showToast(res.msg)
+					}
+							
+				});
+			},
+			liliaoshi(){
+				uni.setStorage({
+				  key: 'taocanDd',
+				  data: '支付',
+				  success: function () {
+				   uni.navigateTo({
+				   	url: '/pages/therapist/therapistDingdan'
+				   })
+				  }
+				});
+			},
+			copy(num) {
+				uni.setClipboardData({
+					data: num,
+					success: r => {
+						this.$queue.showToast('复制成功');
+					}
+				});
+			},
+			goNav(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
+			getIsVip() {
+				this.$Request.get("/app/UserVip/isUserVip").then(res => {
+					if (res.code == 0) {
+						this.isVip = res.data
+						uni.setStorageSync('isVIP', res.data)
+					}
+				});
+			},
+			
+			
+			callPay: function(response) {
+				if (typeof WeixinJSBridge === "undefined") {
+					if (document.addEventListener) {
+						document.addEventListener('WeixinJSBridgeReady', this.onBridgeReady(response), false);
+					} else if (document.attachEvent) {
+						document.attachEvent('WeixinJSBridgeReady', this.onBridgeReady(response));
+						document.attachEvent('onWeixinJSBridgeReady', this.onBridgeReady(response));
+					}
+				} else {
+					this.onBridgeReady(response);
+				}
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.ske-padding{
+		padding: 5rpx 30rpx 36rpx 30rpx;
+		
+	}
+	.header-bottom-money{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: flex-end;
+	}
+	.detail-view-mina{
+		width: 73%;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+	}
+	.detail-view-img{
+		width: 76px;
+		height: 76px;
+		border-radius: 9px;
+	}
+	.detail-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.head-bottom{
+		width: 68%;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+	}
+	.money-pay-jia{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #666666;
+		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;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.head-top{
+		width: 95%;
+		margin: 0 auto;
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		padding: 29rpx;
+		margin-top: 10px;
+	}
+	
+	.pay-title{
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #333333;
+		margin-bottom: 8px;
+	}
+	.header-bottom-money-zhen span{
+		color: #F95900 ;
+	}
+	.header-bottom-money-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: baseline;
+		justify-content: space-between;
+		}
+	.xiangmu-cont-top-left{
+		font-weight: normal;
+		font-size: 24rpx;
+		color: #049E89;
+		margin: 5rpx 0;
+		
+	}
+	.detail-foot-nav-bor{
+		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;
+		color: #000000;
+	}
+	.detail-foot-nav{
+		width: 90%;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+		margin: 8px auto;
+	}
+	.detail-foot-title{
+		    width: 115px;
+		    height: 32px;
+			background-image: url(../../static/servicePackage/horn.png);
+		    background-repeat: no-repeat;
+		    background-size: 100% 100%;
+		    font-weight: 400;
+		    font-size: 13px;
+		    color: #FFFFFF;
+		    text-align: right;
+		    line-height: 32px;
+		    padding-right: 15px;
+			position: absolute;
+			    right: 0;
+			    top: 0;
+	}
+	.detail-foot-list-top{
+		width: 95%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.detail-foot-list{
+		width: 95%;
+		border-radius: 21rpx;
+		position: relative;
+		margin: 6px 0px 5px 0px;
+		padding: 15px;
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+	}
+	.detail-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 15rpx 0px;
+	}
+	
+	.tese span:nth-child(1){
+		font-weight: bold;
+		font-size: 22rpx;
+		color: #333333;
+	}
+	.tese span:nth-child(2){
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #8D9194;
+	}
+	.tese{
+		width: 100%;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.detail-foot-list-top span:nth-child(1){
+		font-weight: bold;
+		font-size: 30rpx;
+		color: #3F3F3F;
+		margin-bottom: 10rpx;
+	}
+	.detail-foot-list-top span:nth-child(2){
+		width: 76rpx;
+		height: 33rpx;
+		line-height: 33rpx;
+		text-align: center;
+		border-radius: 16rpx;
+		border: 1px solid #7D7D7D;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #777777;
+		margin: 0px 25px 0px 5px;
+	}
+	.detail-foot-list-top span:nth-child(3){
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #029d88;
+	}
+	
+	.detail-foot-mian{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+	/deep/uni-checkbox .uni-checkbox-input{
+		width: 26px;
+		height: 26px;
+		border-radius: 50%;
+	}
+	.youhui-img{
+		width: 111.81rpx;
+		height: 111.81rpx;
+	}
+	.youhui-view-right-btn{
+		width: 158rpx;
+		height: 64rpx;
+		background: linear-gradient(-90deg, #019C88, #2DC48E);
+		border-radius: 32rpx;
+		text-align: center;
+		line-height: 64rpx;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #FFFFFF;
+		text-shadow: 0rpx 2rpx 4rpx rgba(0,119,104,0.44);
+		margin-left: 10px;
+	}
+	.youhui-view-right-time{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #999999;
+	}
+	.youhui-view-right-title{
+		width: 110px;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.youhui-view-right-top{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.youhui-view-right{
+		width: 502.08rpx;
+		height: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-around;
+	}
+	.youhui-view-left-bottom{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #FFFFFF;
+	}
+	.youhui-view-left-yuan{
+		display: flex;
+		flex-direction: row;
+		align-items: baseline;
+		color: #FFFFFF;
+	}
+	.youhui-view-left-num{
+		font-weight: bold;
+		font-size: 89rpx;
+	}
+	.youhui-view-left-text{
+		font-weight: bold;
+		font-size:24.31rpx;
+	}
+	.youhui-view-left{
+		width: 199rpx;
+		height: 242rpx;
+		display: flex;
+		flex-direction:column;
+		align-items: center;
+		justify-content: center;
+	}
+	.youhui-yiyong{
+		background-image: url('../../static/youhuijuan/coupons7.png');
+	}
+	.youhui-weiyong{
+		background-image: url('../../static/youhuijuan/coupons1.png');
+	}
+	.youhui-list{
+		width: 95%;
+		display: flex;
+		flex-direction: row;
+		height: 242rpx;
+		border-radius: 21rpx;
+		background-size: 100%;
+		margin: 20px auto;
+		justify-content: space-between;
+	}
+	.dingwei-image{
+		margin-right: 20rpx;
+		width: 66rpx;
+		height: 66rpx;
+		padding: 10rpx 0;
+		border-radius: 50%;
+		background: linear-gradient(90deg, #029d88, #2fc094);
+		text-align: center;
+		line-height: 66rpx;
+	}
+	/deep/.skeleton-fade{
+		display: none;
+	}
+	/deep/.u-button-pay{
+		width: 381rpx;
+		height: 76rpx;
+		line-height: 76px;
+		text-align: center;
+		color: #fff;
+		font-size: 32rpx;
+		background: linear-gradient(90deg, #029d88, #2fc094);
+		border-radius: 60rpx;
+	}
+	.daizhifu{
+		font-size: 38rpx;
+		color: #333333;
+	}
+	.pay-zhifu{
+		width: 100%;
+		background-color: #f7f7f7 !important;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between !important;
+	}
+	.liliao{
+		margin-top: 17px;
+	}
+	.fuwu-time-view{
+		text-align: right;
+	}
+	.liliao-top span:nth-child(2){
+		width: 78rpx;
+		height: 35rpx;
+		line-height: 35rpx;
+		background: linear-gradient(90deg, #FE912E, #FF9970);
+		border-radius: 17rpx;
+		text-align: center;
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #FFFFFF;
+		margin-left: 5px;
+	}
+	.fuwu-time-view span:nth-child(1),.liliao-bottom span:nth-child(1){
+		font-weight: 400;
+		font-size: 29rpx;
+		color: #888;
+		margin-right: 5px;
+	}
+	.fuwu-time-view,.liliao-top{
+		width: 70%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.fuwu-title,.liliao-top span:nth-child(1){
+		font-size: 29rpx;
+		color: #222222;
+	}
+	.fuwu-time,.liliao{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.adders-view image{
+		margin-top: 5px;
+	}
+	.xuanzhe{
+		margin-left: 5px;
+		border: 1px solid;
+	}
+	.header-view-data{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.adders-view span,.header-view-data{
+		font-size: 29rpx;
+		color: #888;
+		text-align: right;
+	}
+	.adders-view{
+		display: flex;
+		flex-direction: row;
+		position: relative;
+	}
+	.header-view-text{
+		width: 170rpx;
+		font-size: 29rpx;
+		color: #222222;
+	}
+	.header-view{
+		background-color: #fff;
+		margin-bottom: 10px;
+		border-radius: 11px;
+	}
+	.head-foot span:nth-child(1){
+		margin-right: 5px;
+	}
+	.head-foot span{
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #222222;
+	}
+	.head-foot{
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-end;
+		margin-top: 10px;
+	}
+	.head-mian{
+		margin-top: 3px;
+	}
+	.qian-right span:nth-child(1){
+		font-size: 16.67rpx;
+	}
+	.qian-right span:nth-child(2){
+		font-size:25rpx;
+	}
+	.qian-right span{
+		color: #727272;
+	}
+	.qian-left span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.qian-left span:nth-child(2){
+		font-size:29.17rpx;
+	}
+	.qian-left span{
+		color: #F95900;
+	}
+	.head-top-view-right-img,.adders-view image,.fuwu-img{
+		width: 9.38rpx;
+		height: 15.83rpx;
+	}
+	.head-top-title-bottom{
+		margin-top: 10px;
+	}
+	.head-top-title,.head-top-title-bottom,.head-mian{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.head-top-view-right{
+		width: 83%;
+		display: flex;
+		flex-direction: column;
+	}
+	.head-top-view-img{
+		width: 98.61rpx;
+		height: 98.61rpx;
+	}
+	.head-top-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.d-title{
+		font-weight: 400;
+		font-size: 29rpx;
+		color: #222;
+		padding: 10px 15px 0px 15px;
+		width: 100%;
+	}
+	.checkbox-data{
+		padding: 0px 11px;
+		margin: 15px 0px;
+	}
+	.list-pay-text span:nth-child(2){
+		padding-left: 5px;
+	}
+	.list-pay-text{
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #999999;
+		line-height: 42rpx;
+	}
+	.list-pay{
+		width: 100%;
+		padding: 0px 29rpx;
+	}
+	.pay-ding-top{
+		width: 100%;
+		height: 80rpx;
+		padding: 0px 29rpx;
+	}
+	.fei-view-list span,.fei-view-list-z span{
+		font-weight: bold;
+		font-size: 25rpx;
+	}
+	.fei-view-list-z{
+		height: 65rpx;
+		background-color: rgba(247, 247, 247, 0.8);
+		border-radius: 33rpx;
+		padding: 0px 5px;
+	}
+	.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
+		color: #666666;
+	}
+	.fei-view-list span:nth-child(2){
+		color: #333333;
+	}
+	.fei-view-list,.fei-view-list-z{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 5px;
+	}
+	.fei-view{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.fei-title{
+		width: 100%;
+		text-align: center;
+		font-weight: bold;
+		font-size: 29rpx;
+		color: #333333;
+		padding-bottom: 10px;
+		margin-bottom: 10px;
+		border-bottom: 1px solid #E5E5E5;
+	}
+	.feiuong{
+		padding: 29rpx;
+	}
+	/deep/.uni-textarea-textarea{
+		font-weight: 400;
+		font-size: 25rpx;
+	}
+	/deep/.uni-textarea-placeholder{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #C5C5C5;
+	}
+	.textarea-pay-list{
+		width: 100%;
+		height: 126rpx;
+		margin-top: 10px;
+	}
+	.textarea-pay{
+		background-color: #f3f3f3;
+		width: 100%;
+		height: 100%;
+		background: #F3F3F3;
+		border-radius: 14rpx;
+		padding: 7px;
+	}
+	
+	.pay-ding{
+		padding-bottom: 15px;
+	}
+	.pay-ding,.feiuong{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		margin-top: 24rpx;
+		// padding: 29rpx;
+	}
+	.phone-pay{
+		width: 49rpx;
+		height: 44rpx;
+	}
+	
+	.d-touxiang{
+		width: 46rpx;
+		height: 46rpx;
+		border-radius: 50%;
+	}
+	.money-pay-jia{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #666666;
+		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;
+		flex-direction: row;
+		align-items: center;
+	}
+	
+	.content{
+		 padding-top: 1px;
+		 width: 100%;
+		 background-color: #f7f7f7;
+	}
+	page {
+		background: #f7f7f7;
+	}
+
+	.bgImg {
+		background-image: url('https://admin.sjajk.com/file/uploadPath/2023/01/03/02952e7260e553d0f3bb26a1cd154921.png');
+		background-size: 100% 1161rpx;
+	}
+
+	.bg {
+		background: #fff;
+	}
+
+	.list_item {
+		// width: 650upx;
+		// height: 160upx;
+		width: 92%;
+		// margin: 30rpx 0;
+		background: #FFFFFF;
+		border-radius: 24upx;
+		padding: 20upx;
+		display: flex;
+		margin-top: 26upx;
+
+		.listitem_rightview {
+			margin-left: 20upx;
+			width: 80%;
+			padding-top: 10rpx;
+
+			.btnview {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				margin-top: 12upx;
+				width: 100%;
+			}
+
+			.titleview {
+				display: flex;
+				align-items: flex-end;
+				justify-content: space-between
+			}
+
+			.moneyview {
+				display: flex;
+				align-items: flex-end;
+
+				image {
+					width: 30upx;
+					height: 30upx;
+					margin-left: 20upx;
+					margin-bottom: 2upx;
+				}
+			}
+
+			.item_time {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				margin-left: 10upx;
+			}
+
+			.item_money {
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: 800;
+				color: #FF1200;
+			}
+
+			.item_oldmoney {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				text-decoration: line-through;
+				color: #999999;
+				margin-left: 10upx;
+			}
+
+			.item_btn {
+				width: 140upx;
+				height: 56upx;
+				background: linear-gradient(to right, #223845, #00a85b);
+				border-radius: 16upx;
+				text-align: center;
+				line-height: 56upx;
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+			.item_yishou {
+				font-size: 22upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+
+			.item_title {
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #1E1F31;
+			}
+		}
+
+		image {
+			width: 220upx;
+			height: 160upx;
+			border-radius: 24upx;
+		}
+	}
+
+	.jz_btn {
+		width: 170rpx;
+		height: 56upx;
+		background: #096f4b;
+		margin-left: 40rpx;
+		border-radius: 35rpx;
+		line-height: 56upx;
+		text-align: center;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+	}
+
+	.tabber {
+		width: 100%;
+		background: #ffffff;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		justify-content: center;
+		height: 127rpx;
+		padding: 0 30rpx;
+	}
+
+	.box {
+		/* border: 1px solid #005dff; */
+		background: #E8FAE1;
+		border-radius: 4rpx;
+		color: #096f4b;
+		padding: 5upx 10upx;
+		font-size: 22rpx;
+		margin-top: 10rpx;
+	}
+
+	.popup_pay {
+		width: 100%;
+		height: 210px;
+		position: relative;
+		padding-bottom: 45rpx;
+		/* #ifndef MP-WEIXIN */
+		/* height: 130px; */
+		/* #endif */
+
+	}
+	.push-button{
+		width: 100%;
+		height: 48px;
+		position: fixed;
+		bottom: 0px;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin: 0 auto;
+		}
+	.pay_btn {
+	   display: inline-block;
+	   width: 92%;
+	   text-align: center;
+	   background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	   height: 40px;
+	   border-radius: 28px;
+	   color: #ffffff;
+	   line-height: 40px;
+	   margin-top: 4px;
+	   font-size: 34rpx;
+	}
+	.pay-btns{
+		display: inline-block;
+	    width: 94%;
+	    text-align: center;
+	    background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	    height: 40px;
+	    border-radius: 28px;
+	    color: #ffffff;
+	    line-height: 40px;
+	    margin-top: 5px;
+	    font-size: 17px;
+	}
+	.serverAddress {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.head-title{
+		font-size: 30rpx;
+	}
+	.zhuangtai{
+		color: #029D88;
+	}
+</style>
\ No newline at end of file
diff --git a/my/order/paydingMs.vue b/my/order/paydingMs.vue
index bb123a3..75f8487 100644
--- a/my/order/paydingMs.vue
+++ b/my/order/paydingMs.vue
@@ -7,7 +7,7 @@
 			<view class="bgImg u-skeleton-fillet" v-if="order.ordersPackageList && order.ordersPackageList.length > 0"
 				style="padding: 0 29rpx;">
 				<view class="head-top">
-					<view class="pay-title" style="">{{orderXm.type=='104'?'服务套餐':orderXm.type=='105'?'项目次卡':'服务疗程'}}</view>
+					<view class="pay-title" style="">服务项目</view>
 					<view class="flex justify-around">
 						<view class="" style="width: 160upx;height: 160upx;">
 							<image :src="order.ordersPackageList[0].packageImg"
@@ -51,11 +51,11 @@
 					<view class="fei-title">费用明细</view>
 					<view class="fei-view">
 						<view class="fei-view-list">
-							<span>{{orderXm.type=='104'?'套餐':orderXm.type=='105'?'次卡':'疗程'}}价格</span>
-							<span>￥{{order.sumMoney}}</span>
+							<span>项目价格</span>
+							<span>￥{{order.ordersPackageList[0].price}}</span>
 						</view>
 						<view class="fei-view-list">
-							<span>{{orderXm.type=='104'?'套餐':orderXm.type=='105'?'次卡':'疗程'}}数量</span>
+							<span>项目数量</span>
 							<span>{{order.ordersPackageList[0].num}}</span>
 						</view>
 						<view class="fei-view-list" v-if="order.couponMoney">
diff --git a/my/order/paydingPt.vue b/my/order/paydingPt.vue
new file mode 100644
index 0000000..488433f
--- /dev/null
+++ b/my/order/paydingPt.vue
@@ -0,0 +1,1646 @@
+<template>
+	<view class="content">
+		<view v-if="order.overTimeOrders == 1" class="dingshi" style="font-size: 32upx;height: 150rpx;padding: 26rpx 29rpx 0 29rpx;">
+			<view style="color: red;font-size:26rpx">(订单已超时)</view>
+		</view>
+		<view class="padding-bottom u-skeleton">
+			<view class="bgImg u-skeleton-fillet" v-if="order.ordersPackageList && order.ordersPackageList.length > 0"
+				style="padding: 0 29rpx;">
+				<view class="head-top">
+					<view class="pay-title" style="">服务项目</view>
+					<view class="flex justify-around">
+						<view class="" style="width: 160upx;height: 160upx;">
+							<image :src="order.ordersPackageList[0].packageImg"
+								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+						</view>
+						<view class="u-flex-1  margin-left-sm" style="display: flex;flex-direction: column;justify-content: space-around;">
+							<view class="flex head-title-right">
+								<view class="margin-right-xs u-skeleton-fillet head-title">
+									{{order.ordersPackageList[0].title}}
+								</view>
+								<view class="zhuangtai">
+									<view v-if="order.ordersPackageList[0].status ==1">待支付</view>
+								</view>
+							</view>
+							<view class="flex align-center">
+								<view class="money-pay" style="width: 100%;justify-content: space-between;">
+									<view class="money-pay-zhen">
+										<span>￥</span>
+										<span>{{order.ordersPackageList[0].price}}</span>
+									</view>
+									<view>
+										<uni-number-box :disabled="true" :value="order.ordersPackageList[0].num" :width='27' :min="1" @change="changeValue" />
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="margin-top-xl pay-ding">
+					<view class="list-pay">
+						<view class="flex justify-between">
+							<view>订单编号</view>
+							<view class="flex align-center" @tap="copy(order.ordersNo)">
+								<view class="">{{order.ordersNo}}</view>
+								<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="pay-ding feiuong">
+					<view class="fei-title">费用明细</view>
+					<view class="fei-view">
+						<view class="fei-view-list">
+							<span>项目价格</span>
+							<span>￥{{order.ordersPackageList[0].price}}</span>
+						</view>
+						<view class="fei-view-list">
+							<span>项目数量</span>
+							<span>{{order.ordersPackageList[0].num}}</span>
+						</view>
+						<view class="fei-view-list" v-if="order.couponMoney">
+							<span>优惠券</span>
+							<span style="color: rgb(249, 55, 49);">-￥{{order.couponMoney}}</span>
+						</view>
+						<view class="fei-view-list" v-if="order.vipReductionMoney">
+							<span>会员减免</span>
+							<view>-￥{{order.vipReductionMoney}}</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view class="fei-view-list-z">
+							<span>总金额</span>
+							<span style="color: #FF3939;font-weight: bold;font-size: 32rpx; ">￥{{order.payMoney}}</span>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
+				<!-- <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
+					>
+					取消订单
+				</u-button> -->
+				<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
+					class="dingshi">立即支付
+				</u-button>
+				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
+					class="dingshi">联系客服</u-button>
+				
+			</view>
+			
+		</view>
+		<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
+		
+		
+		<!-- 支付方式 -->
+		<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
+			<view class="popup_pay">
+				<view style="background-color: #fff;">
+					<view style="padding: 0 20upx;margin-top: 60rpx;margin-bottom: 20rpx;">
+						<view
+							style="display: flex;height: 100upx;align-items: center;padding: 20upx 0;justify-content: center;"
+							v-for="(item,index) in openLists" :key='index'>
+							<image :src="item.image" style="width: 55upx;height: 55upx;border-radius: 50upx;">
+							</image>
+							<view style="font-size: 30upx;margin-left: 20upx;width: 70%;">
+								{{item.text}}
+							</view>
+							<radio-group name="openWay" style="margin-left: 45upx;" @tap='selectWay(item)'>
+								<label class="tui-radio">
+									<radio color="#019c88" :checked="openWay === item.id ? true : false" />
+								</label>
+							</radio-group>
+						</view>
+					</view>
+				</view>
+				<view class="pay_btn" @click="pay()">确认支付</view>
+			</view>
+		</u-popup>
+	</view>
+
+</template>
+
+<script>
+	// 调用手机系统权限
+	// #ifdef APP-PLUS
+	import permision from "@/components/permission.js";
+	// #endif
+	export default {
+		data() {
+			return {
+				ordersId: '',
+				tpayMoney: '',
+				paySel: 0,
+				showorder: false,
+				orderList: [],
+				loading: true,
+				customStyle: {
+					// backgroundColor: '#e5e5e5',
+					// color: '#FFFFFF',
+
+					// #ifdef MP-WEIXIN
+					width: "310upx",
+					// #endif
+					// #ifndef MP-WEIXIN
+					width: '310upx',
+
+					// #endif	
+					margin: '0 10upx',
+				},
+				customStyle2: {
+					backgroundColor: '',
+					color: '#FFFFFF',
+					// #ifdef MP-WEIXIN
+					width: "310upx",
+					// #endif
+					// #ifndef MP-WEIXIN
+					width: '310upx',
+
+					// #endif	
+					margin: '0 10upx',
+				},
+				id: '',
+				order: {
+					user: {},
+					game: {}
+				},
+				isTrue: 0,
+
+				phone: '',
+				isVip: false,
+				birthDate: '',
+				age: '',
+				showpay: false,
+				openLists: [],
+				openWay: 1,
+				closeable: true,
+				yhqxSel: '否',
+				btnShow:false,
+				tiqianData:'',
+				type:'center',
+				qurenJd:[],
+				artificerlist:[],
+				province:'',
+				city:'',
+				district:'',
+				addressId:'',
+				mobile:'',
+				detailaddress:'',
+				orderXm:''
+			}
+		},
+		onLoad(e) {
+			this.isTrue = e.isTrue
+			if (this.isTrue) {
+				uni.setNavigationBarTitle({
+					title: '订单详情'
+				})
+			}
+			this.ordersId = e.ordersId
+			this.getOrder();
+			this.orderXm=this.$queue.getData('mainData');
+			console.log("orderXm=====>",this.orderXm)
+		},
+		onShow() {
+			this.addressId = this.$queue.getData('EditAddress');
+			if (this.addressId) {
+				this.getAddressList(this.addressId);
+			} else {
+				this.addressMy()
+			}
+			this.yhqxSel = this.$queue.getData("yhqxSel");
+			if (uni.getStorageSync('token')) {
+				this.getIsVip()
+			}
+
+			// #ifndef MP-WEIXIN
+			this.openLists = [{
+					image: '../../static/images/icon_weixin.png',
+					text: '微信支付',
+					id: 2
+				}, {
+					image: '../../static/images/zhifubao.png',
+					text: '支付宝支付',
+					id: 3
+				}, {
+					image: '../../static/images/lingqian.png',
+					text: '零钱支付',
+					id: 1
+				}],
+				this.openWay = 2;
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			this.openLists = [{
+					image: '../../static/images/icon_weixin.png',
+					text: '微信支付',
+					id: 2
+				}, {
+					image: '../../static/images/lingqian.png',
+					text: '零钱支付',
+					id: 1
+				}],
+				this.openWay = 2;
+			// #endif
+		},
+		methods: {
+			addressMy() {
+				this.$Request.getT('/app/address/selectAddressById').then(res => {
+					console.log(res)
+					if (res.code == 0) {
+						this.name = res.data.name;
+						this.mobile = res.data.phone;
+						this.cityaddress = res.data.province + res.data.city + res.data.district;
+						this.detailaddress = res.data.detailsAddress;
+						this.isDefault = res.data.isDefault;
+						this.userId = res.data.userId;
+						this.latitude = res.data.latitude;
+						this.longitude = res.data.longitude;
+						this.province = res.data.province
+						this.city = res.data.city
+						this.district = res.data.district
+						this.addressId = res.data.addressId
+						// this.getChuXing();
+						// this.$queue.setData('EditAddress', res.data.addressId);
+					}
+				});
+			},
+			// 选中地址
+			getAddressList(addressId) {
+				if (addressId) {
+					this.$Request.getT('/app/address/selectAddressByAddressId?addressId=' + this.addressId).then(res => {
+						console.log(res)
+						if (res.code == 0) {
+							this.name = res.data.name;
+							this.mobile = res.data.phone;
+							this.cityaddress = res.data.province + res.data.city + res.data.district;
+							this.detailaddress = res.data.detailsAddress;
+							this.isDefault = res.data.isDefault;
+							this.userId = res.data.userId;
+							this.latitude = res.data.latitude;
+							this.longitude = res.data.longitude;
+							this.province = res.data.province
+							this.city = res.data.city
+							this.district = res.data.district
+				
+							// this.getChuXing();
+						}
+						// uni.hideLoading();
+					});
+				} else {
+					uni.navigateTo({
+						url: '../address/address?id=' + this.orderXm.type
+					})
+				}
+				
+			},
+			getTimeStampWithoutSeconds(date) {
+			    // 将日期转换为标准的UTC时间
+			    var utcDate = new Date(
+						   date.getUTCFullYear(), 
+						   date.getUTCMonth(), 
+						   date.getUTCDate(), 
+						   date.getUTCHours(), 
+						   date.getUTCMinutes(), 
+			                           0);
+			    // 返回不含秒的时间戳
+			    return utcDate.getTime();
+			},
+			openpay(item) {
+				// uni.navigateTo({
+				// 	url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId
+				// })
+				// this.goOrder()
+				this.showpay = true
+			},
+			getOrder() {
+				let data = {
+					ordersId: this.ordersId
+				}
+				this.$Request.post('/app/user/package/order/selectOrdersDetails', data).then(res => {
+					if (res.code == 0) {
+						this.loading = false
+						uni.hideLoading()
+						this.order = res.data;
+						var date = new Date(); // 当前日期和时间
+						var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
+						const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数
+						var twoTime=parseInt(new Date(twoHoursInMilliseconds).getTime())
+						var time=parseInt(new Date(this.order.serveTime).getTime())
+							if(time-timestamp>twoTime){
+								this.$set(this.order, 'btnShow', 'true')
+							}else{
+								this.$set(this.order, 'btnShow', 'false')
+							}
+							console.log("sadasdsa0",this.order)
+						let aliphone = this.$queue.getData('aliphone');
+						if (aliphone === '是' && this.order.artificer) {
+							this.ysPhone(this.order.phone, this.order.artificer.phone);
+						}
+					}
+				})
+			},
+			
+			
+			goChat() {
+				let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信 
+				let kefuPhone = this.$queue.getData('kefuPhone');
+				if (uni.getStorageSync('token')) {
+					if (kefu == 1) {
+						uni.makePhoneCall({
+							phoneNumber: kefuPhone //仅为示例
+						});
+					} else if (kefu == 3) {
+						uni.navigateTo({
+							url: '/my/setting/customer'
+						});
+					} else {
+						// #ifdef MP-WEIXIN
+						let that = this
+						try {
+							wx.openCustomerServiceChat({
+								extInfo: {
+									url: that.$queue.getData('kefuUrl')
+								},
+								corpId: that.$queue.getData('kefuAppId'),
+								success(res) {},
+								fail(res) {
+									console.error(res)
+								}
+							})
+						} catch (error) {
+							console.error("catchcatch" + error)
+							uni.showToast({
+								title: '请更新至微信最新版本'
+							});
+						}
+						// #endif
+						// #ifndef MP-WEIXIN
+						let url = this.$queue.getData('kefuUrl');
+						if (url.indexOf('/pages/') !== -1 || url.indexOf('/my/') !== -1) {
+							uni.navigateTo({
+								url
+							});
+						} else {
+							//#ifndef H5
+							uni.navigateTo({
+								url: '/pages/index/webView?url=' + url
+							});
+							//#endif
+							//#ifdef H5
+							window.location.href = url;
+							//#endif
+						}
+						// #endif
+					}
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: '您还未登录,请先登录',
+						success: function(res) {
+							if (res.confirm) {
+								console.log('用户点击确定');
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					})
+				}
+			},
+			copy(num) {
+				uni.setClipboardData({
+					data: num,
+					success: r => {
+						this.$queue.showToast('复制成功');
+					}
+				});
+			},
+			payJZ() {
+				let that = this;
+				if (that.openWay == 1) { //零钱支付
+				
+					uni.showModal({
+						title: '付款提示',
+						content: '确认支付' + that.order.payMoney + '元吗?',
+						success: function(re) {
+							if (re.confirm) {
+								that.$queue.showLoading('支付中...')
+								// console.log('用户点击确定');
+								that.$Request.post("/app/artificer/payOrders", {
+									ordersId: that.ordersId,
+								}).then(ret => {
+									uni.hideLoading();
+									if (ret.code == 0) {
+										uni.showToast({
+											title: '支付成功',
+											icon: 'none'
+										})
+										that.getOrder()
+
+									} else {
+										uni.showToast({
+											title: ret.msg,
+											icon: 'none'
+										})
+									}
+								});
+							} else if (re.cancel) {
+								that.getOrder()
+							}
+						}
+					})
+				} else if (that.openWay == 2) { //微信支付
+					// #ifdef MP-WEIXIN
+					let data = {
+						ordersId: that.ordersId,
+						type: 3
+					}
+					that.$Request.post('/app/wxPay/payGroupOrders', data).then(ret => {
+						console.log(ret)
+						if (ret.code == 0) {
+							uni.hideLoading();
+							uni.requestPayment({
+								provider: 'wxpay',
+								timeStamp: ret.data.timestamp,
+								nonceStr: ret.data.noncestr,
+								package: ret.data.package,
+								signType: ret.data.signType,
+								paySign: ret.data.sign,
+								success: function(ret) {
+									console.log(ret)
+									uni.showToast({
+										title: '支付成功',
+										icon: 'none'
+									})
+									that.getOrder()
+									// this.$queue.showToast('支付成功');
+
+									// uni.switchTab({
+									// 	url: '/pages/my/index'
+									// })
+								},
+								fail: function(err) {
+									// this.$queue.showToast('支付失败');
+									uni.showToast({
+										title: '支付失败',
+										icon: 'nones'
+									});
+									that.getOrder()
+								}
+							});
+						}
+					});
+					// #endif
+
+					// #ifdef H5
+					let ua = navigator.userAgent.toLowerCase();
+					if (ua.indexOf('micromessenger') != -1) {
+						let data = {
+							ordersId: that.ordersId,
+							type: 2
+						}
+						that.$Request.post('/app/wxPay/payGroupOrders', data).then(rea => {
+							that.showpay = false
+							if (rea.code == 0) {
+								that.callPay(rea.data);
+							} else {
+								uni.showToast({
+									title: rea.msg,
+									icon: 'none'
+								})
+							}
+						});
+					} else {
+						let data = {
+							ordersId: that.ordersId,
+							type: 4
+						}
+						that.$Request.post('/app/wxPay/payGroupOrders', data).then(rea => {
+							that.showpay = false
+							if (rea.code == 0) {
+								const urlArr = window.location.href;
+								const hostUrl = urlArr.split("/");
+								const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
+								const url = '&redirect_url=' + callBack + 'my/order/pay';
+								window.location = rea.data.mweb_url + url
+							} else {
+								uni.showToast({
+									title: rea.msg,
+									icon: 'none'
+								})
+							}
+						});
+					}
+
+					// #endif
+
+					// #ifdef APP
+					let data = {
+						ordersId: that.order.ordersId,
+						type: 1
+					}
+					that.$Request.post('/app/wxPay/payGroupOrders', data).then(rea => {
+						console.log(rea)
+						that.showpay = false
+						if (rea.code == 0) {
+							that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
+						}
+					});
+					// #endif
+				} else if (that.openWay == 3) { //支付宝支付
+					// #ifdef H5
+					let data = {
+						ordersId: that.ordersId,
+						type: 2
+					}
+					that.$Request.post('/app/aliPay/payGroupOrders', data).then(
+						rea => {
+							that.showpay = false
+							const div = document.createElement('div')
+							div.innerHTML = rea.data //此处form就是后台返回接收到的数据
+							document.body.appendChild(div)
+							document.forms[0].submit()
+						});
+					// #endif
+
+					// #ifdef APP-PLUS
+					let data = {
+						ordersId: that.ordersId,
+						type: 1
+					}
+					that.$Request.post('/app/aliPay/payGroupOrders', data).then(
+						rea => {
+							that.showpay = false
+							that.setPayment('alipay', rea.data);
+						});
+					// #endif
+				}
+
+			},
+			
+			//支付选择
+			selectWay: function(item) {
+				this.openWay = item.id;
+			},
+			//换算年龄
+			getAge(e) {
+				console.log('出生日期：' + e)
+				this.birthDate = e
+				//创建系统日期
+				var today = new Date();
+				//把出生日期转换成日期
+				this.birthDate = new Date(this.birthDate);
+				//分别获取到年份后相减
+				this.age = today.getFullYear() - this.birthDate.getFullYear();
+				// console.log(this.age+'当前年龄')
+			},
+			// 修改订单地址
+			undateAdd(order) {
+				if (order.state == 0) {
+					uni.navigateTo({
+						url: '../address/address?order=' + order.ordersId + '&id=' + 3
+					})
+				}
+			},
+			// 一键导航
+			bindGps(latitude, longitude, name, detailsadd) {
+				console.log(latitude, longitude, name, detailsadd)
+				uni.openLocation({
+					latitude: latitude - 0, //要去的纬度-地址       
+					longitude: longitude - 0, //要去的经度-地址
+					name: name, //地址名称
+					address: detailsadd, //详细地址名称
+					success: function() {
+						console.log('导航成功');
+					},
+					fail: function(error) {
+						console.log(error)
+					}
+				});
+			},
+			ysPhone(phoneA, phoneB) {
+				this.$Request.getT('/app/user/insertVirtualPhone?phoneA=' + phoneA + '&phoneB=' + phoneB).then(res => {
+					if (res.code == 0) {
+						this.order.artificer.phone = res.data;
+					}
+				});
+			},
+			// 拨打电话
+			bindphone(phone) {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '是否拨打电话',
+					success: function(res) {
+						if (res.confirm) {
+							console.log('用户点击确定', phone);
+							uni.makePhoneCall({
+								phoneNumber: phone //仅为示例
+							});
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			goNav(e,item) {
+				this.$queue.setData('daibudan',item);
+				uni.navigateTo({
+					url: e
+				})
+			},
+			
+			delOrder(e) {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '确定删除订单吗?',
+					success: function(res) {
+						if (res.confirm) {
+							let data = {
+								ordersId: e.ordersId,
+							}
+							that.$queue.showLoading('删除中...')
+							that.$Request.post('/app/artificer/removeOrders', data).then(res => {
+								uni.hideLoading();
+								if (res.code == 0) {
+									uni.showToast({
+										name: "删除成功"
+									})
+									uni.navigateBack()
+								} else {
+									that.$queue.showToast(res.msg);
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			getIsVip() {
+				this.$Request.get("/app/UserVip/isUserVip").then(res => {
+					if (res.code == 0) {
+						this.isVip = res.data
+						uni.setStorageSync('isVIP', res.data)
+					}
+				});
+			},
+			
+			// 支付订单
+			pay() {
+				let that = this
+				this.showpay = false
+				uni.showModal({
+					title: '付款提示',
+					content: '确认支付' +  that.order.payMoney + '元吗?',
+					success: function(re) {
+						if (re.confirm) {
+							that.$queue.showLoading('支付中...')
+							console.log('用户点击确定');
+							if (that.openWay == 1) { //零钱支付
+								that.$Request.post("/app/user/package/order/payGroupOrders", {
+									ordersId: that.ordersId,
+								}).then(res => {
+									uni.hideLoading();
+									if (res.code == 0) {
+										uni.showToast({
+											title: '支付成功'
+										})
+										uni.redirectTo({
+											url:'/pages/my/newTeaml?text='+'index'
+										})
+										that.getOrder()
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: 'none'
+										})
+									}
+								});
+							} else if (that.openWay == 2) { //微信支付
+								that.$queue.showLoading('支付中...')
+								// #ifdef MP-WEIXIN
+								let data = {
+									ordersId: that.order.ordersId,
+									type: 3
+								}
+								that.$Request.post('/app/wxPay/payGroupOrders', data).then(ret => {
+									console.log(ret)
+									if (ret.code == 0) {
+										uni.hideLoading();
+										uni.requestPayment({
+											provider: 'wxpay',
+											timeStamp: ret.data.timestamp,
+											nonceStr: ret.data.noncestr,
+											package: ret.data.package,
+											signType: ret.data.signType,
+											paySign: ret.data.sign,
+											success: function(ret) {
+												console.log(ret)
+												uni.showToast({
+													title: '支付成功'
+												})
+												uni.redirectTo({
+													url:'/pages/my/newTeaml?text='+'index'
+												})
+												// this.$queue.showToast('支付成功');
+							
+												// uni.switchTab({
+												// 	url: '/pages/my/index'
+												// })
+											},
+											fail: function(err) {
+												// this.$queue.showToast('支付失败');
+												uni.showToast({
+													title: '支付失败',
+													icon: 'nones'
+												});
+												that.getOrder()
+											}
+										});
+									}
+								});
+								// #endif
+							
+								// #ifdef H5
+								let ua = navigator.userAgent.toLowerCase();
+								if (ua.indexOf('micromessenger') != -1) {
+									let data = {
+										ordersId: that.order.ordersId,
+										type: 2
+									}
+									that.$Request.post('/app/wxPay/payGroupOrders', data).then(rea => {
+										if (rea.code == 0) {
+											uni.showToast({
+												title: '支付成功'
+											})
+											uni.redirectTo({
+												url:'/pages/my/newTeaml?text='+'index'
+											})
+											that.callPay(rea.data);
+										} else {
+											uni.showToast({
+												title: rea.msg,
+												icon: 'none'
+											})
+										}
+									});
+								} else {
+									let data = {
+										ordersId: that.order.ordersId,
+										type: 4
+									}
+									// debugger;
+									that.$Request.post('/app/wxPay/payGroupOrders', data).then(rea => {
+										// const urlArr = window.location.href;
+										// const hostUrl = urlArr.split("/");
+										// const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
+										// const url = '&redirect_url=' + callBack + 'my/order/pay';
+										// window.location = rea.mweb_url + url
+										if (rea.code == 0) {
+											uni.showToast({
+												title: '支付成功'
+											})
+											uni.redirectTo({
+												url:'/pages/my/newTeaml?text='+'index'
+											})
+											const urlArr = window.location.href;
+											const hostUrl = urlArr.split("/");
+											const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
+											const url = '&redirect_url=' + callBack + 'my/order/pay';
+											window.location = rea.data.mweb_url + url
+										} else {
+											uni.showToast({
+												title: rea.msg,
+												icon: 'none'
+											})
+										}
+									});
+								}
+							
+								// #endif
+							
+								// #ifdef APP
+								let data = {
+									ordersId: that.order.ordersId,
+									type: 1
+								}
+								that.$Request.post('/app/wxPay/payGroupOrders', data).then(rea => {
+									console.log(rea)
+									if (rea.code == 0) {
+										uni.showToast({
+											title: '支付成功'
+										})
+										uni.redirectTo({
+											url:'/pages/my/newTeaml?text='+'index'
+										})
+										that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
+									}
+								});
+								// #endif
+							} else if (that.openWay == 3) { //支付宝支付
+								that.$queue.showLoading('支付中...')
+								// #ifdef H5
+								let data = {
+									ordersId: that.order.ordersId,
+									type: 2
+								}
+								that.$Request.post('/app/aliPay/payGroupOrders', data).then(
+									rea => {
+										uni.showToast({
+											title: '支付成功'
+										})
+										uni.redirectTo({
+											url:'/pages/my/newTeaml?text='+'index'
+										})
+										const div = document.createElement('div')
+										div.innerHTML = rea.data //此处form就是后台返回接收到的数据
+										document.body.appendChild(div)
+										document.forms[0].submit()
+									});
+								// #endif
+							
+								// #ifdef APP-PLUS
+								let data = {
+									ordersId: that.order.ordersId,
+									type: 1
+								}
+								that.$Request.post('/app/aliPay/payGroupOrders', data).then(
+									rea => {
+										uni.showToast({
+											title: '支付成功'
+										})
+										uni.redirectTo({
+											url:'/pages/my/newTeaml?text='+'index'
+										})
+										that.setPayment('alipay', rea.data);
+									});
+								// #endif
+							}
+										
+						} else if (re.cancel) {
+							uni.hideLoading();
+							console.log('用户点击取消');
+						}
+					}
+				
+				})
+				
+			},
+			callPay: function(response) {
+				if (typeof WeixinJSBridge === "undefined") {
+					if (document.addEventListener) {
+						document.addEventListener('WeixinJSBridgeReady', this.onBridgeReady(response), false);
+					} else if (document.attachEvent) {
+						document.attachEvent('WeixinJSBridgeReady', this.onBridgeReady(response));
+						document.attachEvent('onWeixinJSBridgeReady', this.onBridgeReady(response));
+					}
+				} else {
+					this.onBridgeReady(response);
+				}
+			},
+			onBridgeReady: function(response) {
+				let that = this;
+				if (!response.package) {
+					return;
+				}
+				WeixinJSBridge.invoke(
+					'getBrandWCPayRequest', {
+						"appId": response.appid, //公众号名称，由商户传入
+						"timeStamp": response.timestamp, //时间戳，自1970年以来的秒数
+						"nonceStr": response.noncestr, //随机串
+						"package": response.package,
+						"signType": response.signType, //微信签名方式：
+						"paySign": response.sign //微信签名
+					},
+					function(res) {
+						if (res.err_msg === "get_brand_wcpay_request:ok") {
+							// 使用以上方式判断前端返回,微信团队郑重提示：
+							//res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
+							uni.hideLoading();
+
+							uni.showToast({
+								title: '支付成功',
+								icon: 'none'
+							})
+							that.getOrder()
+						} else {
+							uni.hideLoading();
+						}
+						WeixinJSBridge.log(response.err_msg);
+					}
+				);
+			},
+			isCheckPay(code, name, order) {
+				if (code == 0) {
+					this.setPayment(name, order);
+				} else {
+					uni.hideLoading();
+					uni.showToast({
+						title: '支付信息有误'
+					});
+				}
+			},
+			setPayment(name, order) {
+				let that = this
+				uni.requestPayment({
+					provider: name,
+					orderInfo: order, //微信、支付宝订单数据
+					success: function(res) {
+						uni.hideLoading();
+						uni.showToast({
+							title: '支付成功',
+							icon: 'none'
+						})
+						that.getOrder()
+					},
+					fail: function(err) {
+						uni.hideLoading();
+					},
+					complete() {
+						uni.hideLoading();
+					}
+				});
+			},
+			// 取消订单
+			cancelOrder(e) {
+				let that = this
+				let data = {
+					ordersId: e.ordersId
+				}
+				uni.showModal({
+					title: '温馨提示',
+					content: '是否确认取消订单？',
+					success: function(res) {
+						if (res.confirm) {
+							let data = {
+								ordersId: e.ordersId
+							}
+							that.$queue.showLoading('提交中...')
+							that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
+								uni.hideLoading();
+								if (res.code == 0) {
+									uni.showToast({
+										title:'操作成功！'
+									})
+									that.getOrder()
+								} else {
+									that.$queue.showToast(res.msg);
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			// 完成订单
+			cancel(e) {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '确认完成订单吗?',
+					success: function(res) {
+						if (res.confirm) {
+							let data = {
+								ordersId: e.ordersId,
+							}
+							that.$queue.showLoading('提交中...')
+							that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
+								uni.hideLoading();
+								if (res.code == 0) {
+									uni.navigateBack()
+								} else {
+									that.$queue.showToast(res.msg);
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			goMsg() {
+				let data = {
+					userId: uni.getStorageSync('userId'),
+					focusedUserId: this.order.user.userId
+				}
+				this.$Request.postJson('/app/chat/insertChatConversation ', data).then(res => {
+					if (res.code == 0) {
+						let id = this.order.user.userId == res.data.userId ? res.data.focusedUserId : this.order
+							.user.userId
+						uni.navigateTo({
+							url: '/pages/msg/im?chatConversationId=' + res.data.chatConversationId +
+								'&byUserId=' + id
+						})
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.adders-view image{
+		margin-top: 5px;
+	}
+	.jusitify-line-end{
+	  height: 1px;
+	  border-bottom: 1px #f4f4f4 solid;
+	  margin: 15px 0 0 0;
+	}
+	.xuanzhe{
+		background: #e5e7eb;
+		color: #666;
+		margin-left: 5px;
+		border: 1px solid #cdd2db;
+		border-radius: 30rpx;
+		padding: 4rpx 15rpx;
+		font-size: 26rpx;
+	}
+	.header-view-data{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.adders-view span,.header-view-data{
+		font-size: 29rpx;
+		color: #888;
+		text-align: right;
+	}
+	.adders-view{
+		display: flex;
+		flex-direction: row;
+		position: relative;
+	}
+	.header-view-text{
+		width: 170rpx;
+		font-size: 29rpx;
+		color: #222222;
+	}
+	.header-view{
+		background-color: #fff;
+		margin-bottom: 12px;
+		border-radius: 11px;
+	}
+	.ske-padding{
+		padding: 5rpx 30rpx 36rpx 30rpx;
+		
+	}
+	/deep/.u-drawer{
+		z-index:11 !important;
+	}
+	.xiangmu-cont-top-left{
+		font-weight: normal;
+		font-size: 21rpx;
+		color: #049E89;
+		margin-top: 1px;
+	}
+	.xiangmu-cont-top-time{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.xiadan{
+		width: 122rpx;
+		height: 48rpx;
+		line-height: 48rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 24rpx;
+		text-align: center;
+		font-weight: bold;
+		font-size: 24rpx;
+		color: #FFFFFF;
+	}
+	.xiangmu-foot-left{
+		display: flex;
+		flex-direction: row;
+		align-items: flex-end;
+	}
+	.xiangmu-foot-left-shiji span{
+		color: #F95900;
+	}
+	.xiangmu-foot-left-shiji span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.xiangmu-foot-left-shiji span:nth-child(2){
+		font-weight: bold;
+		font-size:36.81rpx;
+	}
+	.xiangmu-foot-left-shiji span:nth-child(3){
+		font-size: 25rpx;
+	}
+	.xiangmu-foot-left-dazhe{
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #848484;
+		text-decoration-line: line-through;
+		margin-left:5px;
+	}
+	.xiangmu-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.xiangmu-about{
+		width: 100%;
+		text-align: left;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #848484;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		margin: 5px 0px;
+	}
+	.xiangmu-cont-top-title{
+		font-weight: bold;
+		font-size: 33rpx;
+		color: #333333;
+	}
+	
+	.xiangmu-cont-top{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.xiangmu-cont{
+		width: 55%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.xiangmu-img{
+		width: 285rpx;
+		height: 218rpx;
+		background: #9F9F9F;
+		border-radius: 14rpx;
+	}
+	.xiangmu{
+		width: 95%;
+		height: 263rpx;
+		background: #FFFFFF;
+		border-radius: 21rpx;
+		margin: 0px auto 10px auto;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		padding: 10px;
+	}
+	
+	.popup-mian-btn span:nth-child(1){
+		background: linear-gradient(90deg, #FE912E, #FF9970);
+	}
+	.popup-mian-btn span:nth-child(2){
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	}
+	.popup-mian-btn span{
+		width: 247rpx;
+		height: 77rpx;
+		line-height: 77rpx;
+		text-align: center;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #FFFEFE;
+		border-radius: 39rpx;
+	}
+	.popup-mian-btn{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 10px;
+	}
+	.popup-mian-textarea{
+		width: 525.69rpx;
+		height: 211.81rpx;
+	}
+	.popup-mian{
+		width: 88%;
+		display: flex;
+		flex-direction: column;
+		margin: 5px auto 0px auto;
+	}
+	.popup-head span:nth-child(2){
+		width: 50rpx;
+		height: 50rpx;
+		line-height: 19px;
+		text-align: center;
+		font-size: 24px;
+		color: #15AB8D;
+		border-radius: 50%;
+		border: 3px solid #15AB8D;
+	}
+	.popup-head span:nth-child(1){
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.popup-head{
+		width: 100%;
+		height: 99.38rpx;
+		background-color: rgba(21, 171, 141, 0.09);
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 15px;
+	}
+	.popup-content{
+		width: 613rpx;
+		height: 479rpx;
+		background: #FFFFFF;
+		border-radius: 56rpx;
+		display: flex;
+		flex-direction: column;
+	}
+	/deep/.btns{
+		background: #019C88 !important;
+		color: #fff !important;
+	}
+	/deep/.u-size-default{
+		margin: 5px 0px 0px 0px;
+	}
+	.showBtn-mian{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		flex-wrap: wrap;
+		justify-content: flex-end;
+	}
+	.gengduo{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #7D7D7D;
+	}
+	.showBtn-view{
+		width: 100%;
+		justify-content: flex-end;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.showBtn,.hideBtn{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		
+	}
+	
+
+	.dingshi{
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	}
+	.zhuangtai{
+		color: #029D88;
+	}
+	.head-title-right{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		font-weight: bold;
+	}
+	.head-title{
+		margin-top: -2px;display: inline-block;
+		width: 300rpx; 
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+	.fei-view-list span,.fei-view-list-z span{
+		font-size: 28rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+	}
+	.fei-view-list-z{
+		height: 65rpx;
+		font-weight: bold;
+	}
+	.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
+		color: #666666;
+	}
+	.fei-view-list span:nth-child(2){
+		color: #333333;
+	}
+	.fei-view-list,.fei-view-list-z{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 5px;
+	}
+	.fei-view{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.fei-title{
+		width: 100%;
+		text-align: center;
+		font-weight: bold;
+		font-size: 30rpx;
+		color: #333333;
+		padding-bottom: 10px;
+		margin-bottom: 10px;
+		border-bottom: 1px solid #f3f3f3;
+	}
+	.feiuong{
+		padding: 29rpx;
+	}
+	/deep/.uni-textarea-textarea{
+		font-weight: 400;
+		font-size: 25rpx;
+	}
+	/deep/.uni-textarea-placeholder{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #C5C5C5;
+	}
+	.textarea-pay-list{
+		width: 100%;
+		height: 126rpx;
+		margin-top: 10px;
+	}
+	.textarea-pay{
+		background-color: #f3f3f3;
+		width: 100%;
+		height: 100%;
+		background: #F3F3F3;
+		border-radius: 14rpx;
+		padding: 7px;
+	}
+	.list-pay{
+		width: 100%;
+		padding: 10px 29rpx;
+	}
+	.pay-ding-top{
+		width: 100%;
+		height: 80rpx;
+		background-image: linear-gradient(to bottom, rgba(8, 162, 138, 0.5), #fff);
+		border-top-left-radius: 24rpx;
+		border-top-right-radius: 24rpx;
+		padding: 0px 29rpx;
+	}
+	.pay-ding,.feiuong{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		margin-top: 24rpx;
+		// padding: 29rpx;
+	}
+	.phone-pay{
+		width: 49rpx;
+		height: 44rpx;
+	}
+	.d-title{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #333333;
+	}
+	.d-touxiang{
+		width: 46rpx;
+		height: 46rpx;
+		border-radius: 50%;
+	}
+	.money-pay-jia{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #666666;
+		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;
+		flex-direction: row;
+		align-items: center;
+	}
+	.head-top{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		padding: 29rpx;
+	}
+	.content{
+		 padding-bottom: 140rpx;
+		 padding-top: 20px;
+		 width: 100%;
+		 background-color: #f7f7f7;
+	}
+	.pay-title{
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #333333;
+		margin-bottom: 8px;
+	}
+	page {
+		background: #f7f7f7;
+	}
+
+	.bgImg {
+		background-image: url('https://admin.sjajk.com/file/uploadPath/2023/01/03/02952e7260e553d0f3bb26a1cd154921.png');
+		background-size: 100% 1161rpx;
+	}
+
+	.bg {
+		background: linear-gradient(to right, #223845, #00a85b);
+	}
+
+	.list_item {
+		// width: 650upx;
+		// height: 160upx;
+		width: 92%;
+		// margin: 30rpx 0;
+		background: #FFFFFF;
+		border-radius: 24upx;
+		padding: 20upx;
+		display: flex;
+		margin-top: 26upx;
+
+		.listitem_rightview {
+			margin-left: 20upx;
+			width: 80%;
+			padding-top: 10rpx;
+
+			.btnview {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				margin-top: 12upx;
+				width: 100%;
+			}
+
+			.titleview {
+				display: flex;
+				align-items: flex-end;
+				justify-content: space-between
+			}
+
+			.moneyview {
+				display: flex;
+				align-items: flex-end;
+
+				image {
+					width: 30upx;
+					height: 30upx;
+					margin-left: 20upx;
+					margin-bottom: 2upx;
+				}
+			}
+
+			.item_time {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				margin-left: 10upx;
+			}
+
+			.item_money {
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: 800;
+				color: #FF1200;
+			}
+
+			.item_oldmoney {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				text-decoration: line-through;
+				color: #999999;
+				margin-left: 10upx;
+			}
+
+			.item_btn {
+				width: 140upx;
+				height: 56upx;
+				background-color: #019C88;
+				border-radius: 16upx;
+				text-align: center;
+				line-height: 56upx;
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+			.item_yishou {
+				font-size: 22upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+
+			.item_title {
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #1E1F31;
+			}
+		}
+
+		image {
+			width: 220upx;
+			height: 160upx;
+			border-radius: 24upx;
+		}
+	}
+
+	.jz_btn {
+		width: 170rpx;
+		height: 56upx;
+		background: #096f4b;
+		margin-left: 40rpx;
+		border-radius: 35rpx;
+		line-height: 56upx;
+		text-align: center;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+	}
+
+	.tabber {
+		width: 100%;
+		background: #ffffff;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		justify-content: center;
+		height: 127rpx;
+		padding: 0 30rpx;
+	}
+
+	.box {
+		/* border: 1px solid #005dff; */
+		background: #E8FAE1;
+		border-radius: 4rpx;
+		color: #096f4b;
+		padding: 5upx 10upx;
+		font-size: 22rpx;
+		margin-top: 10rpx;
+	}
+
+	.popup_pay {
+		width: 100%;
+		position: relative;
+		padding-bottom: 35rpx;
+		/* height: 160px; */
+		/* #ifndef MP-WEIXIN */
+		/* height: 130px; */
+		/* #endif */
+
+	}
+
+	.pay_btn {
+		width: 90%;
+		margin: 0 auto;
+		text-align: center;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		height: 40px;
+		border-radius: 28px;
+		color: #ffffff;
+		line-height: 40px;
+		margin-top: 4px;
+		font-size: 34rpx;
+	}
+
+	.serverAddress {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index cf2ce78..b6f7613 100644
--- a/pages.json
+++ b/pages.json
@@ -53,6 +53,28 @@
 				}
 			}
 		},
+		{
+			"path": "pages/my/pinTuanOderDrtail",
+			"style": {
+				"navigationBarTitleText": "拼团详情",
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/my/pTuanOderDrtail",
+			"style": {
+				"navigationBarTitleText": "拼团订单详情",
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
 		{
 			"path": "pages/my/myMsOderDrtail",
 			"style": {
@@ -111,7 +133,18 @@
 		{
 			"path": "pages/my/newTeaml",
 			"style": {
-				"navigationBarTitleText": "团购",
+				"navigationBarTitleText": "团购列表",
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/my/newTeamlDetail",
+			"style": {
+				"navigationBarTitleText": "团购详情",
 				"enablePullDownRefresh": true,
 				"navigationStyle": "custom",
 				"app-plus": {
@@ -651,6 +684,24 @@
 						"titleNView": false
 					}
 				}
+			},{
+				"path": "order/payModifyPt",
+				"style": {
+					"navigationBarTitleText": "拼团订单",
+					"enablePullDownRefresh": false,
+					"app-plus": {
+						"titleNView": false
+					}
+				}
+			},{
+				"path": "order/paydingPt",
+				"style": {
+					"navigationBarTitleText": "拼团订单",
+					"enablePullDownRefresh": false,
+					"app-plus": {
+						"titleNView": false
+					}
+				}
 			},{
 				"path": "order/payModifyMs",
 				"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ddd627b..c7c9802 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -89,7 +89,7 @@
 				<image src="../../static/index-fenglei10.png" mode="widthFix"></image>
 				<span class="feng_word">充值赠送</span>
 			</view>
-			<view class="index-project-content" @click="qidai()">
+			<view class="index-project-content"  @click="goNav('/pages/my/newTeaml?text='+'index')">
 				<image src="../../static/index-fenglei5.png" mode="widthFix"></image>
 				<span class="feng_word">超值拼团</span>
 			</view>
diff --git a/pages/my/index.vue b/pages/my/index.vue
index dde769d..072cb73 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -100,7 +100,7 @@
 					<image src="../../static/my-liaocheng.png" mode=""></image>
 					<span class="my-serve-list-text">服务疗程</span>
 				</view>
-				<view class="my-serve-list" @click="miaoshao()">
+				<view class="my-serve-list" @click="tuangou()">
 					<image src="../../static/my-liaocheng2.png" mode=""></image>
 					<span class="my-serve-list-text">新人拼团</span>
 				</view>
@@ -606,6 +606,11 @@
 					})
 				}
 			},
+			tuangou(){
+				uni.navigateTo({
+					url:'/pages/my/newTeaml?text='+'my'
+				})
+			},
 			miaoshao(){
 				uni.navigateTo({
 					url:'/pages/my/newseckill?text='+'my'
diff --git a/pages/my/miaoShaOderDrtail.vue b/pages/my/miaoShaOderDrtail.vue
index a923a16..3a6f48a 100644
--- a/pages/my/miaoShaOderDrtail.vue
+++ b/pages/my/miaoShaOderDrtail.vue
@@ -21,10 +21,10 @@
 							<view class="header-bottom-money-zhen">
 								<span>￥</span>
 								<span>{{mainData.price}}</span>
-								<span>/套</span>
+								<span>/次</span>
 							</view>
 							<view class="header-bottom-money-jia">
-								￥{{mainData.oldPrice}}/套
+								￥{{mainData.oldPrice}}/次
 							</view>
 						</view>
 					</view>
@@ -57,7 +57,7 @@
 		</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 class="detail-foot-mian">
@@ -73,7 +73,7 @@
 								<view style="display: flex; align-items: flex-end;">
 									<view class="header-bottom-money-zhen">
 										<span>￥</span>
-										<span>{{item.price}}</span>
+										<span>{{item.packagePrice}}</span>
 									</view>
 									<view class="header-bottom-money-jia" >
 										￥{{item.oldPrice}}
diff --git a/pages/my/myMsOderDrtail.vue b/pages/my/myMsOderDrtail.vue
index edebcea..d7f28f2 100644
--- a/pages/my/myMsOderDrtail.vue
+++ b/pages/my/myMsOderDrtail.vue
@@ -25,9 +25,9 @@
 					<view class="header-bottom-title">
 						<view class="header-bottom-title-text">
 							<span>{{getList.title}}</span>
-							<span class="header-bottom-title-liao">
+							<!-- <span class="header-bottom-title-liao">
 								套餐
-							</span>
+							</span> -->
 						</view>
 						<view class="header-bottom-title-num">
 							<span>{{getList.sales}}</span>
@@ -39,7 +39,7 @@
 						<view class="header-bottom-money">
 							<view class="header-bottom-money-zhen">
 								<span>￥</span>
-								<span>{{getList.price}}</span>
+								<span>{{getList.packagePrice}}</span>
 							</view>
 							<view class="header-bottom-money-jia">
 								￥{{getList.oldPrice}}
diff --git a/pages/my/newTeaml.vue b/pages/my/newTeaml.vue
index 5ad8b22..3bae922 100644
--- a/pages/my/newTeaml.vue
+++ b/pages/my/newTeaml.vue
@@ -1,1495 +1,562 @@
+<!-- 自定义下拉刷新与上拉加载演示(vue) -->
 <template>
 	<view class="content">
-		<view class="header">
-			<view class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
-				<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-if="!isVIP"></image>
-				<image src="../../static/activate2.png" mode="widthFix" v-if="isVIP"></image>
-			</view>
-			<view class="group-buy">
-				<view class="group-buy-left">
-					<view class="group_amount">
-						<span>￥</span>
-						<span>234.00</span>
+		<z-paging ref="paging" v-model="dataList" @query="queryList" >
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<!-- 注意！此处的z-tabs为独立的组件，可替换为第三方的tabs，若需要使用z-tabs，请在插件市场搜索z-tabs并引入，否则会报插件找不到的错误 -->
+			<template #top>
+				<view class="service-head-top">
+					<view class="service-head-top-left">
+						<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
+						<image style="width: 136rpx; height:40rpx ;" src="../../static/seckill4.png"></image>
 					</view>
-					<view class="group-rule">
-						<span>￥688.00</span>
-						<span>2人团</span>
-					</view>
-				</view>
-				<view class="group-buy-right">
-					<view class="group-text">距结束仅剩</view>
-					<view><span>08</span>:<span>08</span>:<span>08</span></view>
-				</view>
-			</view>
-			
-			<view class="header-bottom">
-				<view class="header-bottom-top">
-					<view class="header-bottom-title">
-						<view class="header-bottom-title-text">
-							<span>{{mainData.title}}</span>
-							<span class="header-bottom-title-liao">
-								疗程
-							</span>
-						</view>
-						<view class="header-bottom-title-num">
-							<span> 已拼</span>
-							<span>16</span>
-							<span> 次</span>
-						</view>
-					</view>
-					<view class="tewmwork-prompt">
-						(人人可开团·仅新用户参团)
-					</view>
-					<view class="tewmork-key">
-						<span>精油开背</span>
-						<span>增强免疫</span>
-						<span>调节</span>
-					</view>
-					
-					<!--<view class="header-bottom-money-view">
-						<view class="header-bottom-money1">
-							<view class="header-bottom-money-zhen">
-								<span>￥</span>
-								<span>{{mainData.price}}</span>
-								<span v-if="dataList.name=='index'">/{{serviceCount}}次</span>
-								<span v-else>/{{mainData.serviceCount}}次</span>
-							</view>
-							<view v-if="dataList.name=='index'" class="header-bottom-money-jia" style="text-decoration: line-through;">
-								￥{{mainData.oldPrice}}/{{serviceCount}}次
-							</view>
-							<view v-else class="header-bottom-money-jia" style="text-decoration: line-through;">
-								￥{{mainData.oldPrice}}/{{mainData.serviceCount}}次
-							</view>
+					<view>
+						<uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
+						 @clear="clear">
+						</uni-search-bar>
+						<view class="search-btn" @click="searchBtn">
+							搜索
 						</view>
 					</view>
 				</view>
-				<view class="header-bottom-title-bottom">
-					<image src="../../static/cure.png" mode=""></image>
-					<span>{{liaoTime}}</span>
-				</view>
-				<view class="header-bottom-foot">-->
-					
-					
-				</view>
-			</view>
-		</view>
-		<!-- <view class="detail-foot">
-			<view class="detail-foot-nav">
-				<span class="detail-foot-nav-text">适用说明</span>
-				<span class="detail-foot-nav-bor"></span>
-			</view>
-			<view class="detail-foot-mian">
-				<view class="detail-foot-mian-top">
-					<span class="detail-foot-mian-top-title">性别限制: </span>
-					<span class="detail-foot-mian-top-text">不限性别</span>
-				</view>	
-				<view class="detail-foot-mian-top-bottom">
-					<span class="detail-foot-mian-top-title">适应人群: </span>
-					<span class="detail-foot-mian-top-text">
-						{{mainData.applyPeople}}
-					</span>
-				</view>
-			</view>
-		</view> -->
-		<view class="teamwork-plate">
-			<view class=" flex teamwork-line">
-				<view>
-					<view>1人在拼团，可直接参与</view>
-					<image style="width: 36rpx; height: 36rpx; border-radius: 30rpx;" src="../../static/my-gong-2.png"></image>
-				</view>
-				<view class="flex">
-					<view class="teamwork-se">
-						<view>还差<span class="team-text">1人</span>拼成</view>
-						<view>剩余<span>11</span><span>49</span><span>58</span></view>
-					</view>
-					<view class="teamwork-button">去拼团</view>
-				</view>
-			</view>
-		</view>
-		<view class="teamwork-plate">
-		<view class="header-bottom-foot-cont">
-			<view class="header-bottom-foot-view">
-				<image class="header-bottom-foot-view-img1" src="../../static/servicePackage/idCard.png" mode=""></image>
-				<span>未服务全额退款</span>
-			</view>
-			<view class="header-bottom-foot-view" style="margin: 0px 7px;width: 26%;">
-				<image class="header-bottom-foot-view-img2" src="../../static/servicePackage/money.png" mode=""></image>
-				<span>不满意重做</span>
-			</view>
-			<view class="header-bottom-foot-view">
-				<image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
-				<span>最快30分钟上门</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-bor"></span>
-			</view>
-			<view class="detail-foot-mian">
-				<image class="detail-foot-mian-img" v-for="(item,index) in contentImg" :key="index" :src="item" mode="widthFix"></image>	
-				<!-- <view class="lab-view">
-					<view class="detail-foot-mian-txet" v-for="item in labels" :key="item">
-						<span class="detail-foot-mian-txetList">{{item}}</span>
-					</view>
+				<!-- <view class="fenlei">
+					<z-tabs class="z-tabs-fenlei" :list="tabList" @change="tabChange" @changeClick="changeClick"/>
 				</view> -->
-			</view>
-		</view>
-		<!--<view class="detail-foot" v-if="dataList.name!='index'">
-			<view class="detail-foot-nav">
-				<span class="detail-foot-nav-text">疗程详情</span>
-				<span class="detail-foot-nav-bor"></span>
-			</view>
-			<view class="detail-foot-mian">
-				<view class="detail-foot-list" v-for="(item,index) in detailData" :key="index">
-					<view class="detail-foot-list-top">
-						<span style="margin-right: 5px;">{{item.title}}</span>
-						<span style="display: none;">详情</span>
-						<span v-if="item.maxTime">上次预约:{{item.maxTime}}</span>
-					</view>
-					<view class="header-bottom-money">
-						<view class="header-bottom-money-zhen">
-							已使用{{item.usedQuantity}}次
-						</view>
-						<view class="dingdan-btn" @click="details(item)" :class="[item.usedQuantity=='0'?'dingdan-btn-h':'dingdan-btn-l']">
-							订单详情
-						</view>
-					</view>
-					<view class="header-bottom-money" style="margin-top: 5px;">
-						<view class="header-bottom-money-zhen">
-							未使用{{item.unUsedQuantity}}次
-						</view>
-						<view class="dingdan-btn" @click="goumai(item)" :class="[item.unUsedQuantity=='0'?'dingdan-btn-h':'dingdan-btn-l']">
-							立即预约
-						</view>
-					</view>
-					<view class="detail-foot-title">
-						服务疗程
-					</view>
+			</template>
+			
+			<!-- 自定义下拉刷新view(如果use-custom-refresher为true且不设置下面的slot="refresher"，此时不用获取refresherStatus，会自动使用z-paging自带的下拉刷新view) -->
+
+			<!-- 注意注意注意！！字节跳动小程序中自定义下拉刷新不支持slot-scope，将导致custom-refresher无法显示 -->
+			<!-- 如果是字节跳动小程序，请参照sticky-demo.vue中的写法，此处使用slot-scope是为了减少data中无关变量声明，降低依赖 -->
+			<template #refresher="{refresherStatus}" >
+				<!-- 此处的custom-refresh为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，下拉刷新就显示什么view -->
+				<custom-refresher :status="refresherStatus" />
+			</template>
+			<!-- 自定义没有更多数据view -->
+			<template #loadingMoreNoMore >
+				<!-- 此处的custom-nomore为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，没有更多数据就显示什么view -->
+				<custom-nomore />
+			</template>
+			
+			<!-- 如果希望其他view跟着页面滚动，可以放在z-paging标签内 -->
+			<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)" >
+				<!-- <view class="item-title">{{item.title}}</view>
+				<view class="item-detail">{{item.detail}}</view> -->
+				<!-- <view class="item-line"></view> -->
+				<view class="item-img">
+					<image :src="item.packageImg" mode=""></image>
+					<span class="img-span" v-if="text=='my'">{{item.status=='1'?'未用完':item.status=='2'?'退款':item.status=='9'?'已用完':'其他'}}</span>
 				</view>
+				<view class="item-view" v-if="text=='index'">
+					<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>
+					<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>去拼团￥</span>
+							<span>{{item.oldPrice}}</span>
+						</view>
+						<view class="seckill-rob ">
+							<span class="seckill-text">去拼团</span>
+						</view>
+					</view>
+				</view>	
+				<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>
+					</view>
+					<view class="item-view-bottom-qian">
+						<span>￥</span>
+						<span>{{item.price}}</span>
+						<!-- <span>/{{item.serviceCount}}次</span> -->
+						<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>
+					<view class="item-view-bottom">
+						<view class="item-view-xiangmu">
+							<span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span>
+						</view>
+						<view class="item-view-bottom-btn">
+							查看
+						</view>
+					</view>
+				</view>	
 			</view>
-		</view>-->
+		</z-paging>
 		
-		<view class="detail-btn">
-			<span>￥234.00</span>
-			<span>一键开团</span>
-		</view>
-		<!-- 支付方式 -->
-		<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
-			<view class="popup_pay">
-				<view style="background-color: #fff;">
-					<view style="padding: 0 20upx;margin-top: 60rpx;margin-bottom: 20rpx;display: flex;flex-direction: column;justify-content: center;">
-						<view
-							style="width:92%;display: flex;height: 100upx;align-items: center;padding: 20upx 0;justify-content: center;"
-							v-for="(item,index) in openLists" :key='item.id'>
-							<image :src="item.image" style="width: 55upx;height: 55upx;border-radius: 50upx;">
-							</image>
-							<view style="font-size: 30upx;margin-left: 20upx;width: 70%;">
-								{{item.text}}
-							</view>
-							<radio-group name="openWay" style="margin-left: 45upx;" @tap='selectWay(item)'>
-								<label class="tui-radio">
-									<radio color="#096f4b" :checked="openWay === item.id ? true : false" />
-								</label>
-							</radio-group>
-						</view>
-					</view>
-				</view>
-				<view class="pay_btn" @click="pay()">确认支付</view>
-			</view>
-		</u-popup>
 	</view>
 </template>
+
 <script>
-	export default{
-		data(){
-			return{
-				detailData:[],
-				dataList:[],
-				mainData:[],
-				isVIP:false,
-				// 背景图片的URL可以是动态的，比如从API获取或根据条件生成
-				backgroundImageUrl: '',
-				liaoTime:'',
-				contentImg:[],
-				couponId:'',
-				couponData:[],
-				checkbox:false,
-				showpay:false,
-				closeable: true,
-				openWay: 1,
-				paySel: 0,
-				tpayMoney: '',
+	export default {
+		data() {
+			return {
+				myId: '',
+				// v-model绑定的这个变量不要在分页请求结束中自己赋值！！！
+				dataList: [],
+				tabList: [],
+				typeData:'105',
+				tabIndex: 0,
+				searchValue:'',
+				serviceTrue:true,
 				page:1,
 				limit:10,
-				mainId:'',
-				serviceCount:'',
-				labels:[]
+				titleNmae:'',
+				tagsData:[],
+				text:''
 			}
 		},
-		computed: {
-		    backgroundStyle() {
-		      return {
-		        backgroundImage: `url(${this.backgroundImageUrl})`,
-		        backgroundSize: 'cover', // 根据需要调整
-		      };
-		    }
-		  },
-		onLoad(e) {
-			var that=this;
-			that.dataList=e;
-			that.isVIP=this.$queue.getData('isVIP');
-			that.youhui()
-			that.getData()
+		onLoad(e){
+			this.myId = uni.getStorageSync('userId');
+			this.text=e.text
+			this.getData()
 		},
-		onShow() {
-			
-			// #ifndef MP-WEIXIN
-			this.openLists = [{
-					image: '../../static/images/icon_weixin.png',
-					text: '微信支付',
-					id: 2
-				}, {
-					image: '../../static/images/zhifubao.png',
-					text: '支付宝支付',
-					id: 3
-				}, {
-					image: '../../static/images/lingqian.png',
-					text: '零钱支付',
-					id: 1
-				}],
-				this.openWay = 2;
-			// #endif
-		
-			// #ifdef MP-WEIXIN
-			this.openLists = [{
-					image: '../../static/images/icon_weixin.png',
-					text: '微信支付',
-					id: 2
-				}, {
-					image: '../../static/images/lingqian.png',
-					text: '零钱支付',
-					id: 1
-				}],
-				this.openWay = 2;
-			// #endif
-		},
-		methods:{
-			details(item){//详情
-				if(item.usedQuantity){
-					item.id=this.mainData.id
-					uni.navigateTo({
-						url:'/pages/my/orderDetailsList?id='+item.id+'&mainId='+this.mainId+'&name='+'疗程'
-					})
-				}else{
-					uni.showToast({
-						icon:'error',
-						title:'服务疗程尚未使用，无订单信息！'
-					})
+		methods: {
+			input(res) {//搜索 输入框
+				this.searchValue=res;
+				console.log('----input:', res)
+			},
+			searchBtn(){//搜索按钮
+				if(this.searchValue!=""){
+					this.getData()
 				}
 			},
-			goumai(item){//立即购买
-				if(item.unUsedQuantity>'0'){
-					uni.navigateTo({
-						url:'/pages/my/myCiLiaoDetail?id='+item.massageTypeId+'&mainId='+this.mainId+'&name='+'疗程'
-					})
-				}else{
-					uni.showToast({
-						icon:'error',
-						title:'服务疗程已使用完成，无订单信息！'
-					})
-				}
-			},
-			goNav(e) {
-				uni.navigateTo({
-					url: e
-				})
-			},
-			payJZ() {
-				let that = this;
-				if (that.openWay == 1) { //零钱支付
-					uni.showModal({
-						title: '付款提示',
-						content: '确认支付' + that.tpayMoney + '元吗?',
-						success: function(re) {
-							if (re.confirm) {
-								that.$queue.showLoading('支付中...')
-								// console.log('用户点击确定');
-								that.$Request.post("/app/user/package/order/payOrder", {
-									ordersId: that.tordersId,
-								}).then(ret => {
-									uni.hideLoading();
-									if (ret.code == 0) {
-										uni.showToast({
-											title: '支付成功',
-											icon: 'none'
-										})
-										that.getData()
-									} else {
-										uni.showToast({
-											title: ret.msg,
-											icon: 'none'
-										})
-									}
-								});
-							} else if (re.cancel) {
-							}
-						}
-					})
-				} else if (that.openWay == 2) { //微信支付
-					// #ifdef MP-WEIXIN
-					let data = {
-						ordersId: that.tordersId,
-						type: 3
-					}
-					that.$Request.post('/app/wxPay/payOrder', data).then(ret => {
-						console.log(ret)
-						if (ret.code == 0) {
-							uni.hideLoading();
-							uni.requestPayment({
-								provider: 'wxpay',
-								timeStamp: ret.data.timestamp,
-								nonceStr: ret.data.noncestr,
-								package: ret.data.package,
-								signType: ret.data.signType,
-								paySign: ret.data.sign,
-								success: function(ret) {
-									console.log(ret)
-									uni.showToast({
-										title: '支付成功',
-										icon: 'none'
-									})
-									that.getData()
-									// this.$queue.showToast('支付成功');
-			
-									// uni.switchTab({
-									// 	url: '/pages/my/index'
-									// })
-								},
-								fail: function(err) {
-									// this.$queue.showToast('支付失败');
-									uni.showToast({
-										title: '支付失败',
-										icon: 'nones'
-									});
-								}
-							});
-						}
-					});
-					// #endif
-			
-					// #ifdef H5
-					let ua = navigator.userAgent.toLowerCase();
-					if (ua.indexOf('micromessenger') != -1) {
-						let data = {
-							ordersId: that.tordersId,
-							type: 2
-						}
-						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
-							that.showpay = false
-							if (rea.code == 0) {
-								that.callPay(rea.data);
-								that.getData()
-							} else {
-								uni.showToast({
-									title: rea.msg,
-									icon: 'none'
-								})
-							}
-						});
-					} else {
-						let data = {
-							ordersId: that.tordersId,
-							type: 4
-						}
-						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
-							that.showpay = false
-							if (rea.code == 0) {
-								const urlArr = window.location.href;
-								const hostUrl = urlArr.split("/");
-								const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
-								const url = '&redirect_url=' + callBack + 'my/order/pay';
-								window.location = rea.data.mweb_url + url
-								that.getData()
-							} else {
-								uni.showToast({
-									title: rea.msg,
-									icon: 'none'
-								})
-							}
-						});
-					}
-			
-					// #endif
-			
-					// #ifdef APP
-					let data = {
-						ordersId: that.order.ordersId,
-						type: 1
-					}
-					that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
-						console.log(rea)
-						that.showpay = false
-						if (rea.code == 0) {
-							that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
-						}
-					});
-					// #endif
-				} else if (that.openWay == 3) { //支付宝支付
-					// #ifdef H5
-					let data = {
-						ordersId: that.tordersId,
-						type: 2
-					}
-					that.$Request.post('/app/aliPay/payOrder', data).then(
-						rea => {
-							that.showpay = false
-							const div = document.createElement('div')
-							div.innerHTML = rea.data //此处form就是后台返回接收到的数据
-							document.body.appendChild(div)
-							document.forms[0].submit()
-							that.getData()
-						});
-					// #endif
-			
-					// #ifdef APP-PLUS
-					let data = {
-						ordersId: that.tordersId,
-						type: 1
-					}
-					that.$Request.post('/app/aliPay/payOrder', data).then(
-						rea => {
-							that.showpay = false
-							that.setPayment('alipay', rea.data);
-							that.getData()
-						});
-					// #endif
-				}
-			
-			},
-			// 支付订单
-			pay() {
-				let that = this
-				this.showpay = false
-				if (this.paySel != 0) {
-					this.payJZ();
-					return;
-				}
-				if (that.openWay == 1) { //零钱支付
-					uni.showModal({
-						title: '付款提示',
-						content: '确认支付' + that.order.payMoney + '元吗?',
-						success: function(re) {
-							if (re.confirm) {
-								that.$queue.showLoading('支付中...')
-								console.log('用户点击确定');
-								that.$Request.post("/app/user/package/order/payOrder", {
-									ordersId: that.order.ordersId,
-								}).then(res => {
-									uni.hideLoading();
-									if (res.code == 0) {
-										uni.showToast({
-											title: '支付成功'
-										})
-										that.getData()
-									} else {
-										uni.showToast({
-											title: res.msg,
-											icon: 'none'
-										})
-									}
-								});
-							} else if (re.cancel) {
-								uni.hideLoading();
-								console.log('用户点击取消');
-							}
-						}
-			
-					})
-				} else if (that.openWay == 2) { //微信支付
-					that.$queue.showLoading('支付中...')
-					// #ifdef MP-WEIXIN
-					let data = {
-						ordersId: that.order.ordersId,
-						type: 3
-					}
-					that.$Request.post('/app/wxPay/payOrder', data).then(ret => {
-						console.log(ret)
-						if (ret.code == 0) {
-							uni.hideLoading();
-							uni.requestPayment({
-								provider: 'wxpay',
-								timeStamp: ret.data.timestamp,
-								nonceStr: ret.data.noncestr,
-								package: ret.data.package,
-								signType: ret.data.signType,
-								paySign: ret.data.sign,
-								success: function(ret) {
-									console.log(ret)
-									uni.showToast({
-										title: '支付成功',
-										icon: 'none'
-									})
-									that.getData()
-									// this.$queue.showToast('支付成功');
-			
-									// uni.switchTab({
-									// 	url: '/pages/my/index'
-									// })
-								},
-								fail: function(err) {
-									// this.$queue.showToast('支付失败');
-									uni.showToast({
-										title: '支付失败',
-										icon: 'nones'
-									});
-								}
-							});
-						}
-					});
-					// #endif
-			
-					// #ifdef H5
-					let ua = navigator.userAgent.toLowerCase();
-					if (ua.indexOf('micromessenger') != -1) {
-						let data = {
-							ordersId: that.order.ordersId,
-							type: 2
-						}
-						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
-							that.showpay = false
-							if (rea.code == 0) {
-								that.callPay(rea.data);
-								that.getData()
-							} else {
-								uni.showToast({
-									title: rea.msg,
-									icon: 'none'
-								})
-							}
-						});
-					} else {
-						let data = {
-							ordersId: that.order.ordersId,
-							type: 4
-						}
-						// debugger;
-						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
-							// const urlArr = window.location.href;
-							// const hostUrl = urlArr.split("/");
-							// const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
-							// const url = '&redirect_url=' + callBack + 'my/order/pay';
-							// window.location = rea.mweb_url + url
-							that.showpay = false
-							if (rea.code == 0) {
-								const urlArr = window.location.href;
-								const hostUrl = urlArr.split("/");
-								const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
-								const url = '&redirect_url=' + callBack + 'my/order/pay';
-								window.location = rea.data.mweb_url + url
-								that.getData()
-							} else {
-								uni.showToast({
-									title: rea.msg,
-									icon: 'none'
-								})
-							}
-						});
-					}
-			
-					// #endif
-			
-					// #ifdef APP
-					let data = {
-						ordersId: that.order.ordersId,
-						type: 1
-					}
-					that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
-						console.log(rea)
-						that.showpay = false
-						if (rea.code == 0) {
-							that.getData()
-							that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
-						}
-					});
-					// #endif
-				} else if (that.openWay == 3) { //支付宝支付
-					that.$queue.showLoading('支付中...')
-					// #ifdef H5
-					let data = {
-						ordersId: that.order.ordersId,
-						type: 2
-					}
-					that.$Request.post('/app/aliPay/payOrder', data).then(
-						rea => {
-							const div = document.createElement('div')
-							div.innerHTML = rea.data //此处form就是后台返回接收到的数据
-							document.body.appendChild(div)
-							document.forms[0].submit()
-							that.getData()
-						});
-					// #endif
-			
-					// #ifdef APP-PLUS
-					let data = {
-						ordersId: that.order.ordersId,
-						type: 1
-					}
-					that.$Request.post('/app/aliPay/payOrder', data).then(
-						rea => {
-							that.setPayment('alipay', rea.data);
-							that.getData()
-						});
-					// #endif
-				}
-			},
-			openpay(item) {//立即预约
-				item.packagePrice=this.detailData[0].packagePrice;
-				item.massageImg=this.detailData[0].massageImg;
-				item.serviceCount=this.detailData[0].serviceCount;
-				this.$queue.setData('mainData',item)
-				this.$queue.setData('detailData',this.detailData)
-				this.$queue.setData('xiangmu',item)
-				this.$queue.setData('youhui','');
-				uni.navigateTo({
-					url:'/my/order/payModifyLiao?ordersId='+item.id
-				})
-				// this.goOrder()
-				// this.showpay = true
-			},
-			//支付选择
-			selectWay: function(item) {
-				this.openWay = item.id;
-			},
-			goOrder() {//生成orderId
-				let that = this
-				let data = {
-				  userId: uni.getStorageSync('userId'),
-				  couponId: that.couponId,
-				  oldSumMoney: that.mainData.oldPrice*that.detailData.length,
-				  sumMoney: that.mainData.price*that.detailData.length,
-				  ordersPackageList:[
-				    {packageId: that.mainData.id,num: 1},
-				  ]
-				}
-				that.$Request.postJson("/app/user/package/order/insertOrders", data).then(res => {
-					that.showorder = false
-					if (res.code == 0) {
-						that.tordersId = res.data.ordersId;
-						that.tpayMoney = res.data.payMoney;
-						that.showpay = true;
-						that.paySel = 1;
-					} else {
-						that.$queue.showToast(res.msg)
-					}
-			
-				});
-			},
-			checkboxChange(e){
-				this.couponId=e.detail.value.join(",")
-			},
-			youhui(){//获取优惠卷
-				let that = this
-				let data = {
-							  status: 0,
-							  page: 1,
-							  limit: 10
-							}
-				that.$Request.get("/app/coupon/selectCouponUserList", data).then(res => {
-					if (res.code == 0) {
-						that.couponData=res.data.list
-					} else {
-						that.$queue.showToast(res.msg)
-					}
-							
-				});
-			},
-			
-			
 			getData(){
-				var that=this;
-				if(that.dataList.name=='index'){
-					let data = {
-							  mainId: that.dataList.id,
-							  page: that.page,
-							  limit:  that.limit,
-							}
-					that.$Request.get('/app/massage/packageDetail/findAppPage', data).then(res => {
-						if (res.code == 0) {
-							that.mainData=res.mainData;
-							that.detailData=res.detailData.list;
-							that.backgroundImageUrl=res.mainData.packageImg
-							that.contentImg=res.mainData.contentImg.split(",");
-							that.liaoTime=that.detailData[0].intervalDaysStr;
-							that.serviceCount=that.detailData[0].serviceCount;
-							that.labels=that.mainData.labels.split(',')
+				let data = {
+						  userId: this.myId,
+						  type: '111',
+						  page: this.page,
+						  limit:  this.limit,
+						  title:this.searchValue,
 						}
+				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(',');
+						}
+					}
+				})
+			},
+			tabChange(index) {
+				this.tabIndex = index;
+				//当切换tab或搜索时请调用组件的reload方法，请勿直接调用：queryList方法！！
+				//调用reload时参数传true则代表reload时触发下拉刷新效果，不传或false则代表取消此效果
+				this.$refs.paging.reload(true);
+			},
+			queryList(pageNo, pageSize) {
+				// console.log(pageNo,pageSize,this.tabIndex)
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				const params = {
+					userId: this.myId,
+					page: pageNo,
+					limit: pageSize,
+					type: '111',
+					title:''
+				}
+				this.$Request.get('/app/massage/package/findAppActivityPage',params).then(res => {
+					// 将请求的结果数组传递给z-paging
+					this.$refs.paging.complete(res.data.list);
+				}).catch(res => {
+					// 如果请求失败写this.$refs.paging.complete(false);
+					// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+					// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+					this.$refs.paging.complete(false);
+				})
+			},
+			
+			backImg(){//返回上一页
+				if(this.text=='my'){
+					uni.reLaunch({
+						url:'/pages/my/index'
 					})
 				}else{
-					let data = {
-							  mainId: that.dataList.id,
-							  page: that.page,
-							  limit:  that.limit,
-							}
-					that.$Request.get('/app/user/package/detail/findMyPackageDetailList', data).then(res => {
-						if (res.code == 0) {
-							that.mainData=res.data.mainData;
-							that.detailData=res.data.detailData;
-							that.contentImg=that.mainData.contentImg.split(",");
-							that.mainId=that.mainData.id
-							that.liaoTime=res.data.detailData[0].intervalDaysStr;
-							that.backgroundImageUrl=that.mainData.packageImg;
-							that.labels=that.mainData.labels.split(',')
-						}
+					uni.reLaunch({
+						url:'/pages/index/index'
 					})
 				}
+			},	
+			clear(res) {
+				this.getData()
 			},
+			itemClick(item) {
+				if(this.text=='index'){
+					uni.navigateTo({
+						url:'/pages/my/newTeamlDetail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+this.text
+					})
+				}else{
+					uni.navigateTo({
+						url:'/pages/my/pinTuanOderDrtail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+this.text
+					})
+				}
+			}
 		}
 	}
 </script>
+
 <style scoped>
-	.lab-view{
-		width:100%;
+	.shop_label{
 		display: flex;
-		flex-direction: row;
-		align-items: center;
 		flex-wrap: wrap;
-	}
-	.detail-foot-mian-txet{
-		width: 50%;
-		margin-top: 20px;
-		text-align: center;
-	}
-	/deep/uni-checkbox .uni-checkbox-input{
-		width: 26px;
-		height: 26px;
-		border-radius: 50%;
-	}
-	.youhui-img{
-		width: 111.81rpx;
-		height: 111.81rpx;
-	}
-	.youhui-view-right-btn{
-		width: 158rpx;
-		height: 64rpx;
-		background: linear-gradient(-90deg, #019C88, #2DC48E);
-		border-radius: 32rpx;
-		text-align: center;
-		line-height: 64rpx;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #FFFFFF;
-		text-shadow: 0rpx 2rpx 4rpx rgba(0,119,104,0.44);
-		margin-left: 10px;
-	}
-	.youhui-view-right-time{
-		font-weight: 400;
-		font-size: 22rpx;
-		color: #999999;
-	}
-	.youhui-view-right-title{
-		width: 105px;
-		font-weight: 400;
-		font-size: 32rpx;
-		color: #333333;
-	}
-	.youhui-view-right-top{
-		display: flex;
-		flex-direction: column;
+		margin: 10rpx 0;
 		align-items: center;
 	}
-	.youhui-view-right{
-		width: 502.08rpx;
-		height: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-around;
-	}
-	.youhui-view-left-bottom{
-		font-weight: 400;
-		font-size: 22rpx;
-		color: #FFFFFF;
-	}
-	.youhui-view-left-yuan{
-		display: flex;
-		flex-direction: row;
-		align-items: baseline;
-		color: #FFFFFF;
-	}
-	.youhui-view-left-num{
-		font-weight: bold;
-		font-size: 89rpx;
-	}
-	.youhui-view-left-text{
-		font-weight: bold;
-		font-size:24.31rpx;
-	}
-	.youhui-view-left{
-		width: 199rpx;
-		height: 242rpx;
-		display: flex;
-		flex-direction:column;
-		align-items: center;
-		justify-content: center;
-	}
-	.youhui-yiyong{
-		background-image: url('../../static/youhuijuan/coupons7.png');
-	}
-	.youhui-weiyong{
-		background-image: url('../../static/youhuijuan/coupons1.png');
-	}
-	.youhui-list{
-		width: 95%;
-		display: flex;
-		flex-direction: row;
-		height: 242rpx;
-		border-radius: 21rpx;
-		background-size: 100%;
-		margin: 20px auto;
-		justify-content: space-between;
-	}
-	.popup_pay {
-		width: 100%;
-		position: relative;
-		padding-bottom: 45rpx;
-		/* height: 400px; */
-		/* height: 160px; */
-		/* #ifndef MP-WEIXIN */
-		/* height: 130px; */
-		/* #endif */
-	
-	}
-	.pay_btn {
-		width: 90%;
-		margin: 0 auto;
-		text-align: center;
-		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
-		height: 80rpx;
-		border-radius: 60rpx;
-		color: #ffffff;
-		line-height: 80rpx;
-	}
-	
-	.dingdan-btn{
-		text-align: center;
-		width: 80px;
-		height: 30px;
-		line-height: 30px;
-		border-radius: 4px;
-		font-weight: bold;
-		font-size: 11px;
-		border-radius: 30rpx;
-	}
-	.dingdan-btn-l{
-		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
-		color: #FFFFFF;
-	}
-	.dingdan-btn-h{
-		background: #666;
-		color: #FFFFFF;
-	}
-	.tese span:nth-child(1){
-		font-weight: bold;
-		font-size: 22rpx;
-		color: #333333;
-	}
-	.tese span:nth-child(2){
-		font-weight: 400;
-		font-size: 22rpx;
-		color: #8D9194;
-	}
-	.tese{
-		width: 100%;
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-	.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-text{
-		font-weight: bold;
-		font-size: 32rpx;
-		color: #000000;
-	}
-	.detail-foot-nav{
-		width: 90%;
-		display: flex;
-		flex-direction: column;
-		position: relative;
-	}
-	.detail-foot-title{
-		    width: 115px;
-		    height: 32px;
-			background-image: url(../../static/servicePackage/horn.png);
-		    background-repeat: no-repeat;
-		    background-size: 100% 100%;
-		    font-weight: 400;
-		    font-size: 12px;
-		    color: #FFFFFF;
-		    text-align: right;
-		    line-height: 32px;
-		    padding-right: 15px;
-			position: absolute;
-			    right: 0;
-			    top: 0;
-	}
-	.detail-foot-list-top{
-		width: 95%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		margin-bottom: 25px;
-	}
-	.detail-foot-list{
-		width: 95%;
-		border-radius: 21rpx;
-		position: relative;
-		display: flex;
-		flex-direction: column;
-		background-color: #fff;
-	}
-	.detail-foot{
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-	.detail-foot-list-top span:nth-child(1){
-		font-weight: bold;
-		font-size: 31rpx;
-		color: #3F3F3F;
-	}
-	.detail-foot-list-top span:nth-child(2){
-		width: 76rpx;
-		height: 33rpx;
-		line-height: 33rpx;
-		text-align: center;
-		border-radius: 16rpx;
-		border: 1px solid #7D7D7D;
-		font-weight: 400;
+	.shop_label span{
+		background: #e5e5e5;
+		border-radius: 8rpx;
+		padding: 8rpx 10rpx;
 		font-size: 20rpx;
-		color: #777777;
-	}
-	.detail-foot-list-top span:nth-child(3){
-		font-weight: 400;
-		font-size: 22rpx;
-		color: #777777;
-	}
-	
-	.detail-foot-mian{
-		width: 100%;
+		margin-right: 8rpx;
 		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
+		align-items: center; 
 	}
-	
-	.header-bottom-title-liao{
-		padding: 3px 8px;
-		height: 16px;
-		line-height: 16px;
-		text-align: center;
-		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
-		border-radius: 7px;
-		margin-left: 5px;
-		font-size: 10px;
-		border-top-left-radius: 20px;
-		border-bottom-right-radius: 20px;
-		color: #fff;
+	.shop-arrow{
+		display: inline-block;
+		    border-top: 1px solid;
+		    border-right: 1px solid;
+		    width: 7px;
+		    height: 7px;
+		    border-color: #999;
+		    -webkit-transform: rotate(45deg);
+		    transform: rotate(45deg);
+		    margin-top: 7px;
 	}
-	.detail-btn{
-		width: 94%;
-		    height: 40px;
-		    line-height: 40px;
-		    background: linear-gradient(to right, rgb(255, 117, 98), rgb(233, 71, 52));
-		    border-radius: 23px;
-		    margin: 0 auto;
-		    text-align: center;
-		    font-weight: 400;
-		    font-size: 18px;
-		    color: #FFFFFF;
-		    position: fixed;
-		    bottom: 0px;
-		    margin-bottom: 10px;
-			margin-left:3%;
-	}
-	.detail-foot-mian-txet span:nth-child(1){
-		color: #777777;
-		font-size: 12px;
-		font-weight: bold;
-		margin-bottom: 5px;
-	}
-	.detail-foot-mian-txet span:nth-child(2){
-		color: #333;
-		font-size: 15px;
-		font-weight: bold;
-		margin-bottom:3px;
-	}
-	.detail-foot-mian-txetList{
-		color: #777777;
-		font-size: 14px;
-		font-weight: bold;
-	}
-	
-	.detail-foot-mian-img{
-		width: 100%;
-		height:auto;
-	}
-	.detail-foot-mian-top-bottom{
-		margin-top: 10px;
-	}
-	.detail-foot-mian-top-title{
-		color: #333333;
-	}
-	.detail-foot-mian-top-text{
-		color: #777777;
-		width:80%;
-		margin-left: 5px;
-	}
-	.detail-foot-mian-top,.detail-foot-mian-top-bottom{
-		width: 100%;
+	.pace-plan{
 		display: flex;
 		flex-direction: row;
-		font-size: 26rpx;
+		margin-left: 10rpx;
 	}
-	.header-bottom-title-bottom span{
-		font-weight: bold;
+	.pace-text{
 		font-size: 24rpx;
-		color: #ff6f48;
 	}
-	.header-bottom-title-bottom image{
-		width: 34.03rpx;
-		height: 30.56rpx;
-		margin-right: 3px;
-	}
-	.header-bottom-title-bottom{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		margin: 5px 0px;
-		background: linear-gradient(90deg, #feefec, #fef5ec);
-		padding: 8rpx 20rpx;
-		border-radius: 10rpx;
-		border: 1px #efdfda solid ;
-		margin-top: 30rpx;
-	}
-	.shouc image{
-		width: 34.03rpx;
-		height: 32.64rpx;
+	.pace-text span:nth-child(1){
+		color: #666;
 	}
+	.pace-text span:nth-child(2){
+		color: #666;
+		}
 	
-	.shouc{
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-	.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-text{
-		font-weight: bold;
-		font-size: 32rpx;
-		color: #000000;
-	}
-	.detail-foot-nav{
-		width: 90%;
-		display: flex;
-		flex-direction: column;
-		position: relative;
-		margin: 30rpx 0;
-	}
-	.detail-foot{
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-	
-	.tese span:nth-child(1){
-		font-weight: bold;
-		font-size: 22rpx;
-		color: #333333;
-	}
-	.tese span:nth-child(2){
-		font-weight: 400;
-		font-size: 22rpx;
-		color: #8D9194;
-	}
-	.tese{
-		width: 100%;
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-	.detail-foot-list-top span:nth-child(1){
-		font-weight: bold;
-		font-size: 31rpx;
-		color: #3F3F3F;
-	}
-	.detail-foot-list-top span:nth-child(2){
-		width: 76rpx;
-		height: 33rpx;
-		line-height: 33rpx;
-		text-align: center;
-		border-radius: 16rpx;
-		border: 1px solid #7D7D7D;
-		font-weight: 400;
-		font-size: 20rpx;
-		color: #777777;
-		margin: 0px 25px 0px 5px;
-	}
-	.detail-foot-list-top span:nth-child(3){
-		font-weight: 400;
-		font-size: 22rpx;
-		color: #777777;
-	}
-	
-	.detail-foot-mian{
-		width: 95%;
-		display: flex;
-		flex-direction: column;
-		margin: 0 auto;
-		background-color: #fff;
-		border-radius: 21rpx;
-		padding: 15px;
-	}
-	.jianjie{
-		font-weight: 400;
-		font-size: 22rpx;
-		color: #8D9194;
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-	.header-bottom-mian{
-		margin: 10px 0px;
-	}
-	.header-bottom-mian-title{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		margin-bottom: 6px;
-	}
-	.header-bottom-mian-title span{
-		font-weight: 400;
-		font-size: 26rpx;
-		color: #20AB95;
-		margin-left: 5px;
-	}
-	.header-bottom-mian-title image{
-		width: 30.56rpx;
-		height: 29.86rpx;
-	}
-	.header-bottom-foot-view-img1{
-		width: 30rpx;
+	.pace{
+		width: 60%;
 		height: 30rpx;
+		border-radius: 30rpx;
+		background: #f5f5f5;
+		font-size: 20rpx;
+		line-height: 30rpx;
 	}
-	.header-bottom-foot-view-img2{
-		width: 23rpx;
-		height: 23rpx;
-	}
-	.header-bottom-foot-view-img3{
-		width: 26rpx;
-		height: 26rpx;
-	}
-	.header-bottom-foot-view image{
-		margin-right: 1px;
-	}
-	.header-bottom-foot-view{
-		width: 35%;
+	.seckill-entry{
 		display: flex;
 		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		padding: 2px 5px;
-		height: 22px;
-		line-height: 22px;
-		background-color: rgba(230, 246, 243, 1);
-		border-radius: 15px;
-		font-weight: 400;
-		font-size: 10px;
-		color: #029c88;
-	}
-	.header-bottom-foot-title{
-		height: 22px;
-		line-height: 22px;
-		text-align: left;
-		font-weight: 600;
-		font-size: 30rpx;
-		color: #029d88;
-	}
-	.header-bottom-foot-cont{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
 		justify-content: space-between;
-		margin-top: 6rpx;
+		margin-top: 10rpx;
 	}
-	.header-bottom-foot{
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
+	.seckill-money{
+		width: 74%;
+		background: #fff8f0;
+		border-radius: 10rpx 0 0 10rpx;	
+		padding: 14rpx 20rpx;
 	}
-	.header-bottom-money-jia{
-		font-size: 28rpx;
-		color: #848484;
-		margin-left: 5px;
+	.seckill-money span:nth-child(1){
+		color: #666;
+		font-size: 24rpx;
 		text-decoration: line-through;
 	}
-	.header-bottom-money-zhen span{
-		color: #F95900;
-	}
-	.header-bottom-money-zhen span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.header-bottom-money-zhen span:nth-child(2){
-		font-size:46rpx;
+	.seckill-money span:nth-child(2){
+		color: #fc2d32;
 		font-weight: bold;
+		font-size: 24rpx;
 	}
-	.header-bottom-money-zhen span:nth-child(3){
-		font-size: 25rpx;
-	}
-	.header-bottom-money-zhen{
-		display: flex;
-		flex-direction: row;
-		align-items: baseline;
-	}
-	
-	.header-bottom-money-view{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		margin-top:5px;
-	}
-	.header-bottom-money{
-		padding: 5px 0;
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-		margin-top: 5rpx;
-	}
-	.header-bottom-money1{
-		padding: 5px 0;
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		margin-top: 5rpx;
-		align-items: baseline;
-	}
-	.header-bottom-title-num span{
+	.seckill-money span:nth-child(3){
+		color: #fc2d32;
 		font-size: 30rpx;
 	}
-	.header-bottom-title-num span:nth-child(1){
-		color: #848485;
+	.seckill-rob{
+		width: 30%;
+		height: 60rpx;
+		background: linear-gradient(90deg, #fb2d30, #fc2e37);
+		text-align: center;
+		line-height: 60rpx;
+		border-radius:  0 10rpx  10rpx 0;
 	}
-	.header-bottom-title-num span:nth-child(2){
+	.seckill-img{
+		width: 70rpx;
+		height: 70rpx;
+		position: absolute;
+		top:-18rpx;
+		left:-22rpx;
+	}
+	.seckill-text{
+		color: #fff;
+		font-size:26rpx;
+	}
+	.item-view-bottom-qian{
+	}
+	.item-view-bottom-btn{
+		text-align: center;
+		width: 131rpx;
+		height: 55rpx;
+		line-height: 55rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 10rpx;
 		font-weight: bold;
-		color: #08A28A;
+		font-size: 28rpx;
+		color: #FFFFFF;
 	}
-	.header-bottom-title-num span:nth-child(3){
-		color: #848485;
+	.item-view-bottom-qian span:nth-child(5){
+		 font-size: 28rpx;
+		 color: #848484;
+		 text-decoration-line: line-through;
+		}
+	.item-view-bottom-qian span:nth-child(3){
+		 font-size: 28rpx;
+		 color: #848484;
+		 text-decoration-line: line-through;
+		 margin-left: 5px;
 	}
-	.header-bottom-title-text{
-		font-weight: bold;
-		font-size: 35rpx;
-		color: #13141A;
+	.item-view-bottom-qian span:nth-child(1){
+		 font-weight: 400;
+		 font-size: 25rpx;
+		 color: #F95900;
 	}
-	.header-bottom-title{
+	.item-view-bottom-qian span:nth-child(2){
+		 font-weight: bold;
+		 font-size: 36.81rpx;
+		  color: #F95900;
+	}
+	
+	.item-view-bottom{
 		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.item-view-jianjie{
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #999;
+		margin:5px 0px;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.item-view-biao{
+		padding: 1px 5px;
+		border-radius: 15rpx 3rpx 15rpx 3rpx;
+		}
+	.tuina{
+		background-color:#d1f2df;
+		color: #17984d;
+	}
+	.xiaoer{
+		background-color:#f1f8d7;
+		color: #58b314;
+	}
+	.taishi{
+		background-color:#e5d5c6;
+		color: #805d39;
+	}
+	.kangfu{
+		background-color:#fcf3da;
+		color: #ff8600;
+	}
+	.item-view-xiangmu span:nth-child(2){
+		font-weight: normal;
+		color: #666666;
+	}
+	.item-view-xiangmu span:nth-child(1){
+		font-weight: normal;
+		color: #999;
+		margin-right: 5rpx;
+	}
+	.item-view-xiangmu{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		font-weight: 400;
+		font-size: 25rpx;
+		align-items: flex-end;
+	}
+	.item-view-title{
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+		overflow: hidden;
+	}
+	.item-view{
+		width: 66%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+	}
+	.item-img{
+		width: 200rpx;
+		height: 200rpx;
+		border-radius: 14rpx;
+		position: relative;
+	}
+	.img-span{
+		padding: 2px 5px;
+		font-weight: 400;
+		font-size: 8px;
+		color: #FFFFFF;
+		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
+		border-radius: 7px 0px 7px 0px;
+		position: absolute;
+		bottom: 0px;
+		right: 0;
+		margin-bottom: 5px;
+		margin-right: 5px;
+	}
+	.item-img image{
+		width: 100%;
+		height: 100%;
+		border-radius: 14rpx;
+	}
+	.item {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		height: 140px;
+		background: #FFFFFF;
+		border-radius: 21rpx;
+		margin-top:10px;
+		align-items: center;
+		padding: 0px 10px;
+	}
+	
+	.item-detail {
+		padding: 5rpx 15rpx;
+		border-radius: 10rpx;
+		font-size: 28rpx;
+		color: white;
+		background-color: #007AFF;
+	}
+	
+	.item-line {
+		position: absolute;
+		bottom: 0rpx;
+		left: 0rpx;
+		height: 1px;
+		width: 100%;
+		background-color: #eeeeee;
+	}
+	/deep/.zp-paging-container{
+		background-color: #f7f7f7;
+		width:100%;
+	}
+	/deep/.zp-paging-container-content{
+		width: 95%;
+		margin: 50px auto 0px auto;
+	}
+	.fenlei{
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
 	}
-	.header-bottom-top{
-		width: 100%;
+	.index-fenl-title{
+		width: 81rpx;
+		text-align: center;
+		position: relative;
 		display: flex;
 		flex-direction: column;
+		align-items: center;
+		font-weight: bold;
+		font-size: 34rpx;
+		color:#019C88;
 	}
-	.header-bottom{
-		width: 100%;
-		background-color: #fff;
-		padding: 15px;
+	.index-fenl-title-bottom{
+		position: absolute;
+		bottom: 0;
+		margin-bottom: 0px;
+		width: 81rpx;
+		height: 14rpx;
+		border-radius: 7rpx;
+		background: linear-gradient(-48deg,rgba(1, 156, 136, 0.35),rgba(45, 196, 142, 0.35));
+	}
+	/deep/.uni-searchbar__cancel{
+		display: none;
+	}
+	.search-btn{
+		text-align: center;
+		line-height: 31px;
+		color: #fff;
+		position: absolute;
+		right: 0;
+		top: 0;
+		margin-top:9.4px;
+		margin-right: 11px;
+		height: 32px !important;
+	}
+	/deep/.uni-searchbar__box-icon-search,.search-btn{
+		width: 150rpx;
+		height: 60rpx;
+		background: #18A689;
+		border-radius: 31rpx;
+		
+	}
+	/deep/.uni-searchbar__box{
+		height: 31px;
+		border-radius: 15px !important;
+		background-color: #fff !important;
+		border: 1px solid #E5E5E5;
+		padding: 0px;
 		display: flex;
-		flex-direction: column;
+		flex-direction: row;
+		flex-flow: row-reverse;
+		position: relative;
 	}
-	.header-top image{
-		width: 706.25rpx;
-		height: 105.07rpx;
+	/deep/.uni-searchbar{
+		width: 240px;
+		border-radius: 31rpx;
 	}
-	.header-top{
-		width: 100%;
-		height: 745.83rpx;
-		background-image: url('../../static/servicePackage/display.png');
-		background-size: 100%;
-		background-repeat: no-repeat;
-		display: flex;
-		align-items: flex-end;
-		justify-content: center;
-	}
-	.header{
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-	}
-	.content{
-		width: 100%;
-		height: auto;
-		background-color: #f7f7f7;
-	}
-	.btn {
-	background: linear-gradient(to right, rgb(1, 156, 136), rgb(49, 193, 148));
-	color: rgb(255, 255, 255);
-	margin: 8px 16px;
-	position: fixed;
-	bottom: 0px;
-	width: 90%;
-	border-radius: 27px;
-	height: 43px;
-	line-height: 43px;
-	font-size: 17px;
-	text-align: center;
-	}
-	.group-buy{
-	display: flex;
-	background: #fef0ed;
-	justify-content: space-between;
-	}
-	.group-buy-left{
-	width:65%;
-	padding: 30rpx 30rpx;
-	background: linear-gradient(to right, rgb(255, 117, 98), rgb(233, 71, 52));
-	display: flex;
-	justify-content: space-between;
-	}
-	.group_amount{
-	color: #fff;
-	}
-	.group_amount span:nth-child(2){
-	font-size: 50rpx;
-	font-weight: bold;
-	}
-	.group-rule{
-	display: flex;
-	flex-direction:column;
-	align-items: center;
-	}
-	.group-rule span:nth-child(1){
-	color: #fff;
-	font-size:22rpx;
-	text-decoration: line-through;
-	}
-	.group-rule span:nth-child(2){
-	text-align: center;
-	padding: 2rpx 15rpx;
-	background:#fff;
-	color: #ed4b3e;
-	font-size: 24rpx;
-	border-radius: 3rpx;
-	}
-	.group-buy-right{
-	width: 34%;
-	display: flex;
-	flex-direction:column;
-	align-items: center;
-	padding: 20rpx 0;
-	}
-	.group-text{
-	 color:#ec4439;
-	 margin-bottom: 10rpx;
-	}
-	.group-buy-right span:nth-child(1){
-	background: #000;
-	border-radius: 30rpx;
-	padding: 8rpx;
-	color: #fff;
-	}
-	.group-buy-right span:nth-child(2){
-	background: #000;
-	border-radius: 30rpx;
-	padding: 8rpx;
-	color: #fff;
-	}
-	.group-buy-right span:nth-child(3){
-	background: #000;
-	border-radius: 30rpx;
-	padding: 8rpx;
-	color: #fff;
-	}
-	.teamwork-plate{
-	background: #fff;
-	margin: 20rpx 0;
-	align-items: center;
-	padding:15rpx  26rpx;
-	}
-	.teamwork-line{
-	display: flex;
-	padding: 15rpx 0;
-	justify-content: space-between;
-	}
-	.teamwork-button{
-	padding: 2rpx 15rpx;
-	background:#ed4b3e ;
-	color:#fff;
-	height: 50rpx;
-	line-height: 50rpx;
-	margin-top: 15rpx;
-	border-radius: 6rpx;
-	margin-left: 15rpx;
-	}
-	.team-text{
-	color: #ed4b3e;
-	}
-	.teamwork-se{
-	font-size: 24rpx;
-	text-align: center;
-	margin-top: 6rpx;
-	}
-	.tewmwork-prompt{
-		font-size: 24rpx;
-		color: #ed4b3e;
-		margin-top: 12rpx;
-	}
-	.tewmork-key{
-	display: flex;
-	text-align: center;
-	}
-	.tewmork-key span{
+	.service-head-top-left image{
+		width: 25px;
 		height: 30rpx;
-		line-height: 30rpx;
-		padding: 0 8rpx;
-		font-size: 20rpx;
-		border: 1px #ed4b3e solid ;
-		color: #ed4b3e;
-		border-radius: 6rpx;
-		margin-right: 6rpx;
-		margin-top: 6rpx;
+		margin-right: 10px;
 	}
-</style>
\ No newline at end of file
+	.service-head-top-left span{
+		font-weight: bold;
+		font-size: 34rpx;
+		color: #171717;
+	}
+	.service-head-top-left{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.service-head-top{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		background-color: #fff;
+		position: fixed;
+		z-index: 999;
+	}
+	.view-cata{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+</style>
diff --git a/pages/my/newTeamlDetail.vue b/pages/my/newTeamlDetail.vue
index 6c9e0bd..52b6829 100644
--- a/pages/my/newTeamlDetail.vue
+++ b/pages/my/newTeamlDetail.vue
@@ -1,526 +1,1021 @@
-<!-- 自定义下拉刷新与上拉加载演示(vue) -->
 <template>
 	<view class="content">
-		<z-paging ref="paging" v-model="dataList" @query="queryList" >
-			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
-			<!-- 注意！此处的z-tabs为独立的组件，可替换为第三方的tabs，若需要使用z-tabs，请在插件市场搜索z-tabs并引入，否则会报插件找不到的错误 -->
-			<template #top>
-				<view class="service-head-top">
-					<view class="service-head-top-left">
-						<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
-						<image style="width: 136rpx; height:40rpx ;" src="../../static/seckill4.png"></image>
-					</view>
-					<view>
-						<uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
-						 @clear="clear">
-						</uni-search-bar>
-						<view class="search-btn" @click="searchBtn">
-							搜索
-						</view>
-					</view>
-				</view>
-				<!-- <view class="fenlei">
-					<z-tabs class="z-tabs-fenlei" :list="tabList" @change="tabChange" @changeClick="changeClick"/>
-				</view> -->
-			</template>
-			
-			<!-- 自定义下拉刷新view(如果use-custom-refresher为true且不设置下面的slot="refresher"，此时不用获取refresherStatus，会自动使用z-paging自带的下拉刷新view) -->
-
-			<!-- 注意注意注意！！字节跳动小程序中自定义下拉刷新不支持slot-scope，将导致custom-refresher无法显示 -->
-			<!-- 如果是字节跳动小程序，请参照sticky-demo.vue中的写法，此处使用slot-scope是为了减少data中无关变量声明，降低依赖 -->
-			<template #refresher="{refresherStatus}" >
-				<!-- 此处的custom-refresh为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，下拉刷新就显示什么view -->
-				<custom-refresher :status="refresherStatus" />
-			</template>
-			<!-- 自定义没有更多数据view -->
-			<template #loadingMoreNoMore >
-				<!-- 此处的custom-nomore为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，没有更多数据就显示什么view -->
-				<custom-nomore />
-			</template>
-			
-			<!-- 如果希望其他view跟着页面滚动，可以放在z-paging标签内 -->
-			<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)" >
-				<!-- <view class="item-title">{{item.title}}</view>
-				<view class="item-detail">{{item.detail}}</view> -->
-				<!-- <view class="item-line"></view> -->
-				<view class="item-img">
-					<image :src="item.packageImg" mode=""></image>
-					<span class="img-span">{{item.status=='1'?'未用完':item.status=='2'?'退款':'已用完'}}</span>
-				</view>
-				<view class="item-view">
-					<view class="view-cata">
-						<view class="item-view-title">传统中式学位推拿</view>
-					</view>
-					<view class="shop_label">
-						<span>增强免疫</span>
-						<span>对症调理</span>
-						<span>调节改变</span>
-					</view>
-					<view class="pace-plan">
-						<view class="pace-text"><span>90</span><span>分钟</span></view>
-					</view>
-					<view class="seckill-entry">
-						<view class="seckill-money">
-							<span>￥263.5</span>
-							<span>去拼团￥</span>
-							<span>222</span>
-						</view>
-						<view class="seckill-rob ">
-							<span class="seckill-text">去拼团</span>
-						</view>
-					</view>
-				</view>	
+		<view class="header">
+			<view class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
+				<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-if="!isVIP"></image>
+				<image src="../../static/activate2.png" mode="widthFix" v-if="isVIP"></image>
 			</view>
-		</z-paging>
+			<view class="group-buy">
+				<view class="group-buy-left">
+					<view class="group_amount">
+						<span>￥</span>
+						<span>{{mainData.price}}</span>
+					</view>
+					<view class="group-rule">
+						<span>￥{{mainData.oldPrice}}</span>
+						<span>{{mainData.groupNum}}人团</span>
+					</view>
+				</view>
+				<view class="group-buy-right">
+					<view class="group-text">距结束仅剩</view>
+					<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
+						font-size="13" separator-size="13" @change="onCountdownChange"></u-count-down>
+					<!-- <uni-countdown :show-day="false" :font-size="13" :day="day" :hour="hours" :minute="minutes" :second="seconds" /> -->
+					<!-- <view><span>08</span>:<span>08</span>:<span>08</span></view> -->
+				</view>
+			</view>
+			
+			<view class="header-bottom">
+				<view class="header-bottom-top">
+					<view class="header-bottom-title">
+						<view class="header-bottom-title-text">
+							<span>{{mainData.title}}</span>
+							<!-- <span class="header-bottom-title-liao">
+								疗程
+							</span> -->
+						</view>
+						<view class="header-bottom-title-num">
+							<span> 已拼</span>
+							<span>16</span>
+							<span> 次</span>
+						</view>
+					</view>
+					<view class="tewmwork-prompt" v-if="mainData.isNewer=='1'">
+						(人人可开团·仅新用户参团)
+					</view>
+					<view class="tewmork-key">
+						<span v-for="item in labels" :key="item">{{item}}</span>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="teamwork-plate" v-if="ordersData!=''&&newTime>0">
+			<view class=" flex teamwork-line" v-for="(itema,index) in ordersData" :key="index">
+				<view>
+					<view>{{mainData.buyGroupNum}}人在拼团，可直接参与</view>
+					<view v-for="(itemL,indexL) in itema.orderList" :key="indexL" class="avatar">
+						<image style="width: 30px; height: 30px; border-radius:50%;" :src="itemL.avatar"></image>
+						<span>{{itemL.phone}}</span>
+					</view>
+				</view>
+				<view class="flex" style="align-items: center;">
+					<view class="teamwork-se">
+						<view>还差<span class="team-text">{{itema.lessNum}}人</span>拼成</view>
+						<view>剩余<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
+						font-size="13" separator-size="13" @change="onCountdownChange"></u-count-down></view>
+					</view>
+					<view class="teamwork-button" :class="[newTime<=0?'hBtn':'aBtn']" @click="goumai(mainData,itema.groupNo)" v-if="mainData.isNewer!='1'&&newTime>0">去拼团</view>
+				</view>
+			</view>
+		</view>
+		<view class="teamwork-plate">
+		<view class="header-bottom-foot-cont">
+			<view class="header-bottom-foot-view">
+				<image class="header-bottom-foot-view-img1" src="../../static/servicePackage/idCard.png" mode=""></image>
+				<span>未服务全额退款</span>
+			</view>
+			<view class="header-bottom-foot-view" style="margin: 0px 7px;width: 26%;">
+				<image class="header-bottom-foot-view-img2" src="../../static/servicePackage/money.png" mode=""></image>
+				<span>不满意重做</span>
+			</view>
+			<view class="header-bottom-foot-view">
+				<image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
+				<span>最快30分钟上门</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-bor"></span>
+			</view>
+			<view class="detail-foot-mian">
+				<image class="detail-foot-mian-img" v-for="(item,index) in contentImg" :key="index" :src="item" mode="widthFix"></image>	
+				
+			</view>
+		</view>
+		<view class="detail-btn" :class="[newTime<=0?'hBtn':'aBtn']" @click="goumai(mainData,'null')" v-if="mainData.isNewer!='1'&&newTime>0">
+			<span>￥{{mainData.price}}</span>
+			<span> 一键开团</span>
+		</view>
+		<!-- 支付方式 -->
 		
 	</view>
 </template>
-
 <script>
-	export default {
-		data() {
-			return {
-				myId: '',
-				// v-model绑定的这个变量不要在分页请求结束中自己赋值！！！
-				dataList: [],
-				tabList: [],
-				typeData:'105',
-				tabIndex: 0,
-				searchValue:'',
-				serviceTrue:true,
+	export default{
+		data(){
+			return{
+				detailData:[],
+				dataList:[],
+				mainData:[],
+				isVIP:false,
+				// 背景图片的URL可以是动态的，比如从API获取或根据条件生成
+				backgroundImageUrl: '',
+				liaoTime:'',
+				contentImg:[],
+				couponId:'',
+				couponData:[],
+				checkbox:false,
+				showpay:false,
+				closeable: true,
+				openWay: 1,
+				paySel: 0,
+				tpayMoney: '',
 				page:1,
 				limit:10,
-				titleNmae:''
+				mainId:'',
+				serviceCount:'',
+				labels:[],
+				ordersData:[],
+				endOfServiceTimer:null,
+				newTime:0,
+				hours:0,
+				minutes:0,
+				seconds:0,
+				day:0
 			}
 		},
-		onLoad(){
-			this.myId = uni.getStorageSync('userId')
-			this.getData()
+		computed: {
+		    backgroundStyle() {
+		      return {
+		        backgroundImage: `url(${this.backgroundImageUrl})`,
+		        backgroundSize: 'cover', // 根据需要调整
+		      };
+		    },
+			
+		  },
+		onLoad(e) {
+			var that=this;
+			that.dataList=e;
+			that.isVIP=this.$queue.getData('isVIP');
+			that.getData()
 		},
-		methods: {
-			input(res) {//搜索 输入框
-				this.searchValue=res;
-				console.log('----input:', res)
+		
+		methods:{
+			//老订单 方法
+			onCountdownChange(e) {
+				this.newTime=e
 			},
-			searchBtn(){//搜索按钮
-				if(this.searchValue!=""){
-					this.getData()
+			goumai(item,groupNo){//立即购买
+				this.mainData.groupNo=groupNo
+				this.$queue.setData('mainData',this.mainData);
+				this.$queue.setData('youhui','');
+				if(this.newTime<=0){
+					uni.showToast({
+						icon:'error',
+						title:'已过开团时间，无法开团！'
+					})
+				}else{
+					uni.navigateTo({
+						url:'/my/order/payModifyPt?ordersId='+item.id
+					})
+					
 				}
 			},
-			getData(){
-				let data = {
-						  userId: this.myId,
-						  type: this.typeData,
-						  page: this.page,
-						  limit:  this.limit,
-						  title:this.searchValue,
-						}
-				this.$Request.get('/app/user/package/findMyPackageList', data).then(res => {
-					if (res.code == 0) {
-						this.dataList=res.data.records;
-					}
-				})
-			},
-			tabChange(index) {
-				this.tabIndex = index;
-				//当切换tab或搜索时请调用组件的reload方法，请勿直接调用：queryList方法！！
-				//调用reload时参数传true则代表reload时触发下拉刷新效果，不传或false则代表取消此效果
-				this.$refs.paging.reload(true);
-			},
-			queryList(pageNo, pageSize) {
-				// console.log(pageNo,pageSize,this.tabIndex)
-				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
-				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
-				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
-				const params = {
-					userId: this.myId,
-					page: pageNo,
-					limit: pageSize,
-					type: this.typeData,
-					title:''
-				}
-				this.$Request.get('/app/user/package/findMyPackageList',params).then(res => {
-					// 将请求的结果数组传递给z-paging
-					this.$refs.paging.complete(res.data.records);
-				}).catch(res => {
-					// 如果请求失败写this.$refs.paging.complete(false);
-					// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
-					// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
-					this.$refs.paging.complete(false);
+			goNav(e) {
+				uni.navigateTo({
+					url: e
 				})
 			},
 			
-			backImg(){//返回上一页
-				uni.reLaunch({
-					url:'/pages/my/index'
-				})
-			},	
-			clear(res) {
-				this.getData()
-			},
-			itemClick(item) {
+			openpay(item) {//立即预约
+				item.packagePrice=this.detailData[0].packagePrice;
+				item.massageImg=this.detailData[0].massageImg;
+				item.serviceCount=this.detailData[0].serviceCount;
+				this.$queue.setData('mainData',item)
+				this.$queue.setData('detailData',this.detailData)
+				this.$queue.setData('xiangmu',item)
+				this.$queue.setData('youhui','');
 				uni.navigateTo({
-					url:'/pages/my/cikarDrtail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+'my'
+					url:'/my/order/payModifyLiao?ordersId='+item.id
 				})
-			}
+				// this.goOrder()
+				// this.showpay = true
+			},
+			getTimeInMilliseconds(timeString) {
+			  return new Date(timeString).getTime();
+			},
+			// 将毫秒转换为时分秒
+			toHMS(milliseconds) {
+			  let day = Math.floor(milliseconds / (24 * 3600 * 1000));
+			  var hours = Math.floor(milliseconds / 3600000);
+			  var minutes = Math.floor((milliseconds % 3600000) / 60000);
+			  var seconds = ((milliseconds % 3600000) % 60000) / 1000;
+			  this.day=day;
+			  this.hours=hours;
+			  this.minutes=minutes;
+			  this.seconds=seconds;
+			  console.log("asdsadasdasdasd",this.day,this.hours,this.minutes,this.seconds)
+			},
+			getData(){
+				var that=this;
+				if(that.dataList.name=='index'){
+					let data = {
+							  id: that.dataList.id,
+							  page: that.page,
+							  limit:  that.limit,
+							}
+					that.$Request.get('/app/massage/package/getAppGroupDetail', data).then(res => {
+						if (res.code == 0) {
+							that.mainData=res.groupData;
+							that.ordersData=res.ordersData;
+							that.backgroundImageUrl=res.groupData.packageImg
+							that.contentImg=res.groupData.contentImg.split(",");
+							that.labels=res.groupData.labels.split(',');
+							let afterTimeStamp = new Date(res.groupData.endTime).getTime() / 1000;
+							let currentTimeStamp = new Date().getTime() / 1000;
+							let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
+							this.endOfServiceTimer = formatTimeStamp;
+							// console.log("eeee",this.endOfServiceTimer);
+							// var starTime=that.getTimeInMilliseconds(res.groupData.startTime);
+							// var endTime=that.getTimeInMilliseconds(res.groupData.endTime);
+							// var serTime=endTime-starTime;
+							// that.countdown = serTime; // 转换为时分秒
+							// that.toHMS(serTime); // 转换为时分秒
+						}
+					})
+				}else{
+					let data = {
+							  mainId: that.dataList.id,
+							  page: that.page,
+							  limit:  that.limit,
+							}
+					that.$Request.get('/app/user/package/detail/findMyPackageDetailList', data).then(res => {
+						if (res.code == 0) {
+							that.mainData=res.data.mainData;
+							that.detailData=res.data.detailData;
+							that.contentImg=that.mainData.contentImg.split(",");
+							that.mainId=that.mainData.id
+							that.liaoTime=res.data.detailData[0].intervalDaysStr;
+							that.backgroundImageUrl=that.mainData.packageImg;
+							that.labels=that.mainData.labels.split(',')
+						}
+					})
+				}
+			},
 		}
 	}
 </script>
-
 <style scoped>
-	.shop_label{
+	.avatar{
 		display: flex;
-		flex-wrap: wrap;
-		margin: 10rpx 0;
+		flex-direction: row;
 		align-items: center;
+		margin-top: 5px;
 	}
-	.shop_label span{
-		background: #e5e5e5;
-		border-radius: 8rpx;
-		padding: 8rpx 10rpx;
-		font-size: 20rpx;
-		margin-right: 8rpx;
-		display: flex;
-		align-items: center; 
+	.avatar span{
+		margin-left: 10px;
 	}
-	.shop-arrow{
-		display: inline-block;
-		    border-top: 1px solid;
-		    border-right: 1px solid;
-		    width: 7px;
-		    height: 7px;
-		    border-color: #999;
-		    -webkit-transform: rotate(45deg);
-		    transform: rotate(45deg);
-		    margin-top: 7px;
-	}
-	.pace-plan{
+	.lab-view{
+		width:100%;
 		display: flex;
 		flex-direction: row;
-		margin-left: 10rpx;
+		align-items: center;
+		flex-wrap: wrap;
 	}
-	.pace-text{
-		font-size: 24rpx;
-	}
-	.pace-text span:nth-child(1){
-		color: #666;
-	}
-	.pace-text span:nth-child(2){
-		color: #666;
-		}
-	
-	.pace{
-		width: 60%;
-		height: 30rpx;
-		border-radius: 30rpx;
-		background: #f5f5f5;
-		font-size: 20rpx;
-		line-height: 30rpx;
-	}
-	.seckill-entry{
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		margin-top: 10rpx;
-	}
-	.seckill-money{
-		width: 74%;
-		background: #fff8f0;
-		border-radius: 10rpx 0 0 10rpx;	
-		padding: 14rpx 20rpx;
-	}
-	.seckill-money span:nth-child(1){
-		color: #666;
-		font-size: 24rpx;
-		text-decoration: line-through;
-	}
-	.seckill-money span:nth-child(2){
-		color: #fc2d32;
-		font-weight: bold;
-		font-size: 24rpx;
-	}
-	.seckill-money span:nth-child(3){
-		color: #fc2d32;
-		font-size: 30rpx;
-	}
-	.seckill-rob{
-		width: 30%;
-		height: 60rpx;
-		background: linear-gradient(90deg, #fb2d30, #fc2e37);
+	.detail-foot-mian-txet{
+		width: 50%;
+		margin-top: 20px;
 		text-align: center;
-		line-height: 60rpx;
-		border-radius:  0 10rpx  10rpx 0;
 	}
-	.seckill-img{
-		width: 70rpx;
-		height: 70rpx;
-		position: absolute;
-		top:-18rpx;
-		left:-22rpx;
+	/deep/uni-checkbox .uni-checkbox-input{
+		width: 26px;
+		height: 26px;
+		border-radius: 50%;
 	}
-	.seckill-text{
-		color: #fff;
-		font-size:26rpx;
+	.youhui-img{
+		width: 111.81rpx;
+		height: 111.81rpx;
 	}
-	.item-view-bottom-qian{
-	}
-	.item-view-bottom-btn{
+	.youhui-view-right-btn{
+		width: 158rpx;
+		height: 64rpx;
+		background: linear-gradient(-90deg, #019C88, #2DC48E);
+		border-radius: 32rpx;
 		text-align: center;
-		width: 131rpx;
-		height: 55rpx;
-		line-height: 55rpx;
-		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
-		border-radius: 10rpx;
-		font-weight: bold;
+		line-height: 64rpx;
+		font-weight: 400;
 		font-size: 28rpx;
 		color: #FFFFFF;
+		text-shadow: 0rpx 2rpx 4rpx rgba(0,119,104,0.44);
+		margin-left: 10px;
 	}
-	.item-view-bottom-qian span:nth-child(5){
-		 font-size: 28rpx;
-		 color: #848484;
-		 text-decoration-line: line-through;
-		}
-	.item-view-bottom-qian span:nth-child(4){
-		 font-size: 28rpx;
-		 color: #848484;
-		 text-decoration-line: line-through;
-		 margin-left: 5px;
+	.youhui-view-right-time{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #999999;
 	}
-	.item-view-bottom-qian span:nth-child(1){
-		 font-weight: 400;
-		 font-size: 25rpx;
-		 color: #F95900;
+	.youhui-view-right-title{
+		width: 105px;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #333333;
 	}
-	.item-view-bottom-qian span:nth-child(2){
-		 font-weight: bold;
-		 font-size: 36.81rpx;
-		  color: #F95900;
-	}
-	.item-view-bottom-qian span:nth-child(3){
-		 font-weight: 400;
-		 font-size: 25rpx;
-		 color: #F95900;
-	}
-	.item-view-bottom{
-		width: 100%;
+	.youhui-view-right-top{
 		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
+		flex-direction: column;
 		align-items: center;
 	}
-	.item-view-jianjie{
+	.youhui-view-right{
+		width: 502.08rpx;
+		height: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-around;
+	}
+	.youhui-view-left-bottom{
 		font-weight: 400;
-		font-size: 24rpx;
-		color: #999;
-		margin:5px 0px;
+		font-size: 22rpx;
+		color: #FFFFFF;
+	}
+	.youhui-view-left-yuan{
+		display: flex;
+		flex-direction: row;
+		align-items: baseline;
+		color: #FFFFFF;
+	}
+	.youhui-view-left-num{
+		font-weight: bold;
+		font-size: 89rpx;
+	}
+	.youhui-view-left-text{
+		font-weight: bold;
+		font-size:24.31rpx;
+	}
+	.youhui-view-left{
+		width: 199rpx;
+		height: 242rpx;
+		display: flex;
+		flex-direction:column;
+		align-items: center;
+		justify-content: center;
+	}
+	.youhui-yiyong{
+		background-image: url('../../static/youhuijuan/coupons7.png');
+	}
+	.youhui-weiyong{
+		background-image: url('../../static/youhuijuan/coupons1.png');
+	}
+	.youhui-list{
+		width: 95%;
+		display: flex;
+		flex-direction: row;
+		height: 242rpx;
+		border-radius: 21rpx;
+		background-size: 100%;
+		margin: 20px auto;
+		justify-content: space-between;
+	}
+	.popup_pay {
+		width: 100%;
+		position: relative;
+		padding-bottom: 45rpx;
+		/* height: 400px; */
+		/* height: 160px; */
+		/* #ifndef MP-WEIXIN */
+		/* height: 130px; */
+		/* #endif */
+	
+	}
+	.pay_btn {
+		width: 90%;
+		margin: 0 auto;
+		text-align: center;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		height: 80rpx;
+		border-radius: 60rpx;
+		color: #ffffff;
+		line-height: 80rpx;
+	}
+	
+	.dingdan-btn{
+		text-align: center;
+		width: 80px;
+		height: 30px;
+		line-height: 30px;
+		border-radius: 4px;
+		font-weight: bold;
+		font-size: 11px;
+		border-radius: 30rpx;
+	}
+	.dingdan-btn-l{
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		color: #FFFFFF;
+	}
+	.dingdan-btn-h{
+		background: #666;
+		color: #FFFFFF;
+	}
+	.tese span:nth-child(1){
+		font-weight: bold;
+		font-size: 22rpx;
+		color: #333333;
+	}
+	.tese span:nth-child(2){
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #8D9194;
+	}
+	.tese{
+		width: 100%;
 		display: -webkit-box;
 		-webkit-box-orient: vertical;
 		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
 		overflow: hidden;
 		text-overflow: ellipsis;
 	}
-	.item-view-biao{
-		padding: 1px 5px;
-		border-radius: 15rpx 3rpx 15rpx 3rpx;
-		}
-	.tuina{
-		background-color:#d1f2df;
-		color: #17984d;
+	.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));
 	}
-	.xiaoer{
-		background-color:#f1f8d7;
-		color: #58b314;
-	}
-	.taishi{
-		background-color:#e5d5c6;
-		color: #805d39;
-	}
-	.kangfu{
-		background-color:#fcf3da;
-		color: #ff8600;
-	}
-	.item-view-xiangmu span:nth-child(2){
-		font-weight: normal;
-		color: #666666;
-	}
-	.item-view-xiangmu span:nth-child(1){
-		font-weight: normal;
-		color: #999;
-		margin-right: 5rpx;
-	}
-	.item-view-xiangmu{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		font-weight: 400;
-		font-size: 25rpx;
-		align-items: flex-end;
-	}
-	.item-view-title{
+	.detail-foot-nav-text{
 		font-weight: bold;
 		font-size: 32rpx;
-		color: #333333;
-		overflow: hidden;
+		color: #000000;
 	}
-	.item-view{
-		width: 66%;
-		height: 100%;
+	.detail-foot-nav{
+		width: 90%;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+	}
+	.detail-foot-title{
+		    width: 115px;
+		    height: 32px;
+			background-image: url(../../static/servicePackage/horn.png);
+		    background-repeat: no-repeat;
+		    background-size: 100% 100%;
+		    font-weight: 400;
+		    font-size: 12px;
+		    color: #FFFFFF;
+		    text-align: right;
+		    line-height: 32px;
+		    padding-right: 15px;
+			position: absolute;
+			    right: 0;
+			    top: 0;
+	}
+	.detail-foot-list-top{
+		width: 95%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin-bottom: 25px;
+	}
+	.detail-foot-list{
+		width: 95%;
+		border-radius: 21rpx;
+		position: relative;
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+	}
+	.detail-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.detail-foot-list-top span:nth-child(1){
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #3F3F3F;
+	}
+	.detail-foot-list-top span:nth-child(2){
+		width: 76rpx;
+		height: 33rpx;
+		line-height: 33rpx;
+		text-align: center;
+		border-radius: 16rpx;
+		border: 1px solid #7D7D7D;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #777777;
+	}
+	.detail-foot-list-top span:nth-child(3){
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #777777;
+	}
+	
+	.detail-foot-mian{
+		width: 100%;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
-	}
-	.item-img{
-		width: 200rpx;
-		height: 200rpx;
-		border-radius: 14rpx;
-		position: relative;
-	}
-	.img-span{
-		padding: 2px 5px;
-		font-weight: 400;
-		font-size: 8px;
-		color: #FFFFFF;
-		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
-		border-radius: 7px 0px 7px 0px;
-		position: absolute;
-		bottom: 0px;
-		right: 0;
-		margin-bottom: 5px;
-		margin-right: 5px;
-	}
-	.item-img image{
-		width: 100%;
-		height: 100%;
-		border-radius: 14rpx;
-	}
-	.item {
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		height: 140px;
-		background: #FFFFFF;
-		border-radius: 21rpx;
-		margin-top:10px;
 		align-items: center;
-		padding: 0px 10px;
 	}
 	
-	.item-detail {
-		padding: 5rpx 15rpx;
-		border-radius: 10rpx;
-		font-size: 28rpx;
-		color: white;
-		background-color: #007AFF;
-	}
-	
-	.item-line {
-		position: absolute;
-		bottom: 0rpx;
-		left: 0rpx;
-		height: 1px;
-		width: 100%;
-		background-color: #eeeeee;
-	}
-	/deep/.zp-paging-container{
-		background-color: #f7f7f7;
-		width:100%;
-	}
-	/deep/.zp-paging-container-content{
-		width: 95%;
-		margin: 50px auto 0px auto;
-	}
-	.fenlei{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-	}
-	.index-fenl-title{
-		width: 81rpx;
+	.header-bottom-title-liao{
+		padding: 3px 8px;
+		height: 16px;
+		line-height: 16px;
 		text-align: center;
+		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
+		border-radius: 7px;
+		margin-left: 5px;
+		font-size: 10px;
+		border-top-left-radius: 20px;
+		border-bottom-right-radius: 20px;
+		color: #fff;
+	}
+	.hBtn{
+		background: #ccc;
+	}
+	.aBtn{
+		background: linear-gradient(to right, rgb(255, 117, 98), rgb(233, 71, 52));
+	}
+	.detail-btn{
+		width: 94%;
+		height: 40px;
+		line-height: 40px;
+		border-radius: 23px;
+		margin: 0 auto;
+		text-align: center;
+		font-weight: 400;
+		font-size: 18px;
+		color: #FFFFFF;
+		position: fixed;
+		bottom: 0px;
+		margin-bottom: 10px;
+		margin-left:3%;
+	}
+	.detail-btn span:nth-child(2){
+		margin-left: 5px;
+	}
+	.detail-foot-mian-txet span:nth-child(1){
+		color: #777777;
+		font-size: 12px;
+		font-weight: bold;
+		margin-bottom: 5px;
+	}
+	.detail-foot-mian-txet span:nth-child(2){
+		color: #333;
+		font-size: 15px;
+		font-weight: bold;
+		margin-bottom:3px;
+	}
+	.detail-foot-mian-txetList{
+		color: #777777;
+		font-size: 14px;
+		font-weight: bold;
+	}
+	
+	.detail-foot-mian-img{
+		width: 100%;
+		height:auto;
+	}
+	.detail-foot-mian-top-bottom{
+		margin-top: 10px;
+	}
+	.detail-foot-mian-top-title{
+		color: #333333;
+	}
+	.detail-foot-mian-top-text{
+		color: #777777;
+		width:80%;
+		margin-left: 5px;
+	}
+	.detail-foot-mian-top,.detail-foot-mian-top-bottom{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		font-size: 26rpx;
+	}
+	.header-bottom-title-bottom span{
+		font-weight: bold;
+		font-size: 24rpx;
+		color: #ff6f48;
+	}
+	.header-bottom-title-bottom image{
+		width: 34.03rpx;
+		height: 30.56rpx;
+		margin-right: 3px;
+	}
+	.header-bottom-title-bottom{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin: 5px 0px;
+		background: linear-gradient(90deg, #feefec, #fef5ec);
+		padding: 8rpx 20rpx;
+		border-radius: 10rpx;
+		border: 1px #efdfda solid ;
+		margin-top: 30rpx;
+	}
+	.shouc image{
+		width: 34.03rpx;
+		height: 32.64rpx;
+	}
+	
+	.shouc{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.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-text{
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #000000;
+	}
+	.detail-foot-nav{
+		width: 90%;
+		display: flex;
+		flex-direction: column;
 		position: relative;
+		margin: 30rpx 0;
+	}
+	.detail-foot{
+		width: 100%;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
+	}
+	
+	.tese span:nth-child(1){
 		font-weight: bold;
-		font-size: 34rpx;
-		color:#019C88;
+		font-size: 22rpx;
+		color: #333333;
 	}
-	.index-fenl-title-bottom{
-		position: absolute;
-		bottom: 0;
-		margin-bottom: 0px;
-		width: 81rpx;
-		height: 14rpx;
-		border-radius: 7rpx;
-		background: linear-gradient(-48deg,rgba(1, 156, 136, 0.35),rgba(45, 196, 142, 0.35));
+	.tese span:nth-child(2){
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #8D9194;
 	}
-	/deep/.uni-searchbar__cancel{
-		display: none;
+	.tese{
+		width: 100%;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
 	}
-	.search-btn{
+	.detail-foot-list-top span:nth-child(1){
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #3F3F3F;
+	}
+	.detail-foot-list-top span:nth-child(2){
+		width: 76rpx;
+		height: 33rpx;
+		line-height: 33rpx;
 		text-align: center;
-		line-height: 31px;
-		color: #fff;
-		position: absolute;
-		right: 0;
-		top: 0;
-		margin-top:9.4px;
-		margin-right: 11px;
-		height: 32px !important;
+		border-radius: 16rpx;
+		border: 1px solid #7D7D7D;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #777777;
+		margin: 0px 25px 0px 5px;
 	}
-	/deep/.uni-searchbar__box-icon-search,.search-btn{
-		width: 150rpx;
-		height: 60rpx;
-		background: #18A689;
-		border-radius: 31rpx;
-		
+	.detail-foot-list-top span:nth-child(3){
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #777777;
 	}
-	/deep/.uni-searchbar__box{
-		height: 31px;
-		border-radius: 15px !important;
-		background-color: #fff !important;
-		border: 1px solid #E5E5E5;
-		padding: 0px;
+	
+	.detail-foot-mian{
+		width: 95%;
 		display: flex;
-		flex-direction: row;
-		flex-flow: row-reverse;
-		position: relative;
+		flex-direction: column;
+		margin: 0 auto;
+		background-color: #fff;
+		border-radius: 21rpx;
+		padding: 15px;
 	}
-	/deep/.uni-searchbar{
-		width: 240px;
-		border-radius: 31rpx;
+	.jianjie{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #8D9194;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
 	}
-	.service-head-top-left image{
-		width: 25px;
-		height: 30rpx;
-		margin-right: 10px;
+	.header-bottom-mian{
+		margin: 10px 0px;
 	}
-	.service-head-top-left span{
-		font-weight: bold;
-		font-size: 34rpx;
-		color: #171717;
-	}
-	.service-head-top-left{
+	.header-bottom-mian-title{
+		width: 100%;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
-		justify-content: space-between;
+		margin-bottom: 6px;
 	}
-	.service-head-top{
+	.header-bottom-mian-title span{
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #20AB95;
+		margin-left: 5px;
+	}
+	.header-bottom-mian-title image{
+		width: 30.56rpx;
+		height: 29.86rpx;
+	}
+	.header-bottom-foot-view-img1{
+		width: 30rpx;
+		height: 30rpx;
+	}
+	.header-bottom-foot-view-img2{
+		width: 23rpx;
+		height: 23rpx;
+	}
+	.header-bottom-foot-view-img3{
+		width: 26rpx;
+		height: 26rpx;
+	}
+	.header-bottom-foot-view image{
+		margin-right: 1px;
+	}
+	.header-bottom-foot-view{
+		width: 35%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 2px 5px;
+		height: 22px;
+		line-height: 22px;
+		background-color: rgba(230, 246, 243, 1);
+		border-radius: 15px;
+		font-weight: 400;
+		font-size: 10px;
+		color: #029c88;
+	}
+	.header-bottom-foot-title{
+		height: 22px;
+		line-height: 22px;
+		text-align: left;
+		font-weight: 600;
+		font-size: 30rpx;
+		color: #029d88;
+	}
+	.header-bottom-foot-cont{
 		width: 100%;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
-		background-color: #fff;
-		position: fixed;
-		z-index: 999;
+		margin-top: 6rpx;
 	}
-	.view-cata{
+	.header-bottom-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.header-bottom-money-jia{
+		font-size: 28rpx;
+		color: #848484;
+		margin-left: 5px;
+		text-decoration: line-through;
+	}
+	.header-bottom-money-zhen span{
+		color: #F95900;
+	}
+	.header-bottom-money-zhen span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.header-bottom-money-zhen span:nth-child(2){
+		font-size:46rpx;
+		font-weight: bold;
+	}
+	.header-bottom-money-zhen span:nth-child(3){
+		font-size: 25rpx;
+	}
+	.header-bottom-money-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: baseline;
+	}
+	
+	.header-bottom-money-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		margin-top:5px;
+	}
+	.header-bottom-money{
+		padding: 5px 0;
+		width: 100%;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
+		justify-content: space-between;
+		margin-top: 5rpx;
 	}
-</style>
+	.header-bottom-money1{
+		padding: 5px 0;
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin-top: 5rpx;
+		align-items: baseline;
+	}
+	.header-bottom-title-num span{
+		font-size: 30rpx;
+	}
+	.header-bottom-title-num span:nth-child(1){
+		color: #848485;
+	}
+	.header-bottom-title-num span:nth-child(2){
+		font-weight: bold;
+		color: #08A28A;
+	}
+	.header-bottom-title-num span:nth-child(3){
+		color: #848485;
+	}
+	.header-bottom-title-text{
+		font-weight: bold;
+		font-size: 35rpx;
+		color: #13141A;
+	}
+	.header-bottom-title{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.header-bottom-top{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.header-bottom{
+		width: 100%;
+		background-color: #fff;
+		padding: 15px;
+		display: flex;
+		flex-direction: column;
+	}
+	.header-top image{
+		width: 706.25rpx;
+		height: 105.07rpx;
+	}
+	.header-top{
+		width: 100%;
+		height: 745.83rpx;
+		background-image: url('../../static/servicePackage/display.png');
+		background-size: 100%;
+		background-repeat: no-repeat;
+		display: flex;
+		align-items: flex-end;
+		justify-content: center;
+	}
+	.header{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.content{
+		width: 100%;
+		height: auto;
+		background-color: #f7f7f7;
+	}
+	.btn {
+	background: linear-gradient(to right, rgb(1, 156, 136), rgb(49, 193, 148));
+	color: rgb(255, 255, 255);
+	margin: 8px 16px;
+	position: fixed;
+	bottom: 0px;
+	width: 90%;
+	border-radius: 27px;
+	height: 43px;
+	line-height: 43px;
+	font-size: 17px;
+	text-align: center;
+	}
+	.group-buy{
+	display: flex;
+	background: #fef0ed;
+	justify-content: space-between;
+	}
+	.group-buy-left{
+	width:65%;
+	padding: 30rpx 30rpx;
+	background: linear-gradient(to right, rgb(255, 117, 98), rgb(233, 71, 52));
+	display: flex;
+	justify-content: space-between;
+	}
+	.group_amount{
+	color: #fff;
+	}
+	.group_amount span:nth-child(2){
+	font-size: 50rpx;
+	font-weight: bold;
+	}
+	.group-rule{
+	display: flex;
+	flex-direction:column;
+	align-items: center;
+	}
+	.group-rule span:nth-child(1){
+	color: #fff;
+	font-size:22rpx;
+	text-decoration: line-through;
+	}
+	.group-rule span:nth-child(2){
+	text-align: center;
+	padding: 2rpx 15rpx;
+	background:#fff;
+	color: #ed4b3e;
+	font-size: 24rpx;
+	border-radius: 3rpx;
+	}
+	.group-buy-right{
+	width: 34%;
+	display: flex;
+	flex-direction:column;
+	align-items: center;
+	padding: 20rpx 0;
+	}
+	.group-text{
+	 color:#ec4439;
+	 margin-bottom: 10rpx;
+	}
+	.group-buy-right span:nth-child(1){
+	background: #000;
+	border-radius: 30rpx;
+	padding: 8rpx;
+	color: #fff;
+	}
+	.group-buy-right span:nth-child(2){
+	background: #000;
+	border-radius: 30rpx;
+	padding: 8rpx;
+	color: #fff;
+	}
+	.group-buy-right span:nth-child(3){
+	background: #000;
+	border-radius: 30rpx;
+	padding: 8rpx;
+	color: #fff;
+	}
+	.teamwork-plate{
+	background: #fff;
+	margin: 20rpx 0;
+	align-items: center;
+	padding:15rpx  26rpx;
+	}
+	.teamwork-line{
+	display: flex;
+	padding: 15rpx 0;
+	justify-content: space-between;
+	}
+	.teamwork-button{
+	padding: 2rpx 15rpx;
+	/* background:#ed4b3e ; */
+	color:#fff;
+	height: 50rpx;
+	line-height: 50rpx;
+	margin-top: 15rpx;
+	border-radius: 6rpx;
+	margin-left: 15rpx;
+	}
+	.team-text{
+	color: #ed4b3e;
+	}
+	.teamwork-se{
+	font-size: 24rpx;
+	text-align: center;
+	margin-top: 6rpx;
+	}
+	.tewmwork-prompt{
+		font-size: 24rpx;
+		color: #ed4b3e;
+		margin-top: 12rpx;
+	}
+	.tewmork-key{
+	display: flex;
+	text-align: center;
+	}
+	.tewmork-key span{
+		height: 30rpx;
+		line-height: 30rpx;
+		padding: 0 8rpx;
+		font-size: 20rpx;
+		border: 1px #ed4b3e solid ;
+		color: #ed4b3e;
+		border-radius: 6rpx;
+		margin-right: 6rpx;
+		margin-top: 6rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/my/newseckill.vue b/pages/my/newseckill.vue
index 19b63ed..6df0eaf 100644
--- a/pages/my/newseckill.vue
+++ b/pages/my/newseckill.vue
@@ -45,7 +45,7 @@
 				<!-- <view class="item-line"></view> -->
 				<view class="item-img">
 					<image :src="item.packageImg" mode=""></image>
-					<span class="img-span" v-if="text=='my'">{{item.status=='1'?'未用完':item.status=='2'?'退款':'已用完'}}</span>
+					<span class="img-span" v-if="text=='my'">{{item.status=='1'?'未用完':item.status=='2'?'退款':item.status=='9'?'已用完':'其他'}}</span>
 				</view>
 				<view class="item-view">
 					<view class="view-cata">
@@ -55,9 +55,8 @@
 					<view class="item-view-bottom-qian">
 						<span>￥</span>
 						<span>{{item.price}}</span>
-						<span>/{{item.serviceCount}}次</span>
-						<span>￥</span>
-						<span>{{item.oldPrice}}/{{item.serviceCount}}次</span>
+						<!-- <span>/{{item.serviceCount}}次</span> -->
+						<span>￥{{item.oldPrice}}</span>
 					</view>
 					<view class="shop_label" v-if="tagsData">
 						<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
@@ -295,7 +294,7 @@
 		 color: #848484;
 		 text-decoration-line: line-through;
 		}
-	.item-view-bottom-qian span:nth-child(4){
+	.item-view-bottom-qian span:nth-child(3){
 		 font-size: 28rpx;
 		 color: #848484;
 		 text-decoration-line: line-through;
@@ -311,11 +310,7 @@
 		 font-size: 36.81rpx;
 		  color: #F95900;
 	}
-	.item-view-bottom-qian span:nth-child(3){
-		 font-weight: 400;
-		 font-size: 25rpx;
-		 color: #F95900;
-	}
+	
 	.item-view-bottom{
 		width: 100%;
 		display: flex;
diff --git a/pages/my/newseckilldetails.vue b/pages/my/newseckilldetails.vue
index 1ddbaa8..1149eb6 100644
--- a/pages/my/newseckilldetails.vue
+++ b/pages/my/newseckilldetails.vue
@@ -71,7 +71,7 @@
 		</view>
 		<view class="push-button">
 			<view class="detail-btn" :class="[mainData.btnShow==true?'aBavk':'hBack']" @click="goumai(mainData)">
-				{{text=='index'?'立即购买':'立即预约'}}
+				{{dataList.name=='index'?'立即购买':'立即预约'}}
 			</view>
 		</view>
 		<!-- 支付方式 -->
@@ -178,9 +178,18 @@
 			goumai(item){//立即购买
 				this.$queue.setData('mainData',item)
 				this.$queue.setData('youhui','');
-				uni.navigateTo({
-					url:'/my/order/payModifyMs?ordersId='+item.id
-				})
+				
+				if(item.btnShow=='false'){
+					uni.showToast({
+						icon:'error',
+						title:'已过秒杀时间，无法下单！'
+					})
+				}else{
+					uni.navigateTo({
+						url:'/my/order/payModifyMs?ordersId='+item.id
+					})
+					
+				}
 			},
 			goNav(e) {
 				uni.navigateTo({
diff --git a/pages/my/pTuanOderDrtail.vue b/pages/my/pTuanOderDrtail.vue
new file mode 100644
index 0000000..d7f28f2
--- /dev/null
+++ b/pages/my/pTuanOderDrtail.vue
@@ -0,0 +1,606 @@
+<template>
+	<view class="content">
+		<view class="header">
+			<view class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
+				<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-if="!isVIP"></image>
+				<image src="../../static/activate2.png" mode="widthFix" v-if="isVIP"></image>
+			</view>
+			<view class="header-bottom-top-list">
+				<view class="header-bottom-foot-view2">
+					<image class="header-bottom-foot-view2-img1" src="../../static/servicePackage/idCard.png" mode=""></image>
+					<span>实名认证</span>
+				</view>
+				<view class="header-bottom-foot-view2" style="margin: 0px 7px;">
+					<image class="header-bottom-foot-view2-img2" src="../../static/servicePackage/money.png" mode=""></image>
+					<span>资质认证</span>
+				</view>
+				<view class="header-bottom-foot-view2">
+					<image class="header-bottom-foot-view2-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
+					<span>平台担保</span>
+				</view>
+			</view>
+			<view class="header-bottom">
+				<view class="header-bottom-top">
+					
+					<view class="header-bottom-title">
+						<view class="header-bottom-title-text">
+							<span>{{getList.title}}</span>
+							<!-- <span class="header-bottom-title-liao">
+								套餐
+							</span> -->
+						</view>
+						<view class="header-bottom-title-num">
+							<span>{{getList.sales}}</span>
+							<span> 人选择</span>
+						</view>
+						
+					</view>
+					<view class="header-bottom-money-view">
+						<view class="header-bottom-money">
+							<view class="header-bottom-money-zhen">
+								<span>￥</span>
+								<span>{{getList.packagePrice}}</span>
+							</view>
+							<view class="header-bottom-money-jia">
+								￥{{getList.oldPrice}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="header-bottom-foot">
+					<view class="header-bottom-foot-cont">
+						<!-- <view class="header-fubz">保障</view> -->
+						<view class="header-bottom-foot-view">
+							<image class="header-bottom-foot-view-img1" src="../../static/servicePackage/idCard.png" mode=""></image>
+							<span>未服务全额退款</span>
+						</view>
+						<view class="header-bottom-foot-view" style="margin: 0px 7px;width: 26%;">
+							<image class="header-bottom-foot-view-img2" src="../../static/servicePackage/money.png" mode=""></image>
+							<span>不满意重做</span>
+						</view>
+						<view class="header-bottom-foot-view">
+							<image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
+							<span>最快30分钟上门</span>
+						</view>
+					</view>	
+				</view>
+				<!--<view class="header-bottom-foot">
+					<view class="header-bottom-foot-title">服务保障</view>
+					<view class="header-bottom-foot-cont">
+						<view class="header-bottom-foot-view">
+							<image class="header-bottom-foot-view-img1" src="../../static/servicePackage/idCard.png" mode=""></image>
+							<span>未服务全额退款</span>
+						</view>
+						<view class="header-bottom-foot-view" style="margin: 0px 7px;">
+							<image class="header-bottom-foot-view-img2" src="../../static/servicePackage/money.png" mode=""></image>
+							<span>不满意重做</span>
+						</view>
+						<view class="header-bottom-foot-view">
+							<image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
+							<span>最快30分钟上门</span>
+						</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-bor"></span>
+			</view>
+			<view class="detail-foot-mian">
+				<view class="detail-foot-mian-top">
+					<span class="detail-foot-mian-top-title">性别限制: </span>
+					<span class="detail-foot-mian-top-text">不限性别</span>
+				</view>	
+				<view class="detail-foot-mian-top-bottom">
+					<span class="detail-foot-mian-top-title">适应人群: </span>
+					<span class="detail-foot-mian-top-text">
+						{{getList.applyPeople}}
+					</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-bor"></span>
+			</view>
+			<view class="detail-foot-mian">
+				<image class="detail-foot-mian-img" v-for="(item,index) in contentImg" :key="index" :src="item" mode="widthFix"></image>	
+			</view>
+		</view>
+		<view class="detail-btn" v-if="dataList.status=='0'" @click="goumai(getList)">
+			立即预约
+		</view>
+	</view>
+</template>
+<script>
+	export default{
+		data(){
+			return{
+				dataList:[],
+				getList:[],
+				isVIP:false,
+				// 背景图片的URL可以是动态的，比如从API获取或根据条件生成
+				backgroundImageUrl: '',
+				nameText:'',
+				labels:[],
+				contentImg:[],
+			}
+		},
+		computed: {
+		    backgroundStyle() {
+		      return {
+		        backgroundImage: `url(${this.backgroundImageUrl})`,
+		        backgroundSize: 'cover', // 根据需要调整
+		      };
+		    }
+		  },
+		onLoad(e) {
+			var that=this;
+			that.dataList=e;
+			that.isVIP=this.$queue.getData('isVIP');
+			that.getData();
+		},
+		methods:{
+			goNav(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
+			goumai(item){//立即购买
+					this.$queue.setData('getJishi','')
+					this.$queue.setData('daibudan','');
+					this.$queue.setData('mainData',item);
+					this.$queue.setData('xiangmu',item);
+					this.$queue.setData('getJishi','');
+					this.$queue.setData('youhui','');
+					uni.navigateTo({
+						url:'/my/order/payModifyTcMy?ordersId='+item.id
+					})
+			},
+			getData(){
+				var that=this;
+				let data = {
+						  id: that.dataList.id,
+						  page: that.page,
+						  limit:  that.limit,
+						}
+				that.$Request.get('/app/user/package/detail/getMyPackageDetail', data).then(res => {
+					if (res.code == 0) {
+						that.getList=res.data;
+						that.backgroundImageUrl=that.getList.massageImg
+						// that.labels=res.data.labels.split(',');
+						that.contentImg=res.data.contentImg.split(",");
+					}
+				})
+			},
+		}
+	}
+</script>
+<style scoped>
+	.lab-view{
+		width:100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		flex-wrap: wrap;
+	}
+	.detail-foot-mian-txet{
+		width: 50%;
+		margin-top: 20px;
+		text-align: center;
+	}
+	.header-fubz{
+		font-size: 26rpx;
+		color: #029c88;
+		font-weight: bold;
+	}
+	.header-bottom-title-liao{
+		display: inline-block;
+		padding: 2px 7px;
+		height: 16px;
+		line-height: 16px;
+		text-align: center;
+		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
+		border-radius: 7px;
+		margin-left: 5px;		
+		font-size: 10px;
+		border-top-left-radius: 20px;
+		border-bottom-right-radius: 20px;
+		color: #fff;
+		}
+	.detail-btn{
+		width:95%;
+		height: 80rpx;
+		line-height: 80rpx;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		border-radius: 46rpx;
+		margin: 0 auto;
+		text-align: center;
+		font-weight: 400;
+		font-size: 36rpx;
+		color: #FFFFFF;
+		position: fixed;
+		bottom: 0px;
+		margin-bottom: 10px;
+	}
+	.detail-foot-mian-txet span:nth-child(1){
+		color: #777777;
+		font-size: 12px;
+		font-weight: bold;
+		margin-bottom: 5px;
+	}
+	.detail-foot-mian-txet span:nth-child(2){
+		color: #333;
+		font-size: 15px;
+		font-weight: bold;
+		margin-bottom:3px;
+	}
+	.detail-foot-mian-txet span:nth-child(3){
+		color: #777777;
+		font-size: 14px;
+		font-weight: bold;
+	}
+	.detail-foot-mian-txet{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin-top: 20px;
+	}
+	.detail-foot-mian-img{
+		width: 100%;
+		height:auto;
+	}
+	.detail-foot-mian-top-bottom{
+		margin-top: 10px;
+	}
+	.detail-foot-mian-top-title{
+		color: #333333;
+	}
+	.detail-foot-mian-top-text{
+		color: #777777;
+		width:80%;
+		margin-left: 5px;
+	}
+	.detail-foot-mian-top,.detail-foot-mian-top-bottom{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		font-size: 26rpx;
+	}
+	.header-bottom-title-bottom span{
+		font-weight: bold;
+		font-size: 22rpx;
+		color: #20AB95;
+	}
+	.header-bottom-title-bottom image{
+		width: 34.03rpx;
+		height: 30.56rpx;
+		margin-right: 3px;
+	}
+	.header-bottom-title-bottom{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin: 5px 0px;
+	}
+	.shouc image{
+		width: 34.03rpx;
+		height: 32.64rpx;
+	}
+	
+	.shouc{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.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-text{
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #000000;
+	}
+	.detail-foot-nav{
+		width: 90%;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+		margin-bottom: 15px;
+	}
+	.detail-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 5rpx 0rpx;
+		
+		}
+	
+	.tese span:nth-child(1){
+		font-weight: bold;
+		font-size: 22rpx;
+		color: #333333;
+	}
+	.tese span:nth-child(2){
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #8D9194;
+	}
+	.tese{
+		width: 100%;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.detail-foot-list-top span:nth-child(1){
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #3F3F3F;
+	}
+	.detail-foot-list-top span:nth-child(2){
+		width: 76rpx;
+		height: 33rpx;
+		line-height: 33rpx;
+		text-align: center;
+		border-radius: 16rpx;
+		border: 1px solid #7D7D7D;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #777777;
+		margin: 0px 25px 0px 5px;
+	}
+	.detail-foot-list-top span:nth-child(3){
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #777777;
+	}
+	
+	.detail-foot-mian{
+		width: 95%;
+		display: flex;
+		flex-direction: column;
+		margin: 0 auto;
+		background-color: #fff;
+		border-radius: 21rpx;
+		padding: 15px;
+		margin-bottom: 20rpx;
+	}
+	.jianjie{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #8D9194;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.header-bottom-mian{
+		margin: 10px 0px;
+	}
+	.header-bottom-mian-title{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin-bottom: 6px;
+	}
+	.header-bottom-mian-title span{
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #20AB95;
+		margin-left: 5px;
+	}
+	.header-bottom-mian-title image{
+		width: 30.56rpx;
+		height: 29.86rpx;
+	}
+	.header-bottom-foot-view-img1{
+		width: 30rpx;
+		height: 30rpx;
+	}
+	.header-bottom-foot-view-img2{
+		width: 23rpx;
+		height: 23rpx;
+	}
+	.header-bottom-foot-view-img3{
+		width: 26rpx;
+		height: 26rpx;
+	}
+	.header-bottom-foot-view image{
+		margin-right: 3px;
+	}
+	.header-bottom-foot-view{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 1px 8px;
+		height: 22px;
+		line-height: 22px;
+		background-color: rgba(230, 246, 243, 1);
+		border-radius: 15px;
+		font-weight: 400;
+		font-size: 10px;
+		color: #029c88;
+	}
+	.header-bottom-foot-view2-img1{
+		width: 35rpx;
+		height: 35rpx;
+	}
+	.header-bottom-foot-view2-img2{
+		width: 30rpx;
+		height: 30rpx;
+	}
+	.header-bottom-foot-view2-img3{
+		width: 32rpx;
+		height: 32rpx;
+	}
+	.header-bottom-foot-view2 image{
+		margin-right: 3px;
+	}
+	.header-bottom-foot-view2{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 2px 20px;
+		height: 24px;
+		line-height: 24px;
+		background-color: rgba(230, 246, 243, 1);
+		border-radius: 30px;
+		font-weight: 400;
+		font-size: 11px;
+		color: #019c88;
+		margin: 5rpx auto;
+	}
+	.header-bottom-foot-title{
+		width:100%;
+		height: 22px;
+		line-height: 22px;
+		text-align: left;
+		font-weight: 600;
+		font-size: 23rpx;
+		color: #08A28A;
+		margin-top: 5px;
+	}
+	.header-bottom-foot-cont{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.header-bottom-top-list{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		background-color: rgba(230, 246, 243, 0.6);
+	}
+	.header-bottom-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin-top: 26rpx;
+	}
+	.header-bottom-money-jia{
+		font-size: 28rpx;
+		color: #848484;
+		line-height: 37rpx;
+		text-decoration-line: line-through;
+		margin-left: 5px;
+	}
+	.header-bottom-money-zhen span{
+		color: #F95900;
+	}
+	.header-bottom-money-zhen span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.header-bottom-money-zhen span:nth-child(2){
+		font-size:45.81rpx;
+		font-weight: bold;
+	}
+	.header-bottom-money-zhen span:nth-child(3){
+		font-size: 25rpx;
+	}
+	.header-bottom-money-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: baseline;
+	}
+	
+	.header-bottom-money-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		margin-top:5px;
+	}
+	.header-bottom-money{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin-top: 15rpx;
+		}
+	.header-bottom-title-num span{
+		font-weight: bold;
+		font-size: 25rpx;
+	}
+	.header-bottom-title-num span:nth-child(1){
+		font-weight: bold;
+		color: #08A28A;
+	}
+	.header-bottom-title-num span:nth-child(2){
+		color: #848485;
+		margin-left: 5px;
+	}
+	.header-bottom-title-text{
+		font-weight: bold;
+		font-size: 35rpx;
+		color: #13141A;
+	}
+	.header-bottom-title{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.header-bottom-top{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.header-bottom{
+		width: 100%;
+		background-color: #fff;
+		padding: 15px;
+		display: flex;
+		flex-direction: column;
+		margin-bottom: 20rpx;
+	}
+	.header-top image{
+		width: 706.25rpx;
+		height: 105.07rpx;
+	}
+	.header-top{
+		width: 100%;
+		height: 745.83rpx;
+		background-image: url('../../static/servicePackage/display.png');
+		background-size: 100%;
+		background-repeat: no-repeat;
+		display: flex;
+		align-items: flex-end;
+		justify-content: center;
+	}
+	.header{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.content{
+		width: 100%;
+		height: 100vh;
+		position: relative;
+		background-color: #f7f7f7;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/my/pinTuanOderDrtail.vue b/pages/my/pinTuanOderDrtail.vue
new file mode 100644
index 0000000..f3d6568
--- /dev/null
+++ b/pages/my/pinTuanOderDrtail.vue
@@ -0,0 +1,690 @@
+<template>
+	<view class="content">
+		<view class="header">
+			<view class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
+				<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-if="!isVip"></image>
+				<image src="../../static/activate2.png" mode="widthFix" v-if="isVip"></image>
+			</view>
+			<view class="header-bottom">
+				<view class="header-bottom-top">
+					<view class="header-bottom-title">
+						<view class="header-bottom-title-text">
+							{{mainData.title}} 
+						</view>
+						<view class="header-bottom-title-num">
+							<span>{{mainData.sales}}</span>
+							<span> 人选择</span>
+						</view>
+					</view>
+					<view class="header-bottom-money-view">
+						<view class="header-bottom-money">
+							<view class="header-bottom-money-zhen">
+								<span>￥</span>
+								<span>{{mainData.price}}</span>
+								<span>/次</span>
+							</view>
+							<view class="header-bottom-money-jia">
+								￥{{mainData.oldPrice}}/次
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="header-bottom-mian">
+					<view class="header-bottom-mian-title">
+						<image src="../../static/servicePackage/jianjie.png" mode=""></image>
+						<span>套餐简介</span>
+					</view>
+					<view class="jianjie">
+						{{mainData.content}}
+					</view>
+				</view>
+				<view class="header-bottom-foot">
+					<view><image class="header-bottom-foot-title" src="../../static/dituzhaoren1.png" ></image></view>
+					<view class="header-bottom-foot-view">
+						<image class="header-bottom-foot-view-img1" src="../../static/servicePackage/idCard.png" mode=""></image>
+						<span>实名认证</span>
+					</view>
+					<view class="header-bottom-foot-view" style="margin: 0px 7px;">
+						<image class="header-bottom-foot-view-img2" src="../../static/servicePackage/money.png" mode=""></image>
+						<span>资质认证</span>
+					</view>
+					<view class="header-bottom-foot-view">
+						<image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
+						<span>平台担保</span>
+					</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-bor"></span>
+			</view>
+			<view class="detail-foot-mian">
+				<view class="detail-foot-list" v-for="(item,index) in detailData" :key="index" @click="detail(item)">
+					<view class="detail-foot-list-top">
+						<span style="margin-right: 5px;">{{item.title}}</span>
+					</view>
+					<view class="detail-view" style="position: relative;">
+						<image class="detail-view-img" :src="item.massageImg" mode=""></image>
+						<span v-if="serviData.name!='index'" class="img-span">{{item.status=='1'?'已使用':'未使用'}}</span>
+						<view class="detail-view-mina">
+							<view class="header-bottom-money" style="margin: 7px 0px;display: flex;justify-content: space-between; ">
+								<view style="display: flex; align-items: flex-end;">
+									<view class="header-bottom-money-zhen">
+										<span>￥</span>
+										<span>{{item.packagePrice}}</span>
+									</view>
+									<view class="header-bottom-money-jia" >
+										￥{{item.oldPrice}}
+									</view>
+								</view>
+								<view class="service-more" @click.stop="xiangqing(item)">{{item.status=='1'?'详情':'预约'}}</view>
+							</view>
+							<view style="color: #019c88; font-size: 26rpx;">服务时长:{{item.duration}}分钟</view>
+							<view class="tese">
+								<span>项目特色: </span>
+								<span>{{item.jianjie}}</span>
+							</view>
+						</view>
+					</view>
+					
+					<view class="detail-foot-title">
+						服务项目{{index+1}}
+					</view>
+				</view>
+				<view style="height: 70rpx;"></view>
+				
+			</view>
+		</view>
+		<view class="push-button">
+			<view class="detail-btn" v-if="serviData.name=='index'" @click="openpay(mainData)">
+				立即购买
+			</view>
+		</view>
+		<!-- 支付方式 -->
+		<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
+			<view class="popup_pay">
+				<view style="background-color: #fff;">
+					<view style="padding: 0 20upx;margin-top: 60rpx;margin-bottom: 20rpx;display: flex;flex-direction: column;justify-content: center;">
+						<view
+							style="width:92%;display: flex;height: 100upx;align-items: center;padding: 20upx 0;justify-content: center;"
+							v-for="(item,index) in openLists" :key='item.id'>
+							<image :src="item.image" style="width: 55upx;height: 55upx;border-radius: 50upx;">
+							</image>
+							<view style="font-size: 30upx;margin-left: 20upx;width: 70%;">
+								{{item.text}}
+							</view>
+							<radio-group name="openWay" style="margin-left: 45upx;" @tap='selectWay(item)'>
+								<label class="tui-radio">
+									<radio color="#096f4b" :checked="openWay === item.id ? true : false" />
+								</label>
+							</radio-group>
+						</view>
+					</view>
+				</view>
+				<view class="pay_btn" @click="pay()">确认支付</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+<script>
+	export default{
+		data(){
+			return{
+				checkbox:false,
+				couponData:[],
+				couponId:'',
+				tordersId: '',
+				tpayMoney: '',
+				paySel: 0,
+				openWay: 1,
+				openLists: [],
+				closeable: true,
+				showpay: false,
+				serviData:[],
+				isVip:false,
+				mainData:[],
+				detailData:[],
+				// 背景图片的URL可以是动态的，比如从API获取或根据条件生成
+				backgroundImageUrl: '',
+				zong:''
+			}
+		},
+		computed: {
+		    backgroundStyle() {
+		      return {
+		        backgroundImage: `url(${this.backgroundImageUrl})`,
+		        backgroundSize: 'cover', // 根据需要调整
+		      };
+		    }
+		  },
+		onLoad(e){
+			var that=this;
+			that.serviData=e;
+			that.getData();
+			that.isVip=this.$queue.getData('isVIP');
+		},
+		
+		methods:{
+			goNav(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
+			openpay(item) {
+				
+				uni.navigateTo({
+					url:'/my/order/payModifyTc?ordersId='+item.id
+				})
+				// this.goOrder()
+				// this.showpay = true
+			},
+			xiangqing(item){
+				uni.navigateTo({
+					url:'/pages/my/pTuanOderDrtail?mainId='+item.mainId+'&id='+item.id+
+						'&massageTypeId='+item.massageTypeId+
+						'&status='+item.status
+				})
+			},
+			detail(item){
+				if(item.status=='1'){
+					uni.showToast({
+						title:'该项目已使用！'
+					})
+				}else{
+					uni.navigateTo({
+						url:'/pages/my/pTuanOderDrtail?mainId='+item.mainId+'&id='+item.id+
+							'&massageTypeId='+item.massageTypeId+
+							'&page='+1+
+							'&limit='+10
+					})
+				}
+				
+			},
+			getData(){
+				var that=this;
+					let data = {
+							  mainId: that.serviData.id,
+							  page: that.serviData.page,
+							  limit:  that.serviData.limit,
+							}
+					that.$Request.get('/app/user/package/detail/findMyPackageDetailList',data).then(res => {
+						if (res.code == 0) {
+							that.mainData=res.data.mainData;
+							that.detailData=res.data.detailData;
+							that.backgroundImageUrl=that.mainData.packageImg;
+						}
+					})	
+			},
+		}
+	}
+</script>
+<style scoped>
+	.img-span{
+		    padding: 2px 5px;
+		    font-weight: 400;
+		    font-size: 8px;
+		    color: #FFFFFF;
+		    background: linear-gradient(-90deg, #FF6F48, #FF9E69);
+		    border-radius: 7px 0px 7px 0px;
+		    position: absolute;
+		    bottom: 0px;
+		    left: 0;
+		    margin-bottom: 14px;
+			margin-left: 27px;
+	}
+	.detail-view-mina{
+		width: 74%;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+	}
+	.detail-view-img{
+		width: 80px;
+		height: 80px;
+		border-radius: 9px;
+	}
+	.detail-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	/deep/uni-checkbox .uni-checkbox-input{
+		width: 26px;
+		height: 26px;
+		border-radius: 50%;
+	}
+	.youhui-img{
+		width: 111.81rpx;
+		height: 111.81rpx;
+	}
+	.youhui-view-right-btn{
+		width: 158rpx;
+		height: 64rpx;
+		background: linear-gradient(-90deg, #019C88, #2DC48E);
+		border-radius: 32rpx;
+		text-align: center;
+		line-height: 64rpx;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #FFFFFF;
+		text-shadow: 0rpx 2rpx 4rpx rgba(0,119,104,0.44);
+		margin-left: 10px;
+	}
+	.youhui-view-right-time{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #999999;
+	}
+	.youhui-view-right-title{
+		width: 105px;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.youhui-view-right-top{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.youhui-view-right{
+		width: 502.08rpx;
+		height: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-around;
+	}
+	.youhui-view-left-bottom{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #FFFFFF;
+	}
+	.youhui-view-left-yuan{
+		display: flex;
+		flex-direction: row;
+		align-items: baseline;
+		color: #FFFFFF;
+	}
+	.youhui-view-left-num{
+		font-weight: bold;
+		font-size: 89rpx;
+	}
+	.youhui-view-left-text{
+		font-weight: bold;
+		font-size:24.31rpx;
+	}
+	.youhui-view-left{
+		width: 199rpx;
+		height: 242rpx;
+		display: flex;
+		flex-direction:column;
+		align-items: center;
+		justify-content: center;
+	}
+	.youhui-yiyong{
+		background-image: url('../../static/youhuijuan/coupons7.png');
+	}
+	.youhui-weiyong{
+		background-image: url('../../static/youhuijuan/coupons1.png');
+	}
+	.youhui-list{
+		width: 95%;
+		display: flex;
+		flex-direction: row;
+		height: 242rpx;
+		border-radius: 21rpx;
+		background-size: 100%;
+		margin: 20px auto;
+		justify-content: space-between;
+	}
+	.popup_pay {
+		width: 100%;
+		position: relative;
+		padding-bottom: 45rpx;
+		/* height: 400px; */
+		/* height: 160px; */
+		/* #ifndef MP-WEIXIN */
+		/* height: 130px; */
+		/* #endif */
+	
+	}
+	.pay_btn {
+		width: 90%;
+		margin: 0 auto;
+		text-align: center;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		height: 80rpx;
+		border-radius: 60rpx;
+		color: #ffffff;
+		line-height: 80rpx;
+	}
+	.push-button{
+	width: 100%;
+	height: 48px;
+	position: fixed;
+	bottom: 0px;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	margin: 0 auto;
+	}
+	.detail-btn{
+	display: inline-block;
+	width: 92%;
+	text-align: center;
+	background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	height: 40px;
+	border-radius: 28px;
+	color: #ffffff;
+	line-height: 40px;
+	margin-top: 4px;
+	font-size: 34rpx;
+	}
+	.header-top image{
+		width: 706.25rpx;
+		height: 105.07rpx;
+	}
+	.header-top{
+		width: 100%;
+		height: 745.83rpx;
+		background-image: url('../../static/servicePackage/display.png');
+		/* background-size: 100%;
+		background-repeat: no-repeat; */
+		display: flex;
+		align-items: flex-end;
+		justify-content: center;
+	}
+	.shouc image{
+		width: 34.03rpx;
+		height: 32.64rpx;
+	}
+	
+	.shouc{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.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-text{
+		font-weight: bold;
+		font-size: 34rpx;
+		color: #000000;
+	}
+	.detail-foot-nav{
+		width: 90%;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+	}
+	.detail-foot-title{
+		    width: 115px;
+		    height: 32px;
+			background-image: url(../../static/servicePackage/horn.png);
+		    background-repeat: no-repeat;
+		    background-size: 100% 100%;
+		    font-weight: 400;
+		    font-size: 13px;
+		    color: #FFFFFF;
+		    text-align: right;
+		    line-height: 32px;
+		    padding-right: 15px;
+			position: absolute;
+			    right: 0;
+			    top: 0;
+	}
+	.detail-foot-list-top{
+		width: 95%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.detail-foot-list{
+		width: 95%;
+		border-radius: 21rpx;
+		position: relative;
+		margin: 6px 0px 5px 0px;
+		padding: 15px;
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+	}
+	.detail-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 15px 0px;
+	}
+	
+	.tese span:nth-child(1){
+		font-weight: bold;
+		font-size: 24rpx;
+		color: #666;
+	}
+	.tese span:nth-child(2){
+		font-size: 24rpx;
+		color: #8D9194;
+	}
+	.tese{
+		width: 100%;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		margin-top: 4rpx;
+	}
+	.detail-foot-list-top span:nth-child(1){
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #3F3F3F;
+	}
+	.detail-foot-list-top span:nth-child(2){
+		width: 76rpx;
+		height: 33rpx;
+		line-height: 33rpx;
+		text-align: center;
+		border-radius: 16rpx;
+		border: 1px solid #7D7D7D;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #777777;
+		margin: 0px 25px 0px 5px;
+	}
+	.detail-foot-list-top span:nth-child(3){
+		font-size: 30rpx;
+		color: #029d88;
+	}
+	
+	.detail-foot-mian{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin-top: 8px;
+	}
+	.jianjie{
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #8D9194;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.header-bottom-mian{
+		margin: 3px 0px;
+	}
+	.header-bottom-mian-title{
+		width: 100%;
+		display: flex;
+		align-items: center;
+	}
+	.header-bottom-mian-title span{
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #20AB95;
+		margin-left: 5px;
+		padding: 10rpx 0;
+	}
+	.header-bottom-mian-title image{
+		width: 30.56rpx;
+		height: 29.86rpx;
+	}
+	.header-bottom-foot-view-img1{
+		width: 30rpx;
+		height: 30rpx;
+	}
+	.header-bottom-foot-view-img2{
+		width: 28rpx;
+		height: 28rpx;
+	}
+	.header-bottom-foot-view-img3{
+		width: 30rpx;
+		height: 30rpx;
+	}
+	.header-bottom-foot-view image{
+		margin-right: 3px;
+	}
+	.header-bottom-foot-view{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 80px;
+		height: 22px;
+		line-height: 22px;
+		background-color: rgba(8, 162, 138, 0.1);
+		border-radius: 8px;
+		font-weight: 400;
+		font-size: 11px;
+		color: #029D88;
+	}
+	.header-bottom-foot-title{
+		width: 65px;
+		height: 17px;
+		margin-right: 8rpx;
+		margin-top: 4rpx;
+	}
+	.header-bottom-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center; 
+		margin-top: 8rpx;
+	}
+	.header-bottom-money-jia{
+		font-size: 28rpx;
+		color: #848484;
+		line-height: 37rpx;
+		text-decoration-line: line-through;
+		margin-left: 5px;
+	}
+	.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;
+	}
+	.header-bottom-money-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: baseline;
+	}
+	
+	.header-bottom-money-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		margin-top:8px;
+	}
+	.header-bottom-money{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: flex-end;
+	}
+	.header-bottom-title-num span{
+		font-size: 28rpx;
+	}
+	.header-bottom-title-num span:nth-child(1){
+		font-weight: bold;
+		color: #08A28A;
+	}
+	.header-bottom-title-num span:nth-child(2){
+		color: #848485;
+		margin-left: 5px;
+	}
+	.header-bottom-title-text{
+		font-weight: bold;
+		font-size: 35rpx;
+		color: #13141A;
+	}
+	.header-bottom-title{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.header-bottom-top{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.header-bottom{
+		width: 100%;
+		background-color: #fff;
+		padding: 15px 20px;
+		display: flex;
+		flex-direction: column;
+	}
+	
+	.header{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.content{
+		width: 100%;
+		height: 100vh;
+		position: relative;
+		background-color: #f7f7f7;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.service-more{
+		    width: 50px;
+		    height: 26px;
+		    font-size: 13px;
+		    border-radius: 15px;
+		    line-height: 26px;
+			border: 1px #2dbe93 solid ;
+		    color: #019c88;
+		    text-align: center;
+		    justify-content: fex-end;
+			background: #eefffa;
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/uni-countdown/changelog.md b/uni_modules/uni-countdown/changelog.md
new file mode 100644
index 0000000..16fc324
--- /dev/null
+++ b/uni_modules/uni-countdown/changelog.md
@@ -0,0 +1,26 @@
+## 1.2.3（2024-02-20）
+- 新增 支持控制小时，分钟的显隐：showHour showMinute
+## 1.2.2（2022-01-19）
+- 修复 在微信小程序中样式不生效的bug
+## 1.2.1（2022-01-18）
+- 新增 update 方法 ，在动态更新时间后，刷新组件
+## 1.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-countdown](https://uniapp.dcloud.io/component/uniui/uni-countdown)
+## 1.1.3（2021-10-18）
+- 重构
+- 新增 font-size 支持自定义字体大小
+## 1.1.2（2021-08-24）
+- 新增 支持国际化
+## 1.1.1（2021-07-30）
+- 优化 vue3下小程序事件警告的问题
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.5（2021-06-18）
+- 修复 uni-countdown 重复赋值跳两秒的 bug
+## 1.0.4（2021-05-12）
+- 新增 组件示例地址
+## 1.0.3（2021-05-08）
+- 修复 uni-countdown 不能控制倒计时的 bug
+## 1.0.2（2021-02-04）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-countdown/components/uni-countdown/i18n/en.json b/uni_modules/uni-countdown/components/uni-countdown/i18n/en.json
new file mode 100644
index 0000000..06309cb
--- /dev/null
+++ b/uni_modules/uni-countdown/components/uni-countdown/i18n/en.json
@@ -0,0 +1,6 @@
+{
+	"uni-countdown.day": "day",
+	"uni-countdown.h": "h",
+	"uni-countdown.m": "m",
+	"uni-countdown.s": "s"
+}
diff --git a/uni_modules/uni-countdown/components/uni-countdown/i18n/index.js b/uni_modules/uni-countdown/components/uni-countdown/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-countdown/components/uni-countdown/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hans.json b/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hans.json
new file mode 100644
index 0000000..358cdd1
--- /dev/null
+++ b/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hans.json
@@ -0,0 +1,6 @@
+{
+	"uni-countdown.day": "天",
+	"uni-countdown.h": "时",
+	"uni-countdown.m": "分",
+	"uni-countdown.s": "秒"
+}
diff --git a/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hant.json b/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hant.json
new file mode 100644
index 0000000..e5a63de
--- /dev/null
+++ b/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hant.json
@@ -0,0 +1,6 @@
+{
+	"uni-countdown.day": "天",
+	"uni-countdown.h": "時",
+	"uni-countdown.m": "分",
+	"uni-countdown.s": "秒"
+}
diff --git a/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
new file mode 100644
index 0000000..d86940d
--- /dev/null
+++ b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
@@ -0,0 +1,288 @@
+<template>
+	<view class="uni-countdown">
+		<text v-if="showDay" :style="[timeStyle]" class="uni-countdown__number">{{ d }}</text>
+		<text v-if="showDay" :style="[splitorStyle]" class="uni-countdown__splitor">{{dayText}}</text>
+		<text v-if="showHour" class="uni-countdown__number">{{ h }}</text>
+		<text v-if="showHour" :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : hourText }}</text>
+		<text v-if="showMinute" class="uni-countdown__number">{{ i }}</text>
+		<text v-if="showMinute" :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : minuteText }}</text>
+		<text class="uni-countdown__number">{{ s }}</text>
+		<text v-if="!showColon" :style="[splitorStyle]" class="uni-countdown__splitor">{{secondText}}</text>
+	</view>
+</template>
+<script>
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+	/**
+	 * Countdown 倒计时
+	 * @description 倒计时组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=25
+	 * @property {String} backgroundColor 背景色
+	 * @property {String} color 文字颜色
+	 * @property {Number} day 天数
+	 * @property {Number} hour 小时
+	 * @property {Number} minute 分钟
+	 * @property {Number} second 秒
+	 * @property {Number} timestamp 时间戳
+	 * @property {Boolean} showDay = [true|false] 是否显示天数
+	 * @property {Boolean} showHour = [true|false] 是否显示小时
+	 * @property {Boolean} showMinute = [true|false] 是否显示分钟
+	 * @property {Boolean} show-colon = [true|false] 是否以冒号为分隔符
+	 * @property {String} splitorColor 分割符号颜色
+	 * @event {Function} timeup 倒计时时间到触发事件
+	 * @example <uni-countdown :day="1" :hour="1" :minute="12" :second="40"></uni-countdown>
+	 */
+	export default {
+		name: 'UniCountdown',
+		emits: ['timeup'],
+		props: {
+			showDay: {
+				type: Boolean,
+				default: true
+			},
+			showHour: {
+				type: Boolean,
+				default: true
+			},
+			showMinute: {
+				type: Boolean,
+				default: true
+			},
+			showColon: {
+				type: Boolean,
+				default: true
+			},
+			start: {
+				type: Boolean,
+				default: true
+			},
+			backgroundColor: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333'
+			},
+			fontSize: {
+				type: Number,
+				default: 14
+			},
+			splitorColor: {
+				type: String,
+				default: '#333'
+			},
+			day: {
+				type: Number,
+				default: 0
+			},
+			hour: {
+				type: Number,
+				default: 0
+			},
+			minute: {
+				type: Number,
+				default: 0
+			},
+			second: {
+				type: Number,
+				default: 0
+			},
+			timestamp: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+				timer: null,
+				syncFlag: false,
+				d: '00',
+				h: '00',
+				i: '00',
+				s: '00',
+				leftTime: 0,
+				seconds: 0
+			}
+		},
+		computed: {
+			dayText() {
+				return t("uni-countdown.day")
+			},
+			hourText(val) {
+				return t("uni-countdown.h")
+			},
+			minuteText(val) {
+				return t("uni-countdown.m")
+			},
+			secondText(val) {
+				return t("uni-countdown.s")
+			},
+			timeStyle() {
+				const {
+					color,
+					backgroundColor,
+					fontSize
+				} = this
+				return {
+					color,
+					backgroundColor,
+					fontSize: `${fontSize}px`,
+					width: `${fontSize * 22 / 14}px`, // 按字体大小为 14px 时的比例缩放
+ 					lineHeight: `${fontSize * 20 / 14}px`,
+					borderRadius: `${fontSize * 3 / 14}px`,
+				}
+			},
+			splitorStyle() {
+				const { splitorColor, fontSize, backgroundColor } = this
+				return {
+					color: splitorColor,
+					fontSize: `${fontSize * 12 / 14}px`,
+					margin: backgroundColor ? `${fontSize * 4 / 14}px` : ''
+				}
+			}
+		},
+		watch: {
+			day(val) {
+				this.changeFlag()
+			},
+			hour(val) {
+				this.changeFlag()
+			},
+			minute(val) {
+				this.changeFlag()
+			},
+			second(val) {
+				this.changeFlag()
+			},
+			start: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (newVal) {
+						this.startData();
+					} else {
+						if (!oldVal) return
+						clearInterval(this.timer)
+					}
+				}
+
+			}
+		},
+		created: function(e) {
+			this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
+			this.countDown()
+		},
+		// #ifndef VUE3
+		destroyed() {
+			clearInterval(this.timer)
+		},
+		// #endif
+		// #ifdef VUE3
+		unmounted() {
+			clearInterval(this.timer)
+		},
+		// #endif
+		methods: {
+			toSeconds(timestamp, day, hours, minutes, seconds) {
+				if (timestamp) {
+					return timestamp - parseInt(new Date().getTime() / 1000, 10)
+				}
+				return day * 60 * 60 * 24 + hours * 60 * 60 + minutes * 60 + seconds
+			},
+			timeUp() {
+				clearInterval(this.timer)
+				this.$emit('timeup')
+			},
+			countDown() {
+				let seconds = this.seconds
+				let [day, hour, minute, second] = [0, 0, 0, 0]
+				if (seconds > 0) {
+					day = Math.floor(seconds / (60 * 60 * 24)/2)
+					hour = Math.floor(seconds / (60 * 60)) - (day * 24)
+					minute = Math.floor(seconds / 60) - (day * 24 * 60) - (hour * 60)
+					second = Math.floor(seconds) - (day * 24 * 60 * 60) - (hour * 60 * 60) - (minute * 60)
+					
+				} else {
+					this.timeUp()
+				}
+				
+				if (day < 10) {
+					day = '0' + day
+				}
+				if (hour < 10) {
+					hour = '0' + hour
+				}
+				if (minute < 10) {
+					minute = '0' + minute
+				}
+				if (second < 10) {
+					second = '0' + second
+				}
+				this.d = day
+				this.h = hour
+				this.i = minute
+				this.s = second
+			},
+			startData() {
+				this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
+				if (this.seconds <= 0) {
+					this.seconds = this.toSeconds(0, 0, 0, 0, 0)
+					this.countDown()
+					return
+				}
+				clearInterval(this.timer)
+				this.countDown()
+				this.timer = setInterval(() => {
+					this.seconds--
+					if (this.seconds < 0) {
+						this.timeUp()
+						return
+					}
+					this.countDown()
+				}, 1000)
+			},
+			update(){
+				this.startData();
+			},
+			changeFlag() {
+				if (!this.syncFlag) {
+					this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
+					this.startData();
+					this.syncFlag = true;
+				}
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	$font-size: 14px;
+	.uni-countdown__number{
+		background: #000;
+		border-radius: 30rpx;
+		padding: 8rpx;
+		color: #fff;
+	}
+	.uni-countdown {
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		align-items: center;
+
+		&__splitor {
+			margin: 0 2px;
+			font-size: $font-size;
+			color: #333;
+		}
+
+		&__number {
+			border-radius: 3px;
+			text-align: center;
+			font-size: $font-size;
+		}
+	}
+</style>
diff --git a/uni_modules/uni-countdown/package.json b/uni_modules/uni-countdown/package.json
new file mode 100644
index 0000000..6622074
--- /dev/null
+++ b/uni_modules/uni-countdown/package.json
@@ -0,0 +1,83 @@
+{
+  "id": "uni-countdown",
+  "displayName": "uni-countdown 倒计时",
+  "version": "1.2.3",
+  "description": "CountDown 倒计时组件",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "countdown",
+    "倒计时"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-countdown/readme.md b/uni_modules/uni-countdown/readme.md
new file mode 100644
index 0000000..4bcb1aa
--- /dev/null
+++ b/uni_modules/uni-countdown/readme.md
@@ -0,0 +1,10 @@
+
+
+## CountDown 倒计时
+> **组件名：uni-countdown**
+> 代码块： `uCountDown`
+
+倒计时组件。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-countdown)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uview-ui/components/u-count-down/u-count-down.vue b/uview-ui/components/u-count-down/u-count-down.vue
index 7285d67..069d620 100644
--- a/uview-ui/components/u-count-down/u-count-down.vue
+++ b/uview-ui/components/u-count-down/u-count-down.vue
@@ -10,7 +10,7 @@
 			:style="{fontSize: separatorSize + 'rpx', color: separatorColor, paddingBottom: separator == 'colon' ? '4rpx' : 0}"
 			v-if="showDays && (hideZeroDay || (!hideZeroDay && d != '00'))"
 		>
-			{{ separator == 'colon' ? ':' : '天' }}
+			{{ separator == 'colon' ? '天' : '天' }}
 		</view>
 		<view class="u-countdown-item" :style="[itemStyle]" v-if="showHours">
 			<view class="u-countdown-time" :style="{ fontSize: fontSize + 'rpx', color: color}">