From 0d5dc4dded1148f8e48244729e886d361bca628d Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Mon, 24 Jun 2024 11:29:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/config.js                              |    7 +-
 common/queue.js                               |    2 +
 components/t-refresh/t-refresh.vue            |  202 ++
 manifest.json                                 |    7 +-
 my/address/Endaddress.vue                     |   18 +-
 my/address/address.vue                        |   12 +-
 my/hongbao/youhuijuan.vue                     |    1 +
 my/order/pay.vue                              |  445 +++-
 my/order/payModify.vue                        |  422 +++-
 my/order/payModifyDzhifu.vue                  | 1816 +++++++++++++++++
 my/wallet/index.vue                           |  372 +++-
 my/wallet/mymoneydetail.vue                   |   50 +-
 pages.json                                    |  123 +-
 pages/index/index.vue                         |  266 ++-
 pages/index/order/orderDet.vue                |   68 +-
 pages/my/cika.vue                             |  414 ++++
 pages/my/cikarDrtail.vue                      | 1269 ++++++++++++
 pages/my/cureOderDrtail.vue                   |  101 +-
 pages/my/fuwuDateil.vue                       |  514 +++++
 pages/my/fuwuGengduo.vue                      |  420 ++++
 pages/my/fuwuliaocheng.vue                    |  414 ++++
 pages/my/fuwuliaochengDetail.vue              | 1281 ++++++++++++
 pages/my/fuwuxiangm.vue                       |  420 ++++
 pages/my/historyMy.vue                        |  444 ++++
 pages/my/index.vue                            |   43 +-
 pages/my/indextaociliaoList.vue               |  413 ++++
 pages/my/myCiLiaoDetail.vue                   |  626 ++++++
 pages/my/orderDetailsList.vue                 |  448 ++++
 pages/my/serviceOderDrtail.vue                |  675 +++++-
 pages/my/servicePackage.vue                   |  345 +---
 pages/order/index.vue                         |  316 ++-
 pages/therapist/orderDetail.vue               |   20 +-
 pages/therapist/therapist.vue                 |  165 +-
 static/activate2.png                          |  Bin 0 -> 40510 bytes
 static/activate3.png                          |  Bin 0 -> 39513 bytes
 static/topimg.png                             |  Bin 0 -> 41507 bytes
 .../liu-goods-swiper/liu-goods-swiper.vue     |    8 +-
 uview-ui/components/u-field/u-field.vue       |    4 +
 uview-ui/libs/request/index.js                |    1 +
 39 files changed, 11306 insertions(+), 846 deletions(-)
 create mode 100644 components/t-refresh/t-refresh.vue
 create mode 100644 my/order/payModifyDzhifu.vue
 create mode 100644 pages/my/cika.vue
 create mode 100644 pages/my/cikarDrtail.vue
 create mode 100644 pages/my/fuwuDateil.vue
 create mode 100644 pages/my/fuwuGengduo.vue
 create mode 100644 pages/my/fuwuliaocheng.vue
 create mode 100644 pages/my/fuwuliaochengDetail.vue
 create mode 100644 pages/my/fuwuxiangm.vue
 create mode 100644 pages/my/historyMy.vue
 create mode 100644 pages/my/indextaociliaoList.vue
 create mode 100644 pages/my/myCiLiaoDetail.vue
 create mode 100644 pages/my/orderDetailsList.vue
 create mode 100644 static/activate2.png
 create mode 100644 static/activate3.png
 create mode 100644 static/topimg.png

diff --git a/common/config.js b/common/config.js
index ac0ef30..62340aa 100644
--- a/common/config.js
+++ b/common/config.js
@@ -2,9 +2,13 @@
 // const ROOTPATH1 = "http://120.46.52.165/sqx_fast";
 // const ROOTPATH3 = "wss://120.46.52.165/wss/websocket/";
 
+const ROOTPATH3 = "wss://192.168.2.222:8187/wss/websocket/";
 const ROOTPATH = "http://192.168.2.222:8187/sqx_fast";
 const ROOTPATH1 = "http://192.168.2.222:8187/sqx_fast";
-const ROOTPATH3 = "wss://192.168.2.222:8187/wss/websocket/";
+
+// const ROOTPATH = "http://192.168.2.13:8187/sqx_fast";
+// const ROOTPATH1 = "http://192.168.2.13:8187/sqx_fast";
+// const ROOTPATH3 = "wss://192.168.2.13:8187/wss/websocket/";
 
 // const ROOTPATH = "http://192.168.1.169:8187/sqx_fast";
 // const ROOTPATH1 = "http://192.168.1.169:8187/sqx_fast";
@@ -35,6 +39,7 @@ const TX_MAP_KEY = 'VIWBZ-5OM3F-CV7JZ-NLKJY-AXSYV-TMFM6';
 //const TX_MAP_KEY = '55UBZ-STNK4-DSNUM-F4A75-Q7BC5-FRBMS';
 
 //ws基础连接地址
+// const WS_BASE_PATH = 'ws://192.168.2.13:8187/sqx_fast/';
 const WS_BASE_PATH = 'ws://192.168.2.222:8187/sqx_fast/';
 // const WS_BASE_PATH = 'ws://120.46.52.165/sqx_fast/';
 // const WS_BASE_PATH = 'wss://admin.sjajk.com/sqx_fast/';//生产需替换
diff --git a/common/queue.js b/common/queue.js
index c2c17a4..371436b 100644
--- a/common/queue.js
+++ b/common/queue.js
@@ -21,12 +21,14 @@ module.exports = {
 		// return 'https://admin.sjajk.com'//生产需替换
 		// return 'http://120.46.52.165'
 		return 'http://192.168.2.222:8187'
+		// return 'http://192.168.2.13:8187'
 	},
 	//全局域名 部分html中需要单独替换 需要修改config中的网络请求域名
 	publicYuMingApp() {
 		// return 'https://wx.sjajk.com'//生产需替换
 		// return 'http://120.46.52.165'
 		return 'http://192.168.2.222:8187'
+		// return 'http://192.168.2.13:8187'
 	},
 	logout() {
 		this.remove("token");
diff --git a/components/t-refresh/t-refresh.vue b/components/t-refresh/t-refresh.vue
new file mode 100644
index 0000000..a258d96
--- /dev/null
+++ b/components/t-refresh/t-refresh.vue
@@ -0,0 +1,202 @@
+<template>
+	<view style="width: 100%;" class="refresh-body" @touchmove.stop.prevent>
+	  <scroll-view scroll-y @scroll="scroll" @touchstart="touchstart" @scrolltolower="loadMore" @touchmove="touchmove" @touchend="touchend" class="refresh-scroll">
+		   <view class="content">
+			    <!-- 内容 -->
+				<slot name="content"></slot>
+				<!-- 上拉加载 -->
+				<view class="t-loading-box" v-if="loadingType!=3&&openLoadMore" @click="loadMore">
+					<view class="t-line"></view>
+					<view class="t-loading-text">
+						<view class="loading" v-if="loadingType==2"></view>
+						<text>{{loadingText[loadingType]}}</text>
+					</view>
+					<view class="t-line"></view>
+				</view>
+		   </view> 
+	  </scroll-view> 
+	</view> 
+</template> 
+
+<script> 
+export default {
+	name:'t-refresh',
+	props:{
+		//高度
+		height: {
+			type: String,
+			default: '100vh'
+		},
+		//padding高度  配合tabs
+		tPadding: {
+			type: Number,
+		},
+		//是否开启上拉加载
+		openLoadMore:{
+			type: Boolean,
+			default: true
+		},
+		//上拉状态  0 上拉加载更多 1 加载全部 2 上拉加载中 3 不展示组件
+		loadingType: {
+			type : Number,
+			default: 0
+		},
+		//上拉状态文字
+		loadingText : {
+			type  : Array,
+			default :()=>{
+			   return ["上拉或点击加载更多","已加载全部数据",'加载中','']
+			}
+		},
+	},
+  data() {
+    return {
+	  icon_class:'',
+	  top:-90,
+      touchstart_num:0,  //点击位置
+	  touchmove_num:0,   //移动距离
+	  move_number:0, //拖动距离
+	  rotate_number:0,
+	  timer:null,
+	  is_refresh:false, //是否在刷新
+	  move_timer:null,
+    };
+  },
+  methods: {
+	  scroll(e){
+		e.detail.scrollTop>20?this.is_refresh=true:this.is_refresh=false
+	  },
+	  //触底加载更多
+	  loadMore(e) {
+	  	if(this.openLoadMore){
+			this.$emit("loadMore")
+		}
+	  },
+	  //点击位置
+	  touchstart(e){
+		  this.touchstart_num=e.touches[0].clientY
+	  },
+	  //移动距离
+	  touchmove(e){
+		  if(!this.is_refresh&&e.touches.length<=1&&this.openRefresh){
+			  this.move_number=e.touches[0].clientY-this.touchstart_num
+			  this.rotate_number=this.move_number*2
+			  if(this.move_number<120){
+					this.top=(this.move_number)/1-90
+			  }else if(120<=this.move_number&&this.move_number<=170){
+					this.top=(this.move_number)/4
+			  }else{
+					this.top=(this.move_number)/60+40
+			  }
+			  clearTimeout(this.timer)
+			  this.timer = setTimeout(()=>{
+				this.touchmove_num=e.touches[0].clientY
+			  },500) 
+		  }
+	  },
+	  //结束 
+	  touchend(e){
+		  if(this.is_refresh||e.touches.length>=1||!this.openRefresh){return}
+		  if(this.move_number>170){
+			  this.icon_class='refresh-icon-active'
+			  this.top+=Number(this.tPadding)/2
+			  this.is_refresh=true
+			  this.$emit('refresh')
+			 this.move_timer=setInterval(()=>{
+				this.rotate_number+=8
+			 },10) 
+		  }else{
+			this.move_timer=setInterval(()=>{
+				this.top-=8
+				if(this.top<=-90){
+					clearInterval(this.move_timer)
+				}
+			},10)
+		  }
+	  },
+	  //加载完成
+	  endRefresh(){
+		 this.top=-90
+		 this.icon_class=''
+		 this.move_number=this.rotate_number=0
+		 this.is_refresh=false
+		 clearInterval(this.move_timer)
+	  },
+  }
+};
+</script>
+<style lang="scss" >
+.refresh-body{
+	box-sizing: border-box;
+	height: auto !important;
+	padding-top: 0px !important;
+	.refresh-scroll{
+		position: relative;
+		height: 100%;
+	}
+	.refresh-icon{
+		width: 80upx;
+		height: 80upx;
+		text-align: center;
+		line-height: 80upx;
+		border-radius: 50%;
+		background: #FFFFFF;
+		box-shadow: 0px 0px 10rpx 0px rgba(0, 0, 0, 0.2);
+		position: absolute;
+		left: 50%; 
+		color: #00aa7f;
+		z-index: 9999999999;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		.iconfont{
+			font-size: 36upx;
+		}
+		image{
+			width: 36upx;
+		}
+	}
+	.refresh-icon-active{
+		position: fixed;
+	}
+	.content{
+		height: 100%;
+	}
+	.t-loading-box{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: row;
+		line-height:80upx;
+		font-size: 26upx;
+		width: 100%;
+		padding-bottom:20upx;
+		color: #888888;
+		.t-loading-text{
+			padding: 0 10upx;
+			display: flex;
+			align-items: center;
+			flex-direction: row;
+		}
+		.loading {
+			width:25upx;
+			height:25upx;
+			border:2.5upx solid #888888;
+			border-bottom:#ffffff 2.5upx solid;
+			border-radius:50%;
+			margin-right: 15upx;
+			animation:grace-rotate360 1200ms infinite linear;
+		}
+		.t-line{
+			margin: 0px;
+			border-bottom: 1px solid rgb(212, 212, 212);
+			width: 20px;
+			transform: scaleY(0.5);
+			border-top-color: rgb(212, 212, 212);
+			border-right-color: rgb(212, 212, 212);
+			border-left-color: rgb(212, 212, 212);
+		}
+	}
+	@keyframes grace-rotate360{0%{transform:rotate(0deg);} 50%{transform:rotate(180deg);} 100%{transform:rotate(360deg);}}
+}
+</style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 67a0782..ffc0e01 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "盛安到家",
-    "appid" : "H56D02895",
+    "appid" : "__UNI__0A81F4F",
     "description" : "",
     "versionName" : "1.0.1",
     "versionCode" : 101,
@@ -184,8 +184,9 @@
                     "key" : "2acf1b8c3d1aaf0070472dec19018d96",
                     "securityJsCode" : "2b07c8496878c327a8ae7a19de33e2a7",
                     // "serviceHost" : "http://wx.sjajk.com/_AMapService"//生产需替换
-					// "serviceHost" : "http://120.46.52.165/_AMapService"
-					"serviceHost" : "http://192.168.2.222:8187/_AMapService"
+                    // "serviceHost" : "http://120.46.52.165/_AMapService"
+					  "serviceHost" : "http://192.168.2.222:8187/_AMapService"
+                    // "serviceHost" : "http://192.168.2.13:8187/_AMapService"
                 }
             }
         },
diff --git a/my/address/Endaddress.vue b/my/address/Endaddress.vue
index 03751d6..2962ef2 100644
--- a/my/address/Endaddress.vue
+++ b/my/address/Endaddress.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="content">
 		<!-- #ifdef MP-WEIXIN -->
 		<view class="part1">
 			<view class="mobile">
@@ -27,6 +27,7 @@
 			</view>
 			<view class="btn" @click="bindhelp">确定</view>
 		</view>
+		<!-- #endif -->
 		<!-- <view style="margin-top: 20upx;background-color: #FFFFFF;height: max-content;padding: 20upx 20upx 20upx 35upx;">
 			<input type="text" placeholder="收货人" style="height: 80upx;color: #000000;font-size: 30upx;" v-model="consignee" />
 			<input type="number" placeholder="手机号码" maxlength="11" style="height: 80upx;margin-top: 20upx;color: #000000;font-size: 30upx;"
@@ -35,8 +36,6 @@
 			<pickerAddress style="padding-bottom: 20upx;color: #000000;font-size: 30upx;height: 30upx;" @change="change">{{provinces}}</pickerAddress>
 			<input type="text" v-model="detail" placeholder="详情地址:如道路，门牌号，小区，楼栋号，单元室等" style="height: 80upx;margin-top: 30upx;color: #000000;font-size: 30upx;" />
 		</view> -->
-
-		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN -->
 		<view class="part1">
 			<view class="part1-top">
@@ -141,16 +140,15 @@
 			},
 			shengcheng(longitude, latitude) {
 				this.$Request.getT('/app/Login/selectCity?lat=' + latitude + '&lng=' + longitude).then(res => {
-					// console.log(res)
+					console.log(res)
 					if (res.code === 0) {
 						this.cityaddress = res.data.province + res.data.city + res.data.district
-						// console.log(this.address)
+						console.log(this.cityaddress)
 						this.province = res.data.province
 						this.city = res.data.city
 						this.district = res.data.district
 					}
 				});
-
 			},
 			getAddressList(id) {
 				uni.showLoading({
@@ -267,6 +265,14 @@
 </script>
 
 <style scoped>
+	/deep/uni-page-refresh{
+		display: none !important;
+	}
+	.content{
+		width: 100%;
+		height: 100vh;
+		background: #f7f7f7;
+	}
 	.part1-bottom{
 		width: 100%;
 		padding:10px;
diff --git a/my/address/address.vue b/my/address/address.vue
index 1c70751..d9b27df 100644
--- a/my/address/address.vue
+++ b/my/address/address.vue
@@ -81,14 +81,16 @@
 		},
 		methods: {
 			goBackByAddress(addressId) {
-				console.log(addressId)
+				// console.log("addressId",addressId)
 				this.$queue.setData('EditAddress', addressId);
-				console.log(this.isfa)
 				if (this.isfa == 0) {
 					console.log('1111111')
-				}
-				if (this.isfa == 1) {
-					uni.navigateBack()
+				}else if (this.isfa ==1 ) {
+					this.updateaddress()
+				}else if (this.isfa == 2) {
+					uni.reLaunch({
+						url:'/my/order/payModify'
+					})
 				} else if (this.isfa == 3) {
 					this.updateaddress()
 				}
diff --git a/my/hongbao/youhuijuan.vue b/my/hongbao/youhuijuan.vue
index 5fc05c3..bdd5fd6 100644
--- a/my/hongbao/youhuijuan.vue
+++ b/my/hongbao/youhuijuan.vue
@@ -239,6 +239,7 @@
 		border-radius: 21rpx;
 		background-size: 100%;
 		margin: 20px auto;
+		justify-content: space-between;
 	}
 	.you-nav{
 		background: #FFFFFF;
diff --git a/my/order/pay.vue b/my/order/pay.vue
index a448c26..b7d87c4 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -1,16 +1,8 @@
 <template>
 	<view class="content">
-		<!-- <view class="bg" style="font-size: 32upx;height: 150rpx;padding: 26rpx 29rpx 0 29rpx;">
-			<view v-if="order.status ==1" style="color: #ffffff;">待付款...</view>
-			<view v-if="order.status ==2" style="color: #ffffff;">待服务</view>
-			<view v-if="order.status ==5" style="color: #ffffff;">已完成</view>
-			<view v-if="order.status ==6" style="color: #ffffff;">服务中</view>
-			<view v-if="order.status ==7" style="color: #ffffff;">理疗师出发</view>
-			<view v-if="order.status ==8" style="color: #ffffff;">理疗师到达</view>
-			<view v-if="order.status ==3" style="color: #ffffff;">待评价</view>
-			<view v-if="order.status ==4" style="color: #ffffff;">已取消</view>
-			<view v-if="order.overTimeOrders == 1" style="color: red;font-size:26rpx">(订单已超时)</view>
-		</view> -->
+		<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.ordersMassageList && order.ordersMassageList.length > 0"
 				style="padding: 0 29rpx;">
@@ -22,11 +14,22 @@
 								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
 						</view>
 						<view class="u-flex-1  margin-left-sm">
-							<view class="flex" style="font-weight: 600;">
-								<view class="margin-right-xs text-df u-skeleton-fillet"
-									style="margin-top: -2px;display: inline-block;width: 400rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+							<view class="flex head-title-right">
+								<view class="margin-right-xs text-df u-skeleton-fillet head-title">
 									{{order.ordersMassageList[0].massageType.title}}
 								</view>
+								<view class="zhuangtai">
+									<view v-if="order.status ==1">待付款...</view>
+									<view v-if="order.status ==2">待服务</view>
+									<view v-if="order.status ==5">已完成</view>
+									<view v-if="order.status ==6">服务中</view>
+									<view v-if="order.status ==7">理疗师出发</view>
+									<view v-if="order.status ==8">理疗师到达</view>
+									<view v-if="order.status ==3">待评价</view>
+									<view v-if="order.status ==4">已取消</view>
+									<view v-if="order.status ==9">待确认</view>
+									<view v-if="order.status ==10">待补单</view>
+								</view>
 							</view>
 							<view class="flex align-center">
 								<view>
@@ -176,7 +179,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="pay-ding feiuong">
+				<!-- <view class="pay-ding feiuong">
 					<view class="fei-title">费用明细</view>
 					<view class="fei-view">
 						<view class="fei-view-list">
@@ -185,7 +188,7 @@
 						</view>
 						<view class="fei-view-list">
 							<span>出行费用</span>
-							<span>￥20</span>
+							<span>￥{{order.taxiMoney}}</span>
 						</view>
 						<view class="fei-view-list">
 							<span>优惠券</span>
@@ -196,7 +199,7 @@
 							<span style="color: #FF3939;font-size: 29rpx;">￥286</span>
 						</view>
 					</view>
-				</view>
+				</view> -->
 			</view>
 
 
@@ -239,30 +242,87 @@
 				</view>
 			</view> -->
 
-			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
+			<view v-if="order.status !=6" class="flex tabber padding-top-sm padding-bottom-sm align-center">
 				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
 					v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">取消订单
 				</u-button>
-				<u-button @click="openpay()" shape="circle" :custom-style="customStyle2" :hair-line="false"
+				<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
 					v-if="order.status == 1"
-					style="background: linear-gradient(to right, #223845, #00a85b);border: 0;">立即支付
+					class="dingshi">立即支付
 				</u-button>
-				<!-- <u-button @click="cancel(order)" class="margin-right" shape="circle" :custom-style="customStyle2"
-					:hair-line="false" v-if="order.status == 6">订单完成
-				</u-button> -->
-				<u-button v-if="order.status == 2 || order.status == 5|| order.status == 3" :custom-style="customStyle2"
+				<u-button v-if="order.status == 5|| order.status == 3" :custom-style="customStyle2"
 					shape="circle" :plain="true"
 					@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
-					style="background: linear-gradient(to right, #223845, #00a85b);">
+					class="dingshi">
 					去投诉
 				</u-button>
+				<u-button v-if="order.status == 9&&order.refusalContent!=''&&order.refusalContent!=null" :custom-style="customStyle2"
+					shape="circle" :plain="true"
+					@click="toggleQ('center',order)"
+					class="dingshi">
+					拒单确认
+				</u-button>
+				<u-button v-if="order.status == 10" :custom-style="customStyle2"
+					shape="circle" :plain="true"
+					@click="goNav('/my/order/payModifyDzhifu?ordersId='+order.ordersId,order)"
+					class="dingshi">
+					立即预约
+				</u-button>
+				<u-button v-if="order.status != 4&&order.status != 1&&order.status != 10&&order.status != 3&&order.status == 9&&order.status != 5" :custom-style="customStyle2"
+					shape="circle" :plain="true"
+					@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order)"
+					class="dingshi">
+					修改订单
+				</u-button>
 				<u-button v-if="order.status == 3" :custom-style="customStyle2" shape="circle" :plain="true"
 					@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
-					style="background: linear-gradient(to right, #223845, #00a85b);">
+					class="dingshi">
 					去评价
 				</u-button>
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					style="border: 0;background: linear-gradient(to right, #223845, #00a85b);">联系客服</u-button>
+					class="dingshi">联系客服</u-button>
+			</view>
+			<view v-else class="flex tabber padding-top-sm padding-bottom-sm align-center" :style="{'height':btnShow?'100px':'60px'}">
+				<view class="showBtn-mian">
+					<view class="showBtn">
+						<view class="gengduo" @click.stop="gengBtn">更多</view>
+						<u-button shape="circle" :plain="true" @click="goChat"
+							class="btns">联系客服</u-button>
+						<u-button
+							shape="circle" :plain="true"
+							@click="toggle('center',order)"
+							class="btns">
+							提前结束
+						</u-button>
+						<u-button
+							shape="circle" :plain="true"
+							@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
+							class="btns">
+							修改订单
+						</u-button>
+					</view>
+					<view class="showBtn-view" v-show="btnShow">
+						<u-button
+							shape="circle" :plain="true"
+							@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
+							class="btns">
+							充值
+						</u-button>
+						<u-button
+							shape="circle" :plain="true"
+							@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
+							class="btns">
+							加钟
+						</u-button>
+						<u-button
+							shape="circle" :plain="true"
+							@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
+							class="btns">
+							改价
+						</u-button>
+					</view>
+				</view>
+				
 			</view>
 		</view>
 		<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
@@ -313,12 +373,63 @@
 				<view class="pay_btn" @click="pay()">确认支付</view>
 			</view>
 		</u-popup>
-
+		<!-- 提前结束 -->
+		<view>
+			<!-- 提前结束 -->
+			<uni-popup ref="popup" background-color="#fff">
+				<view class="popup-content">
+					<view class="popup-head">
+						<span>请输入提前结束的原因</span>
+						<span @click="closePopup(type)">x</span>
+					</view>
+					<view class="popup-mian">
+						<textarea placeholder="请输入提前结束服务原因" @input="textareaInp" class="popup-mian-textarea" name="" id="" cols="30" rows="10"></textarea>
+						<view class="popup-mian-btn">
+							<span @click="closePopup(type)">
+								取消
+							</span>
+							<span @click="tiqian('center')">
+								确定
+							</span>
+						</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+		<!-- 确认拒绝 -->
+		<view>
+			<!-- 确认拒绝 -->
+			<uni-popup ref="popupQ" background-color="#fff">
+				<view class="popup-content">
+					<view class="popup-head">
+						<span>确认拒单</span>
+						<span @click="closePopupQ(type)">x</span>
+					</view>
+					<view class="popup-mian">
+						<view  class="popup-mian-textarea">
+							{{qurenJd.refusalContent}}
+						</view>
+						<view class="popup-mian-btn">
+							<span @click="TuiPopup(type,'1')">
+								同意
+							</span>
+							<span @click="TuiPopup(type,'3')">
+								全额退款
+							</span>
+						</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
 	</view>
 
 </template>
 
 <script>
+	// 调用手机系统权限
+	// #ifdef APP-PLUS
+	import permision from "@/components/permission.js";
+	// #endif
 	export default {
 		data() {
 			return {
@@ -368,7 +479,12 @@
 				openLists: [],
 				openWay: 1,
 				closeable: true,
-				yhqxSel: '否'
+				yhqxSel: '否',
+				btnShow:false,
+				tiqianData:'',
+				type:'center',
+				earlyFinishReason:'',
+				qurenJd:[]
 			}
 		},
 		onLoad(e) {
@@ -426,6 +542,125 @@
 			// #endif
 		},
 		methods: {
+			getOrder() {
+				let data = {
+					ordersId: this.ordersId
+				}
+				this.$Request.get('/app/artificer/selectOrdersDetails', data).then(res => {
+					if (res.code == 0) {
+						this.loading = false
+						uni.hideLoading()
+						this.order = res.data
+						let aliphone = this.$queue.getData('aliphone');
+						if (aliphone === '是' && this.order.artificer) {
+							this.ysPhone(this.order.phone, this.order.artificer.phone);
+						}
+					}
+				})
+			},
+			closePopupQ(type){//提前结束    关闭弹出框
+				this.type = type
+				this.$refs.popupQ.close(type);
+			},
+			toggleQ(type,item) {//确认拒单 弹出框
+				this.qurenJd=item;
+				
+				this.type = type
+				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+				this.$refs.popupQ.open(type)
+			},
+			TuiPopup(typeTxte,type){//确认拒单 全额退款.同意按钮   关闭弹出框
+				this.type = typeTxte
+				let data = {
+					ordersId: this.qurenJd.ordersId,
+					isAuto: '0',
+					type: type
+				}
+				this.$Request.post('/app/artificer/cancelSupplementOrders', data).then(res => {
+					if (res.code == 0) {
+						uni.showToast({
+							title:'操作完成！'
+						})
+							this.$refs.popupQ.close(typeTxte);
+					}else{
+						uni.showToast({
+							icon:'error',
+							title:'操作失败！'
+						})
+					}
+				
+				}).catch(() => {
+					//联网失败, 结束加载
+				});
+			},
+			closePopup(type){//提前结束    关闭弹出框
+				this.type = type
+				this.$refs.popup.close(type);
+			},
+			textareaInp(e){//提前结束 输入框
+				this.earlyFinishReason=e.detail.value;
+				console.log("earlyFinishReason",this.earlyFinishReason)
+			},
+			tiqian(type){//提前结束 确认按钮
+				var that=this;
+				that.type = type;
+				
+				uni.getLocation({
+					type: 'wgs84',
+					success: function (resa) {
+						var longitude=resa.longitude;
+						var latitude=resa.latitude;
+						console.log('当前位置的经度：' + resa.longitude);
+						console.log('当前位置的纬度：' + resa.latitude);
+						let data = {
+							ordersId: that.tiqianData.ordersId,
+							accomplishLongitude:longitude,
+							accomplishLatitude:latitude,
+							earlyFinishReason: that.earlyFinishReason,
+						}
+						that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
+							if (res.code == 0) {
+								uni.showToast({
+									title:'操作完成！'
+								})
+								that.$refs.popup.close(type);
+							}else{
+								console.log('shibai：' + longitude);
+								console.log('shibai：' + latitude);
+								uni.showToast({
+									icon:'error',
+									title:'操作失败！'
+								})
+							}
+						
+						}).catch(() => {
+							//联网失败, 结束加载
+						});
+						
+					},
+						fail: function(e) {
+							// #ifdef H5
+								uni.showToast({
+									title:'获取地址失败！'
+								})
+							// #endif
+							// #ifdef APP-PLUS
+							that.checkPermission();
+							// #endif
+						}
+				});
+				
+			},
+			toggle(type,item) {//提前结束 弹出框
+				this.tiqianData=item;
+				this.type = type;
+				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+				this.$refs.popup.open(type);
+			},
+			
+			gengBtn(){
+				this.btnShow=!this.btnShow
+			},
 			goChat() {
 				let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信 
 				let kefuPhone = this.$queue.getData('kefuPhone');
@@ -787,27 +1022,13 @@
 					}
 				});
 			},
-			goNav(e) {
+			goNav(e,item) {
+				this.$queue.setData('daibudan',item);
 				uni.navigateTo({
 					url: e
 				})
 			},
-			getOrder() {
-				let data = {
-					ordersId: this.ordersId
-				}
-				this.$Request.get('/app/artificer/selectOrdersDetails', data).then(res => {
-					if (res.code == 0) {
-						this.loading = false
-						uni.hideLoading()
-						this.order = res.data
-						let aliphone = this.$queue.getData('aliphone');
-						if (aliphone === '是' && this.order.artificer) {
-							this.ysPhone(this.order.phone, this.order.artificer.phone);
-						}
-					}
-				})
-			},
+			
 			delOrder(e) {
 				let that = this
 				uni.showModal({
@@ -844,8 +1065,11 @@
 					}
 				});
 			},
-			openpay() {
-				this.showpay = true
+			openpay(item) {
+				uni.navigateTo({
+					url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId
+				})
+				// this.showpay = true
 			},
 			// 支付订单
 			pay() {
@@ -1173,6 +1397,131 @@
 </script>
 
 <style lang="scss" scoped>
+	.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-weight: bold;
 		font-size: 25rpx;
diff --git a/my/order/payModify.vue b/my/order/payModify.vue
index 6ef72ab..a553685 100644
--- a/my/order/payModify.vue
+++ b/my/order/payModify.vue
@@ -1,27 +1,27 @@
 <template>
 	<view class="content">
 		<view class="padding-bottom u-skeleton">
-			<view class="bgImg u-skeleton-fillet" v-if="order.ordersMassageList && order.ordersMassageList.length > 0"
-				style="padding: 0 29rpx;">
-				<view class="padding margin-top-sm header-view">
+			<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
+				<view class="padding margin-top-sm header-view" @click="getAddressList()">
+					<view v-if="!detailaddress">请选择地址</view>
 					<view class="margin-right-xs">
 						<view class="flex justify-between margin-top-lg">
 							<view class="header-view-text">联系人</view>
 							<view class="header-view-data">
-								<text>{{order.serveTime}}</text>
+								<text>{{name}}</text>
 							</view>
 						</view>
 						<view class="flex justify-between margin-top-lg">
 							<view class="header-view-text">手机号码</view>
-							<view class="header-view-data" @click="bindphone(order.phone)">
-								{{order.phone}}
+							<view class="header-view-data">
+								{{mobile}}
 							</view>
 						</view>
 						<view class="flex justify-between margin-top-lg">
 							<view class="header-view-text">详细地址</view>
-							<view class="flex adders-view" @tap="bindGps(order.latitude,order.longitude,order.address)">
+							<view class="flex adders-view">
 									<span>
-										{{order.address}}
+										{{province}}/{{city}}/{{district}}/{{detailaddress}}
 									</span>
 									<image src="../../static/shezhi-jiantou.png" mode=""></image>
 							</view>
@@ -42,24 +42,46 @@
 							服务时间
 						</view>
 						<view class="fuwu-time-view" @change="changeLog">
-							<uni-datetime-picker v-model="single">{{single==''?order.serveTime:single}}</uni-datetime-picker>
+							<uni-datetime-picker :hide-second='true' v-model="single" type="datetime">{{single==''?order.serveTime:single}}</uni-datetime-picker>
 							<!-- <span>{{order.serveTime}}</span> -->
 							<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
 						</view>
 					</view>
-					<view class="liliao">
-						<view class="liliao-top">
+					<view class="liliao" @click="liliaoshi">
+						<view class="liliao-top" style="width: 30%;">
 							<span>理疗师</span>
-							<span>资深</span>
+							<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
 						</view>
 						<view class="liliao-bottom">
-							<span>王丽娜</span>
+							<span v-if="jishiName">{{jishiName.artificerName}}</span>
+							<span v-else>选择不同技师价格可能不一样哦~</span>
 							<image class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
 						</view>
 					</view>
 				</view>
-				
-				<view class="head-top">
+				<checkbox-group @change="checkboxChange">
+					<view class="youhui-weiyong youhui-list" v-for="(itemY,indexY) in couponData" :key="itemY.id">
+						<view class="youhui-view-left">
+							<view class="youhui-view-left-yuan">
+								<span class="youhui-view-left-num">{{itemY.money}}</span>
+								<span class="youhui-view-left-text">元</span>
+							</view>
+							<view class="youhui-view-left-bottom">
+								满{{itemY.minMoney}}元可用
+							</view>
+						</view>
+						<view class="youhui-view-right">
+							<view class="youhui-view-right-top">
+								<view class="youhui-view-right-title">{{itemY.couponName}}</view>
+								<view class="youhui-view-right-time">{{itemY.endDate}}</view>
+							</view>
+							<label class="tui-radio">
+								<checkbox activeBackgroundColor="#096f4b" color="#096f4b" :value="itemY.id.toString()" :checked="checkbox"/>
+							</label>
+						</view>
+					</view>
+				</checkbox-group>
+				<!-- <view class="head-top">
 					<view class="head-top-view">
 						<image class="head-top-view-img" src="../../static/yuyue.png" mode=""></image>
 						<view class="head-top-view-right">
@@ -90,12 +112,12 @@
 						<span>合计</span>
 						<span>￥{{order.sumMoney}}</span>
 					</view>
-				</view>
+				</view> -->
 				<view class="margin-top-xl pay-ding">
 					<view class="d-title">备注</view>
 					<view class="list-pay">
 						<view class="textarea-pay-list">
-							<textarea class="textarea-pay" placeholder="请输入备注" name="" maxlength="100"></textarea>
+							<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
 						</view>
 						
 					</view>
@@ -124,15 +146,10 @@
 
 
 			
-
-			<view class="tabber padding-top-sm padding-bottom-sm pay-zhifu">
-				<span class="daizhifu">待支付:￥268</span>
-				<u-button class="u-button-pay" @click="openpay()" shape="circle" :custom-style="customStyle2" :hair-line="false">
-					立即支付
-				</u-button>
-			</view>
+			<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">立即预约</view>
+		
 		</view>
-		<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
+		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
 		<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
 			<scroll-view scroll-y="true" style="width: 750rpx;height: 500rpx;">
 				<view class="list_item" v-for="(item,index) in orderList" :key="index">
@@ -176,7 +193,13 @@
 						</view>
 					</view>
 				</view>
-			<view class="pay_btn" @click="pay()">确认支付</view>
+				<view class="tabber padding-top-sm padding-bottom-sm pay-zhifu" style="background: #fff !important;">
+					<span class="daizhifu">待支付:￥{{tpayMoney}}</span>
+					<u-button class="u-button-pay" @click="pay()" shape="circle" :custom-style="customStyle2" :hair-line="false">
+						立即支付
+					</u-button>
+				</view>
+			
 			</view>
 		</u-popup>
 
@@ -188,7 +211,7 @@
 	export default {
 		data() {
 			return {
-				single: '',
+				single:'2024-06-19',
 				radio1:'',
 				sex: [{
 					text: '我已同意《盛安健康服务协议》',
@@ -240,14 +263,32 @@
 				openLists: [],
 				openWay: 1,
 				closeable: true,
-				yhqxSel: '否'
+				yhqxSel: '否',
+				address:[],
+				detailaddress:'',
+				name:'',
+				mobile:'',
+				cityaddress:'',
+				isDefault:'',
+				userId:'',
+				latitude:'',
+				longitude:'',
+				province:'',
+				city:'',
+				district:'',
+				addressId:'',
+				isTrues: true,
+				jishiName:'',
+				checkbox:false,
+				couponData:[],
+				couponId:'',
+				textareaData:'',
+				ordersId:'',
+				userPackageDetailId:'',
 			}
 		},
 		onLoad(e) {
-			uni.showLoading({
-				title: '加载中......',
-
-			})
+			this.jishiName=this.$queue.getData('getJishi');
 			// setTimeout(() => {
 			// 	// this.loading = false;
 			// }, 2000)
@@ -257,14 +298,18 @@
 					title: '订单详情'
 				})
 			}
-			this.ordersId = e.ordersId
+			this.ordersId = this.$queue.getData('ordersId');
+			this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
+			this.youhui()
 			// this.getOrder()
 		},
+		
 		onShow() {
-			this.yhqxSel = this.$queue.getData("yhqxSel");
-			this.getOrder()
-			if (uni.getStorageSync('token')) {
-				this.getIsVip()
+			this.addressId = this.$queue.getData('EditAddress');
+			if (this.addressId) {
+				this.getAddressList(this.addressId);
+			} else {
+				this.addressMy()
 			}
 
 			// #ifndef MP-WEIXIN
@@ -298,7 +343,134 @@
 			// #endif
 		},
 		methods: {
+			openpay() {//验证
+				if(this.single=='2024-06-19'){
+					uni.showToast({
+						title:'请选择服务时间！'
+					})
+				}else if(this.jishiName==''){
+					uni.showToast({
+						title:'请选择理疗师！'
+					})
+				}else if(this.radio1!='0'){
+					uni.showToast({
+						title:'请同意服务保障！'
+					})
+				}else{
+					this.showpay = true;
+					this.goOrder()
+				}
+				
+			},
+			textareaChange(e){//备注
+				this.textareaData=e.detail.value
+				console.log("adsadas0",this.textareaData)
+			},
+			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)
+					}
+							
+				});
+			},
+			liliaoshi(){
+				// this.$queue.setData('taocanDd', '2');
+				
+				uni.setStorage({
+				  key: 'taocanDd',
+				  data: '支付',
+				  success: function () {
+				   uni.switchTab({
+				   	url: '/pages/therapist/therapist'
+				   })
+				  }
+				});
+			},
+			getChuXing() {//判断这个城市 是不是在经营范围
+				this.$Request.getT('/app/artificer/selectTaxiMoney?artificerId=' + this.artificerId + '&latitude=' + this
+					.latitude + '&longitude=' + this.longitude).then(res => {
+					if (res.code == 0) {
+						this.cheFei = res.data.taxiMoney ? res.data.taxiMoney : 0;
+						// this.price = parseInt(this.price)+parseInt(this.cheFei).toFixed(2)
+						this.distances = res.data.distances
+						this.tripNum = res.data.tripNum
+						this.xuMoney = res.data.xuMoney
+						this.tripPrice = res.data.tripPrice
+						this.cxSel = true;
+					} else {
+						this.cxSel = false;
+						uni.showToast({
+							title: '当前城市暂未开通，请切换城市',
+							duration: 2000,
+							icon: 'none'
+						});
+					}
+				});
+			},
+			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=' + 2
+					})
+				}
+				
+			},
 			changeLog(e){//服务时间
+			console.log("11111",e)
 				this.single=e;
 			},
 			goChat() {
@@ -377,32 +549,38 @@
 					}
 				});
 			},
-			goOrder(item) {
+			goOrder() {//生成orderId
 				let that = this
-				let payMoney = that.isVip ? item.memberPrice : item.price;
 				let data = {
-					parentId: that.order.ordersId,
-					artificerId: that.order.artificerId,
-					ordersMassageList: [{
-						massageId: item.massageTypeId,
-						num: 1,
-					}],
-					price: payMoney,
-					couponId: '',
-					payMoney: payMoney,
-					userId: uni.getStorageSync('userId'),
+				  address:that.province+that.city+that.district+that.detailaddress,
+				  artificerId:that.jishiName.artificerId,
+				  userPackageDetailId:that.userPackageDetailId,
+				  phone:that.mobile,
+				  userName:that.name,
+				  tripWay:that.jishiName.tripWay,
+				  city:that.city,
+				  couponId: that.couponId,
+				  userId: uni.getStorageSync('userId'),
+				  longitude:that.longitude,
+				  latitude:that.latitude,
+				  serveTime:that.single,
+				  remarks:that.textareaData,
+				  ordersMassageList:[
+				    {massageId: that.userPackageDetailId? that.userPackageDetailId:that.ordersId,num: 1},
+				  ]
 				}
 				that.$Request.postJson("/app/artificer/insertOrders", data).then(res => {
 					that.showorder = false
 					if (res.code == 0) {
-						that.tordersId = res.data.ordersId;
-						that.tpayMoney = payMoney;
+						that.ordersId = res.data.ordersId;
+						that.tpayMoney = res.data.payMoney;
 						that.showpay = true;
 						that.paySel = 1;
+						
 					} else {
 						that.$queue.showToast(res.msg)
 					}
-
+							
 				});
 			},
 			payJZ() {
@@ -416,7 +594,7 @@
 								that.$queue.showLoading('支付中...')
 								// console.log('用户点击确定');
 								that.$Request.post("/app/artificer/payOrders", {
-									ordersId: that.tordersId,
+									ordersId: that.ordersId,
 								}).then(ret => {
 									uni.hideLoading();
 									if (ret.code == 0) {
@@ -424,7 +602,7 @@
 											title: '支付成功',
 											icon: 'none'
 										})
-										that.getOrder()
+										// that.getOrder()
 
 									} else {
 										uni.showToast({
@@ -434,7 +612,7 @@
 									}
 								});
 							} else if (re.cancel) {
-								that.getOrder()
+								// that.getOrder()
 							}
 						}
 					})
@@ -461,7 +639,7 @@
 										title: '支付成功',
 										icon: 'none'
 									})
-									that.getOrder()
+									// that.getOrder()
 									// this.$queue.showToast('支付成功');
 
 									// uni.switchTab({
@@ -474,7 +652,7 @@
 										title: '支付失败',
 										icon: 'nones'
 									});
-									that.getOrder()
+									// that.getOrder()
 								}
 							});
 						}
@@ -719,9 +897,7 @@
 					}
 				});
 			},
-			openpay() {
-				this.showpay = true
-			},
+			
 			// 支付订单
 			pay() {
 				let that = this
@@ -730,23 +906,24 @@
 					this.payJZ();
 					return;
 				}
+				console.log("ordersId000000000",this.ordersId)
 				if (that.openWay == 1) { //零钱支付
 					uni.showModal({
 						title: '付款提示',
-						content: '确认支付' + that.order.payMoney + '元吗?',
+						content: '确认支付' + that.tpayMoney + '元吗?',
 						success: function(re) {
 							if (re.confirm) {
 								that.$queue.showLoading('支付中...')
 								console.log('用户点击确定');
 								that.$Request.post("/app/artificer/payOrders", {
-									ordersId: that.order.ordersId,
+									ordersId: that.ordersId,
 								}).then(res => {
 									uni.hideLoading();
 									if (res.code == 0) {
 										uni.showToast({
 											title: '支付成功'
 										})
-										that.getOrder()
+										// that.getOrder()
 									} else {
 										uni.showToast({
 											title: res.msg,
@@ -785,7 +962,7 @@
 										title: '支付成功',
 										icon: 'none'
 									})
-									that.getOrder()
+									// that.getOrder()
 									// this.$queue.showToast('支付成功');
 
 									// uni.switchTab({
@@ -798,7 +975,7 @@
 										title: '支付失败',
 										icon: 'nones'
 									});
-									that.getOrder()
+									// that.getOrder()
 								}
 							});
 						}
@@ -930,7 +1107,7 @@
 								title: '支付成功',
 								icon: 'none'
 							})
-							that.getOrder()
+							// that.getOrder()
 						} else {
 							uni.hideLoading();
 						}
@@ -959,7 +1136,7 @@
 							title: '支付成功',
 							icon: 'none'
 						})
-						that.getOrder()
+						// that.getOrder()
 					},
 					fail: function(err) {
 						uni.hideLoading();
@@ -990,7 +1167,7 @@
 							that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
 								uni.hideLoading();
 								if (res.code == 0) {
-									that.getOrder()
+									// that.getOrder()
 								} else {
 									that.$queue.showToast(res.msg);
 								}
@@ -1048,6 +1225,108 @@
 </script>
 
 <style lang="scss" scoped>
+	/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, #019C88, #28BA92, #35C495);
+		text-align: center;
+		line-height: 66rpx;
+	}
+	/deep/.skeleton-fade{
+		display: none;
+	}
 	/deep/.u-button-pay{
 		width: 381rpx;
 		height: 68rpx;
@@ -1354,8 +1633,7 @@
 	}
 	
 	.content{
-		 padding-bottom: 140rpx;
-		 padding-top: 20px;
+		 padding-top: 1px;
 		 width: 100%;
 		 background-color: #f7f7f7;
 	}
@@ -1375,7 +1653,7 @@
 	}
 
 	.bg {
-		background: linear-gradient(to right, #223845, #00a85b);
+		background: #fff;
 	}
 
 	.list_item {
@@ -1517,9 +1795,9 @@
 
 	.popup_pay {
 		width: 100%;
+		height: 210px;
 		position: relative;
 		padding-bottom: 45rpx;
-		/* height: 160px; */
 		/* #ifndef MP-WEIXIN */
 		/* height: 130px; */
 		/* #endif */
diff --git a/my/order/payModifyDzhifu.vue b/my/order/payModifyDzhifu.vue
new file mode 100644
index 0000000..ac3de6f
--- /dev/null
+++ b/my/order/payModifyDzhifu.vue
@@ -0,0 +1,1816 @@
+<template>
+	<view class="content">
+		<view class="padding-bottom u-skeleton">
+			<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
+				<view class="padding margin-top-sm header-view">
+					<view v-if="!detailaddress">请选择地址</view>
+					<view class="margin-right-xs">
+						<view class="flex justify-between margin-top-lg">
+							<view class="header-view-text">联系人</view>
+							<view class="header-view-data">
+								<text>{{name}}</text>
+							</view>
+						</view>
+						<view class="flex justify-between margin-top-lg">
+							<view class="header-view-text">手机号码</view>
+							<view class="header-view-data">
+								{{mobile}}
+							</view>
+						</view>
+						<view class="flex justify-between margin-top-lg">
+							<view class="header-view-text">详细地址</view>
+							<view class="flex adders-view">
+									<span>
+										{{province}}/{{city}}/{{district}}/{{detailaddress}}
+									</span>
+									<image src="../../static/shezhi-jiantou.png" mode=""></image>
+							</view>
+						</view>
+						<view class="flex justify-between margin-top-lg" v-if="order.remark">
+							<view style="width: 170rpx;">备注内容</view>
+							<view class="flex">
+								<view class="">
+									{{order.remark}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="padding margin-top-sm header-view">
+					<view class="fuwu-time">
+						<view class="fuwu-title">
+							服务时间
+						</view>
+						<view class="fuwu-time-view" @change="changeLog">
+							<uni-datetime-picker :hide-second='true' v-model="single" type="datetime">{{single==''?order.serveTime:single}}</uni-datetime-picker>
+							<!-- <span>{{order.serveTime}}</span> -->
+							<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
+						</view>
+					</view>
+					<view class="liliao" @click="liliaoshi">
+						<view class="liliao-top" style="width: 30%;">
+							<span>理疗师</span>
+							<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
+						</view>
+						<view class="liliao-bottom">
+							<span v-if="jishiName">{{jishiName.artificerName}}</span>
+							<span v-else>选择不同技师价格可能不一样哦~</span>
+							<image class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
+						</view>
+					</view>
+				</view>
+				<checkbox-group @change="checkboxChange">
+					<view class="youhui-weiyong youhui-list" v-for="(itemY,indexY) in couponData" :key="indexY">
+						<view class="youhui-view-left">
+							<view class="youhui-view-left-yuan">
+								<span class="youhui-view-left-num">{{itemY.money}}</span>
+								<span class="youhui-view-left-text">元</span>
+							</view>
+							<view class="youhui-view-left-bottom">
+								满{{itemY.minMoney}}元可用
+							</view>
+						</view>
+						<view class="youhui-view-right">
+							<view class="youhui-view-right-top">
+								<view class="youhui-view-right-title">{{itemY.couponName}}</view>
+								<view class="youhui-view-right-time">{{itemY.endDate}}</view>
+							</view>
+							<label class="tui-radio">
+								<checkbox :checked="checkbox=itemY.id==huixian[indexY]?true:false" activeBackgroundColor="#096f4b" color="#096f4b" :value="itemY.id.toString()"/>
+							</label>
+						</view>
+					</view>
+				</checkbox-group>
+				<view class="margin-top-xl pay-ding">
+					<view class="d-title">备注</view>
+					<view class="list-pay">
+						<view class="textarea-pay-list">
+							<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
+						</view>
+						
+					</view>
+				</view>
+				<view class="margin-top-xl pay-ding">
+					<view class="d-title" style="margin-bottom: 5px;">服务保障</view>
+					<view class="list-pay">
+						<view class="list-pay-text">
+							<span>*每单保险</span>
+							<span>赠送意外险，每单保障您的人身及财产安全</span>
+						</view>
+						<view class="list-pay-text">
+							<span>*迟到补偿</span>
+							<span>调理师迟到，按迟到时长规则补偿一定金额给客户</span>
+						</view>
+						<view class="list-pay-text">
+							<span>*不满意退全款</span>
+							<span>服务不满意，可在订单结束48小时内向平台提出异议</span>
+						</view>
+					</view>
+					<view class="checkbox-data">
+						<uni-data-checkbox v-model="radio1" :localdata="sex"></uni-data-checkbox>
+					</view>
+				</view>
+			</view>
+			<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">立即预约</view>
+		</view>
+		<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
+			<scroll-view scroll-y="true" style="width: 750rpx;height: 500rpx;">
+				<view class="list_item" v-for="(item,index) in orderList" :key="index">
+					<image :src="item.massageImg"></image>
+					<view class="listitem_rightview">
+						<view class="titleview">
+							<view class="item_title">{{item.title}}</view>
+							<view class="item_yishou">已售{{item.sales}}</view>
+						</view>
+						<view class="flex flex-wrap" style="margin-top: 10rpx;" v-if="item.labels.length>0">
+							<text class="margin-bottom-xs box" v-for="(items,index) in item.labels"
+								:key="index">{{items}}</text>
+						</view>
+						<view class="btnview">
+							<view class="item_money"> <text style="font-size: 24upx;">￥</text> <text
+									v-if="isVip">{{item.memberPrice}}</text><text v-if="!isVip">{{item.price}}</text>
+								/<text style="font-weight: 500;font-size: 24upx;	">{{item.duration}}分钟</text></view>
+							<view class="item_btn" @click="goOrder(item)">确认加钟</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</u-popup>
+		<!-- 支付方式 -->
+		<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="#096f4b" :checked="openWay === item.id ? true : false" />
+								</label>
+							</radio-group>
+						</view>
+					</view>
+				</view>
+				<view class="tabber padding-top-sm padding-bottom-sm pay-zhifu" style="background: #fff !important;">
+					<span class="daizhifu">待支付:￥{{tpayMoney}}</span>
+					<u-button class="u-button-pay" @click="pay()" shape="circle" :custom-style="customStyle2" :hair-line="false">
+						立即支付
+					</u-button>
+				</view>
+			
+			</view>
+		</u-popup>
+
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				single:'',
+				radio1:'',
+				sex: [{
+					text: '我已同意《盛安健康服务协议》',
+					value: 0
+				}],
+				tordersId: '',
+				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: '否',
+				address:[],
+				detailaddress:'',
+				name:'',
+				mobile:'',
+				cityaddress:'',
+				isDefault:'',
+				userId:'',
+				latitude:'',
+				longitude:'',
+				province:'',
+				city:'',
+				district:'',
+				addressId:'',
+				isTrues: true,
+				jishiName:'',
+				checkbox:false,
+				couponData:[],
+				couponId:'',
+				textareaData:'',
+				ordersId:'',
+				userPackageDetailId:'',
+				dingdanData:'',
+				huixian:[]
+			}
+		},
+		onLoad(e) {
+			this.jishiName=this.$queue.getData('getJishi');
+			this.dingdanData=this.$queue.getData('daibudan');
+			console.log("his.dingdanData",this.dingdanData)
+			this.huixian=this.dingdanData.couponId.split(',');
+			this.single=this.dingdanData.serveTime
+			// setTimeout(() => {
+			// 	// this.loading = false;
+			// }, 2000)
+			this.isTrue = e.isTrue
+			if (this.isTrue) {
+				uni.setNavigationBarTitle({
+					title: '订单详情'
+				})
+			}
+			this.ordersId = this.$queue.getData('ordersId');
+			this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
+			this.youhuiZ()
+			// this.getOrder()
+		},
+		
+		onShow() {
+			this.addressId = this.$queue.getData('EditAddress');
+			if (this.addressId) {
+				this.getAddressList(this.addressId);
+			} else {
+				this.addressMy()
+			}
+
+			// #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: {
+			openpay() {//验证
+				if(this.single=='2024-06-19'){
+					uni.showToast({
+						title:'请选择服务时间！'
+					})
+				}else if(this.jishiName==''){
+					uni.showToast({
+						title:'请选择理疗师！'
+					})
+				}else if(this.radio1!='0'){
+					uni.showToast({
+						title:'请同意服务保障！'
+					})
+				}else{
+					this.showpay = true;
+					this.goOrder()
+				}
+				
+			},
+			textareaChange(e){//备注
+				this.textareaData=e.detail.value
+			},
+			checkboxChange(e){//选择优惠卷
+				this.couponId=e.detail.value.join(",");
+				if(this.huixian.length>1){
+					this.huixian.push(this.couponId)
+				}
+			},
+			youhuiZ(){//获取优惠卷
+				let that = this
+				let data = {
+							  status:0,
+							  page: 1,
+							  limit: 10,
+							}
+				that.$Request.get("/app/coupon/selectCouponUserList", data).then(res => {
+					if (res.code == 0) {
+						var couponData=res.data.list
+						this.youhui(couponData)
+					} else {
+						that.$queue.showToast(res.msg)
+					}
+							
+				});
+			},
+			youhui(couponData){//获取优惠卷
+				let that = this;
+				var daijin=couponData;
+				let data = {
+							  page: 1,
+							  limit: 10,
+							  id:this.dingdanData.couponId,
+							}
+				that.$Request.get("/app/coupon/selectCouponUserList", data).then(res => {
+					if (res.code == 0) {
+						that.couponData=res.data.list;
+						var list=[]
+						for(var i=0;i<daijin.length;i++){
+							that.couponData.push(daijin[i])
+						}
+					} else {
+						that.$queue.showToast(res.msg)
+					}
+							
+				});
+			},
+			liliaoshi(){
+				uni.setStorage({
+				  key: 'taocanDd',
+				  data: '待支付',
+				  success: function () {
+				    uni.switchTab({
+				    	url: '/pages/therapist/therapist'
+				    })
+				  }
+				});
+				
+			},
+			getChuXing() {//判断这个城市 是不是在经营范围
+				this.$Request.getT('/app/artificer/selectTaxiMoney?artificerId=' + this.artificerId + '&latitude=' + this
+					.latitude + '&longitude=' + this.longitude).then(res => {
+					if (res.code == 0) {
+						this.cheFei = res.data.taxiMoney ? res.data.taxiMoney : 0;
+						// this.price = parseInt(this.price)+parseInt(this.cheFei).toFixed(2)
+						this.distances = res.data.distances
+						this.tripNum = res.data.tripNum
+						this.xuMoney = res.data.xuMoney
+						this.tripPrice = res.data.tripPrice
+						this.cxSel = true;
+					} else {
+						this.cxSel = false;
+						uni.showToast({
+							title: '当前城市暂未开通，请切换城市',
+							duration: 2000,
+							icon: 'none'
+						});
+					}
+				});
+			},
+			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=' + 2
+					})
+				}
+				
+			},
+			changeLog(e){//服务时间
+				this.single=e;
+			},
+			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('复制成功');
+					}
+				});
+			},
+			goOrder() {//生成orderId
+					let that = this
+					let data = {
+					  address:that.province+that.city+that.district+that.detailaddress,
+					  artificerId:that.jishiName.artificerId,
+					  ordersMassageList:[
+					    {massageId: that.dingdanData.massageTypeId,num: 1},
+					  ],
+					  city:that.city,
+					  phone:that.mobile,
+					  serveTime:that.single,
+					  userName:that.name,
+					  userId: uni.getStorageSync('userId'),
+					  remarks:that.textareaData,
+					  classifyId:that.dingdanData.classifyId,
+					  couponId: that.couponId==''?that.huixian.join(','):that.couponId,
+					  longitude:that.longitude,
+					  latitude:that.latitude,
+					  ordersId:that.dingdanData.ordersId,
+					  massageTypeId:that.dingdanData.massageTypeId,
+					  userPackageDetailId:that.dingdanData.userPackageDetailId,
+					  technicianType:that.dingdanData.technicianType,
+					}
+					that.$Request.postJson("/app/artificer/updateOrders", data).then(res => {
+						that.showorder = false
+						if (res.code == 0) {
+							that.ordersId = res.data.ordersId;
+							that.tpayMoney = res.data.payMoney;
+							that.showpay = true;
+							that.paySel = 1;
+						} else {
+							that.$queue.showToast(res.msg)
+						}
+								
+					});
+			},
+			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/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.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.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.tordersId,
+							type: 2
+						}
+						that.$Request.post('/app/wxPay/payOrder', 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.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
+							} 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()
+						});
+					// #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);
+						});
+					// #endif
+				}
+
+			},
+			saveJZ(classifyId) {
+				let data = {
+					parentId: classifyId,
+					page: 1,
+					limit: 50,
+					status: 1
+				}
+				let that = this;
+				this.$queue.showLoading('查询中...')
+				that.$Request.get("/app/artificer/selectMassageTypePage", data).then(res => {
+					if (res.code == 0) {
+						if (res.data.list && res.data.list.length > 0) {
+							that.orderList = res.data.list
+							for (let i = 0; i < that.orderList.length; i++) {
+								if (that.orderList[i].labels) {
+									that.orderList[i].labels = that.orderList[i].labels.split(",");
+								}
+							}
+							uni.hideLoading();
+							that.showorder = true;
+						} else {
+							uni.hideLoading();
+							that.$queue.showToast('暂无可加钟项目');
+						}
+					} else {
+						uni.hideLoading();
+						that.$queue.showToast(res.msg);
+					}
+
+				})
+			},
+			//支付选择
+			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) {
+				uni.navigateTo({
+					url: e
+				})
+			},
+			getOrder() {
+				let data = {
+					ordersId: this.ordersId
+				}
+				this.$Request.get('/app/artificer/selectOrdersDetails', data).then(res => {
+					if (res.code == 0) {
+						this.loading = false
+						uni.hideLoading()
+						this.order = res.data
+						let aliphone = this.$queue.getData('aliphone');
+						if (aliphone === '是' && this.order.artificer) {
+							this.ysPhone(this.order.phone, this.order.artificer.phone);
+						}
+					}
+				})
+			},
+			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
+				if (this.paySel != 0) {
+					this.payJZ();
+					return;
+				}
+				console.log("ordersId000000000",this.ordersId)
+				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/artificer/payOrders", {
+									ordersId: that.ordersId,
+								}).then(res => {
+									uni.hideLoading();
+									if (res.code == 0) {
+										uni.showToast({
+											title: '支付成功'
+										})
+										// that.getOrder()
+									} 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.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.order.ordersId,
+							type: 2
+						}
+						that.$Request.post('/app/wxPay/payOrder', 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.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
+							} 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) { //支付宝支付
+					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()
+						});
+					// #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);
+						});
+					// #endif
+				}
+			},
+			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 contentName = '';
+				let closeKC = this.$queue.getData('closeKC');
+				if (e.status == 7 || e.status == 8 && closeKC) {
+					let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
+					contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
+				}
+				let that = this
+				uni.showModal({
+					title: '温馨提示',
+					content: '是否确认取消订单？' + contentName,
+					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) {
+									// 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>
+	/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, #019C88, #28BA92, #35C495);
+		text-align: center;
+		line-height: 66rpx;
+	}
+	/deep/.skeleton-fade{
+		display: none;
+	}
+	/deep/.u-button-pay{
+		width: 381rpx;
+		height: 68rpx;
+		line-height: 68px;
+		text-align: center;
+		color: #fff;
+		font-size: 31rpx;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		border-radius: 34rpx;
+	}
+	.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: 10px;
+	}
+	.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: 25rpx;
+		color: #666666;
+		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-weight: bold;
+		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;
+	}
+	.adders-view span,.header-view-data{
+		font-weight: 400;
+		font-size: 29rpx;
+		color: #666666;
+		text-align: right;
+	}
+	.adders-view{
+		display: flex;
+		flex-direction: row;
+		position: relative;
+	}
+	.header-view-text{
+		width: 170rpx;
+		font-weight: bold;
+		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;
+	}
+	.head-top{
+		width: 100%;
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		padding: 29rpx;
+	}
+	.d-title{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #333333;
+		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: 22rpx;
+		color: #999999;
+		line-height: 38rpx;
+	}
+	.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;
+	}
+	.pay-title{
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #333333;
+		margin-bottom: 5px;
+	}
+	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 */
+
+	}
+
+	.pay_btn {
+		width: 90%;
+		margin: 0 auto;
+		text-align: center;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		height:68rpx;
+		border-radius: 60rpx;
+		color: #ffffff;
+		line-height: 68rpx;
+	}
+
+	.serverAddress {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/my/wallet/index.vue b/my/wallet/index.vue
index a9d48c6..6b5ed57 100644
--- a/my/wallet/index.vue
+++ b/my/wallet/index.vue
@@ -23,21 +23,21 @@
 				<view class="money-miao">只能用于平台消费支付，充值后不可退款</view>
 			</view>
 			<view class="padding-lr padding-bottom">
-				<view class="yu-e">
-					余额充值
+				<view class="chongzhi">
+					<span class="yu-e">余额充值</span>
+					<span @click="toggle('center')">为TA充值</span>
 				</view>
 				<view class="flex justify-between flex-wrap" v-if="wallet.length > 0">
 					<view v-for="(item,index) in wallet" :key='index' class="padding-sm radius"
 						style="color: #555;background-color: #f7f7f7;width: 48%; margin-top: 20rpx;"
 						@click="active(item)" :class="{active:item.isSelect}">
-						<view v-if="item.coupon && item.coupon.money" class="coupon">
-							¥{{item.price}}
+						<view class="coupon" style="display: flex;justify-content:space-between;align-items: center;">
+							<span>充¥{{item.price}}</span>
+							<span>赠¥{{item.sumMoney}}</span>
 						</view>
-						<view v-else style="height: 100%;display: flex;align-items: center;font-size: 34rpx;font-weight: bold;">
-							¥{{item.price}}
-						</view>
-						<view v-if="item.coupon && item.coupon.money" class="coupon-bottom" style="color: #029D88 !important;">
-							赠送 <span style="color: #D33232;">{{item.giveNum}}张{{item.coupon.money}}</span>元优惠券
+						<view class="coupon-bottom" style="color: #029D88 !important;">
+							赠送 <span style="color: #D33232;">{{item.remarks}}</span>
+							<!-- 赠送 <span style="color: #D33232;">{{item.giveNum}}张{{item.coupon.money}}</span>元优惠券 -->
 						</view>
 					</view>
 				</view>
@@ -84,11 +84,15 @@
 					<image src="../../static/img/you.png" style="width: 16rpx;height: 28rpx;"></image>
 				</view>
 			</view> -->
-
+			
+			<!-- <view class="flex justify-around margin-top " v-if="jsczSel != '否'">
+				<view @click="goNav('/pages/therapist/therapistList?index=2')">为TA充值</view>
+				<view @click="goNav('/pages/therapist/therapistList?index=3')">我的理疗师</view>
+			</view> -->
 			<view
 				style="position: fixed;bottom: 0rpx;left: 0;right: 0;background: #FFFFFF;height: 110rpx;line-height: 110rpx;z-index: 999;">
 				<view class="btn" @click="pay"
-					style="background: linear-gradient(to right, #223845, #00a85b);color: #FFFFFF;margin: 16rpx 30upx;position: fixed;bottom: 0upx;width: 90%;border-radius: 50rpx;height: 78rpx;line-height: 78rpx;font-size: 32rpx;">
+					style="background: linear-gradient(to right, #00a85b, #00a85b);color: #FFFFFF;margin: 16rpx 30upx;position: fixed;bottom: 0upx;width: 90%;border-radius: 50rpx;height: 78rpx;line-height: 78rpx;font-size: 32rpx;">
 					确定充值</view>
 			</view>
 		</view>
@@ -206,11 +210,109 @@
 				<view class="btn" @click="cashMoney">立即提现</view>
 			</view>
 		</view>
-
-		<!-- <view class="flex justify-around margin-top " v-if="jsczSel != '否'">
-			<view @click="goNav('/pages/therapist/therapistList?index=2')">为TA充值</view>
-			<view @click="goNav('/pages/therapist/therapistList?index=3')">我的理疗师</view>
-		</view> -->
+		<view>
+			<!-- 普通弹窗 -->
+			<uni-popup ref="popup" background-color="#fff" @change="change">
+				<view class="popup-content">
+					<view class="popup-head">
+						<span>改价单</span>
+						<span @click="closePopup(type)">x</span>
+					</view>
+					<view class="popup-mian">
+						<!-- <view class="popup-mian-textarea">
+							<view class="popup-mian-view">
+								<span>原服务项目价格:</span>
+								<span>￥198元</span>
+							</view>
+							<view class="popup-mian-view">
+								<span>现服务项目价格:</span>
+								<span>￥298元</span>
+							</view>
+							<view class="popup-mian-view">
+								<span>改价需支付差价:</span>
+								<span>￥100元</span>
+							</view>
+						</view> -->
+						<view class="chong">
+							<view class="chong-list">
+								<view class="chong-list-left">
+									<radio value=""  class="chong-list-radio"/>
+									<image src="../../static/jinggao.png" mode=""></image>
+								</view>
+								<view class="chong-list-right">
+									<view class="chong-title">
+										<span>王丽楠</span>
+										<image src="../../static/xinren.png" mode=""></image>
+									</view>
+									<view class="chong-bottom">
+										<view class="chong-bottom-ding">
+											<image src="../../static/orderDetail/dingwei.png" mode=""></image>
+											<span>0.8km</span>
+										</view>
+										<view class="chong-bottom-cheng">
+											<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
+											<span>春城有约</span>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="chong-list">
+								<view class="chong-list-left">
+									<radio value=""  class="chong-list-radio"/>
+									<image src="../../static/jinggao.png" mode=""></image>
+								</view>
+								<view class="chong-list-right">
+									<view class="chong-title">
+										<span>王丽楠</span>
+										<image src="../../static/xinren.png" mode=""></image>
+									</view>
+									<view class="chong-bottom">
+										<view class="chong-bottom-ding">
+											<image src="../../static/orderDetail/dingwei.png" mode=""></image>
+											<span>0.8km</span>
+										</view>
+										<view class="chong-bottom-cheng">
+											<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
+											<span>春城有约</span>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="chong-list">
+								<view class="chong-list-left">
+									<radio value=""  class="chong-list-radio"/>
+									<image src="../../static/jinggao.png" mode=""></image>
+								</view>
+								<view class="chong-list-right">
+									<view class="chong-title">
+										<span>王丽楠</span>
+										<image src="../../static/xinren.png" mode=""></image>
+									</view>
+									<view class="chong-bottom">
+										<view class="chong-bottom-ding">
+											<image src="../../static/orderDetail/dingwei.png" mode=""></image>
+											<span>0.8km</span>
+										</view>
+										<view class="chong-bottom-cheng">
+											<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
+											<span>春城有约</span>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="popup-mian-btn">
+							<span @click="closePopup(type)">
+								取消
+							</span>
+							<span>
+								确定
+							</span>
+						</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
 
 	</view>
 </template>
@@ -219,6 +321,7 @@
 	export default {
 		data() {
 			return {
+				type:'center',
 				jsczSel: '否',
 				tgCheck: '否',
 				isAgency: 0,
@@ -270,7 +373,8 @@
 				placeholder: '',
 				renzheng: 0,
 				sp: 0,
-				txMsg: ''
+				txMsg: '',
+				nameTxt:''
 			}
 		},
 		onLoad(d) {
@@ -280,12 +384,14 @@
 			} else {
 				this.tabIndex = 0;
 			}
+			
 			this.wxTxSel = this.$queue.getData('wxTxSel');
 			this.ylTxSel = this.$queue.getData('ylTxSel');
 			this.jsczSel = this.$queue.getData('jsczSel');
 			this.txMsg = this.$queue.getData('txMsg');
 			this.avatar = uni.getStorageSync('avatar')
 			this.renzheng = uni.getStorageSync("renzheng")
+			this.nameTxt=d.text
 			this.getMoneyList();
 			// #ifndef MP-WEIXIN
 			this.openLists = [{
@@ -326,9 +432,6 @@
 					if (res.code == 0) {
 						this.wallet = [];
 						res.data.forEach((d, index) => {
-							// if(!d.coupon){
-							// 	return;
-							// }
 							if (index == 0) {
 								d.isSelect = true;
 								this.thisSelect = d;
@@ -340,6 +443,19 @@
 					}
 				});
 			},
+			change(e) {
+				console.log('当前模式：' + e.type + ',状态：' + e.show);
+			},
+			closePopup(type){//改价    关闭弹出框
+				this.type = type
+				this.$refs.popup.close(type);
+			},
+			toggle(type) {//改价 弹出框
+				this.type = type
+				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+				this.$refs.popup.open(type)
+			},
+			
 			//退保证金
 			TuiPrice() {
 				let that = this
@@ -781,6 +897,206 @@
 </script>
 
 <style scoped>
+	.chong-list:last-child{
+		border: 0px !important;
+	}
+	.chong-bottom-cheng image{
+		width: 22.22rpx;
+		height: 22.22rpx;
+		margin-right: 5px;
+	}
+	.chong-bottom-cheng span{
+		font-weight: 500;
+		font-size: 23rpx;
+		color: #222222;
+	}
+	.chong-bottom-ding image{
+		width: 18.75rpx;
+		height: 21.53rpx;
+		margin-right: 5px;
+	}
+	.chong-bottom-ding span{
+		font-weight: bold;
+		font-size: 25rpx;
+		color: #848485;
+	}
+	.chong-bottom-ding,.chong-bottom-cheng{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.chong-bottom{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 10px;
+	}
+	.chong-title image{
+		width: 50rpx;
+		height: 22.22rpx;
+	}
+	.chong-title span{
+		font-weight: 400;
+		font-size: 29rpx;
+		color: #333333;
+		margin-right: 5px;
+	}
+	.chong-title{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.chong-list-right{
+		width: 75%;
+		display: flex;
+		flex-direction: column;
+	}
+	.chong-list-left image{
+		width: 76rpx;
+		height: 76rpx;
+	}
+	/deep/uni-radio .uni-radio-input{
+		width: 29.86rpx;
+		height: 29.86rpx;
+		margin: -3px 0px 0px -20px;
+		background-color: rgba(4, 159, 137, 1) !important;
+		border-color: rgba(4, 159, 137, 1) !important;
+	}
+	.chong-list-radio{
+		margin-right: 5px;
+		width: 29.86rpx;
+		height: 29.86rpx;
+	}
+	.chong-list-left{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.chong-list{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		padding: 10px 0px;
+		border-bottom: 1px solid #DCDCDC;
+	}
+	.chong{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.img-span{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 40px;
+		height: 16px;
+		line-height: 16px;
+		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
+		border-top-left-radius: 15rpx;
+		border-bottom-right-radius: 15rpx;
+		font-weight: bold;
+		font-size: 18rpx;
+		color: #FFFFFF;
+		position: absolute;
+		bottom: 0;
+		right: 0;
+		margin: 0 6px 6px 0px;
+	}
+	
+	.popup-mian-view span:nth-child(1){
+		color: #666666;
+	}
+	.popup-mian-view span:nth-child(2){
+		color: #333;
+		font-weight: bold;
+	}
+	.popup-mian-view span{
+		font-size: 29rpx;
+	}
+	.popup-mian-view{
+		width: 100%;
+		height: 35px;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		border-bottom: 1px solid #DCDCDC;
+	}
+	.popup-mian-textarea{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.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{
+		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;
+		padding-bottom: 10px;
+		background: #FFFFFF;
+		border-radius: 56rpx;
+		display: flex;
+		flex-direction: column;
+	}
+	
+	
 	.coupon-bottom{
 		font-weight: 400;
 		font-size: 28rpx;
@@ -795,6 +1111,22 @@
 		width: 95%;
 		margin: 0 auto;
 	}
+	.chongzhi span:nth-child(2){
+		color: #00a85b;
+		background-color: #fff;
+		padding: 2px 5px;
+		font-weight: bold;
+		font-size: 35rpx;
+		border:1px solid #00a85b;
+		border-radius: 30px;
+	}
+	.chongzhi{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
 	.yu-e{
 		font-weight: bold;
 		font-size: 35rpx;
diff --git a/my/wallet/mymoneydetail.vue b/my/wallet/mymoneydetail.vue
index eeaf4f7..e2b85e2 100644
--- a/my/wallet/mymoneydetail.vue
+++ b/my/wallet/mymoneydetail.vue
@@ -7,26 +7,30 @@
 					<view style="margin-bottom: 8upx">{{item.content}}</view>
 					<view style="margin-bottom: 8upx"> 创建时间：{{item.createTime}}</view>
 					<view style="margin-bottom: 8upx;text-align: right;">
-						<text v-if="item.type == 1" class="text-olive" style="font-size: 32upx;font-weight: 600"><text class="text-olive">+</text>{{item.money}}元</text>
+						<text v-if="item.type == 2" class="text-olive" style="font-size: 32upx;font-weight: 600"><text class="text-olive">+</text>{{item.money}}元</text>
 						<text v-if="item.type == 2" class="text-red" style="font-size: 32upx;font-weight: 600"><text class="text-red">-</text>{{item.money}}元</text>
 					</view>
 				</view>
 			</view> -->
-			<view class="content-list">
+			<view class="content-list" v-for="(item, index) in list" :key="index">
 				<view class="list-top">
-					<span>支付订单</span>
-					<span class="shijiH">-48元</span>
+					<view class="list-top-view">
+						<span class="list-top-view-title">{{item.title}}</span>
+						<span class="img-span">{{item.blFlag=='1'?'余额':'现金'}}</span>
+					</view>
+					<text v-if="item.type == 1" class="text-olive" style="font-size: 32upx;font-weight: 600"><text class="text-olive">+</text>{{item.money}}元</text>
+					<text v-if="item.type == 2" class="text-red" style="font-size: 32upx;font-weight: 600"><text class="text-red">-</text>{{item.money}}元</text>
 				</view>
 				<view class="list-bottom">
 					<view class="list-bottom-ding">
-						订单号:2023120611401234567，已经下单成功  
+						{{item.content}}
 					</view>
 					<view class="list-bottom-time">
-						2024-01-01 10:00:00
+						创建时间：{{item.createTime}}
 					</view>
 				</view>
 			</view>
-			<!-- <empty v-if="list.length == 0" content="暂无明细" ></empty> -->
+			<empty v-if="list.length == 0" content="暂无明细" ></empty>
 		</view>
 	</view>
 </template>
@@ -93,6 +97,26 @@
 </script>
 
 <style lang="less">
+	.img-span{
+		display: block;
+		padding: 1px 5px;
+		font-weight: 400;
+		font-size: 8px;
+		color: #FFFFFF;
+		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
+		border-radius: 10px 0px 10px 0px;
+		margin-left: 5px;
+	}
+	.list-top-view-title{
+		color: #13141A;
+		font-weight: bold;
+		font-size: 35rpx;
+	}
+	.list-top-view{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
 	.list-bottom-time{
 		font-weight: 400;
 		font-size: 25rpx;
@@ -109,13 +133,7 @@
 		display: flex;
 		flex-direction: column;
 	}
-	.list-top span{
-		font-weight: bold;
-		font-size: 35rpx;
-	}
-	.list-top span:nth-child(1){
-		color: #13141A;
-	}
+	
 	.shijiH{
 		color: #FF8400;
 	}
@@ -146,11 +164,13 @@
 		display: flex;
 		flex-direction: column;
 		margin: 0 auto;
+		padding-bottom: 30px;
 	}
 	.content {
 		width: 100%;
-		height: 100vh;
+		// height: 100vh;
 		background: #f7f7f7;
+		// overflow: scroll;
 	}
 
 	.tui-tab-item-title {
diff --git a/pages.json b/pages.json
index f2e01ac..12e4f09 100644
--- a/pages.json
+++ b/pages.json
@@ -9,7 +9,7 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "盛安到家",
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom",
 				"app-plus": {
 					"titleNView": false
@@ -21,7 +21,7 @@
 		// #ifndef H5
 		{
 			"path": "pages/index/index",
-			"enablePullDownRefresh": true,
+			"enablePullDownRefresh": false,
 			"style": {
 				"navigationBarTitleText": "盛安到家",
 				"navigationStyle": "custom",
@@ -163,6 +163,109 @@
 			}
 		},
 		// #endif
+		{
+			// 我的页面进入 次卡 疗程列表 在进入后订单详情列表
+			"path": "pages/my/orderDetailsList",
+			"style": {
+				"navigationBarTitleText": "订单详情列表",
+				"navigationBarBackgroundColor": "#096f4b",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/my/historyMy",
+			"style": {
+				"navigationBarTitleText": "浏览历史",
+				"navigationBarBackgroundColor": "#096f4b",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/my/myCiLiaoDetail",
+			"style": {
+				"navigationBarTitleText": "我的次卡疗程详情",
+				"navigationBarBackgroundColor": "#096f4b",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/my/indextaociliaoList",
+			"style": {
+				"navigationBarTitleText": "首页套餐次卡疗程",
+				"navigationBarBackgroundColor": "#096f4b",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/my/fuwuliaocheng",
+			"style": {
+				"navigationBarTitleText": "服务疗程",
+				"navigationBarBackgroundColor": "#096f4b",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/my/fuwuGengduo",
+			"style": {
+				"navigationBarTitleText": "更多优惠",
+				"navigationBarBackgroundColor": "#096f4b",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/my/fuwuDateil",
+			"style": {
+				"navigationBarTitleText": "服务项目详情",
+				"navigationBarBackgroundColor": "#096f4b",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/my/fuwuxiangm",
+			"style": {
+				"navigationBarTitleText": "服务项目",
+				"navigationBarBackgroundColor": "#096f4b",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/my/fuwuliaochengDetail",
+			"style": {
+				"navigationBarTitleText": "服务疗程详情",
+				"navigationBarBackgroundColor": "#096f4b",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/my/cika",
+			"style": {
+				"navigationBarTitleText": "项目次卡",
+				"navigationBarBackgroundColor": "#096f4b",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/my/cikarDrtail",
+			"style": {
+				"navigationBarTitleText": "项目次卡详情",
+				"navigationBarBackgroundColor": "#096f4b",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/my/servicePackage",
 			"style": {
@@ -354,7 +457,10 @@
 			"path": "pages/therapist/therapist",
 			"style": {
 				"navigationBarTitleText": "理疗师",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true,
+				"app-plus": {
+					"titleNView": false
+				}
 			}
 		}, 
 		// #endif
@@ -363,7 +469,7 @@
 			"style": {
 				"navigationBarTitleText": "选择理疗师",
 				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/therapist/orderDetail",
@@ -396,12 +502,19 @@
 					}
 				}
 			}, {
+				"path": "order/payModifyDzhifu",
+				"style": {
+					"navigationBarTitleText": "订单详情",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
 				"path": "help/helpDetail",
 				"style": {
 					"navigationBarTitleText": "帮助详情",
 					"enablePullDownRefresh": false
 				}
-			}, {
+			},{
 				"path": "hongbao/youhuijuan",
 				"style": {
 					"navigationBarTitleText": "优惠券",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 99cf12b..b92b835 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -34,8 +34,8 @@
 			</view>
 			
 			<view class="index-nav-bottom width">
-				<image src="../../static/index-nav-6.png" mode="widthFix"></image>
-				<image src="../../static/index-nav-7.png" mode="widthFix"></image>
+				<image src="../../static/index-nav-6.png" mode="widthFix" @click="chaoji"></image>
+				<image src="../../static/index-nav-7.png" mode="widthFix" @click="xinren"></image>
 			</view>
 		</view>
 		<view class="title-star">
@@ -55,7 +55,7 @@
 			</view>
 		</view>
 		<view class="index-project width">
-			<view class="index-project-content" @click="goNav('/pages/my/servicePackage')">
+			<view class="index-project-content" @click="goNav('/pages/my/indextaociliaoList?type='+104+'&name='+'index')">
 				<image src="../../static/index-fenglei1.png" mode="widthFix"></image>
 				<span>盛安套餐</span>
 			</view>
@@ -71,7 +71,7 @@
 				<image src="../../static/index-fenglei4.png" mode="widthFix"></image>
 				<span>会员中心</span>
 			</view>
-			<view class="index-project-content" @click="goNav('/my/wallet/index')">
+			<view class="index-project-content"  @click="chaoji">
 				<image src="../../static/index-fenglei10.png" mode="widthFix"></image>
 				<span>充值赠送</span>
 			</view>
@@ -79,9 +79,9 @@
 				<image src="../../static/index-fenglei5.png" mode="widthFix"></image>
 				<span>超值拼团</span>
 			</view>
-			<view class="index-project-content" @click="goNav('/pages/my/servicePackage')">
+			<view class="index-project-content" @click="goNav('/pages/my/indextaociliaoList?type='+106+'&name='+'index')">
 				<image src="../../static/index-fenglei6.png" mode="widthFix"></image>
-				<span>超值套餐</span>
+				<span>服务疗程</span>
 			</view>
 			<view class="index-project-content" @click="goNav()">
 				<image src="../../static/index-fenglei7.png" mode="widthFix"></image>
@@ -99,7 +99,7 @@
 		<view class="index-guanggao width">
 			<image class="index-guanggao-pintuan" src="../../static/pintuan.png" mode="widthFix"></image>
 			<view class="index-guanggao-right">
-				<image class="index-guanggao-right-cika" @click="goNav('/pages/my/onceCardPackage')" src="../../static/cika.png" mode="widthFix"></image>
+				<image class="index-guanggao-right-cika" @click="goNav('/pages/my/indextaociliaoList?type='+105+'&name='+'index')" src="../../static/cika.png" mode="widthFix"></image>
 				<image class="index-guanggao-right-yuyue" src="../../static/yuyue.png" mode="widthFix"></image>
 			</view>
 		</view>
@@ -119,24 +119,23 @@
 					<view class="index-fujin-view">
 						<image class="index-fujin-view-img" :src="item.artificerImg" mode=""></image>
 						<view class="index-fujin-view-text">
-							<image src="../../static/orderDetail/dingwei.png" mode=""></image>
+							<image src="../../static/orderDetail/dingwei.png" mode="w"></image>
 							<span>1.2km</span>
 						</view>
 					</view>
 					<view class="index-fujin-jie">
 						<view class="index-fujin-jie-view">
 							<span class="index-fujin-jie-name">{{item.artificerName}}</span>
-							<span class="index-fujin-jie-id">{{item.classifyName}}</span>
+							<span class="index-fujin-jie-id">{{item.content}}</span>
 						</view>
 					</view>
 				</view>
 				
 			</view>
-			
 			<view class="index-taocan width">
 				<view class="index-taocan-view">
 					<view class="index-taocan-view-nav" v-for="item in felNav" :key="item.id" @click="chengFel(item)">
-						<view class="index-taocan-view-nav-s" @click="tuijian(item)">
+						<view class="index-taocan-view-nav-s">
 							<span class="index-taocan-view-nav-text" :class="[currentTabFl==item.id?'activeL':'activeH']">{{item.name}}</span>
 							<span class="index-taocan-view-nav-jie" :class="[currentTabFl==item.id?'activeXL':'activeXH']">{{item.content}}</span>
 						</view>
@@ -144,13 +143,14 @@
 					</view>
 				</view>
 				<view class="index-card">
-					<view class="index-card-view">
+					<view class="index-card-view" v-for="(item,index) in tjData" :key="index" @click="goDatail(item)">
 						<view class="index-card-view-title">
-							<view class="index-card-view-title-left">古法十二经络</view>
+							<image class="index-card-image" :src="item.packageImg" mode=""></image>
+							<!-- <view class="index-card-view-title-left">{{item.title}}</view> -->
 							<view class="index-card-view-title-right">助眠解压</view>
 						</view>
 						<view class="index-card-mian">
-							<view class="index-card-mian-title marginTop">古法十二经络SPA</view>
+							<view class="index-card-mian-title marginTop">{{item.title}}</view>
 							<view class="index-card-mian-biao marginTop">
 								<view class="index-card-mian-biao-left">
 									助眠减压
@@ -159,38 +159,13 @@
 									缓解疲劳
 								</view>
 							</view>
-							<view class="index-card-mian-time marginTop">
+							<view class="index-card-mian-time marginTop" v-if="item.duration">
 								<image src="../../static/rumen-time.png" mode="widthFix"></image>
-								<span>100分钟</span>
+								<span>{{item.duration}}分钟</span>
 							</view>
 							<view class="index-card-mian-money marginTop">
-								<span class="index-card-mian-money-zhen">￥388</span>
-								<span class="index-card-mian-money-jia">￥500</span>
-							</view>
-						</view>
-					</view>
-					<view class="index-card-view">
-						<view class="index-card-view-title">
-							<view class="index-card-view-title-left">古法十二经络</view>
-							<view class="index-card-view-title-right">助眠解压</view>
-						</view>
-						<view class="index-card-mian">
-							<view class="index-card-mian-title marginTop">古法十二经络SPA</view>
-							<view class="index-card-mian-biao marginTop">
-								<view class="index-card-mian-biao-left">
-									助眠减压
-								</view>
-								<view class="index-card-mian-biao-right">
-									缓解疲劳
-								</view>
-							</view>
-							<view class="index-card-mian-time marginTop">
-								<image src="../../static/rumen-time.png" mode="widthFix"></image>
-								<span>100分钟</span>
-							</view>
-							<view class="index-card-mian-money marginTop">
-								<span class="index-card-mian-money-zhen">￥388</span>
-								<span class="index-card-mian-money-jia">￥500</span>
+								<span class="index-card-mian-money-zhen">￥{{item.price}}</span>
+								<span class="index-card-mian-money-jia">￥{{item.oldPrice}}</span>
 							</view>
 						</view>
 					</view>
@@ -280,6 +255,7 @@
 				city: '请选择城市',
 				XCXIsSelect: '否',
 				currentTabFl: 1,
+				tjData:[],
 				felNav:[{
 						id:1,
 						content: '大家常买',
@@ -340,35 +316,8 @@
 				starTechnician:[],//明星技师
 				nearbyTechnician:[],//附近技师
 				classifyId: '',
-				 //列表数据
-				goodsList: [
-					{
-						id: 1,
-						name: '大甜梨',
-						descr: '又大又甜又脆巨好吃',
-						icon: '../../static/index-nav-6.png'
-					},{
-						id: 2,
-						name: '猕猴桃',
-						descr: '口感甜酸、可口',
-						icon: '../../static/index-nav-7.png'
-					},{
-						id: 3,
-						name: '樱桃',
-						descr: '又大又甜水还多',
-						icon: '../../static/index-nav-6.png'
-					},{
-						id: 4,
-						name: '牛油果',
-						descr: '果肉柔软、细腻',
-						icon: '../../static/index-nav-7.png'
-					},{
-						id: 5,
-						name: '提子',
-						descr: '又大又甜水还多',
-						icon: '../../static/index-nav-6.png'
-					},
-				]
+				page:1,
+				limit:10,
 			}
 		},
 		onLoad() {
@@ -401,6 +350,7 @@
 			})
 			that.getBannerList()
 			that.getHomeArtificerList()
+			that.remen()
 		},
 		onShow() {
 			let that = this
@@ -431,13 +381,25 @@
 			// that.myId = uni.getStorageSync('userId')
 		},
 		methods: {
-			tuijian(item){//推荐
-				if(item.id==4){
-					uni.navigateTo({
-						url:'/pages/my/serviceItems'
-					})
-				}
-				
+			chaoji(){//超级满减
+				uni.navigateTo({
+					url:'/my/wallet/index'
+				})
+			},
+			xinren(){//新人专享
+				var that=this;
+				that.$Request.get('/app/coupon/insertNewUserCoupon').then(res => {
+					if (res.code == 0) {
+						uni.showToast({
+							title:res.msg
+						})
+					}else{
+						uni.showToast({
+							icon:'error',
+							title:res.msg
+						})
+					}
+				})
 			},
 			goNav(e){
 				if(e!=undefined){
@@ -450,6 +412,39 @@
 					})
 				}
 				
+			},
+			// chooseItem(item){
+				
+			// },
+			chooseItem(e) {//点击某一个item 推荐明星
+				console.log('授权', uni.getStorageSync('sendMsg'))
+				if (uni.getStorageSync('sendMsg')) {
+					console.log('授权+1')
+					wx.requestSubscribeMessage({
+						tmplIds: this.arr,
+						success(re) {
+							console.log(JSON.stringify(re), 111111111111)
+							var datas = JSON.stringify(re);
+							if (datas.indexOf("accept") != -1) {
+								console.log(re)
+							}
+						},
+						fail: (res) => {
+							console.log(res)
+						}
+					})
+				}
+				if (this.token) {
+					uni.navigateTo({
+						url: '/pages/therapist/orderDetail?artificerId=' + e.artificerId + "&classifyId=" + this
+							.tabIndex
+					});
+				} else {
+					uni.navigateTo({
+						url: '/pages/public/login'
+					});
+				}
+			
 			},
 			goOrder(e) {
 				console.log('授权', uni.getStorageSync('sendMsg'))
@@ -471,8 +466,7 @@
 				}
 				if (this.token) {
 					uni.navigateTo({
-						url: '/pages/therapist/orderDetail?artificerId=' + e.artificerId + "&classifyId=" + this
-							.tabIndex
+						url: '/pages/therapist/orderDetail?artificerId=' + e.artificerId + "&classifyId=" + this.tabIndex
 					});
 				} else {
 					uni.navigateTo({
@@ -572,8 +566,59 @@
 					}
 				});
 			},
+			goDatail(item){//热门精选，推荐套餐 跳详情
+				if(this.currentTabFl=='1'){
+					uni.navigateTo({
+						url:'/pages/my/fuwuDateil?id='+item.massageTypeId+'&limit='+this.limit+'&page='+this.page
+					})
+				}else if(this.currentTabFl=='2'){
+					uni.navigateTo({
+						url:'/pages/my/serviceOderDrtail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+'index'+'&isCanCoupon='+item.isCanCoupon
+					})
+				}
+			},
 			chengFel(item){//大家常买。。。 导航切换
-				this.currentTabFl=item.id
+				this.currentTabFl=item.id;
+				if(this.currentTabFl=='1'){
+					this.remen()
+				}else if(this.currentTabFl=='2'){
+					this.tjtaocan()
+				}else if(this.currentTabFl=='3'){
+					uni.navigateTo({
+						url:'/pages/my/fuwuxiangm'
+					})
+				}else{
+					uni.navigateTo({
+						url:'/pages/my/fuwuGengduo'
+					})
+				}
+			},
+			tjtaocan(){//推荐套餐
+				this.$Request.get("/app/massage/package/findPage", {
+					type:'104',
+					page:'1',
+					limit:'2'
+				}).then(res => {
+					if (res.code == 0) {
+						if (res.data) {
+							this.tjData = res.data.list
+						}
+					}
+				});
+			},
+			remen(){//热门精选
+				this.$Request.get("/app/artificer/selectMassageTypePage", {
+					by: '3',
+					status:'1',
+					page:'1',
+					limit:'2'
+				}).then(res => {
+					if (res.code == 0) {
+						if (res.data) {
+							this.tjData = res.data.list
+						}
+					}
+				});
 			},
 			swichMenu(id) {//视频导航
 				this.currentTab = id
@@ -593,17 +638,24 @@
 				this.swichMenu(index)
 				
 			},
-			//点击某一个item 推荐明星
-			chooseItem(item){
-				this.goOrder(item);
-				console.log("推荐明星",item)
-				// 点击拿到整个当前点击的item 执行业务逻辑 
-			},
+			
 		}
 	}
 </script>
 
 <style scoped>
+	.index-card-image{
+		width: 100%;
+		height: 100%;
+	}
+	.index-card-view-title{
+		position: relative;
+		width: 100%;
+		height: 337.5rpx;
+		display: flex;
+		flex-direction: row;
+		border-radius: 30px;
+	}
 	/deep/.u-select{
 		width: 100%;
 		height: 100%;
@@ -618,7 +670,7 @@
 	}
 	/deep/.u-content,/deep/.u-search{
 		flex: none;
-		width: 557.08rpx;
+		width: 230px;
 		border-radius: 32rpx !important;
 		height: 64rpx !important;
 	}
@@ -808,6 +860,7 @@
 		font-weight: bold;
 		font-size: 31rpx;
 		color: #333333;
+		text-align: center;
 	}
 	.marginTop{
 		margin-bottom: 10px;
@@ -830,7 +883,7 @@
 		font-size: 21rpx;
 		color: #fff;
 		position: absolute;
-		margin-left: 85px;
+		/* margin-left: 85px; */
 	}
 	.index-card-view-title-left{
 		width: 95px;
@@ -843,15 +896,7 @@
 		border-top-left-radius: 30px;
 		background-color: rgba(176, 176, 176, 0.48);
 	}
-	.index-card-view-title{
-		position: relative;
-		width: 100%;
-		height: 337.5rpx;
-		background: url(../../static/yuyue.png) 100% no-repeat;
-		display: flex;
-		flex-direction: row;
-		border-radius: 30px;
-	}
+	
 	.index-card-mian-time,.index-card-mian-money{
 		display: flex;
 		flex-direction: row;
@@ -884,6 +929,14 @@
 		display: flex;
 		flex-direction: column;
 	}
+	.tuijian-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 15px;
+	}
 	.index-card{
 		width: 100%;
 		display: flex;
@@ -927,7 +980,7 @@
 		justify-content: space-between;
 	}
 	.index-taocan{
-		margin: 54px auto 23px auto;
+		margin: 15px auto 0px auto;
 		display: flex;
 		flex-direction: column;
 	}
@@ -935,6 +988,16 @@
 		font-weight: 400;
 		font-size: 25rpx;
 		color: #999999;
+		text-align: center;
+		display: table;
+		width: 100px;
+		line-height: 15px;
+		white-space: pre-wrap;
+		margin-top: 10px;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
 	}
 	.index-fujin-jie-name{
 		margin-bottom: 5px;
@@ -946,14 +1009,13 @@
 		width: 100%;
 		height: 290px;
 		background: linear-gradient(0deg, #CFFAEC, #F4FFFB);
-		margin: 20px 0;
 	}
 	.index-fujin-jie-view{
 		width: 222.22rpx;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		margin-top: 15px;
+		margin-top: 10px;
 	}
 	.index-fujin-jie{
 		width: 100%;
diff --git a/pages/index/order/orderDet.vue b/pages/index/order/orderDet.vue
index 23732e2..5b58fdb 100644
--- a/pages/index/order/orderDet.vue
+++ b/pages/index/order/orderDet.vue
@@ -130,22 +130,14 @@
 							备注
 						</view>
 						<view style="color: #999999;font-size: 22rpx;">
-							<!-- <input v-model="beizhu" type="textarea" placeholder="请输入备注" maxlength="300" v-if="isTrues" />
-						<input v-model="beizhu" type="textarea" placeholder="请输入备注" maxlength="300" :disabled="true"
-							v-else /> -->
+						
 							<u-input v-model="beizhu" type="textarea" placeholder="请输入备注" :clearable="false"
 								maxlength="300" :custom-style="boxStyle" height="200" />
 						</view>
 					</view>
 				</view>
 			</view>
-			<!-- <view class="footer" style="font-size: 26upx;" @tap="isShowAgree">
-			<view style="font-size: 26upx;display: flex;align-items: center;" class="cuIcon"
-				:class="showAgree?'cuIcon-radiobox':'cuIcon-round'">
-				<text>我已阅读并同意</text>
-				<navigator url="/my/setting/about?id=391&name=下单协议" open-type="navigate">《下单协议》</navigator>
-			</view>
-		</view> -->
+			
 			<view class="text-white flex justify-between cu-bar foot bg padding-lr" style="color: #096f4b;"
 				v-if="cxSel">
 				<view style="color: #333;">
@@ -220,61 +212,11 @@
 								<view class="btn" @tap="goFaBu(item)">立即使用</view>
 							</view>
 						</view>
-						<!-- <view style="width: 100%;text-align: center;" v-for='(item,index) in CouponIssueList' :key='index'>
-						<view
-							style="background: #fcf3e8;width: 100%;height: 130rpx;border-radius: 10rpx;margin-top: 20rpx;">
-							<view style="display: flex;color: #1a1a1a;width: 100%;">
-								<view
-									style="line-height: 130rpx;margin-left: 0rpx;font-size: 40rpx;color: #1a1a1a;font-weight: 600;width: 150rpx;">
-									<text style="font-size: 20upx;">￥</text>{{item.money}}
-								</view>
-								<view style="margin-left: 20rpx;width: 50%;text-align: left;">
-									<view style="margin-top: 25rpx;">
-										{{item.couponName}}</view>
-									<view style="margin-top: 10rpx;font-size: 26rpx;">满{{item.minMoney}}减{{item.money}}</view>
-								</view>
-								<view
-									style="height: 105rpx;width: 2rpx;background: #1a1a1a;margin-left: 20rpx;margin-top: 15rpx;">
-								</view>
-								<view
-									style="color: #1a1a1a;line-height: 130rpx;height: 130rpx;width: 145rpx;font-weight: 600;"
-									@tap='goFaBu(item)'>立即使用</view>
-							</view>
-						</view>
-					</view> -->
+						
 					</scroll-view>
 				</view>
 			</u-popup>
-			<!-- <u-popup v-model="showpay" mode="bottom" :closeable="closeable" style="position: fixed;bottom: 0;"> -->
-			<!-- <view style="width: 100%;height: 100vh;background: rgba(0,0,0,0.8);z-index: 991;position: absolute;top: 0;left: 0;" v-if="showpay" @touchmove.stop.prevent="moveHandle">
-			<view class="popup_pay" >
-				<view style="background-color: #fff;">
-					<view style="width: 90%;margin: 0 auto;text-align: end;margin-top: 15px;" @tap.stop='close()'>
-						<u-icon name="close-circle" size="40" color="#CCCCCC"></u-icon>
-					</view>
-					<view style="padding: 0 20upx;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.stop='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>
-		</view> -->
-			<!-- </u-popup> -->
-
-			<!-- <u-picker v-model="addshow" mode="region" @confirm="addData"></u-picker> -->
+			
 		</view>
 		<u-skeleton :loading="loading" :animation="true" elColor='#FFFFFF' bgColor='#FFFFFF'></u-skeleton>
 	</view>
@@ -379,7 +321,7 @@
 				this.tripWay = option.tripWay;
 			}
 			this.isVIP = uni.getStorageSync('isVIP')
-			this.getDet()
+			// this.getDet()
 			this.getordertherapist()
 			this.XCXIsSelect = this.$queue.getData("XCXIsSelect");
 			var date = new Date();
diff --git a/pages/my/cika.vue b/pages/my/cika.vue
new file mode 100644
index 0000000..6bec8bd
--- /dev/null
+++ b/pages/my/cika.vue
@@ -0,0 +1,414 @@
+<!-- 自定义下拉刷新与上拉加载演示(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>
+						<span>项目次卡</span>
+					</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="item-view-title">
+						{{item.title}}
+					</view>
+					<view class="item-view-xiangmu">
+						<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
+						<span>已售{{item.sales}}w+ | 好评{{item.esteemRate}}%</span>
+					</view>
+					<view class="item-view-jianjie">
+						{{item.content}}
+					</view>
+					<view class="item-view-bottom">
+						<view class="item-view-bottom-qian">
+							<span>￥</span>
+							<span>{{item.price}}</span>
+							<span>/元套</span>
+							<span>{{item.oldPrice}}</span>
+						</view>
+						<view class="item-view-bottom-btn">
+							查看
+						</view>
+					</view>
+				</view>	
+			</view>
+		</z-paging>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				myId: '',
+				// v-model绑定的这个变量不要在分页请求结束中自己赋值！！！
+				dataList: [],
+				tabList: [],
+				typeData:'105',
+				tabIndex: 0,
+				searchValue:'',
+				serviceTrue:true,
+				page:1,
+				limit:10,
+				titleNmae:''
+			}
+		},
+		onLoad(){
+			this.myId = uni.getStorageSync('userId')
+			this.getData()
+		},
+		methods: {
+			input(res) {//搜索 输入框
+				this.searchValue=res;
+				console.log('----input:', res)
+			},
+			searchBtn(){//搜索按钮
+				if(this.searchValue!=""){
+					this.getData()
+				}
+			},
+			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);
+				})
+			},
+			
+			backImg(){//返回上一页
+				uni.reLaunch({
+					url:'/pages/my/index'
+				})
+			},	
+			clear(res) {
+				this.getData()
+			},
+			itemClick(item) {
+				uni.navigateTo({
+					url:'/pages/my/cikarDrtail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+'my'
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	
+	.item-view-bottom-btn{
+		text-align: center;
+		width: 131rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 10rpx;
+		font-weight: bold;
+		font-size: 24rpx;
+		color: #FFFFFF;
+	}
+	.item-view-bottom-qian span:nth-child(4){
+		 font-weight: bold;
+		 font-size: 31rpx;
+		 color: #848484;
+		 text-decoration-line: line-through;
+		 margin-left: 5px;
+	}
+	.item-view-bottom-qian span:nth-child(1){
+		 font-weight: 400;
+		 font-size: 25rpx;
+		 color: #F95900;
+	}
+	.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%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.item-view-jianjie{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #848484;
+		margin:5px 0px;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.item-view-biao{
+		padding: 1px 2px;
+		border-radius: 6rpx;
+	}
+	.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;
+		margin-left: 5px;
+	}
+	.item-view-xiangmu{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		font-weight: 400;
+		font-size: 21rpx;
+		margin-top: 5px;
+	}
+	.item-view-title{
+		font-weight: bold;
+		font-size: 33rpx;
+		color: #333333;
+	}
+	.item-view{
+		width: 55%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+	}
+	.item-img{
+		width: 285rpx;
+		height: 120px;
+		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%;
+	}
+	.item {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		height: 140px;
+		background: #FFFFFF;
+		border-radius: 21rpx;
+		margin-top:20px;
+		align-items: center;
+		padding: 0px 5px;
+	}
+	
+	.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: 0 auto;
+	}
+	.fenlei{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.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;
+	}
+	.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: 101rpx;
+		height: 60rpx;
+		background: #18A689;
+		border-radius: 31rpx;
+		
+	}
+	/deep/.uni-searchbar__box{
+		height: 31px;
+		border-radius: 15px !important;
+		background-color: #fff !important;
+		border: 2px solid #E5E5E5;
+		padding: 0px;
+		display: flex;
+		flex-direction: row;
+		flex-flow: row-reverse;
+		position: relative;
+	}
+	/deep/.uni-searchbar{
+		width: 240px;
+		border-radius: 31rpx;
+	}
+	.service-head-top-left image{
+		width: 25px;
+		height: 30rpx;
+		margin-right: 10px;
+	}
+	.service-head-top-left span{
+		font-weight: bold;
+		font-size: 44rpx;
+		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;
+	}
+	
+</style>
diff --git a/pages/my/cikarDrtail.vue b/pages/my/cikarDrtail.vue
new file mode 100644
index 0000000..3af464c
--- /dev/null
+++ b/pages/my/cikarDrtail.vue
@@ -0,0 +1,1269 @@
+<template>
+	<view class="content">
+		<view class="header">
+			<view class="header-top" :style="backgroundStyle">
+				<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">
+							<span>{{mainData.title}}</span>
+							<span class="header-bottom-title-liao">
+								次卡
+							</span>
+						</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-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" style="background-color: #fff;width: 95%;">
+				<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="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="detail-foot-mian-txet">
+					<span>SCIENTIFIC WAIST</span>
+					<span>科学护腰，不上脊椎</span>
+					<span>让您的腰不在盲目呵护!避免二次伤害!</span>
+				</view>
+			</view>
+		</view>
+		<view class="detail-foot" v-if="dataList.name=='my'">
+			<view class="detail-foot-nav">
+				<span class="detail-foot-nav-text">次卡详情1</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}}111</span>
+						<!-- <span style="display: none;">详情</span>
+						<span>服务时长:{{item.duration}}分钟</span> -->
+					</view>
+					<view class="header-bottom-money">
+						<view class="header-bottom-money-zhen">
+							已使用{{item.usedQuantity}}次
+						</view>
+						<view class="dingdan-btn" @click="detail(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">
+						服务项目{{index+1}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<checkbox-group @change="checkboxChange" v-if="dataList.name=='index' && dataList.isCanCoupon=='1'">
+			<view class="youhui-weiyong youhui-list" v-for="(itemY,indexY) in couponData" :key="itemY.id">
+				<view class="youhui-view-left">
+					<view class="youhui-view-left-yuan">
+						<span class="youhui-view-left-num">{{itemY.money}}</span>
+						<span class="youhui-view-left-text">元</span>
+					</view>
+					<view class="youhui-view-left-bottom">
+						满{{itemY.minMoney}}元可用
+					</view>
+				</view>
+				<view class="youhui-view-right">
+					<view class="youhui-view-right-top">
+						<view class="youhui-view-right-title">{{itemY.couponName}}</view>
+						<view class="youhui-view-right-time">{{itemY.endDate}}</view>
+					</view>
+					<label class="tui-radio">
+						<checkbox activeBackgroundColor="#096f4b" color="#096f4b" :value="itemY.id.toString()" :checked="checkbox"/>
+					</label>
+				</view>
+			</view>
+		</checkbox-group>
+		<view class="detail-btn"  v-if="dataList.name=='index'" @click="openpay">
+			立即购买
+		</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,
+				contentImg:[],
+				// 背景图片的URL可以是动态的，比如从API获取或根据条件生成
+				backgroundImageUrl: '',
+				couponId:'',
+				couponData:[],
+				checkbox:false,
+				showpay:false,
+				closeable: true,
+				openWay: 1,
+				paySel: 0,
+				tpayMoney: '',
+				mainId:''
+			}
+		},
+		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()
+			that.youhui()
+		},
+		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:{
+			
+			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() {//立即预约
+				this.goOrder()
+				this.showpay = true
+			},
+			//支付选择
+			selectWay: function(item) {
+				this.openWay = item.id;
+			},
+			goOrder() {//生成orderId
+				let that = this
+				console.log('asdasd',that.couponId)
+				// let payMoney =item.price;
+				// let payMoney = that.isVip ? item.memberPrice : item.price;
+				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: that.detailData.length},
+				  ]
+				}
+				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.dataList.page,
+								limit:  that.dataList.limit,
+							}
+					that.$Request.get('/app/massage/packageDetail/findAppPage', data).then(res => {
+						if (res.code == 0) {
+							that.mainData=res.mainData;
+							
+							that.contentImg=that.mainData.contentImg.split(",");
+							that.detailData=res.detailData.list;
+							
+							that.backgroundImageUrl=that.mainData.packageImg
+						}
+					})
+				}else{
+					let data = {
+							  mainId: that.dataList.id,
+							  page: that.dataList.page,
+							  limit:  that.dataList.limit,
+							}
+					that.$Request.get('/app/user/package/detail/findMyPackageDetailList', data).then(res => {
+						if (res.code == 0) {
+							that.mainData=res.data.mainData;
+							that.contentImg=that.mainData.contentImg.split(",");
+							that.detailData=res.data.detailData;
+							that.mainId=that.mainData.id
+							that.backgroundImageUrl=that.mainData.packageImg
+						}
+					})
+				}
+				
+			},
+			detail(item){//详情
+				uni.navigateTo({
+					url:'/pages/my/orderDetailsList?id='+item.massageTypeId+'&mainId='+this.mainId+'&name='+'次卡'
+				})
+			},
+			goumai(item){//立即购买
+				uni.navigateTo({
+					url:'/pages/my/myCiLiaoDetail?id='+item.massageTypeId+'&mainId='+this.mainId+'&name='+'次卡'
+				})
+			},
+		}
+	}
+</script>
+<style scoped>
+	/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;
+	}
+	
+	.dingdan-btn{
+		text-align: center;
+		width: 62px;
+		height: 24px;
+		line-height: 24px;
+		border-radius: 4px;
+		font-weight: bold;
+		font-size: 11px;
+	}
+	.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;
+		padding: 10px;
+		margin-bottom: 10px;
+	}
+	.detail-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 15px 0px;
+	}
+	.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: 100%;
+		display: flex;
+		flex-direction: column;
+		margin: 0 auto;
+		border-radius: 21rpx;
+		padding: 15px;
+	}
+	.header-bottom-title-liao{
+		display: inline-block;
+		padding: 0 7px;
+		height: 16px;
+		line-height: 16px;
+		text-align: center;
+		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
+		border-radius: 7px;
+		margin-left: 5px;
+		font-weight: bold;
+		font-size: 8px;
+		border-top-left-radius: 20px;
+		border-bottom-right-radius: 20px;
+		color: #fff;
+	}
+	.detail-btn{
+		width:95%;
+		height: 92rpx;
+		line-height: 92rpx;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		border-radius: 46rpx;
+		margin: 0 auto;
+		text-align: center;
+		font-weight: 400;
+		font-size: 42rpx;
+		color: #FFFFFF;
+	}
+	.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:83%;
+	}
+	.detail-foot-mian-top,.detail-foot-mian-top-bottom{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		font-weight: bold;
+		font-size: 22rpx;
+	}
+	.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: 10px;
+	}
+	.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: 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;
+	}
+	
+	
+	.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: 22.92rpx;
+		height: 17.36rpx;
+	}
+	.header-bottom-foot-view-img2{
+		width: 16.67rpx;
+		height: 16.67rpx;
+	}
+	.header-bottom-foot-view-img3{
+		width: 15.97rpx;
+		height: 18.06rpx;
+	}
+	.header-bottom-foot-view image{
+		margin-right: 3px;
+	}
+	.header-bottom-foot-view{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 0 5px;
+		height: 22px;
+		line-height: 22px;
+		background-color: rgba(8, 162, 138, 0.1);
+		border-radius: 8px;
+		font-weight: 400;
+		font-size: 8px;
+		color: #029D88;
+	}
+	.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-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.header-bottom-money-jia{
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #848484;
+		line-height: 37rpx;
+		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:36.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;
+		justify-content: space-between;
+	}
+	.header-bottom-title-num span{
+		font-weight: bold;
+		font-size: 25rpx;
+	}
+	.header-bottom-title-num span:nth-child(1){
+		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;
+	}
+	.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;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/my/cureOderDrtail.vue b/pages/my/cureOderDrtail.vue
index 3709840..66976e2 100644
--- a/pages/my/cureOderDrtail.vue
+++ b/pages/my/cureOderDrtail.vue
@@ -1,18 +1,21 @@
 <template>
 	<view class="content">
 		<view class="header">
-			<view class="header-top">
-				<image src="../../static/servicePackage/member_ba.png" mode=""></image>
+			<view class="header-top" :style="backgroundStyle">
+				<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">
-							<span>全身经络SPA 疗 </span>
-							<span class="header-bottom-title-liao">疗程</span>
+							<span>{{getList.title}}</span>
+							<span class="header-bottom-title-liao">
+								套餐
+							</span>
 						</view>
 						<view class="header-bottom-title-num">
-							<span>3856</span>
+							<span>{{getList.sales}}</span>
 							<span> 人选择</span>
 						</view>
 						
@@ -21,15 +24,15 @@
 						<view class="header-bottom-money">
 							<view class="header-bottom-money-zhen">
 								<span>￥</span>
-								<span>365</span>
+								<span>{{getList.price}}</span>
 								<span>/元套</span>
 							</view>
 							<view class="header-bottom-money-jia">
-								￥430
+								￥{{getList.oldPrice}}
 							</view>
 						</view>
 					</view>
-					<view class="header-bottom-title-bottom">
+					<view class="header-bottom-title-bottom" v-if="dataList.titleNmae=='服务疗程'">
 						<image src="../../static/my-cika.png" mode=""></image>
 						<span>30天一疗程，每隔三天一次</span>
 					</view>	
@@ -64,10 +67,10 @@
 					<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-title">适应人群: </span>
 					<span class="detail-foot-mian-top-text">
-						1.孕期、生理期禁做调理。
-						2.血小板减少、有出血倾适用人群向等血液病患者禁做调理。3急性损伤引起的骨折、不明原因的肿痛和急性软2.血小板减少、有出血倾适用人群向等血液病患者禁做调理。3急性损伤引起的骨折、不明原因的肿痛和急性软2.血小板减少、有出血倾适用人群向等血液病患者禁做调理。3急性损伤引起的骨折、不明原因的肿痛和急性软2.血小板减少、有出血倾适用人群向等血液病患者禁做调理。3急性损伤引起的骨折、不明原因的肿痛和急性软2.血小板减少、有出血倾适用人群向等血液病患者禁做调理。3急性损伤引起的骨折、不明原因的肿痛和急性软2.血小板减少、有出血倾适用人群向等血液病患者禁做调理。3急性损伤引起的骨折、不明原因的肿痛和急性软2.血小板减少、有出血倾适用人群向等血液病患者禁做调理。3急性损伤引起的骨折、不明原因的肿痛和急性软</span>
+						{{getList.applyPeople}}
+					</span>
 				</view>
 			</view>
 		</view>
@@ -77,7 +80,7 @@
 				<span class="detail-foot-nav-bor"></span>
 			</view>
 			<view class="detail-foot-mian">
-				<image src="../../static/img/user.png" mode=""></image>	
+				<image class="detail-foot-mian-img" :src="getList.contentImg" mode="widthFix"></image>	
 				<view class="detail-foot-mian-txet">
 					<span>SCIENTIFIC WAIST</span>
 					<span>科学护腰，不上脊椎</span>
@@ -85,7 +88,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="detail-btn">
+		<view class="detail-btn" v-if="dataList.name=='my'" @click="goumai(getList)">
 			立即购买
 		</view>
 	</view>
@@ -94,10 +97,75 @@
 	export default{
 		data(){
 			return{
+				dataList:[],
+				getList:[],
+				isVIP:false,
+				// 背景图片的URL可以是动态的，比如从API获取或根据条件生成
+				backgroundImageUrl: '',
+				nameText:''
+			}
+		},
+		computed: {
+		    backgroundStyle() {
+		      return {
+		        backgroundImage: `url(${this.backgroundImageUrl})`,
+		        backgroundSize: 'cover', // 根据需要调整
+		      };
+		    }
+		  },
+		onLoad(e) {
+			var that=this;
+			that.dataList=e;
+			that.isVIP=this.$queue.getData('isVIP');
+			if(that.dataList.name=='index'){
+				that.getIndexData()
+			}else{
+				that.getData();
 			}
 		},
 		methods:{
-			
+			goumai(item){//立即购买
+					this.$queue.setData('getJishi','')
+					this.$queue.setData('ordersId',this.dataList.massageTypeId);
+					this.$queue.setData('userPackageDetailId',this.dataList.id);
+					this.$queue.setData('daibudan','');
+					uni.navigateTo({
+						url:'/my/order/payModify?ordersId='+this.dataList.massageTypeId
+					})
+					
+			},
+			getIndexData(){//从首页 推荐进入 请求的接口
+				var that=this;
+				let data = {
+						  id: that.dataList.id,
+						  limit: that.dataList.limit,
+						  mainId: that.dataList.mainId,
+						  massageTypeId:that.dataList.massageTypeId,
+						  page:that.dataList.page,
+						}
+				that.$Request.get('/app/massage/packageDetail/getAppPackageDetail',data).then(res => {
+					if (res.code == 0) {
+						that.getList=res.data;
+						that.backgroundImageUrl=that.getList.massageImg
+					}
+				})
+			},
+			getData(){
+				var that=this;
+				let data = {
+						  id: that.dataList.id,
+						  limit: that.dataList.limit,
+						  mainId: that.dataList.mainId,
+						  massageTypeId:that.dataList.massageTypeId,
+						  page:that.dataList.page,
+						}
+				that.$Request.get('/app/user/package/detail/getMyPackageDetail', data).then(res => {
+					if (res.code == 0) {
+						that.getList=res.data;
+						that.backgroundImageUrl=that.getList.massageImg
+					}
+				})
+			},
 		}
 	}
 </script>
@@ -153,9 +221,9 @@
 		align-items: center;
 		margin-top: 20px;
 	}
-	.detail-foot-mian image{
+	.detail-foot-mian-img{
 		width: 100%;
-		height: 369.44rpx;
+		height:auto;
 	}
 	.detail-foot-mian-top-bottom{
 		margin-top: 10px;
@@ -219,6 +287,7 @@
 		display: flex;
 		flex-direction: column;
 		position: relative;
+		margin-bottom: 10px;
 	}
 	.detail-foot{
 		width: 100%;
diff --git a/pages/my/fuwuDateil.vue b/pages/my/fuwuDateil.vue
new file mode 100644
index 0000000..f1cce36
--- /dev/null
+++ b/pages/my/fuwuDateil.vue
@@ -0,0 +1,514 @@
+<template>
+	<view class="content">
+		<view class="header">
+			<view class="header-top" :style="backgroundStyle">
+				<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">
+							<span>{{getList.title}}</span>
+							<span class="header-bottom-title-liao">
+								{{getList.classifyName}}
+							</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.price}}</span>
+								<span>/元套</span>
+							</view>
+							<view class="header-bottom-money-jia">
+								￥{{getList.oldPrice}}
+							</view>
+						</view>
+					</view>
+					
+					<view class="header-bottom-title-bottom" v-if="dataList.titleNmae=='服务疗程'">
+						<image src="../../static/my-cika.png" mode=""></image>
+						<span>30天一疗程，每隔三天一次</span>
+					</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 class="detail-foot-mian-txet">
+					<span>SCIENTIFIC WAIST</span>
+					<span>科学护腰，不上脊椎</span>
+					<span>让您的腰不在盲目呵护!避免二次伤害!</span>
+				</view>
+			</view>
+		</view>
+		<view class="detail-btn" v-if="getList.status=='1'" @click="goumai(getList)">
+			立即购买
+		</view>
+	</view>
+</template>
+<script>
+	export default{
+		data(){
+			return{
+				dataList:[],
+				getList:[],
+				isVIP:false,
+				// 背景图片的URL可以是动态的，比如从API获取或根据条件生成
+				backgroundImageUrl: '',
+				myId:'',
+				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.myId = uni.getStorageSync('userId');
+			that.getData()
+		},
+		methods:{
+			goumai(item){//立即购买
+					this.$queue.setData('getJishi','')
+					this.$queue.setData('userPackageDetailId','');
+					this.$queue.setData('ordersId',this.dataList.id);
+					this.$queue.setData('daibudan','');
+					uni.navigateTo({
+						url:'/my/order/payModify?ordersId='+this.dataList.id
+					})
+			},
+			getData(){
+				var that=this;
+				let data = {
+						  userId: that.myId,
+						  limit: that.dataList.limit,
+						  mainId: that.dataList.mainId,
+						  massageTypeId:that.dataList.id,
+						  page:that.dataList.page,
+						}
+				that.$Request.get('/app/artificer/selectMassageTypeById', data).then(res => {
+					if (res.code == 0) {
+						that.getList=res.data;
+						that.contentImg=res.data.contentImg.split(",");
+						that.backgroundImageUrl=that.getList.massageImg;
+					}
+				})
+			},
+		}
+	}
+</script>
+<style scoped>
+	.header-bottom-title-liao{
+		display: inline-block;
+		padding: 0 7px;
+		height: 16px;
+		line-height: 16px;
+		text-align: center;
+		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
+		border-radius: 7px;
+		margin-left: 5px;
+		font-weight: bold;
+		font-size: 8px;
+		border-top-left-radius: 20px;
+		border-bottom-right-radius: 20px;
+		color: #fff;
+	}
+	.detail-btn{
+		width:95%;
+		height: 92rpx;
+		line-height: 92rpx;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		border-radius: 46rpx;
+		margin: 0 auto;
+		text-align: center;
+		font-weight: 400;
+		font-size: 42rpx;
+		color: #FFFFFF;
+	}
+	.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:83%;
+	}
+	.detail-foot-mian-top,.detail-foot-mian-top-bottom{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		font-weight: bold;
+		font-size: 22rpx;
+	}
+	.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: 10px;
+	}
+	.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: 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: 22.92rpx;
+		height: 17.36rpx;
+	}
+	.header-bottom-foot-view-img2{
+		width: 16.67rpx;
+		height: 16.67rpx;
+	}
+	.header-bottom-foot-view-img3{
+		width: 15.97rpx;
+		height: 18.06rpx;
+	}
+	.header-bottom-foot-view image{
+		margin-right: 3px;
+	}
+	.header-bottom-foot-view{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 0 5px;
+		height: 22px;
+		line-height: 22px;
+		background-color: rgba(8, 162, 138, 0.1);
+		border-radius: 8px;
+		font-weight: 400;
+		font-size: 8px;
+		color: #029D88;
+	}
+	.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-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.header-bottom-money-jia{
+		font-weight: bold;
+		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:36.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: flex-end;
+	}
+	.header-bottom-title-num span{
+		font-weight: bold;
+		font-size: 25rpx;
+	}
+	.header-bottom-title-num span:nth-child(1){
+		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;
+	}
+	.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;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/my/fuwuGengduo.vue b/pages/my/fuwuGengduo.vue
new file mode 100644
index 0000000..41dc2ac
--- /dev/null
+++ b/pages/my/fuwuGengduo.vue
@@ -0,0 +1,420 @@
+<!-- 自定义下拉刷新与上拉加载演示(vue) -->
+<template>
+	<view class="content-view">
+		<view class="service-head-top">
+			<view class="service-head-top-left">
+				<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
+				<span>更多推荐</span>
+			</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> -->
+		<t-refresh ref="refresh"  v-if="dataList.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
+			<template slot="content">
+				<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
+					<view class="item-img">
+						<image :src="item.packageImg" mode=""></image>
+					</view>
+					<view class="item-view">
+						<view class="item-view-title">
+							{{item.title}}
+						</view>
+						<!-- <view class="item-view-xiangmu">
+							<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
+							<span>已售{{item.sales}}w+ | 好评{{item.esteemRate}}%</span>
+						</view> -->
+						<view class="item-view-jianjie">
+							{{item.content}}
+						</view>
+						<view class="item-view-bottom">
+							<view class="item-view-bottom-qian">
+								<span>￥</span>
+								<span>{{item.price}}</span>
+								<span>/元套</span>
+								<span>{{item.oldPrice}}</span>
+							</view>
+							<view class="item-view-bottom-btn">
+								查看
+							</view>
+						</view>
+					</view>	
+				</view>
+			</template> 
+		</t-refresh>
+		<empty v-if="dataList.length==0"></empty>
+			
+	</view>
+</template>
+
+<script>
+	import empty from '@/components/empty.vue'
+	import tRefresh from "@/components/t-refresh/t-refresh.vue"
+	export default {
+		components:{tRefresh,empty},
+		data() {
+			return {
+				loadingType:0,
+				myId: '',
+				// v-model绑定的这个变量不要在分页请求结束中自己赋值！！！
+				dataList: [],
+				tabList: [],
+				typeData:'105',
+				tabIndex: 0,
+				searchValue:'',
+				serviceTrue:true,
+				page:1,
+				limit:10,
+				titleNmae:'',
+				classifyId:''
+			}
+		},
+		onLoad(){
+			this.myId = uni.getStorageSync('userId')
+			this.getData()
+		},
+		onPullDownRefresh: function() {
+			this.page = 1;
+			this.getData()
+		},
+		methods: {
+			// 加载更多
+			loadMore: async function() {
+				//loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中
+				if(this.loadingType==0){
+					this.loadingType=2
+					//模拟数据请求
+					setTimeout(()=>{
+						this.page++;
+						this.loadingType=0;
+						this.getData()
+					},1000)
+				}
+			},
+			
+			input(res) {//搜索 输入框
+				this.searchValue=res;
+				console.log('----input:', res)
+			},
+			searchBtn(){//搜索按钮
+				if(this.searchValue!=""){
+					this.getData()
+				}
+			},
+			getData(){
+				this.$Request.get("/app/massage/package/findPackageAndMassagePage",{
+					city:'',
+					page:this.page,
+					limit:this.limit,
+					title:this.searchValue
+				}).then(res => {
+					if (res.code == 0) {
+						if (res.data) {
+							if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
+							this.dataList = [...this.dataList, ...res.data.list]; //追加新数据
+							uni.stopPullDownRefresh()
+						}
+					}
+				});
+			},
+			changeClick(index,item){
+				this.classifyId=item.id
+				this.searchValue=''
+				this.getData()
+			},
+			backImg(){//返回上一页
+				uni.reLaunch({
+					url:'/pages/index/index'
+				})
+			},	
+			clear(res) {
+				this.getData()
+			},
+			itemClick(item) {
+				if(item.type=='104'){
+					uni.navigateTo({
+						url:'/pages/my/serviceOderDrtail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+'index'+'&isCanCoupon='+item.isCanCoupon
+					})
+				}else if(item.type=='105'){
+					uni.navigateTo({
+						url:'/pages/my/cikarDrtail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+'index'+'&isCanCoupon='+item.isCanCoupon
+					})
+				}else if(item.type=='106'){
+					uni.navigateTo({
+						url:'/pages/my/fuwuliaochengDetail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+'index'+'&isCanCoupon='+item.isCanCoupon
+					})
+				}else{
+					uni.navigateTo({
+						url:'/pages/my/fuwuDateil?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+'index'+'&isCanCoupon='+item.isCanCoupon
+					})
+				}
+				
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	/deep/.refresh-body{
+		height: 100% !important;
+		background-color: #f7f7f7;
+		margin-top: 35px;
+	}
+	.content-view{
+		width: 100%;
+		height: 100vh;
+		overflow: auto;
+	}
+	.item-view-bottom-btn{
+		text-align: center;
+		width: 131rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 10rpx;
+		font-weight: bold;
+		font-size: 24rpx;
+		color: #FFFFFF;
+	}
+	.item-view-bottom-qian span:nth-child(4){
+		 font-weight: bold;
+		 font-size: 31rpx;
+		 color: #848484;
+		 text-decoration-line: line-through;
+		 margin-left: 5px;
+	}
+	.item-view-bottom-qian span:nth-child(1){
+		 font-weight: 400;
+		 font-size: 25rpx;
+		 color: #F95900;
+	}
+	.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%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.item-view-jianjie{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #848484;
+		margin:5px 0px;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.item-view-biao{
+		padding: 1px 2px;
+		border-radius: 6rpx;
+	}
+	.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;
+		margin-left: 5px;
+	}
+	.item-view-xiangmu{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		font-weight: 400;
+		font-size: 21rpx;
+		margin-top: 5px;
+	}
+	.item-view-title{
+		font-weight: bold;
+		font-size: 33rpx;
+		color: #333333;
+	}
+	.item-view{
+		width: 55%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+	}
+	.item-img{
+		width: 285rpx;
+		height: 120px;
+		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%;
+	}
+	.item {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		height: 140px;
+		background: #FFFFFF;
+		border-radius: 21rpx;
+		margin-top:20px;
+		align-items: center;
+		padding: 0px 5px;
+	}
+	
+	.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: 0 auto;
+	}
+	.fenlei{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.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;
+	}
+	.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: 101rpx;
+		height: 60rpx;
+		background: #18A689;
+		border-radius: 31rpx;
+		
+	}
+	/deep/.uni-searchbar__box{
+		height: 31px;
+		border-radius: 15px !important;
+		background-color: #fff !important;
+		border: 2px solid #E5E5E5;
+		padding: 0px;
+		display: flex;
+		flex-direction: row;
+		flex-flow: row-reverse;
+		position: relative;
+	}
+	/deep/.uni-searchbar{
+		width: 240px;
+		border-radius: 31rpx;
+	}
+	.service-head-top-left image{
+		width: 25px;
+		height: 30rpx;
+		margin-right: 10px;
+	}
+	.service-head-top-left span{
+		font-weight: bold;
+		font-size: 44rpx;
+		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;
+		position: fixed;
+		background-color: #fff;
+	}
+	
+</style>
diff --git a/pages/my/fuwuliaocheng.vue b/pages/my/fuwuliaocheng.vue
new file mode 100644
index 0000000..a6a8832
--- /dev/null
+++ b/pages/my/fuwuliaocheng.vue
@@ -0,0 +1,414 @@
+<!-- 自定义下拉刷新与上拉加载演示(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>
+						<span>服务疗程</span>
+					</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="item-view-title">
+						{{item.title}}
+					</view>
+					<view class="item-view-xiangmu">
+						<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
+						<span>已售{{item.sales}}w+ | 好评{{item.esteemRate}}%</span>
+					</view>
+					<view class="item-view-jianjie">
+						{{item.content}}
+					</view>
+					<view class="item-view-bottom">
+						<view class="item-view-bottom-qian">
+							<span>￥</span>
+							<span>{{item.price}}</span>
+							<span>/元套</span>
+							<span>{{item.oldPrice}}</span>
+						</view>
+						<view class="item-view-bottom-btn">
+							查看
+						</view>
+					</view>
+				</view>	
+			</view>
+		</z-paging>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				myId: '',
+				// v-model绑定的这个变量不要在分页请求结束中自己赋值！！！
+				dataList: [],
+				tabList: [],
+				typeData:'106',
+				tabIndex: 0,
+				searchValue:'',
+				serviceTrue:true,
+				page:1,
+				limit:10,
+				titleNmae:''
+			}
+		},
+		onLoad(){
+			this.myId = uni.getStorageSync('userId')
+			this.getData()
+		},
+		methods: {
+			input(res) {//搜索 输入框
+				this.searchValue=res;
+				console.log('----input:', res)
+			},
+			searchBtn(){//搜索按钮
+				if(this.searchValue!=""){
+					this.getData()
+				}
+			},
+			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);
+				})
+			},
+			
+			backImg(){//返回上一页
+				uni.reLaunch({
+					url:'/pages/my/index'
+				})
+			},	
+			clear(res) {
+				this.getData()
+			},
+			itemClick(item) {
+				uni.navigateTo({
+					url:'/pages/my/fuwuliaochengDetail?id='+item.id+'&name='+'my'
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	
+	.item-view-bottom-btn{
+		text-align: center;
+		width: 131rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 10rpx;
+		font-weight: bold;
+		font-size: 24rpx;
+		color: #FFFFFF;
+	}
+	.item-view-bottom-qian span:nth-child(4){
+		 font-weight: bold;
+		 font-size: 31rpx;
+		 color: #848484;
+		 text-decoration-line: line-through;
+		 margin-left: 5px;
+	}
+	.item-view-bottom-qian span:nth-child(1){
+		 font-weight: 400;
+		 font-size: 25rpx;
+		 color: #F95900;
+	}
+	.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%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.item-view-jianjie{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #848484;
+		margin:5px 0px;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.item-view-biao{
+		padding: 1px 2px;
+		border-radius: 6rpx;
+	}
+	.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;
+		margin-left: 5px;
+	}
+	.item-view-xiangmu{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		font-weight: 400;
+		font-size: 21rpx;
+		margin-top: 5px;
+	}
+	.item-view-title{
+		font-weight: bold;
+		font-size: 33rpx;
+		color: #333333;
+	}
+	.item-view{
+		width: 55%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+	}
+	.item-img{
+		width: 285rpx;
+		height: 120px;
+		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%;
+	}
+	.item {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		height: 140px;
+		background: #FFFFFF;
+		border-radius: 21rpx;
+		margin-top:20px;
+		align-items: center;
+		padding: 0px 5px;
+	}
+	
+	.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: 0 auto;
+	}
+	.fenlei{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.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;
+	}
+	.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: 101rpx;
+		height: 60rpx;
+		background: #18A689;
+		border-radius: 31rpx;
+		
+	}
+	/deep/.uni-searchbar__box{
+		height: 31px;
+		border-radius: 15px !important;
+		background-color: #fff !important;
+		border: 2px solid #E5E5E5;
+		padding: 0px;
+		display: flex;
+		flex-direction: row;
+		flex-flow: row-reverse;
+		position: relative;
+	}
+	/deep/.uni-searchbar{
+		width: 240px;
+		border-radius: 31rpx;
+	}
+	.service-head-top-left image{
+		width: 25px;
+		height: 30rpx;
+		margin-right: 10px;
+	}
+	.service-head-top-left span{
+		font-weight: bold;
+		font-size: 44rpx;
+		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;
+	}
+	
+</style>
diff --git a/pages/my/fuwuliaochengDetail.vue b/pages/my/fuwuliaochengDetail.vue
new file mode 100644
index 0000000..6d79789
--- /dev/null
+++ b/pages/my/fuwuliaochengDetail.vue
@@ -0,0 +1,1281 @@
+<template>
+	<view class="content">
+		<view class="header">
+			<view class="header-top" :style="backgroundStyle">
+				<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">
+							<span>{{mainData.title}}</span>
+							<span class="header-bottom-title-liao">
+								疗程
+							</span>
+						</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-title-bottom">
+					<image src="../../static/my-cika.png" mode=""></image>
+					<span>{{liaoTime}}</span>
+				</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">
+						{{mainData.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 class="detail-foot-mian-txet">
+					<span>SCIENTIFIC WAIST</span>
+					<span>科学护腰，不上脊椎</span>
+					<span>让您的腰不在盲目呵护!避免二次伤害!</span>
+				</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>上次预约:{{item.maxTime}}</span>
+					</view>
+					<view class="header-bottom-money">
+						<view class="header-bottom-money-zhen">
+							已使用{{item.usedQuantity}}次
+						</view>
+						<view class="dingdan-btn" @click="goumai(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">
+						服务项目{{index+1}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<checkbox-group @change="checkboxChange" v-if="dataList.name=='index' && dataList.isCanCoupon=='1'">
+			<view class="youhui-weiyong youhui-list" v-for="(itemY,indexY) in couponData" :key="itemY.id">
+				<view class="youhui-view-left">
+					<view class="youhui-view-left-yuan">
+						<span class="youhui-view-left-num">{{itemY.money}}</span>
+						<span class="youhui-view-left-text">元</span>
+					</view>
+					<view class="youhui-view-left-bottom">
+						满{{itemY.minMoney}}元可用
+					</view>
+				</view>
+				<view class="youhui-view-right">
+					<view class="youhui-view-right-top">
+						<view class="youhui-view-right-title">{{itemY.couponName}}</view>
+						<view class="youhui-view-right-time">{{itemY.endDate}}</view>
+					</view>
+					<label class="tui-radio">
+						<checkbox activeBackgroundColor="#096f4b" color="#096f4b" :value="itemY.id.toString()" :checked="checkbox"/>
+					</label>
+				</view>
+			</view>
+		</checkbox-group>
+		<view class="detail-btn"  v-if="dataList.name=='index'" @click="openpay">
+			立即购买
+		</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: '',
+				page:1,
+				limit:10,
+				mainId:''
+			}
+		},
+		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()
+		},
+		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:{
+			
+			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() {//立即预约
+				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: that.detailData.length},
+				  ]
+				}
+				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)
+					}
+							
+				});
+			},
+			detail(item){//详情
+			this.$queue.setData('daibudan','');
+				if(item=='0'){
+					// uni.navigateTo({
+					// 	url:'/my/order/payModify'
+					// })
+				}
+			},
+			goumai(item){//立即购买
+				uni.navigateTo({
+					url:'/pages/my/orderDetailsList?id='+item.massageTypeId+'&mainId='+this.mainId+'&name='+'疗程'
+				})
+			},
+			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(",");
+						}
+					})
+				}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
+						}
+					})
+				}
+			},
+		}
+	}
+</script>
+<style scoped>
+	/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;
+	}
+	
+	.dingdan-btn{
+		text-align: center;
+		width: 62px;
+		height: 24px;
+		line-height: 24px;
+		border-radius: 4px;
+		font-weight: bold;
+		font-size: 11px;
+	}
+	.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;
+		padding: 15px 0px;
+	}
+	.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: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+	
+	.header-bottom-title-liao{
+		display: inline-block;
+		padding: 0 7px;
+		height: 16px;
+		line-height: 16px;
+		text-align: center;
+		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
+		border-radius: 7px;
+		margin-left: 5px;
+		font-weight: bold;
+		font-size: 8px;
+		border-top-left-radius: 20px;
+		border-bottom-right-radius: 20px;
+		color: #fff;
+	}
+	.detail-btn{
+		width:95%;
+		height: 92rpx;
+		line-height: 92rpx;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		border-radius: 46rpx;
+		margin: 0 auto;
+		text-align: center;
+		font-weight: 400;
+		font-size: 42rpx;
+		color: #FFFFFF;
+	}
+	.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:83%;
+	}
+	.detail-foot-mian-top,.detail-foot-mian-top-bottom{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		font-weight: bold;
+		font-size: 22rpx;
+	}
+	.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: 10px;
+	}
+	.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: 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: 22.92rpx;
+		height: 17.36rpx;
+	}
+	.header-bottom-foot-view-img2{
+		width: 16.67rpx;
+		height: 16.67rpx;
+	}
+	.header-bottom-foot-view-img3{
+		width: 15.97rpx;
+		height: 18.06rpx;
+	}
+	.header-bottom-foot-view image{
+		margin-right: 3px;
+	}
+	.header-bottom-foot-view{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 0 5px;
+		height: 22px;
+		line-height: 22px;
+		background-color: rgba(8, 162, 138, 0.1);
+		border-radius: 8px;
+		font-weight: 400;
+		font-size: 8px;
+		color: #029D88;
+	}
+	.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-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.header-bottom-money-jia{
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #848484;
+		line-height: 37rpx;
+		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:36.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;
+		justify-content: space-between;
+	}
+	.header-bottom-title-num span{
+		font-weight: bold;
+		font-size: 25rpx;
+	}
+	.header-bottom-title-num span:nth-child(1){
+		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;
+	}
+	.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;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/my/fuwuxiangm.vue b/pages/my/fuwuxiangm.vue
new file mode 100644
index 0000000..13c093e
--- /dev/null
+++ b/pages/my/fuwuxiangm.vue
@@ -0,0 +1,420 @@
+<!-- 自定义下拉刷新与上拉加载演示(vue) -->
+<template>
+	<view class="content-view">
+		<view class="service-head-top">
+			<view class="service-head-top-left">
+				<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
+				<span>服务项目</span>
+			</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>
+		<t-refresh ref="refresh"  v-if="dataList.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
+			<template slot="content">
+				<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
+					<view class="item-img">
+						<image :src="item.massageImg" mode=""></image>
+					</view>
+					<view class="item-view">
+						<view class="item-view-title">
+							{{item.title}}
+						</view>
+						<view class="item-view-xiangmu">
+							<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
+							<span>已售{{item.sales}}w+ | 好评{{item.esteemRate}}%</span>
+						</view>
+						<view class="item-view-jianjie">
+							{{item.jianjie}}
+						</view>
+						<view class="item-view-bottom">
+							<view class="item-view-bottom-qian">
+								<span>￥</span>
+								<span>{{item.price}}</span>
+								<span>/元套</span>
+								<span>{{item.oldPrice}}</span>
+							</view>
+							<view class="item-view-bottom-btn">
+								查看
+							</view>
+						</view>
+					</view>	
+				</view>
+			</template> 
+		</t-refresh>
+		<empty v-if="dataList.length==0"></empty>
+			
+	</view>
+</template>
+
+<script>
+	import empty from '@/components/empty.vue'
+	import tRefresh from "@/components/t-refresh/t-refresh.vue"
+	export default {
+		components:{tRefresh,empty},
+		data() {
+			return {
+				loadingType:0,
+				myId: '',
+				// v-model绑定的这个变量不要在分页请求结束中自己赋值！！！
+				dataList: [],
+				tabList: [],
+				typeData:'105',
+				tabIndex: 0,
+				searchValue:'',
+				serviceTrue:true,
+				page:1,
+				limit:10,
+				titleNmae:'',
+				classifyId:''
+			}
+		},
+		onLoad(){
+			this.myId = uni.getStorageSync('userId')
+			this.tabNav()
+		},
+		onPullDownRefresh: function() {
+			this.page = 1;
+			this.getData()
+		},
+		methods: {
+			// 加载更多
+			loadMore: async function() {
+				//loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中
+				if(this.loadingType==0){
+					this.loadingType=2
+					//模拟数据请求
+					setTimeout(()=>{
+						this.page++;
+						this.loadingType=0;
+						this.getData()
+					},1000)
+				}
+			},
+			tabNav(){
+				let data = {
+						  type: "服务类型",
+						}
+				this.$Request.get('/app/dict/list', data).then(res => {
+					if (res.code == 0) {
+						this.tabList=res.data;
+						this.classifyId=res.data[0].id;
+						this.getData()
+					}
+				})
+			},
+			input(res) {//搜索 输入框
+				this.searchValue=res;
+				console.log('----input:', res)
+			},
+			searchBtn(){//搜索按钮
+				if(this.searchValue!=""){
+					this.getData()
+				}
+			},
+			getData(){
+				this.$Request.get("/app/artificer/selectMassageTypePage", {
+					by: '3',
+					status:'1',
+					classifyId:this.classifyId,
+					page:this.page,
+					limit:this.limit,
+					title:this.searchValue
+				}).then(res => {
+					if (res.code == 0) {
+						if (res.data) {
+							if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
+							this.dataList = [...this.dataList, ...res.data.list]; //追加新数据
+							uni.stopPullDownRefresh()
+						}
+					}
+				});
+			},
+			changeClick(index,item){
+				this.classifyId=item.id
+				this.searchValue=''
+				this.getData()
+			},
+			backImg(){//返回上一页
+				uni.reLaunch({
+					url:'/pages/index/index'
+				})
+			},	
+			clear(res) {
+				this.getData()
+			},
+			itemClick(item) {
+				uni.navigateTo({
+					url:'/pages/my/fuwuDateil?id='+item.massageTypeId+'&limit='+this.limit+'&page='+this.page+'&name='+'index'+'&isCanCoupon='+item.isCanCoupon
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	/deep/.refresh-body .content{
+		background-color: #f7f7f7;
+	}
+	/deep/.refresh-body{
+		height: 100% !important;
+		border-top: 2px solid #f7f7f7;
+	}
+	.content-view{
+		width: 100%;
+		height: 100vh;
+		overflow: auto;
+		background-color: #f7f7f7;
+	}
+	.item-view-bottom-btn{
+		text-align: center;
+		width: 131rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 10rpx;
+		font-weight: bold;
+		font-size: 24rpx;
+		color: #FFFFFF;
+	}
+	.item-view-bottom-qian span:nth-child(4){
+		 font-weight: bold;
+		 font-size: 31rpx;
+		 color: #848484;
+		 text-decoration-line: line-through;
+		 margin-left: 5px;
+	}
+	.item-view-bottom-qian span:nth-child(1){
+		 font-weight: 400;
+		 font-size: 25rpx;
+		 color: #F95900;
+	}
+	.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%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.item-view-jianjie{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #848484;
+		margin:5px 0px;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.item-view-biao{
+		padding: 1px 2px;
+		border-radius: 6rpx;
+	}
+	.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;
+		margin-left: 5px;
+	}
+	.item-view-xiangmu{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		font-weight: 400;
+		font-size: 21rpx;
+		margin-top: 5px;
+	}
+	.item-view-title{
+		font-weight: bold;
+		font-size: 33rpx;
+		color: #333333;
+	}
+	.item-view{
+		width: 55%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+	}
+	.item-img{
+		width: 285rpx;
+		height: 120px;
+		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%;
+	}
+	.item {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		height: 140px;
+		background: #FFFFFF;
+		border-radius: 21rpx;
+		margin-top:20px;
+		align-items: center;
+		padding: 0px 5px;
+	}
+	
+	.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: 0 auto;
+	}
+	.fenlei{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.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;
+	}
+	.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: 101rpx;
+		height: 60rpx;
+		background: #18A689;
+		border-radius: 31rpx;
+		
+	}
+	/deep/.uni-searchbar__box{
+		height: 31px;
+		border-radius: 15px !important;
+		background-color: #fff !important;
+		border: 2px solid #E5E5E5;
+		padding: 0px;
+		display: flex;
+		flex-direction: row;
+		flex-flow: row-reverse;
+		position: relative;
+	}
+	/deep/.uni-searchbar{
+		width: 240px;
+		border-radius: 31rpx;
+	}
+	.service-head-top-left image{
+		width: 25px;
+		height: 30rpx;
+		margin-right: 10px;
+	}
+	.service-head-top-left span{
+		font-weight: bold;
+		font-size: 44rpx;
+		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;
+	}
+	
+</style>
diff --git a/pages/my/historyMy.vue b/pages/my/historyMy.vue
new file mode 100644
index 0000000..26d86fa
--- /dev/null
+++ b/pages/my/historyMy.vue
@@ -0,0 +1,444 @@
+<!-- 自定义下拉刷新与上拉加载演示(vue) -->
+<template>
+	<view class="content-view">
+		<view class="service-head-top">
+			<view class="service-head-top-left">
+				<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
+				<span>浏览历史</span>
+			</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>
+		<t-refresh ref="refresh"  v-if="dataList.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
+			<template slot="content">
+				<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
+					<view class="item-img">
+						<image :src="item.massageImg" mode=""></image>
+					</view>
+					<view class="item-view">
+						<view class="item-view-title">
+							<span class="item-view-title-text">{{item.title}}</span>
+							<span class="header-bottom-title-liao">
+								{{item.typeName}}
+							</span>
+						</view>
+						<!-- <view class="item-view-xiangmu">
+							<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
+							<span>已售{{item.sales}}w+ | 好评{{item.esteemRate}}%</span>
+						</view> -->
+						<view class="item-view-jianjie">
+							{{item.content}}
+						</view>
+						<view class="item-view-bottom">
+							<view class="item-view-bottom-qian">
+								<span>￥</span>
+								<span>{{item.price}}</span>
+								<span>/元套</span>
+								<span>{{item.oldPrice}}</span>
+							</view>
+							<view class="item-view-bottom-btn">
+								查看
+							</view>
+						</view>
+					</view>	
+				</view>
+			</template> 
+		</t-refresh>
+		<empty v-if="dataList.length==0"></empty>
+			
+	</view>
+</template>
+
+<script>
+	import empty from '@/components/empty.vue'
+	import tRefresh from "@/components/t-refresh/t-refresh.vue"
+	export default {
+		components:{tRefresh,empty},
+		data() {
+			return {
+				loadingType:0,
+				myId: '',
+				// v-model绑定的这个变量不要在分页请求结束中自己赋值！！！
+				dataList: [],
+				tabList: [],
+				typeData:'105',
+				tabIndex: 0,
+				searchValue:'',
+				serviceTrue:true,
+				page:1,
+				limit:10,
+				titleNmae:'',
+				classifyId:''
+			}
+		},
+		onLoad(){
+			this.myId = uni.getStorageSync('userId');
+			this.getData();
+		},
+		onPullDownRefresh: function() {
+			this.page = 1;
+			this.getData();
+		},
+		methods: {
+			// 加载更多
+			loadMore: async function() {
+				//loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中
+				if(this.loadingType==0){
+					this.loadingType=2
+					//模拟数据请求
+					setTimeout(()=>{
+						this.page++;
+						this.loadingType=0;
+						this.getData()
+					},1000)
+				}
+			},
+			input(res) {//搜索 输入框
+				this.searchValue=res;
+			},
+			searchBtn(){//搜索按钮
+				if(this.searchValue!=""){
+					this.getData()
+				}
+			},
+			getData(){
+				this.$Request.get("/app/collect/massage/findPage", {
+					userId: this.myId,
+					classify:'2',
+					page:this.page,
+					limit:this.limit,
+					title:this.searchValue
+				}).then(res => {
+					if (res.code == 0) {
+						if (res.data) {
+							if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
+							this.dataList = [...this.dataList, ...res.data.records]; //追加新数据
+							uni.stopPullDownRefresh()
+						}
+					}
+				});
+			},
+			backImg(){//返回上一页
+				uni.reLaunch({
+					url:'/pages/my/index'
+				})
+			},	
+			clear(res) {
+				this.getData()
+			},
+			itemClick(item) {
+				if(item.typeName=='项目'){
+					uni.navigateTo({
+						url:'/pages/my/fuwuDateil?id='+item.projectId+'&limit='+this.limit+'&page='+this.page+'&name='+'index'
+					})
+				}else if(item.typeName=='套餐'){
+					uni.navigateTo({
+						url:'/pages/my/serviceOderDrtail?id='+item.projectId+'&limit='+10+'&page='+1+'&name='+'index'
+					})
+				}else if(item.typeName=='次卡'){
+					uni.navigateTo({
+						url:'/pages/my/cikarDrtail?id='+item.projectId+'&limit='+this.limit+'&page='+this.page+'&name='+'index'
+					})
+				}else if(item.typeName=='疗程'){
+					uni.navigateTo({
+						url:'/pages/my/fuwuliaochengDetail?id='+item.projectId+'&limit='+this.limit+'&page='+this.page+'&name='+'index'
+					})
+				}
+				
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.header-bottom-title-liao{
+		display: inline-block;
+		padding: 0 7px;
+		height: 16px;
+		line-height: 16px;
+		text-align: center;
+		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
+		border-radius: 7px;
+		margin-left: 5px;
+		font-weight: bold;
+		font-size: 8px;
+		border-top-left-radius: 20px;
+		border-bottom-right-radius: 20px;
+		color: #fff;
+	}
+	/deep/.refresh-body .content{
+		background-color: #f7f7f7;
+	}
+	/deep/.refresh-body{
+		height: 100% !important;
+		border-top: 2px solid #f7f7f7;
+	}
+	.content-view{
+		width: 100%;
+		height: 100vh;
+		overflow: auto;
+		background-color: #f7f7f7;
+	}
+	.item-view-bottom-btn{
+		text-align: center;
+		width: 131rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 10rpx;
+		font-weight: bold;
+		font-size: 24rpx;
+		color: #FFFFFF;
+	}
+	.item-view-bottom-qian span:nth-child(4){
+		 font-weight: bold;
+		 font-size: 31rpx;
+		 color: #848484;
+		 text-decoration-line: line-through;
+		 margin-left: 5px;
+	}
+	.item-view-bottom-qian span:nth-child(1){
+		 font-weight: 400;
+		 font-size: 25rpx;
+		 color: #F95900;
+	}
+	.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%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.item-view-jianjie{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #848484;
+		margin:5px 0px;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.item-view-biao{
+		padding: 1px 2px;
+		border-radius: 6rpx;
+	}
+	.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;
+		margin-left: 5px;
+	}
+	.item-view-xiangmu{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		font-weight: 400;
+		font-size: 21rpx;
+		margin-top: 5px;
+	}
+	.item-view-title-text{
+		display: inline-block;
+		width: 100px;
+		font-weight: bold;
+		font-size: 33rpx;
+		color: #333333;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+	.item-view-title{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.item-view{
+		width: 55%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+	}
+	.item-img{
+		width: 285rpx;
+		height: 120px;
+		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%;
+	}
+	.item {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		height: 140px;
+		background: #FFFFFF;
+		border-radius: 21rpx;
+		margin-top:20px;
+		align-items: center;
+		padding: 0px 5px;
+	}
+	
+	.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: 0 auto;
+	}
+	.fenlei{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.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;
+	}
+	.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: 101rpx;
+		height: 60rpx;
+		background: #18A689;
+		border-radius: 31rpx;
+		
+	}
+	/deep/.uni-searchbar__box{
+		height: 31px;
+		border-radius: 15px !important;
+		background-color: #fff !important;
+		border: 2px solid #E5E5E5;
+		padding: 0px;
+		display: flex;
+		flex-direction: row;
+		flex-flow: row-reverse;
+		position: relative;
+	}
+	/deep/.uni-searchbar{
+		width: 240px;
+		border-radius: 31rpx;
+	}
+	.service-head-top-left image{
+		width: 25px;
+		height: 30rpx;
+		margin-right: 10px;
+	}
+	.service-head-top-left span{
+		font-weight: bold;
+		font-size: 44rpx;
+		color: #171717;
+	}
+	.service-head-top-left{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.service-head-top{
+		width: 100%;
+		height: 51px;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		background-color: #fff;
+	}
+	
+</style>
diff --git a/pages/my/index.vue b/pages/my/index.vue
index bcca9ec..3de9c1c 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -41,10 +41,11 @@
 					</view>
 				</view>
 			</view>
-			<!-- <view class="my-head-bottom back-width" @click="kaitong">
-				<image src="../../static/my-kaitonghuiyuan.png" mode="widthFix"></image>
-			</view> -->
-			<view class="padding-lr margin-lr" style="background-color: #35C495;border-radius: 18rpx;margin-top: 30rpx;"
+			<view class="my-head-bottom back-width"  @click="goNav('/my/vip/index')">
+				<image src="../../static/my-kaitonghuiyuan.png" mode="widthFix" v-if="!isVip"></image>
+				<image src="../../static/activate3.png" mode="widthFix" v-if="isVip"></image>
+			</view>
+			<!-- <view class="padding-lr margin-lr" style="background-color: #35C495;border-radius: 18rpx;margin-top: 30rpx;"
 				v-if="XCXIsSelect != '否' && hyCheck != '否'">
 				<view class="flex justify-between align-center" style="height: 140rpx;">
 					<view class="flex justify-between align-center" style="">
@@ -65,7 +66,7 @@
 						style="justify-content: space-between;color: #fff;">会员特权
 					</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="my-serve width">
 			<view class="my-serve-title">我的服务</view>
@@ -127,7 +128,7 @@
 					{urlImg:'../../static/my-gong-5.png',text:'地址管理',link:'/my/address/address'},
 					{urlImg:'../../static/my-gong-6.png',text:'帮助中心',link:'/my/help/feedbackIndex'},
 					{urlImg:'../../static/my-gong-7.png',text:'设置中心',link:'/my/setting/index'},
-					{urlImg:'../../static/my-gong-8.png',text:'浏览历史',link:'/my/gird/browse'},
+					{urlImg:'../../static/my-gong-8.png',text:'浏览历史',link:'/pages/my/historyMy'},
 					{urlImg:'../../static/my-gong-9.png',text:'我的团队',link:'/pages/my/myteam'},
 				]
 			}
@@ -457,26 +458,28 @@
 					})
 			},
 			meServe(item){
-				uni.navigateTo({
-					url:'/pages/my/servicePackage?name='+item
-				})
-				// if(item=="服务套餐"){
-					
-				// }else if(item=="项目次卡"){
-				// 	uni.navigateTo({
-				// 		url:'/pages/my/onceCardPackage?name='+'项目次卡'
-				// 	})
-				// }else if(item=="服务疗程"){
-				// 	uni.navigateTo({
-				// 		url:'/pages/my/curePackage?name='+'服务疗程'
-				// 	})
-				// }
+				if(item=="服务套餐"){
+					uni.navigateTo({
+						url:'/pages/my/servicePackage'
+					})
+				}else if(item=="项目次卡"){
+					uni.navigateTo({
+						url:'/pages/my/cika'
+					})
+				}else if(item=="服务疗程"){
+					uni.navigateTo({
+						url:'/pages/my/fuwuliaocheng'
+					})
+				}
 			},
 		}
 	}
 </script>
 
 <style scoped>
+	
+	
+	
 	.my-use-list-text{
 		font-weight: bold;
 		font-size: 30rpx;
diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue
new file mode 100644
index 0000000..a8ddf94
--- /dev/null
+++ b/pages/my/indextaociliaoList.vue
@@ -0,0 +1,413 @@
+<!-- 自定义下拉刷新与上拉加载演示(vue) -->
+<template>
+	<view class="content-view">
+		<view class="service-head-top">
+			<view class="service-head-top-left">
+				<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
+				<span>{{typeData=='104'?'服务套餐':typeData=='105'?'次卡':'服务疗程'}}</span>
+			</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>
+		<t-refresh ref="refresh"  v-if="dataList.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
+			<template slot="content">
+				<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
+					<view class="item-img">
+						<image :src="item.packageImg" mode=""></image>
+					</view>
+					<view class="item-view">
+						<view class="item-view-title">
+							{{item.title}}
+						</view>
+						<view class="item-view-xiangmu">
+							<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
+							<span>已售{{item.sales}}w+ | 好评{{item.esteemRate}}%</span>
+						</view>
+						<view class="item-view-jianjie">
+							{{item.jianjie}}
+						</view>
+						<view class="item-view-bottom">
+							<view class="item-view-bottom-qian">
+								<span>￥</span>
+								<span>{{item.price}}</span>
+								<span>/元套</span>
+								<span>{{item.oldPrice}}</span>
+							</view>
+							<view class="item-view-bottom-btn">
+								查看
+							</view>
+						</view>
+					</view>	
+				</view>
+			</template> 
+		</t-refresh>
+		<empty v-if="dataList.length==0"></empty>
+			
+	</view>
+</template>
+
+<script>
+	import empty from '@/components/empty.vue'
+	import tRefresh from "@/components/t-refresh/t-refresh.vue"
+	export default {
+		components:{tRefresh,empty},
+		data() {
+			return {
+				loadingType:0,
+				myId: '',
+				// v-model绑定的这个变量不要在分页请求结束中自己赋值！！！
+				dataList: [],
+				typeData:'104',
+				tabIndex: 0,
+				searchValue:'',
+				serviceTrue:true,
+				page:1,
+				limit:10,
+				titleNmae:'',
+				classifyId:'',
+				getName:''
+			}
+		},
+		onLoad(e){
+			this.typeData=e.type
+			this.getName=e.name;
+			this.myId = uni.getStorageSync('userId')
+			this.getData()
+		},
+		onPullDownRefresh: function() {
+			this.page = 1;
+			this.getData()
+		},
+		methods: {
+			// 加载更多
+			loadMore: async function() {
+				//loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中
+				if(this.loadingType==0){
+					this.loadingType=2
+					//模拟数据请求
+					setTimeout(()=>{
+						this.page++;
+						this.loadingType=0;
+						this.getData()
+					},1000)
+				}
+			},
+			
+			input(res) {//搜索 输入框
+				this.searchValue=res;
+				console.log('----input:', res)
+			},
+			searchBtn(){//搜索按钮
+				if(this.searchValue!=""){
+					this.getData()
+				}
+			},
+			getData(){
+				var that=this;
+					that.$Request.get("/app/massage/package/findPage", {
+						type:that.typeData,
+						page:that.page,
+						limit:that.limit
+					}).then(res => {
+						if (res.code == 0) {
+							if (res.data) {
+								if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
+								this.dataList = [...this.dataList, ...res.data.list]; //追加新数据
+								uni.stopPullDownRefresh()
+							}
+						}
+					});
+			},
+			backImg(){//返回上一页
+				uni.reLaunch({
+					url:'/pages/index/index'
+				})
+			},	
+			clear(res) {
+				this.getData()
+			},
+			itemClick(item) {
+				if(this.typeData=='104'){
+					uni.navigateTo({
+						url:'/pages/my/serviceOderDrtail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+this.getName+'&isCanCoupon='+item.isCanCoupon
+					})
+				}else if(this.typeData=='105'){
+					uni.navigateTo({
+						url:'/pages/my/cikarDrtail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+this.getName+'&isCanCoupon='+item.isCanCoupon
+					})
+				}else if(this.typeData=='106'){
+					uni.navigateTo({
+						url:'/pages/my/fuwuliaochengDetail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+this.getName+'&isCanCoupon='+item.isCanCoupon
+					})
+				}
+				
+				
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	/deep/.refresh-body .content{
+		background-color: #f7f7f7;
+	}
+	/deep/.refresh-body{
+		height: 100% !important;
+		border-top: 2px solid #f7f7f7;
+	}
+	.content-view{
+		width: 100%;
+		height: 100vh;
+		overflow: auto;
+		background-color: #f7f7f7;
+	}
+	.item-view-bottom-btn{
+		text-align: center;
+		width: 131rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 10rpx;
+		font-weight: bold;
+		font-size: 24rpx;
+		color: #FFFFFF;
+	}
+	.item-view-bottom-qian span:nth-child(4){
+		 font-weight: bold;
+		 font-size: 31rpx;
+		 color: #848484;
+		 text-decoration-line: line-through;
+		 margin-left: 5px;
+	}
+	.item-view-bottom-qian span:nth-child(1){
+		 font-weight: 400;
+		 font-size: 25rpx;
+		 color: #F95900;
+	}
+	.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%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.item-view-jianjie{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #848484;
+		margin:5px 0px;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.item-view-biao{
+		padding: 1px 2px;
+		border-radius: 6rpx;
+	}
+	.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;
+		margin-left: 5px;
+	}
+	.item-view-xiangmu{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		font-weight: 400;
+		font-size: 21rpx;
+		margin-top: 5px;
+	}
+	.item-view-title{
+		font-weight: bold;
+		font-size: 33rpx;
+		color: #333333;
+	}
+	.item-view{
+		width: 55%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+	}
+	.item-img{
+		width: 285rpx;
+		height: 120px;
+		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%;
+	}
+	.item {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		height: 140px;
+		background: #FFFFFF;
+		border-radius: 21rpx;
+		margin-top:20px;
+		align-items: center;
+		padding: 0px 5px;
+	}
+	
+	.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: 0 auto;
+	}
+	.fenlei{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.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;
+	}
+	.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: 101rpx;
+		height: 60rpx;
+		background: #18A689;
+		border-radius: 31rpx;
+		
+	}
+	/deep/.uni-searchbar__box{
+		height: 31px;
+		border-radius: 15px !important;
+		background-color: #fff !important;
+		border: 2px solid #E5E5E5;
+		padding: 0px;
+		display: flex;
+		flex-direction: row;
+		flex-flow: row-reverse;
+		position: relative;
+	}
+	/deep/.uni-searchbar{
+		width: 240px;
+		border-radius: 31rpx;
+	}
+	.service-head-top-left image{
+		width: 25px;
+		height: 30rpx;
+		margin-right: 10px;
+	}
+	.service-head-top-left span{
+		font-weight: bold;
+		font-size: 44rpx;
+		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;
+	}
+	
+</style>
diff --git a/pages/my/myCiLiaoDetail.vue b/pages/my/myCiLiaoDetail.vue
new file mode 100644
index 0000000..e34c133
--- /dev/null
+++ b/pages/my/myCiLiaoDetail.vue
@@ -0,0 +1,626 @@
+<template>
+	<view class="content">
+		<view class="header">
+			<view class="header-top" :style="backgroundStyle">
+				<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">
+							<span>{{getList.title}}</span>
+							<span class="header-bottom-title-liao">
+								{{dataList.name}}
+							</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.price}}</span>
+								<span>/元套</span>
+							</view>
+							<view class="header-bottom-money-jia">
+								￥{{getList.oldPrice}}
+							</view>
+						</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" style="background-color: #fff;width: 95%;">
+				<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" :src="getList.contentImg" mode="widthFix"></image>	
+				<view class="detail-foot-mian-txet">
+					<span>SCIENTIFIC WAIST</span>
+					<span>科学护腰，不上脊椎</span>
+					<span>让您的腰不在盲目呵护!避免二次伤害!</span>
+				</view>
+			</view>
+		</view>
+		<view class="detail-btn" @click="goumai(getList)">
+			立即购买
+		</view>
+	</view>
+</template>
+<script>
+	export default{
+		data(){
+			return{
+				detailData:[],
+				dataList:[],
+				getList:[],
+				isVIP:false,
+				// 背景图片的URL可以是动态的，比如从API获取或根据条件生成
+				backgroundImageUrl: '',
+				page:1,
+				limit:10,
+				
+			}
+		},
+		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:{
+			goumai(item){//立即购买
+					this.$queue.setData('getJishi','')
+					this.$queue.setData('ordersId','');
+					this.$queue.setData('ordersId',item.massageTypeId);
+					this.$queue.setData('userPackageDetailId',item.id);
+					this.$queue.setData('daibudan','');
+					uni.navigateTo({
+						url:'/my/order/payModify?ordersId='+item.massageTypeId
+					})
+					
+			},
+			getData(){//次卡
+				var that=this;
+				let data = {
+							massageTypeId:that.dataList.id,
+							mainId: that.dataList.mainId,
+							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.packageImg
+					}
+				})
+			},
+		}
+	}
+</script>
+<style scoped>
+	.dingdan-btn{
+		text-align: center;
+		width: 62px;
+		height: 24px;
+		line-height: 24px;
+		border-radius: 4px;
+		font-weight: bold;
+		font-size: 11px;
+	}
+	.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;
+		padding: 10px;
+		margin-bottom: 10px;
+	}
+	.detail-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 15px 0px;
+	}
+	.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: 100%;
+		display: flex;
+		flex-direction: column;
+		margin: 0 auto;
+		border-radius: 21rpx;
+		padding: 15px;
+	}
+	.header-bottom-title-liao{
+		display: inline-block;
+		padding: 0 7px;
+		height: 16px;
+		line-height: 16px;
+		text-align: center;
+		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
+		border-radius: 7px;
+		margin-left: 5px;
+		font-weight: bold;
+		font-size: 8px;
+		border-top-left-radius: 20px;
+		border-bottom-right-radius: 20px;
+		color: #fff;
+	}
+	.detail-btn{
+		width:95%;
+		height: 92rpx;
+		line-height: 92rpx;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		border-radius: 46rpx;
+		margin: 0 auto;
+		text-align: center;
+		font-weight: 400;
+		font-size: 42rpx;
+		color: #FFFFFF;
+	}
+	.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:83%;
+	}
+	.detail-foot-mian-top,.detail-foot-mian-top-bottom{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		font-weight: bold;
+		font-size: 22rpx;
+	}
+	.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: 10px;
+	}
+	.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: 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;
+	}
+	
+	
+	.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: 22.92rpx;
+		height: 17.36rpx;
+	}
+	.header-bottom-foot-view-img2{
+		width: 16.67rpx;
+		height: 16.67rpx;
+	}
+	.header-bottom-foot-view-img3{
+		width: 15.97rpx;
+		height: 18.06rpx;
+	}
+	.header-bottom-foot-view image{
+		margin-right: 3px;
+	}
+	.header-bottom-foot-view{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 0 5px;
+		height: 22px;
+		line-height: 22px;
+		background-color: rgba(8, 162, 138, 0.1);
+		border-radius: 8px;
+		font-weight: 400;
+		font-size: 8px;
+		color: #029D88;
+	}
+	.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-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.header-bottom-money-jia{
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #848484;
+		line-height: 37rpx;
+		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:36.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;
+		justify-content: space-between;
+	}
+	.header-bottom-title-num span{
+		font-weight: bold;
+		font-size: 25rpx;
+	}
+	.header-bottom-title-num span:nth-child(1){
+		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;
+	}
+	.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;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/my/orderDetailsList.vue b/pages/my/orderDetailsList.vue
new file mode 100644
index 0000000..cc4d0fc
--- /dev/null
+++ b/pages/my/orderDetailsList.vue
@@ -0,0 +1,448 @@
+<!-- 自定义下拉刷新与上拉加载演示(vue) -->
+<template>
+	<view class="content-view">
+		<view class="service-head-top">
+			<view class="service-head-top-left">
+				<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
+				<span>{{previousPage.name}}</span>
+			</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>
+		<t-refresh ref="refresh"  v-if="dataList.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
+			<template slot="content">
+				<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
+					<view class="item-img">
+						<image :src="item.massageImg" mode=""></image>
+					</view>
+					<view class="item-view">
+						<view class="item-view-title">
+							<span class="item-view-title-text">{{item.title}}</span>
+							<span class="header-bottom-title-liao">
+								{{item.typeName}}
+							</span>
+						</view>
+						<!-- <view class="item-view-xiangmu">
+							<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
+							<span>已售{{item.sales}}w+ | 好评{{item.esteemRate}}%</span>
+						</view> -->
+						<view class="item-view-jianjie">
+							{{item.content}}
+						</view>
+						<view class="item-view-bottom">
+							<view class="item-view-bottom-qian">
+								<span>￥</span>
+								<span>{{item.price}}</span>
+								<span>/元套</span>
+								<span>{{item.oldPrice}}</span>
+							</view>
+							<view class="item-view-bottom-btn">
+								查看
+							</view>
+						</view>
+					</view>	
+				</view>
+			</template> 
+		</t-refresh>
+		<empty v-if="dataList.length==0"></empty>
+			
+	</view>
+</template>
+
+<script>
+	import empty from '@/components/empty.vue'
+	import tRefresh from "@/components/t-refresh/t-refresh.vue"
+	export default {
+		components:{tRefresh,empty},
+		data() {
+			return {
+				loadingType:0,
+				myId: '',
+				// v-model绑定的这个变量不要在分页请求结束中自己赋值！！！
+				dataList: [],
+				tabList: [],
+				typeData:'105',
+				tabIndex: 0,
+				searchValue:'',
+				serviceTrue:true,
+				page:1,
+				limit:10,
+				titleNmae:'',
+				classifyId:'',
+				previousPage:{}
+			}
+		},
+		onLoad(e){
+			var that=this;
+			that.previousPage=e;
+			that.isVIP=this.$queue.getData('isVIP');
+			that.myId = uni.getStorageSync('userId');
+			that.getData()
+		},
+		onPullDownRefresh: function() {
+			this.page = 1;
+			this.getData();
+		},
+		methods: {
+			// 加载更多
+			loadMore: async function() {
+				//loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中
+				if(this.loadingType==0){
+					this.loadingType=2
+					//模拟数据请求
+					setTimeout(()=>{
+						this.page++;
+						this.loadingType=0;
+						this.getData()
+					},1000)
+				}
+			},
+			input(res) {//搜索 输入框
+				this.searchValue=res;
+			},
+			searchBtn(){//搜索按钮
+				if(this.searchValue!=""){
+					this.getData()
+				}
+			},
+			getData(){
+				this.$Request.get("/app/collect/massage/findPage", {
+					userId: this.myId,
+					classify:'2',
+					page:this.page,
+					limit:this.limit,
+					title:this.searchValue
+				}).then(res => {
+					if (res.code == 0) {
+						if (res.data) {
+							if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
+							this.dataList = [...this.dataList, ...res.data.records]; //追加新数据
+							uni.stopPullDownRefresh()
+						}
+					}
+				});
+			},
+			backImg(){//返回上一页
+				uni.reLaunch({
+					url:'/pages/my/index'
+				})
+			},	
+			clear(res) {
+				this.getData()
+			},
+			itemClick(item) {
+				if(item.typeName=='项目'){
+					uni.navigateTo({
+						url:'/pages/my/fuwuDateil?id='+item.projectId+'&limit='+this.limit+'&page='+this.page+'&name='+'index'
+					})
+				}else if(item.typeName=='套餐'){
+					uni.navigateTo({
+						url:'/pages/my/serviceOderDrtail?id='+item.projectId+'&limit='+10+'&page='+1+'&name='+'index'
+					})
+				}else if(item.typeName=='次卡'){
+					uni.navigateTo({
+						url:'/pages/my/cikarDrtail?id='+item.projectId+'&limit='+this.limit+'&page='+this.page+'&name='+'index'
+					})
+				}else if(item.typeName=='疗程'){
+					uni.navigateTo({
+						url:'/pages/my/fuwuliaochengDetail?id='+item.projectId+'&limit='+this.limit+'&page='+this.page+'&name='+'index'
+					})
+				}
+				
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.header-bottom-title-liao{
+		display: inline-block;
+		padding: 0 7px;
+		height: 16px;
+		line-height: 16px;
+		text-align: center;
+		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
+		border-radius: 7px;
+		margin-left: 5px;
+		font-weight: bold;
+		font-size: 8px;
+		border-top-left-radius: 20px;
+		border-bottom-right-radius: 20px;
+		color: #fff;
+	}
+	/deep/.refresh-body .content{
+		background-color: #f7f7f7;
+	}
+	/deep/.refresh-body{
+		height: 100% !important;
+		border-top: 2px solid #f7f7f7;
+	}
+	.content-view{
+		width: 100%;
+		height: 100vh;
+		overflow: auto;
+		background-color: #f7f7f7;
+	}
+	.item-view-bottom-btn{
+		text-align: center;
+		width: 131rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 10rpx;
+		font-weight: bold;
+		font-size: 24rpx;
+		color: #FFFFFF;
+	}
+	.item-view-bottom-qian span:nth-child(4){
+		 font-weight: bold;
+		 font-size: 31rpx;
+		 color: #848484;
+		 text-decoration-line: line-through;
+		 margin-left: 5px;
+	}
+	.item-view-bottom-qian span:nth-child(1){
+		 font-weight: 400;
+		 font-size: 25rpx;
+		 color: #F95900;
+	}
+	.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%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.item-view-jianjie{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #848484;
+		margin:5px 0px;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.item-view-biao{
+		padding: 1px 2px;
+		border-radius: 6rpx;
+	}
+	.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;
+		margin-left: 5px;
+	}
+	.item-view-xiangmu{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		font-weight: 400;
+		font-size: 21rpx;
+		margin-top: 5px;
+	}
+	.item-view-title-text{
+		display: inline-block;
+		width: 100px;
+		font-weight: bold;
+		font-size: 33rpx;
+		color: #333333;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+	.item-view-title{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.item-view{
+		width: 55%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+	}
+	.item-img{
+		width: 285rpx;
+		height: 120px;
+		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%;
+	}
+	.item {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		height: 140px;
+		background: #FFFFFF;
+		border-radius: 21rpx;
+		margin-top:20px;
+		align-items: center;
+		padding: 0px 5px;
+	}
+	
+	.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: 0 auto;
+	}
+	.fenlei{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.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;
+	}
+	.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: 101rpx;
+		height: 60rpx;
+		background: #18A689;
+		border-radius: 31rpx;
+		
+	}
+	/deep/.uni-searchbar__box{
+		height: 31px;
+		border-radius: 15px !important;
+		background-color: #fff !important;
+		border: 2px solid #E5E5E5;
+		padding: 0px;
+		display: flex;
+		flex-direction: row;
+		flex-flow: row-reverse;
+		position: relative;
+	}
+	/deep/.uni-searchbar{
+		width: 240px;
+		border-radius: 31rpx;
+	}
+	.service-head-top-left image{
+		width: 25px;
+		height: 30rpx;
+		margin-right: 10px;
+	}
+	.service-head-top-left span{
+		font-weight: bold;
+		font-size: 44rpx;
+		color: #171717;
+	}
+	.service-head-top-left{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.service-head-top{
+		width: 100%;
+		height: 51px;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		background-color: #fff;
+	}
+	
+</style>
diff --git a/pages/my/serviceOderDrtail.vue b/pages/my/serviceOderDrtail.vue
index 0319762..74bac95 100644
--- a/pages/my/serviceOderDrtail.vue
+++ b/pages/my/serviceOderDrtail.vue
@@ -2,7 +2,8 @@
 	<view class="content">
 		<view class="header">
 			<view class="header-top" :style="backgroundStyle">
-				<image v-if="isVIP==false" src="../../static/servicePackage/member_ba.png" mode=""></image>
+				<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">
@@ -11,7 +12,7 @@
 							{{mainData.title}} 
 						</view>
 						<view class="header-bottom-title-num">
-							<span>{{mainData.sales}} </span>
+							<span>{{mainData.sales}}</span>
 							<span> 人选择</span>
 						</view>
 					</view>
@@ -78,29 +79,87 @@
 					</view>
 					<view class="tese">
 						<span>项目特色: </span>
-						<span>{{item.content}}</span>
+						<span>{{item.jianjie}}</span>
 					</view>
 					<view class="detail-foot-title">
 						服务项目{{index+1}}
 					</view>
 				</view>
-			
-				
-							
 			</view>
 		</view>
+		<checkbox-group @change="checkboxChange" v-if="serviData.name=='index' && serviData.isCanCoupon=='1'">
+			<view class="youhui-weiyong youhui-list" v-for="(itemY,indexY) in couponData" :key="itemY.id">
+				<view class="youhui-view-left">
+					<view class="youhui-view-left-yuan">
+						<span class="youhui-view-left-num">{{itemY.money}}</span>
+						<span class="youhui-view-left-text">元</span>
+					</view>
+					<view class="youhui-view-left-bottom">
+						满{{itemY.minMoney}}元可用
+					</view>
+				</view>
+				<view class="youhui-view-right">
+					<view class="youhui-view-right-top">
+						<view class="youhui-view-right-title">{{itemY.couponName}}</view>
+						<view class="youhui-view-right-time">{{itemY.endDate}}</view>
+					</view>
+					<label class="tui-radio">
+						<checkbox activeBackgroundColor="#096f4b" color="#096f4b" :value="itemY.id.toString()" :checked="checkbox"/>
+					</label>
+				</view>
+			</view>
+		</checkbox-group>
+		<view class="detail-btn" v-if="serviData.name=='index'" @click="openpay">
+			立即预约
+		</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,
+				isVip:false,
 				mainData:[],
 				detailData:[],
 				// 背景图片的URL可以是动态的，比如从API获取或根据条件生成
-				backgroundImageUrl: ''
+				backgroundImageUrl: '',
+				nameText:'',
+				zong:''
 			}
 		},
 		computed: {
@@ -113,36 +172,606 @@
 		  },
 		onLoad(e){
 			var that=this;
-			that.serviData=e
+			that.serviData=e;
 			that.getData();
-			this.isVIP=this.$queue.getData('isVIP');
+			that.youhui()
+			that.isVip=this.$queue.getData('isVIP');
+		},
+		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:{
+			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)
+					}
+							
+				});
+			},
+			goOrder() {//生成orderId
+				let that = this
+				console.log('asdasd',that.couponId)
+				// let payMoney =item.price;
+				// let payMoney = that.isVip ? item.memberPrice : item.price;
+				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: that.detailData.length},
+				  ]
+				}
+				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)
+					}
+			
+				});
+			},
+			openpay() {
+				this.goOrder()
+				this.showpay = true
+			},
+			//支付选择
+			selectWay: function(item) {
+				this.openWay = item.id;
+			},
+			
+			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
+				}
+			},
+			
 			detail(item){
-				console.log("111111",item)
 				uni.navigateTo({
-					url:'/pages/my/cureOderDrtail'
+					url:'/pages/my/cureOderDrtail?mainId='+item.mainId+'&id='+item.id+
+						'&massageTypeId='+item.massageTypeId+
+						'&page='+1+
+						'&limit='+10+
+						'&name='+this.nameText
 				})
+				
 			},
 			getData(){
 				var that=this;
-				let data = {
-						  mainId: that.serviData.id,
-						  page: that.serviData.page,
-						  limit:  that.serviData.limit,
+				if(that.serviData.name!='index'){
+					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;
+							that.nameText="my"
 						}
-				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
-					}
-				})
+					})	
+				}else{//从首页 推荐进入 请求的接口
+					let data = {
+							  mainId: that.serviData.id,
+							  page: that.serviData.page,
+							  limit:  that.serviData.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=that.mainData.packageImg;
+							that.nameText="index"
+						}
+					})
+				}
+				
 			},
 		}
 	}
 </script>
 <style scoped>
+	/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;
+	}
+	.detail-btn{
+		width:95%;
+		height: 92rpx;
+		line-height: 92rpx;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		border-radius: 46rpx;
+		margin: 0 auto;
+		text-align: center;
+		font-weight: 400;
+		font-size: 42rpx;
+		color: #FFFFFF;
+	}
 	.header-top image{
 		width: 706.25rpx;
 		height: 105.07rpx;
diff --git a/pages/my/servicePackage.vue b/pages/my/servicePackage.vue
index c4298a2..cf6f1b2 100644
--- a/pages/my/servicePackage.vue
+++ b/pages/my/servicePackage.vue
@@ -8,7 +8,7 @@
 				<view class="service-head-top">
 					<view class="service-head-top-left">
 						<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
-						<span>{{titleNmae}}</span>
+						<span>服务套餐</span>
 					</view>
 					<view>
 						<uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
@@ -45,7 +45,7 @@
 				<!-- <view class="item-line"></view> -->
 				<view class="item-img">
 					<image :src="item.packageImg" mode=""></image>
-					<span class="img-span">{{item.type}}</span>
+					<span class="img-span">{{item.status=='1'?'未用完':item.status=='2'?'退款':'已用完'}}</span>
 				</view>
 				<view class="item-view">
 					<view class="item-view-title">
@@ -65,116 +65,14 @@
 							<span>/元套</span>
 							<span>{{item.oldPrice}}</span>
 						</view>
-						<view class="item-view-bottom-btn" @click.stop="toggle('center')">
+						<view class="item-view-bottom-btn">
 							查看
 						</view>
 					</view>
 				</view>	
 			</view>
 		</z-paging>
-		<view>
-			<!-- 普通弹窗 -->
-			<uni-popup ref="popup" background-color="#fff" @change="change">
-				<view class="popup-content">
-					<view class="popup-head">
-						<span>改价单</span>
-						<span @click="closePopup(type)">x</span>
-					</view>
-					<view class="popup-mian">
-						<!-- <view class="popup-mian-textarea">
-							<view class="popup-mian-view">
-								<span>原服务项目价格:</span>
-								<span>￥198元</span>
-							</view>
-							<view class="popup-mian-view">
-								<span>现服务项目价格:</span>
-								<span>￥298元</span>
-							</view>
-							<view class="popup-mian-view">
-								<span>改价需支付差价:</span>
-								<span>￥100元</span>
-							</view>
-						</view> -->
-						<view class="chong">
-							<view class="chong-list">
-								<view class="chong-list-left">
-									<radio value=""  class="chong-list-radio"/>
-									<image src="../../static/jinggao.png" mode=""></image>
-								</view>
-								<view class="chong-list-right">
-									<view class="chong-title">
-										<span>王丽楠</span>
-										<image src="../../static/xinren.png" mode=""></image>
-									</view>
-									<view class="chong-bottom">
-										<view class="chong-bottom-ding">
-											<image src="../../static/orderDetail/dingwei.png" mode=""></image>
-											<span>0.8km</span>
-										</view>
-										<view class="chong-bottom-cheng">
-											<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
-											<span>春城有约</span>
-										</view>
-									</view>
-								</view>
-							</view>
-							<view class="chong-list">
-								<view class="chong-list-left">
-									<radio value=""  class="chong-list-radio"/>
-									<image src="../../static/jinggao.png" mode=""></image>
-								</view>
-								<view class="chong-list-right">
-									<view class="chong-title">
-										<span>王丽楠</span>
-										<image src="../../static/xinren.png" mode=""></image>
-									</view>
-									<view class="chong-bottom">
-										<view class="chong-bottom-ding">
-											<image src="../../static/orderDetail/dingwei.png" mode=""></image>
-											<span>0.8km</span>
-										</view>
-										<view class="chong-bottom-cheng">
-											<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
-											<span>春城有约</span>
-										</view>
-									</view>
-								</view>
-							</view>
-							<view class="chong-list">
-								<view class="chong-list-left">
-									<radio value=""  class="chong-list-radio"/>
-									<image src="../../static/jinggao.png" mode=""></image>
-								</view>
-								<view class="chong-list-right">
-									<view class="chong-title">
-										<span>王丽楠</span>
-										<image src="../../static/xinren.png" mode=""></image>
-									</view>
-									<view class="chong-bottom">
-										<view class="chong-bottom-ding">
-											<image src="../../static/orderDetail/dingwei.png" mode=""></image>
-											<span>0.8km</span>
-										</view>
-										<view class="chong-bottom-cheng">
-											<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
-											<span>春城有约</span>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="popup-mian-btn">
-							<span @click="closePopup(type)">
-								取消
-							</span>
-							<span>
-								确定
-							</span>
-						</view>
-					</view>
-				</view>
-			</uni-popup>
-		</view>
+		
 	</view>
 </template>
 
@@ -183,7 +81,6 @@
 		data() {
 			return {
 				myId: '',
-				type:'center',
 				// v-model绑定的这个变量不要在分页请求结束中自己赋值！！！
 				dataList: [],
 				tabList: [],
@@ -196,22 +93,13 @@
 				titleNmae:''
 			}
 		},
-		onLoad(e){
-			this.titleNmae=e.name
-			if(this.titleNmae=="服务套餐"){
-				this.typeData='104';
-			}else if(this.titleNmae=="项目次卡"){
-				this.typeData='105';
-			}else if(this.titleNmae=="服务疗程"){
-				this.typeData='106';
-			}
+		onLoad(){
 			this.myId = uni.getStorageSync('userId')
 			this.getData()
 		},
 		methods: {
 			input(res) {//搜索 输入框
 				this.searchValue=res;
-				console.log('----input:', res)
 			},
 			searchBtn(){//搜索按钮
 				if(this.searchValue!=""){
@@ -260,18 +148,7 @@
 					this.$refs.paging.complete(false);
 				})
 			},
-			change(e) {
-				console.log('当前模式：' + e.type + ',状态：' + e.show);
-			},
-			closePopup(type){//改价    关闭弹出框
-				this.type = type
-				this.$refs.popup.close(type);
-			},
-			toggle(type) {//改价 弹出框
-				this.type = type
-				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
-				this.$refs.popup.open(type)
-			},
+			
 			backImg(){//返回上一页
 				uni.reLaunch({
 					url:'/pages/my/index'
@@ -282,211 +159,27 @@
 			},
 			itemClick(item) {
 				uni.navigateTo({
-					url:'/pages/my/serviceOderDrtail?id='+item.id+'&limit='+this.limit+'&page='+this.page
+					url:'/pages/my/serviceOderDrtail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+'my'
 				})
+				
 			}
 		}
 	}
 </script>
 
 <style scoped>
-	.chong-list:last-child{
-		border: 0px !important;
-	}
-	.chong-bottom-cheng image{
-		width: 22.22rpx;
-		height: 22.22rpx;
-		margin-right: 5px;
-	}
-	.chong-bottom-cheng span{
-		font-weight: 500;
-		font-size: 23rpx;
-		color: #222222;
-	}
-	.chong-bottom-ding image{
-		width: 18.75rpx;
-		height: 21.53rpx;
-		margin-right: 5px;
-	}
-	.chong-bottom-ding span{
-		font-weight: bold;
-		font-size: 25rpx;
-		color: #848485;
-	}
-	.chong-bottom-ding,.chong-bottom-cheng{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-	.chong-bottom{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-		margin-top: 10px;
-	}
-	.chong-title image{
-		width: 50rpx;
-		height: 22.22rpx;
-	}
-	.chong-title span{
-		font-weight: 400;
-		font-size: 29rpx;
-		color: #333333;
-		margin-right: 5px;
-	}
-	.chong-title{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-	.chong-list-right{
-		width: 75%;
-		display: flex;
-		flex-direction: column;
-	}
-	.chong-list-left image{
-		width: 76rpx;
-		height: 76rpx;
-	}
-	/deep/uni-radio .uni-radio-input{
-		width: 29.86rpx;
-		height: 29.86rpx;
-		margin: -3px 0px 0px -5px;
-		background-color: rgba(4, 159, 137, 1) !important;
-		border-color: rgba(4, 159, 137, 1) !important;
-	}
-	.chong-list-radio{
-		margin-right: 5px;
-		width: 29.86rpx;
-		height: 29.86rpx;
-	}
-	.chong-list-left{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-	}
-	.chong-list{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		padding: 10px 0px;
-		border-bottom: 1px solid #DCDCDC;
-	}
-	.chong{
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-	}
 	.img-span{
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		width: 40px;
-		height: 16px;
-		line-height: 16px;
-		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
-		border-top-left-radius: 15rpx;
-		border-bottom-right-radius: 15rpx;
-		font-weight: bold;
-		font-size: 18rpx;
-		color: #FFFFFF;
-		position: absolute;
-		bottom: 0;
-		right: 0;
-		margin: 0 6px 6px 0px;
-	}
-	
-	.popup-mian-view span:nth-child(1){
-		color: #666666;
-	}
-	.popup-mian-view span:nth-child(2){
-		color: #333;
-		font-weight: bold;
-	}
-	.popup-mian-view span{
-		font-size: 29rpx;
-	}
-	.popup-mian-view{
-		width: 100%;
-		height: 35px;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-		border-bottom: 1px solid #DCDCDC;
-	}
-	.popup-mian-textarea{
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-	}
-	.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;
+		padding: 2px 5px;
 		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{
-		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;
-		padding-bottom: 10px;
-		background: #FFFFFF;
-		border-radius: 56rpx;
-		display: flex;
-		flex-direction: column;
+		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-view-bottom-btn{
 		text-align: center;
@@ -662,7 +355,7 @@
 	}
 	.search-btn{
 		text-align: center;
-		line-height: 60rpx;
+		line-height: 31px;
 		color: #fff;
 		position: absolute;
 		right: 0;
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 9f7cb32..fcc1b84 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -22,12 +22,13 @@
 				<view class="text-green" v-if="item.status ==1"><span>202312061140172215</span><span>待付款</span></view>
 				<view class="text-green" v-if="item.status ==2"><span>202312061140172215</span><span>待服务</span></view>
 				<view class="text-green" v-if="item.status ==3"><span>202312061140172215</span><span>待评价</span></view>
-				<view class="text-green" v-if="item.status ==9"><span>202312061140172215</span><span>待补单</span></view>
+				<view class="text-green" v-if="item.status ==4" style="color: #333333;">已取消</view>
 				<view class="text-green" v-if="item.status ==5"><span>202312061140172215</span><span>已完成</span></view>
 				<view class="text-green" v-if="item.status ==6"><span>202312061140172215</span><span>服务中</span></view>
 				<view class="text-green" v-if="item.status ==7"><span>202312061140172215</span><span>技师出发</span></view>
 				<view class="text-green" v-if="item.status ==8"><span>202312061140172215</span><span>技师到达</span></view>
-				<view class="text-green" v-if="item.status ==4" style="color: #333333;">已取消</view>
+				<view class="text-green" v-if="item.status ==9"><span>202312061140172215</span><span>待确认</span></view>
+				<view class="text-green" v-if="item.status ==10"><span>202312061140172215</span><span>待补单</span></view>
 				<!-- <view class="u-tips-color">{{item.createTime}}</view> -->
 			</view>
 			<view class="margin-top-sm" style="width: 100%;height: 1rpx;background: #f7f7f7;"></view>
@@ -56,53 +57,107 @@
 				
 			</view>
 			<view class="flex u-p-t-20 justify-between align-center" style="justify-content: flex-end;">
-				<view class="flex text-right">
-					<u-button
-						v-if="(item.status == 1 || item.status == 2 || item.status == 7 || item.status == 8) && yhqxSel != '否'"
-						:custom-style="customStyle" shape="circle" :plain="true"
-						 class="btnsH"
-						@click="cancelOrder(item)">取消订单</u-button>
-					<u-button v-if="item.status != 4" :custom-style="customStyle1" shape="circle" :plain="true"
-						@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH">联系客服</u-button>
-					<u-button v-if="item.status != 4" :custom-style="customStyle1" shape="circle" :plain="true"
-						@click="goNav('/my/order/payModify?ordersId='+item.ordersId)" class="btnsH">修改订单</u-button>
-					<u-button v-if="item.status == 1" :custom-style="customStyle1" shape="circle" :plain="true"
-						@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btns">去支付</u-button>
-					<u-button v-if="item.status == 2" :custom-style="customStyle1" shape="circle" :plain="true"
-						@click="goNav('/my/order/pay?ordersId='+item.ordersId)"  class="btns">查看详情</u-button>
-					<!-- <u-button v-if="item.status == 6" :custom-style="customStyle" shape="circle" :plain="true"
-							@click="cancel(item)">订单完成</u-button> -->
-					<u-button v-if="item.status == 5" :custom-style="customStyle" shape="circle"  class="btns" :plain="true" @click="goNav('/my/order/complain?id='+item.ordersId)" >
-						去投诉
-					</u-button>
-					<u-button v-if="item.status == 3" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
-						@click="toggle('center')">
-						提前结束
-					</u-button>
-					<u-button v-if="item.status == 3" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
-						@click="goNav('/my/order/feedback?artificerId='+item.artificerId+ '&ordersId='+item.ordersId)">
-						去评价
-					</u-button>
-					<!-- <u-button v-if="item.status == 4" :custom-style="customStyle" shape="circle" :plain="true"
-							@click="delOrder(item)">删除订单</u-button> -->
+				<view class="flex text-right" style="flex-direction: column;width: 100%;">
+					
+					<view class="showBtn" :style="{'justify-content':item.status != 6?'flex-end':'space-between'}">
+						<view class="gengduo" @click.stop="gengBtn(index)" v-show="item.status ==6">更多</view>
+						<view class="showBtn-view">
+							<u-button v-if="item.status == 10" :custom-style="customStyle1" shape="circle" :plain="true"
+								@click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item)" class="btns">
+								立即预约
+							</u-button>
+							<u-button v-if="item.status == 3" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
+								@click="goNav('/my/order/feedback?artificerId='+item.artificerId+ '&ordersId='+item.ordersId)">
+								待评价
+							</u-button>		
+							<u-button v-if="item.status == 9&&item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true"
+								@click="toggleQ('center',item)"  class="btns">
+								拒单确认
+							</u-button>
+							<u-button v-if="item.status == 1" :custom-style="customStyle1" shape="circle" :plain="true"
+								@click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item)" class="btns">
+								去支付
+							</u-button>
+							<u-button
+								v-if="(item.status == 1 || item.status == 2 || item.status == 7 || item.status == 8) && yhqxSel != '否'"
+								:custom-style="customStyle" shape="circle" :plain="true"
+								 class="btns"
+								@click="cancelOrder(item)">
+								取消订单
+							</u-button>
+							<u-button v-if="item.status != 4&&item.status != 1&&item.status != 10&&item.status != 3&&item.status != 9&&item.status != 5" :custom-style="customStyle1" shape="circle" :plain="true"
+								@click="goNav('/my/order/payModify?ordersId='+item.ordersId,item)" class="btns">
+								修改订单
+							</u-button>
+							<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
+									@click="cancel(item)">
+								充值
+							</u-button>
+							<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
+									@click="cancel(item)">
+								加钟
+							</u-button>
+							<u-button :custom-style="customStyle1" shape="circle" :plain="true"
+								@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH">
+								联系客服
+							</u-button>
+							<u-button v-if="item.status == 5" :custom-style="customStyle1" shape="circle"  class="btns" :plain="true" @click="goNav('/my/order/complain?id='+item.ordersId)" >
+								去投诉
+							</u-button>
+						</view>
+					</view>
+					<view class="hideBtn" v-show="btnShow==index" style="justify-content: end;">
+						<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
+								@click="cancel(item)">
+							改价
+						</u-button>
+						<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
+							@click="toggle('center',item)">
+							提前结束
+						</u-button>
+					</view>
 				</view>
 			</view>
 		</view>
 		<view>
-			<!-- 普通弹窗 -->
-			<uni-popup ref="popup" background-color="#fff" @change="change">
+			<!-- 确认拒绝 -->
+			<uni-popup ref="popupQ" background-color="#fff">
+				<view class="popup-content">
+					<view class="popup-head">
+						<span>确认拒单</span>
+						<span @click="closePopupQ(type)">x</span>
+					</view>
+					<view class="popup-mian">
+						<view  class="popup-mian-textarea">
+							{{qurenJd.refusalContent}}
+						</view>
+						<view class="popup-mian-btn">
+							<span @click="TuiPopup(type,'1')">
+								同意
+							</span>
+							<span @click="TuiPopup(type,'3')">
+								全额退款
+							</span>
+						</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+		<view>
+			<!-- 提前结束 -->
+			<uni-popup ref="popup" background-color="#fff">
 				<view class="popup-content">
 					<view class="popup-head">
 						<span>请输入提前结束的原因</span>
 						<span @click="closePopup(type)">x</span>
 					</view>
 					<view class="popup-mian">
-						<textarea placeholder="请输入提前结束服务原因" class="popup-mian-textarea" name="" id="" cols="30" rows="10"></textarea>
+						<textarea placeholder="请输入提前结束服务原因" @input="textareaInp" class="popup-mian-textarea" name="" id="" cols="30" rows="10"></textarea>
 						<view class="popup-mian-btn">
 							<span @click="closePopup(type)">
 								取消
 							</span>
-							<span>
+							<span @click="tiqian('center')">
 								确定
 							</span>
 						</view>
@@ -119,7 +174,10 @@
 	import mescrollBody from "@/components/mescroll-uni/components/mescroll-body/mescroll-body.vue";
 	import meTabs from "@/components/mescroll-uni/me-tabs/me-tabs.vue";
 	import empty from '@/components/empty.vue'
-
+	// 调用手机系统权限
+	// #ifdef APP-PLUS
+	import permision from "@/components/permission.js";
+	// #endif
 	export default {
 		mixins: [MescrollMixin], // 使用mixin
 		components: {
@@ -129,6 +187,9 @@
 		},
 		data() {
 			return {
+				tiqianData:[],
+				qurenJd:[],
+				btnShow:'',
 				type:'center',
 				goods: [], // 数据列表
 				game: [],
@@ -151,7 +212,7 @@
 					name: '待补单',
 					Aurl:'../../static/order_icon/order_icon4-4.png',
 					Surl:'../../static/order_icon/order_icon4.png',
-					status: '9'
+					status: '10'
 				},{
 					name: '技师出发',
 					Aurl:'../../static/order_icon/order_icon10-10.png',
@@ -208,7 +269,9 @@
 					margin: "0 0 0 20rpx",
 					fontSize: '26rpx'
 				},
-				yhqxSel: '否'
+				yhqxSel: '否',
+				latitude: '43.86487',
+				longitude: '',
 				// customStyle: {
 				// 	color: '#1789FD',
 				// 	backgroundColor: '#1E1F31',
@@ -217,11 +280,13 @@
 				// 	height: '54rpx',
 				// 	margin: "0 0 0 20rpx"
 				// }
+				earlyFinishReason:''
 			}
 		},
 		onLoad() {
 			this.userId = uni.getStorageSync('userId')
-			this.nickName = uni.getStorageSync('nickName')
+			this.nickName = uni.getStorageSync('nickName');
+			
 		},
 		onShow() {
 			this.yhqxSel = this.$queue.getData("yhqxSel");
@@ -244,17 +309,144 @@
 			}
 		},
 		methods: {
-			change(e) {
-				console.log('当前模式：' + e.type + ',状态：' + e.show);
+			goNav(url,item) {
+				this.$queue.setData('daibudan',item);
+				uni.navigateTo({
+					url:url
+				})
 			},
+			gengBtn(index){//更多按钮
+				this.btnShow=index
+			},
+			closePopupQ(type){//提前结束    关闭弹出框
+				this.type = type
+				this.$refs.popupQ.close(type);
+			},
+			toggleQ(type,item) {//确认拒单 弹出框
+				this.qurenJd=item;
+				
+				this.type = type
+				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+				this.$refs.popupQ.open(type)
+			},
+			TuiPopup(typeTxte,type){//确认拒单 全额退款.同意按钮   关闭弹出框
+				this.type = typeTxte
+				let data = {
+					ordersId: this.qurenJd.ordersId,
+					isAuto: '0',
+					type: type
+				}
+				this.$Request.post('/app/artificer/cancelSupplementOrders', data).then(res => {
+					if (res.code == 0) {
+						uni.showToast({
+							title:'操作完成！'
+						})
+							this.$refs.popupQ.close(typeTxte);
+					}else{
+						uni.showToast({
+							icon:'error',
+							title:'操作失败！'
+						})
+					}
+				
+				}).catch(() => {
+					//联网失败, 结束加载
+				});
+			},
+			
 			closePopup(type){//提前结束    关闭弹出框
 				this.type = type
 				this.$refs.popup.close(type);
 			},
-			toggle(type) {//提前结束 弹出框
-				this.type = type
+			textareaInp(e){//提前结束 输入框
+				this.earlyFinishReason=e.detail.value;
+				console.log("earlyFinishReason",this.earlyFinishReason)
+			},
+			tiqian(type){//提前结束 确认按钮
+				var that=this;
+				that.type = type;
+				
+				uni.getLocation({
+					type: 'wgs84',
+					success: function (resa) {
+						var longitude=resa.longitude;
+						var latitude=resa.latitude;
+						console.log('当前位置的经度：' + resa.longitude);
+						console.log('当前位置的纬度：' + resa.latitude);
+						let data = {
+							ordersId: that.tiqianData.ordersId,
+							accomplishLongitude:longitude,
+							accomplishLatitude:latitude,
+							earlyFinishReason: that.earlyFinishReason,
+						}
+						that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
+							if (res.code == 0) {
+								uni.showToast({
+									title:'操作完成！'
+								})
+								that.$refs.popup.close(type);
+							}else{
+								console.log('shibai：' + longitude);
+								console.log('shibai：' + latitude);
+								uni.showToast({
+									icon:'error',
+									title:'操作失败！'
+								})
+							}
+						
+						}).catch(() => {
+							//联网失败, 结束加载
+						});
+						
+					},
+						fail: function(e) {
+							// #ifdef H5
+								uni.showToast({
+									title:'获取地址失败！'
+								})
+							// #endif
+							// #ifdef APP-PLUS
+							that.checkPermission();
+							// #endif
+						}
+				});
+				
+			},
+			toggle(type,item) {//提前结束 弹出框
+				this.tiqianData=item;
+				this.type = type;
 				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
-				this.$refs.popup.open(type)
+				this.$refs.popup.open(type);
+			},
+			async checkPermission() {
+				let status = permision.isIOS ? await permision.requestIOS('location') : await permision.requestAndroid(
+					'android.permission.ACCESS_FINE_LOCATION');
+				if (status === null || status === 1) {
+					status = 1;
+				} else if (status === 2) {
+					uni.showModal({
+						content: "系统定位已关闭",
+						confirmText: "确定",
+						showCancel: false,
+						success: function(res) {}
+					})
+				} else if (status.code) {
+					uni.showModal({
+						content: status.message
+					})
+				} else {
+					uni.showModal({
+						title: '定位服务已关闭',
+						content: "您需要打开定位权限，否则我们将无法获得到您附近的项目服务，导致我们无法为您提供服务，请到>设置>隐私>定位服务>中开启【盛安到家】定位权限",
+						confirmText: "设置",
+						success: function(res) {
+							if (res.confirm) {
+								permision.gotoAppSetting();
+							}
+						}
+					})
+				}
+				return status;
 			},
 			//获取列表数据
 			getOrderList() {
@@ -302,7 +494,6 @@
 				uni.showLoading({
 					title: '加载中...'
 				})
-				console.log("asdasd",index)
 				this.tabIndex = index
 				// this.goods = []; // 置空列表,显示加载进度条
 				this.page = 1
@@ -407,16 +598,13 @@
 					}
 				});
 			},
-			goNav(url) {
-				uni.navigateTo({
-					url
-				})
-			}
+			
 		},
 		onReachBottom: function() {
 			this.page = this.page + 1;
 			this.getOrderList();
-			if (this.totalCount == this.orderList.length) {
+			console.log("asd",this.totalCount)
+			if (this.totalCount==undefined&&this.orderList!='') {
 				uni.showToast({
 					title: '已经到底了~',
 					icon: 'none'
@@ -434,6 +622,32 @@
 </script>
 
 <style lang="scss" scoped>
+	/deep/.u-size-default{
+		margin-top: 5px !important;
+	}
+	.gengduo{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #7D7D7D;
+	}
+	.showBtn-view{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.showBtn{
+		justify-content: space-between;
+	}
+	.showBtn,.hideBtn{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		
+	}
+	
 	.popup-mian-btn span:nth-child(1){
 		background: linear-gradient(90deg, #FE912E, #FF9970);
 	}
diff --git a/pages/therapist/orderDetail.vue b/pages/therapist/orderDetail.vue
index e1c5438..62cd885 100644
--- a/pages/therapist/orderDetail.vue
+++ b/pages/therapist/orderDetail.vue
@@ -52,7 +52,7 @@
 							
 							</view>
 						</view>
-						<view class="oder-mian-qing">请TA上线</view>
+						<view class="oder-mian-qing" @click="shangxian">请TA上线</view>
 						<view class="oder-mian-guan" :class="[isFollow?'activeG':'activeQ']" @click="guanzhu(order)">
 							+ 关注
 						</view>
@@ -343,6 +343,24 @@
 			});
 		},
 		methods: {
+			shangxian(){//请TA上线
+				var data={
+					  userId: this.myId,
+					  artificerId: this.artificerId
+				}
+				this.$Request.post("/app/message/insertUpMessage", data).then(res => {
+					if (res.code == 0) {
+						uni.showToast({
+							title: '提醒成功！'
+						})
+					}else{
+						uni.showToast({
+							icon:'error',
+							title: '提醒成功失败！'
+						})
+					}
+				});
+			},
 			dianMoney(e){//点击 图片打赏 输入金额
 				this.money=e;
 			},
diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue
index 2c521ba..ad5b8d6 100644
--- a/pages/therapist/therapist.vue
+++ b/pages/therapist/therapist.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="content-head">
-			<view class="padding-top-sm flex align-center">
+			<view class="padding-top-sm flex align-center" style="padding-bottom: 9px;">
 				<view v-if="XCXIsSelect != '否'" class="flex align-center justify-between margin-right-sm"
 					@tap="showCityList" style="line-height: 68rpx;">
 					<image src="../../static/liliao-1.png" class="dingwei-img"></image>
@@ -14,15 +14,6 @@
 					<selectSwitchDitu @change="switch1Change" />
 				</view>
 			</view>
-			
-			<!-- <view class="tabview1" v-if="XCXIsSelect != '否'">
-				<view class="tabview" v-if="tablist && tablist.length > 1">
-					<view v-for="(item, index) in tablist" :key="index" @tap="tanChange(index, item)"
-						:class="tabIndex == item.id ? 'tabItem_sel' : 'tabItem'">
-						<view>{{ item.value }}</view>
-					</view>
-				</view>
-			</view> -->
 		</view>
 		<view class="liebiao" v-show="current === 0">
 			<view v-if="orderList.length" class="flex text-center flex-wrap list-view">
@@ -36,10 +27,10 @@
 								src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png"
 								style="width: 30rpx;height: 36rpx;position: absolute;z-index: 99;top: 40rpx;left: 110rpx;">
 							</image>
-							<!-- <image class="touxiang" src="../../static/cika.png" mode=""></image> -->
-							<view class="zpmore_view_left" v-if="item.isNewer==1" @click.stop="saveImgss(item.isNewer, 0)">
+							<!-- <view class="zpmore_view_left" v-if="item.technicianType==1" @click.stop="saveImgss(item.technicianType, 0)">
 								<image src="../../static/dituzhaoren1.png" mode=""></image>
-							</view>
+							</view> -->
+							<span class="img-span">{{item.technicianType=='3'?'新手':item.technicianType=='4'?'专家':'资深'}}</span>
 						</view>
 						<view class="list-right">
 							<view class="flex align-center" style="justify-content: start;">
@@ -56,13 +47,10 @@
 										}}</view>
 										</view>
 									</view>
-									<view class="list-right-top-bottom">
-										{{item.technicianTypeName}}
-									</view>
 								</view>
-								<!-- <view class="kyy_view">可服务</view> -->
-								<!-- <view class="kfw_view">可预约</view>
-								<view class="byy_view">休息中</view> -->
+							</view>
+							<view class="item-view-jianjie">
+								{{item.technicianTypeName}}
 							</view>
 							<view class="therapist-mian">
 								<view class="therapist-mian-top">
@@ -248,10 +236,10 @@
 	import commonConfig from 'common/config.js';
 
 	import * as webMap from 'utils/webMap.js';
-
+import permision from "@/components/permission.js";
 	// 调用手机系统权限
 	// #ifdef APP-PLUS
-	import permision from "@/components/permission.js";
+	// import permision from "@/components/permission.js";
 	// #endif
 	export default {
 		components: {
@@ -354,18 +342,17 @@
 				massageTypeId: null,
 				currentMarkerIndex: -1,
 				showPopup: false,
+				dataIndex:''
 			}
 		},
 
 		onLoad(e) {
-			console.log(e.massageTypeId)
 			let that = this
 			that.massageTypeId = e.massageTypeId
-			//that.massageTypeId = e.massageTypeId;
 			// that.getLocation();//低精度，快就完事了
 			//    that.getLocation(true);//高精度，慢慢查询
-
-
+			
+			that.getTypeList();
 			uni.getLocation({
 				type: 'wgs84',
 				geocode: true, //设置该参数为true可直接获取经纬度及城市信息
@@ -423,6 +410,12 @@
 			that.city = uni.getStorageSync('city') ? uni.getStorageSync('city') : '请选择城市'
 			that.getTpCount();
 			that.getTpMy();
+			uni.getStorage({
+			      key: 'taocanDd',
+			      success: (res) => {
+			        that.dataIndex = res.data;
+			      }
+			    });
 			that.token = uni.getStorageSync('token')
 			// if (uni.getStorageSync('token')) {
 			if (that.latitude && that.longitude) {
@@ -468,6 +461,53 @@
 			//this.closeSocket();
 		},
 		methods: {
+			// 跳转订单
+			goOrder(e) {
+				if(this.dataIndex!='支付'&&this.dataIndex!='待支付'){
+					console.log('授权', uni.getStorageSync('sendMsg'))
+					if (uni.getStorageSync('sendMsg')) {
+						console.log('授权+1')
+						wx.requestSubscribeMessage({
+							tmplIds: this.arr,
+							success(re) {
+								console.log(JSON.stringify(re), 111111111111)
+								var datas = JSON.stringify(re);
+								if (datas.indexOf("accept") != -1) {
+									console.log(re)
+								}
+							},
+							fail: (res) => {
+								console.log(res)
+							}
+						})
+					}
+					if (this.token) {
+						uni.navigateTo({
+							url: '/pages/therapist/orderDetail?artificerId=' + e.artificerId + "&classifyId=" + this
+								.tabIndex
+						});
+					} else {
+						uni.navigateTo({
+							url: '/pages/public/login'
+						});
+					}
+				}else{
+					if(this.dataIndex=='待支付'){
+						this.$queue.setData('getJishi',e);
+						uni.reLaunch({
+							url:'/my/order/payModifyDzhifu'
+						})
+					
+					}else{
+						this.$queue.setData('getJishi',e);
+						uni.reLaunch({
+							url:'/my/order/payModify'
+						})
+					}
+				}
+				
+			
+			},
 			switch1Change: function (e) {//地图和列表切换
 				var num= Number(e)
 				if(e==false){
@@ -882,7 +922,6 @@
 			},
 			// 跳转游戏列表
 			goNav(url) {
-				console.log(url, '1111112333')
 				if (uni.getStorageSync('sendMsg')) {
 					console.log('授权+1')
 					wx.requestSubscribeMessage({
@@ -936,37 +975,7 @@
 					url: '/pages/index/search/index?index=' + index
 				});
 			},
-			// 跳转订单
-			goOrder(e) {
-				console.log('授权', uni.getStorageSync('sendMsg'))
-				if (uni.getStorageSync('sendMsg')) {
-					console.log('授权+1')
-					wx.requestSubscribeMessage({
-						tmplIds: this.arr,
-						success(re) {
-							console.log(JSON.stringify(re), 111111111111)
-							var datas = JSON.stringify(re);
-							if (datas.indexOf("accept") != -1) {
-								console.log(re)
-							}
-						},
-						fail: (res) => {
-							console.log(res)
-						}
-					})
-				}
-				if (this.token) {
-					uni.navigateTo({
-						url: '/pages/therapist/orderDetail?artificerId=' + e.artificerId + "&classifyId=" + this
-							.tabIndex
-					});
-				} else {
-					uni.navigateTo({
-						url: '/pages/public/login'
-					});
-				}
-
-			},
+			
 			//地图初始化，
 			getLocation(isHighAccuracy = false) {
 				console.log('获取地理位置，精度：', isHighAccuracy);
@@ -1241,6 +1250,18 @@
 </script>
 
 <style lang="scss" scoped>
+	.item-view-jianjie{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #848484;
+		margin:5px 0px;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		text-align: left;
+	}
 	.dituList{
 		width: 85%;
 		height: 173px;
@@ -1250,7 +1271,7 @@
 	}
 	.liebiao{
 		height: 100vh;
-		margin-top: 52px;
+		margin-top: 55px;
 		display: flex;
 		flex-direction: column;
 	}
@@ -1259,10 +1280,11 @@
 		top: 0rpx;
 		z-index: 999;
 		width: 100%;
+		background-image: url('../../static/topimg.png');
 		// background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), #f7f7f7), url('../../static/background-img.png');
 		// background-position: center center;
 		// background-repeat: no-repeat;
-		// background-size: cover;
+		background-size: cover;
 		// overflow: auto;
 	}
 	.therapist-bottom-dingwei-text{
@@ -1420,21 +1442,34 @@
 		width: 68.75rpx;
 		height: 29.86rpx;
 	}
-	.zpmore_view_left image{
+	.img-span{
+		padding: 1px 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: 0px;
-		margin: 0px 5px -16px 0px;
-		width: 68.75rpx;
-		height: 29.86rpx;
+		right: 0;
+		margin-bottom: 5px;
+		margin-right: 5px;
 	}
+	// .zpmore_view_left image{
+	// 	position: absolute;
+	// 	bottom: 0px;
+	// 	right: 0px;
+	// 	margin: 0px 5px -16px 0px;
+	// 	width: 68.75rpx;
+	// 	height: 29.86rpx;
+	// }
 	.touxiang{
 		width: 202.08rpx;
 		height: 306.94rpx;
 	}
 	.touxiang-left-content{
 		width: 202.08rpx;
-		height: 306.94rpx;
+		height: auto;
 		border-radius: 10rpx;
 		position: relative;
 	}
diff --git a/static/activate2.png b/static/activate2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1b66e204e270bc07c6cd9bbd43f4082c31b9b84
GIT binary patch
literal 40510
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
Rrog(pUMp!SR>+$N{SQu+hA995

literal 0
HcmV?d00001

diff --git a/static/activate3.png b/static/activate3.png
new file mode 100644
index 0000000000000000000000000000000000000000..23e6e053f5f3a6de6d5a39e080cf32f343703628
GIT binary patch
literal 39513
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
A$p8QV

literal 0
HcmV?d00001

diff --git a/static/topimg.png b/static/topimg.png
new file mode 100644
index 0000000000000000000000000000000000000000..d02b5006b05bb8d0442ac084f5092e32c43f6338
GIT binary patch
literal 41507
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
CrM8Ix

literal 0
HcmV?d00001

diff --git a/uni_modules/liu-goods-swiper/components/liu-goods-swiper/liu-goods-swiper.vue b/uni_modules/liu-goods-swiper/components/liu-goods-swiper/liu-goods-swiper.vue
index e8a2f4e..49f2685 100644
--- a/uni_modules/liu-goods-swiper/components/liu-goods-swiper/liu-goods-swiper.vue
+++ b/uni_modules/liu-goods-swiper/components/liu-goods-swiper/liu-goods-swiper.vue
@@ -5,7 +5,7 @@
 				@click="chooseItem(item)">
 				<image :src="item.artificerImg" :style="'width:'+imgWidth+'px;'+'height:'+225+'px;'" mode=""></image>
 				<view class="item-name">{{item.artificerName}}</view>
-				<view class="item-descr">{{item.classifyName}}</view>
+				<view class="item-descr">{{item.content}}</view>
 			</view>
 		</scroll-view>
 	</view>
@@ -96,15 +96,15 @@
 	.item-descr {
 		text-align: center;
 		display: table;
-		width: 100%;
+		width: 100px;
 		font-size: 24rpx;
-		line-height: 24rpx;
+		line-height: 15px;
 		white-space: pre-wrap;
 		color: #999999;
 		margin-top: 10px;
 		display: -webkit-box;
 		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 1;
+		-webkit-line-clamp: 2;
 		overflow: hidden;
 	}
 </style>
\ No newline at end of file
diff --git a/uview-ui/components/u-field/u-field.vue b/uview-ui/components/u-field/u-field.vue
index cb7d7ac..6428d55 100644
--- a/uview-ui/components/u-field/u-field.vue
+++ b/uview-ui/components/u-field/u-field.vue
@@ -264,16 +264,20 @@ export default {
 			this.$emit('blur', event);
 		},
 		onConfirm(e) {
+			console.log("onConfirm")
 			this.$emit('confirm', e.detail.value);
 		},
 		onClear(event) {
+			console.log("onClear")
 			this.$emit('input', '');
 		},
 		rightIconClick() {
+			console.log("rightIconClick")
 			this.$emit('right-icon-click');
 			this.$emit('click');
 		},
 		fieldClick() {
+			console.log("fieldClick")
 			this.$emit('click');
 		}
 	}
diff --git a/uview-ui/libs/request/index.js b/uview-ui/libs/request/index.js
index 6ed747a..a25c908 100644
--- a/uview-ui/libs/request/index.js
+++ b/uview-ui/libs/request/index.js
@@ -104,6 +104,7 @@ class Request {
 			// baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换
 			// baseUrl: 'http://120.46.52.165/', // 请求的根域名	
 			baseUrl: 'http://192.168.2.222:8187/',
+			// baseUrl: 'http://192.168.2.27:8187/',
 			// 默认的请求头
 			header: {},
 			method: 'POST',