diff --git a/manifest.json b/manifest.json
index b7e1616..a21c9c4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -170,7 +170,7 @@
             "proxy" : {
                 // 可代理多个
                 "/TencentGet" : {
-                    "target" : "https://apis.map.qq.com/ws/geocoder/v1/", // 腾讯地图逆地址解析
+                    "target" : "http://sauser.blxinchuang.com/", // 腾讯地图逆地址解析
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {
@@ -189,7 +189,7 @@
             }
         },
         // "serviceHost" : "http://192.168.2.222:8187/_AMapService"
-        // "serviceHost" : "http://47.75.182.93:8090/_AMapService"
+        // "serviceHost" : "http://120.46.52.165/_AMapService"
         "template" : "index.html"
     }
 }
diff --git a/my/address/address.vue b/my/address/address.vue
index b29e4cd..d718b5a 100644
--- a/my/address/address.vue
+++ b/my/address/address.vue
@@ -18,7 +18,7 @@
 			</view>
 			<view style="margin-top: 30rpx;height: 1rpx;background-color: #f7f7f7;margin-bottom: 10upx;"></view>
 			<view style="display: flex;padding: 0 5upx 0 0;font-size: 26upx;">
-				<radio-group name="openWay" style="text-align: left;width: 70%;">
+				<radio-group name="openWay" style="text-align: left;width: 70%; margin-top:15rpx;">
 					<label class="tui-radio">
 						<radio :checked="item.isDefault == 1 ? true : false" color="#019c88" :disabled='item.isDefault == 1 ? false : true'
 							style="transform:scale(0.6);" />
@@ -190,14 +190,15 @@
 		margin-left: 10px;
 	}
 	.delete-view{
-		width: 85rpx;
+		width: 120rpx;
 		text-align: center;
-		background: #FFFFFF;
-		border-radius: 18rpx;
-		border: 1px solid #4D4D4D;
+		background: #e5e7eb;
+		border-radius: 30rpx;
+		border: 1px solid #cdd2db;
 		font-weight: 400;
-		font-size: 23rpx;
-		color: #4D4D4D;
+		font-size: 30rpx;
+		color: #666;
+		padding: 8rpx 10rpx;
 	}
 	.address-list-img{
 		width: 91rpx;
@@ -231,12 +232,12 @@
 	.shouhuo{
 		margin: 16rpx 30upx;
 		position: fixed;
-		bottom: -7upx;
+		bottom: -2upx;
 		width: 92%;
-		height: 92rpx;
+		height: 80rpx;
 		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
 		border-radius: 46rpx;
-		line-height: 92rpx;
+		line-height: 80rpx;
 		font-weight: 400;
 		font-size: 36rpx;
 		color: #FFFFFF;
diff --git a/my/hongbao/youhuijuan.vue b/my/hongbao/youhuijuan.vue
index 7e4a60e..5900866 100644
--- a/my/hongbao/youhuijuan.vue
+++ b/my/hongbao/youhuijuan.vue
@@ -158,6 +158,9 @@
 </script>
 
 <style scoped>
+	/deep/.page-box{
+		width: 100%;
+	}
 	.youhui-img{
 		width: 111.81rpx;
 		height: 111.81rpx;
diff --git a/my/hongbao/youhuijuanList.vue b/my/hongbao/youhuijuanList.vue
index 25bea55..63d3948 100644
--- a/my/hongbao/youhuijuanList.vue
+++ b/my/hongbao/youhuijuanList.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="page-content">
 		<!-- <view class="flex align-center justify-between you-nav">
 			<view v-for="(item,index) in tab" :key="index" class="text-center box"
 				:class="tabIndex == index?'tanColor':''" @click="bindTab(item.state)">
@@ -22,18 +22,20 @@
 				<view class="youhui-view-right">
 					<view class="youhui-view-right-top">
 						<view class="youhui-view-right-title">{{item.couponName}}</view>
-						<view class="youhui-view-right-time">{{item.endDate}}</view>
+						<view class="time-money" style="margin-top: 10px;">
+							<view class="youhui-view-right-time">{{item.createTime.substring(0,10)}} ~ </view>
+							<view class="youhui-view-right-time" style="margin-left: 3px;"> {{item.expirationTime.substring(0,10)}}</view>
+						</view>
 					</view>
 					<label class="tui-radio">
 						<checkbox activeBackgroundColor="#029d88" color="#029d88" :value="item.id.toString()" :checked="checkbox"/>
 					</label>
-					<!-- <view class="youhui-view-right-btn" @tap="shiYong()">立即使用</view> -->
 				</view>
 			</view>
 		</checkbox-group>
-		
-		
-		
+		<view @tap="queding()" class="queding">
+			<span class="que-btn">确定</span>
+		</view>
 		<empty v-if="hongbao.length==0"></empty>
 	</view>
 </template>
@@ -68,18 +70,29 @@
 					contentrefresh: '正在加载...',
 					contentnomore: '没有更多数据了'
 				},
-				couponId:''
+				couponId:'',
+				content:''
 			}
 		},
-		onLoad() {
+		onLoad(e) {
+			if(e){
+				this.content=e.text
+			}
 			this.getMyList();
 		},
 		methods: {
 			queding(){
 				this.$queue.setData('youhui',this.couponId);
-				uni.navigateTo({
-					url:'/my/order/payModify'
-				})
+				if(this.content){//返回推荐套餐订单
+					uni.navigateTo({
+						url:'/my/order/payModifyTc'
+					})
+				}else{
+					uni.navigateTo({//返回项目订单
+						url:'/my/order/payModify'
+					})
+				}
+				
 			},
 			checkboxChange(e){
 				this.couponId=e.detail.value.join(",")
@@ -94,14 +107,18 @@
 				uni.showLoading({
 					title: '加载中...'
 				});
-				this.$Request.getT('/app/coupon/selectCouponUserList?page='+this.page+'&limit='+this.size+'&status=' + this.tabIndex).then(res => {
+				var data={
+					page:this.page,
+					limit:this.size,
+					status:this.tabIndex,
+					minMoney:this.$queue.getData('minMoney')
+				}
+				this.$Request.getT('/app/coupon/selectUserCouponList',data).then(res => {
 					if (res.code == 0) {
 						if (this.page == 1) {
 							this.hongbao = [];
 						}
-						res.data.list.forEach(d => {
-							this.hongbao.push(d);
-						});
+						this.hongbao=res.data.list
 						if (res.data.list.length === this.size) {
 							this.loadingType = 0;
 						} else {
@@ -135,6 +152,42 @@
 </script>
 
 <style scoped>
+	/deep/.page-box{
+		width: 100%;
+	}
+	.page-content{
+		width:100%;
+		position: relative;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.que-btn{
+		display: inline-block;
+		width: 90%;
+		text-align: center;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		height: 32px;
+		border-radius: 28px;
+		color: #ffffff;
+		line-height: 32px;
+	}
+	.queding{
+		width: 90%;
+		height: 32px;
+		background-color: #fff;
+		position: fixed;
+		bottom: 0px;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.time-money{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
 	/deep/uni-checkbox .uni-checkbox-input{
 		border-radius: 50%;
 	}
diff --git a/my/order/pay.vue b/my/order/pay.vue
index 7b99082..ff21ea3 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -172,11 +172,13 @@
 								</view>
 							</view>
 						</view>
+						
 						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
 							<view style="color: #333;font-size: 26rpx;">合计：</view>
 							<view class="" style="color: #F93731;">￥<text
 									style="font-size: 35rpx;font-weight: bold;">{{order.sumMoney}}</text></view>
 						</view>
+						
 					</view>
 				</view>
 				<!-- <view class="pay-ding feiuong">
@@ -256,11 +258,11 @@
 					class="dingshi">
 					去投诉
 				</u-button>
-				<u-button v-if="order.status == 9&&order.refusalContent==null" :custom-style="customStyle2"
+				<u-button v-if="order.status == 9&&order.refusalContent" :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"
@@ -347,7 +349,7 @@
 							<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 class="item_btn" @click="goOrderJ(item)">确认加钟</view>
 						</view>
 					</view>
 				</view>
@@ -529,10 +531,9 @@
 			}
 		},
 		onLoad(e) {
-			uni.showLoading({
-				title: '加载中......',
-
-			})
+			// uni.showLoading({
+			// 	title: '加载中......',
+			// })
 			// setTimeout(() => {
 			// 	// this.loading = false;
 			// }, 2000)
@@ -543,7 +544,7 @@
 				})
 			}
 			this.ordersId = e.ordersId
-			// this.getOrder()
+			this.getOrder()
 		},
 		onShow() {
 			this.yhqxSel = this.$queue.getData("yhqxSel");
@@ -866,9 +867,33 @@
 					}
 				});
 			},
+			goOrderJ(item) {
+				
+				let that = this
+				let data = {
+				  classifyId:item.classifyId,
+				  ordersId:that.order.ordersId,
+				  ordersMassageList:[
+				    {massageId: item.massageTypeId,num: 1},
+				  ],
+				  massageTypeId:item.massageTypeId,
+				  userPackageDetailId:item.userPackageDetailId,
+				}
+				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)
+					}
+							
+				});
+			},
 			goOrder(item) {
-				console.log("item=====>",item)
-				console.log("order=====>",this.order)
+				
 				let that = this
 				let data = {
 				  classifyId:item.classifyId,
diff --git a/my/order/payModify.vue b/my/order/payModify.vue
index 8e591cf..7f921c2 100644
--- a/my/order/payModify.vue
+++ b/my/order/payModify.vue
@@ -2,6 +2,36 @@
 	<view class="content">
 		<view class="padding-bottom u-skeleton">
 			<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
+				<view class="head-top">
+					<view class="pay-title" style="">服务项目</view>
+					<view class="flex">
+						<view class="" style="width: 160upx;height: 160upx;">
+							<image :src="orderXm.massageImg"
+								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+						</view>
+						<view class="head-bottom  margin-left-sm">
+							<view class="flex head-title-right">
+								<view class="margin-right-xs text-df u-skeleton-fillet head-title">
+									{{orderXm.title}}
+								</view>
+								
+							</view>
+							<view class="flex align-center">
+								<view style="width: 100%;">
+									<view class="money-pay">
+										<view class="money-pay-zhen">
+											<span>￥</span>
+											<span>{{orderXm.price}}</span>
+										</view>
+										<view>
+											<uni-number-box :width='27' :min="1" @change="changeValue" />
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
 				<view class="ske-padding margin-top-sm header-view">
 					<view v-if="!detailaddress">请选择地址</view>
 					<view class="margin-right-xs">
@@ -9,7 +39,7 @@
 							<view class="header-view-text">联系人</view>
 							<view class="header-view-data">
 								<text>{{name}}</text>
-								<text class="xuanzhe" @click="getAddressList()">选择</text>
+								<text class="xuanzhe" @click="getAddressList()">修改</text>
 							</view>
 						</view>
 						<view class="flex justify-between margin-top-lg">
@@ -89,60 +119,6 @@
 						</view>
 					</view>
 				</view>
-				<!-- <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">
-							<view class="head-top-title">
-								<span>专业足疗+背部精油调理[90分钟]</span>
-								<image class="head-top-view-right-img" src="../../static/shezhi-jiantou.png" mode=""></image>
-							</view>
-							<view class="head-top-title-bottom">
-								<view class="qian-left">
-									<span>￥</span>
-									<span>268</span>
-								</view>
-								<view class="qian-right">
-									<span>X</span>
-									<span>8</span>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="head-mian">
-						<span>平台优惠券</span>
-						<view class="qian-right">
-							<span>￥</span>
-							<span>8</span>
-						</view>
-					</view>
-					<view class="head-foot">
-						<span>合计</span>
-						<span>￥{{order.sumMoney}}</span>
-					</view>
-				</view> -->
 				<view class="margin-top-xl pay-ding">
 					<view class="d-title">备注</view>
 					<view class="list-pay">
@@ -152,7 +128,7 @@
 						
 					</view>
 				</view>
-				<view class="margin-top-xl pay-ding">
+				<!-- <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">
@@ -171,12 +147,12 @@
 					<view class="checkbox-data">
 						<uni-data-checkbox v-model="radio1" :localdata="sex"></uni-data-checkbox>
 					</view>
-				</view>
+				</view> -->
 			</view>
 
 
 			
-			<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">立即预约</view>
+			<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view>
 		
 		</view>
 		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
@@ -236,7 +212,7 @@
 		<u-popup v-model="isTrue" mode="bottom">
 			<view>
 				<scroll-view scroll-y="true">
-					<its-calendar :sta_num="0" :end_num="24" :int_num="msTimeDate" :msTimeList="msTimeList" :classifyId="classifyId"
+					<its-calendar :sta_num="0" :end_num="24" :int_num="msTimeDate" :msTimeList="msTimeList" :classifyId="orderXm.classifyId"
 						@getTime="TimeData">
 					</its-calendar>
 				</scroll-view>
@@ -326,7 +302,9 @@
 				textareaData:'',
 				ordersId:'',
 				userPackageDetailId:'',
-				couponDataList:''
+				couponDataList:'',
+				orderXm:[],
+				number:1,
 			}
 		},
 		onLoad(e) {
@@ -343,15 +321,13 @@
 			let fullDate = `${month}-${days}`
 			let Time = year + '-' + fullDate
 			this.yearsDate = Time;
-			var classifyId=this.$queue.getData('classifyId')
-			this.classifyId = classifyId;
 			this.getMsTime(Time);
 			this.jishiName=this.$queue.getData('getJishi');
 			this.couponId=this.$queue.getData('youhui');
 			if(this.couponId){
 				this.youhuiF(this.couponId)
 			}
-			
+			this.orderXm=this.$queue.getData('xiangmu');//上一个页面带过来的全部数据
 			this.ordersId = this.$queue.getData('ordersId');
 			this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
 			this.youhui()
@@ -397,6 +373,9 @@
 			// #endif
 		},
 		methods: {
+			changeValue(value){
+				this.number=value
+			},
 			// 时间段数据
 			TimeData(e) {
 				var date = new Date();
@@ -446,7 +425,12 @@
 				})
 			},
 			openpay() {//验证
-				if(this.single=='2024-06-19'){
+					// else if(this.radio1!='0'){
+					// 	uni.showToast({
+					// 		title:'请同意服务保障！'
+					// 	})
+					// }
+				if(this.startTime==''){
 					uni.showToast({
 						title:'请选择服务时间！'
 					})
@@ -454,12 +438,8 @@
 					uni.showToast({
 						title:'请选择理疗师！'
 					})
-				}else if(this.radio1!='0'){
-					uni.showToast({
-						title:'请同意服务保障！'
-					})
 				}else{
-					this.showpay = true;
+					// this.showpay = true;
 					this.goOrder()
 				}
 				
@@ -682,9 +662,9 @@
 				  longitude:that.longitude,
 				  latitude:that.latitude,
 				  serveTime:that.startTime,
-				  remarks:that.textareaData,
+				  remark:that.textareaData,
 				  ordersMassageList:[
-				    {massageId: that.userPackageDetailId? that.userPackageDetailId:that.ordersId,num: 1},
+				    {massageId: that.userPackageDetailId? that.userPackageDetailId:that.ordersId,num: that.number},
 				  ]
 				}
 				that.$Request.postJson("/app/artificer/insertOrders", data).then(res => {
@@ -692,9 +672,11 @@
 					if (res.code == 0) {
 						that.ordersId = res.data.ordersId;
 						that.tpayMoney = res.data.payMoney;
-						that.showpay = true;
+						// that.showpay = true;
 						that.paySel = 1;
-						
+						uni.navigateTo({
+							url:'/my/order/payding?ordersId='+ res.data.ordersId
+						})
 					} else {
 						that.$queue.showToast(res.msg)
 					}
@@ -1024,7 +1006,6 @@
 					this.payJZ();
 					return;
 				}
-				console.log("ordersId000000000",this.ordersId)
 				if (that.openWay == 1) { //零钱支付
 					uni.showModal({
 						title: '付款提示',
@@ -1343,6 +1324,53 @@
 </script>
 
 <style lang="scss" scoped>
+	.head-bottom{
+		width: 68%;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+	}
+	.money-pay-jia{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #666666;
+		text-decoration-line: line-through;
+		margin-left: 5px;
+	}
+	.money-pay-zhen span{
+		color: #FF6000;
+	}
+	.money-pay-zhen span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.money-pay-zhen span:nth-child(2){
+		font-size: 31.25rpx;
+		font-weight: bold;
+	}
+	.money-pay-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.money-pay{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.head-top{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		padding: 29rpx;
+	}
+	
+	.pay-title{
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #333333;
+		margin-bottom: 5px;
+	}
 	.view-more{
 		display:inline-block;
 		border-top:1px solid;
@@ -1361,6 +1389,7 @@
 		padding: 5rpx 30rpx 36rpx 30rpx;
 		
 	}
+
 	.header-bottom-money-zhen span{
 		color: #F95900 !important;
 		font-weight: bold !important;
diff --git a/my/order/payModifyDd.vue b/my/order/payModifyDd.vue
new file mode 100644
index 0000000..a8c4f19
--- /dev/null
+++ b/my/order/payModifyDd.vue
@@ -0,0 +1,1985 @@
+<template>
+	<view class="content">
+		<view class="padding-bottom u-skeleton">
+			<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
+				<view class="head-top">
+					<view class="pay-title" style="">服务项目</view>
+					<view class="flex">
+						<view class="" style="width: 160upx;height: 160upx;">
+							<image :src="(orderXm.ordersMassageList && orderXm.ordersMassageList.length > 0 && orderXm.ordersMassageList[0].massageType && orderXm.ordersMassageList[0].massageType.massageImg)?orderXm.ordersMassageList[0].massageType.massageImg: '../../static/logo.png'"
+								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+						
+						</view>
+						<view class="head-bottom  margin-left-sm">
+							<view class="flex head-title-right">
+								<view class="margin-right-xs text-df u-skeleton-fillet head-title">
+									{{orderXm.entryName}}
+								</view>
+								
+							</view>
+							<view class="flex align-center">
+								<view style="width: 100%;">
+									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
+										<view style="justify-content: space-between;">
+											{{orderXm.ordersMassageList[0].massageType.duration}}分钟
+											x{{orderXm.massageNum}}
+										</view>
+									</view>
+									<view class="money-pay">
+										<view class="money-pay-zhen">
+											<span>￥</span>
+											<span>{{orderXm.price}}</span>
+										</view>
+										<view>
+											<uni-number-box :disabled="true" :width='27' :min="1" @change="changeValue" />
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<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>
+								<text class="xuanzhe" @click="getAddressList()">修改</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>
+							<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
+						</view> -->
+						<view class="flex align-center justify-between"
+							style="height: 100rpx;line-height: 100rpx;padding: 0rpx 10rpx;">
+							<view class="flex justify-between margin-tb-sm" @click="openData()">
+								<view v-if="startTime">{{startTime}}</view>
+								<view class="tetx-sm" style="color:#999999;" v-else>请选择预约时间</view>
+								<u-icon name="arrow-right" color="#999999"></u-icon>
+							</view>
+						</view>
+					</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 class="liliao">
+						<view class="liliao-top" style="width: 30%;">
+							<span>平台优惠劵</span>
+						</view>
+						<view class="header-bottom-money-zhen">
+							<view class="" style="margin-right: 5px;">
+								<span>-￥{{orderXm.couponMoney}}</span>
+							</view>
+							<!-- <span v-else>选择优惠劵</span> -->
+							<!-- <image class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image> -->
+						</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 @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-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">
+					<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="#029d88" :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>
+		<!-- 预约弹窗 -->
+		<u-popup v-model="isTrue" mode="bottom">
+			<view>
+				<scroll-view scroll-y="true">
+					<its-calendar :sta_num="0" :end_num="24" :int_num="msTimeDate" :msTimeList="msTimeList" :classifyId="orderXm.classifyId"
+						@getTime="TimeData">
+					</its-calendar>
+				</scroll-view>
+			</view>
+		</u-popup>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				startTime: '',
+				msTimeList: [],
+				msTimeDate: 0,
+				isTrue1: false,
+				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: {}
+				},
+				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:'',
+				isTrue: false,
+				jishiName:'',
+				checkbox:false,
+				couponData:[],
+				couponId:'',
+				textareaData:'',
+				ordersId:'',
+				couponDataList:'',
+				orderXm:[],
+				number:1,
+			}
+		},
+		onLoad(e) {
+			if (this.$queue.getData('msTimeDate')) {
+				this.msTimeDate = parseInt(this.$queue.getData('msTimeDate'));
+			} else {
+				this.msTimeDate = 60;
+			}
+			var date = new Date();
+			var year = date.getFullYear();
+			let month = (parseInt(date.getMonth()) + 1) > 9 ? (parseInt(date.getMonth()) + 1) : "0" + (parseInt(
+				date.getMonth()) + 1) // 当前月份
+			let days = (date.getDate()) > 9 ? date.getDate() : "0" + date.getDate() //当前日期
+			let fullDate = `${month}-${days}`
+			let Time = year + '-' + fullDate
+			this.yearsDate = Time;
+			this.getMsTime(Time);
+			this.jishiName=this.$queue.getData('getJishi');
+			this.couponId=this.$queue.getData('youhui');
+			if(this.couponId){
+				this.youhuiF(this.couponId)
+			}
+			this.orderXm=this.$queue.getData('xiangmu');//上一个页面带过来的全部数据
+			this.number=this.orderXm.massageNum
+			console.log("this.orderXm====>",this.orderXm)
+			this.youhui()
+			// this.getOrder()
+			// couponMoney
+		},
+		
+		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: {
+			changeValue(value){
+				this.number=value
+			},
+			// 时间段数据
+			TimeData(e) {
+				var date = new Date();
+				var year = date.getFullYear();
+				// if(this.msTimeList.length > 0){
+				// 	let startTime = year + '-' + e.days + ' ' + e.hours
+				// 	for (var i = 0; i < this.msTimeList.length; i++) {
+				// 		let msTime = this.msTimeList[i].artificerDate + ' ' + this.msTimeList[i].artificerTime
+				// 		if(startTime === msTime){
+				// 			this.isTrue = false
+				// 			uni.showModal({
+				// 				title: '温馨提示',
+				// 				content: '当前时段已被预约，请更换预约时段！',
+				// 				showCancel: true,
+				// 				cancelText: '取消',
+				// 				confirmText: '确定',
+				// 				success: res => {
+				// 					if(res.confirm){
+				// 						this.isTrue = true
+				// 					}
+				// 				}
+				// 			});
+				// 			return;
+				// 		}
+				// 	}
+				// }else{
+				this.startTime = year + '-' + e.days + ' ' + e.hours
+				this.isTrue = false
+				// }
+			},
+			getMsTime(artificerDate) {
+				this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + this
+					.artificerId + '&artificerDate=' + artificerDate).then(res => {
+					if (res.code == 0) {
+						this.msTimeList = res.data;
+						console.log(res.data, "获取忙时时间")
+					}
+				})
+			},
+			// 打开弹窗
+			openData() {
+				this.isTrue = true
+			},
+			youhuijuan(){
+				uni.navigateTo({
+					url:'/my/hongbao/youhuijuanList'
+				})
+			},
+			openpay() {//验证
+					// else if(this.radio1!='0'){
+					// 	uni.showToast({
+					// 		title:'请同意服务保障！'
+					// 	})
+					// }
+				if(this.startTime==''){
+					uni.showToast({
+						title:'请选择服务时间！'
+					})
+				}else if(this.jishiName==''){
+					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(",")
+			},
+			youhuiF(couponId){//获取优惠卷
+				let that = this;
+				let data = {
+							  page: 1,
+							  limit: 10,
+							  id:couponId,
+							}
+				that.$Request.get("/app/coupon/selectCouponUserList", data).then(res => {
+					if (res.code == 0) {
+						var list=res.data.list;
+						that.couponDataList=list.reduce((sum, item) => sum + item.money, 0)
+						console.log("asdasdasdasd",that.couponDataList)
+					} else {
+						that.$queue.showToast(res.msg)
+					}
+							
+				});
+			},
+			youhui(){//获取优惠卷
+				let that = this
+				let data = {
+							  status: 0,
+							  page: 1,
+							  limit: 10
+							}
+				that.$Request.get("/app/coupon/selectCouponUserList", data).then(res => {
+					if (res.code == 0) {
+						that.couponData=res.data.list
+					} else {
+						that.$queue.showToast(res.msg)
+					}
+							
+				});
+			},
+			liliaoshi(){
+				uni.setStorage({
+				  key: 'taocanDd',
+				  data: '支付',
+				  success: function () {
+				   uni.navigateTo({
+				   	url: '/pages/therapist/therapistDingdan'
+				   })
+				  }
+				});
+			},
+			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() {
+				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.orderXm.massageTypeId,num: that.orderXm.massageNum},
+				  ],
+				  city:that.city,
+				  phone:that.mobile,
+				  serveTime:that.startTime,
+				  userName:that.name,
+				  userId: uni.getStorageSync('userId'),
+				  remarks:that.textareaData,
+				  classifyId:that.orderXm.classifyId,
+				  couponId: that.couponId==''?that.huixian.join(','):that.couponId,
+				  longitude:that.longitude,
+				  latitude:that.latitude,
+				  ordersId:that.orderXm.ordersId,
+				  massageTypeId:that.orderXm.massageTypeId,
+				  userPackageDetailId:that.orderXm.userPackageDetailId,
+				  technicianType:that.orderXm.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;
+						uni.navigateTo({
+							url:'/my/order/paydingDd?ordersId='+ res.data.ordersId
+						})
+					} 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;
+				}
+				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>
+	.head-bottom{
+		width: 68%;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+	}
+	.money-pay-jia{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #666666;
+		text-decoration-line: line-through;
+		margin-left: 5px;
+	}
+	.money-pay-zhen span{
+		color: #FF6000;
+	}
+	.money-pay-zhen span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.money-pay-zhen span:nth-child(2){
+		font-size: 31.25rpx;
+		font-weight: bold;
+	}
+	.money-pay-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.money-pay{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.head-top{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		padding: 29rpx;
+	}
+	
+	.pay-title{
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #333333;
+		margin-bottom: 5px;
+	}
+	.header-bottom-money-zhen span{
+		color: #F95900 !important;
+		font-weight: bold !important;
+		font-size: 22rpx !important;
+	}
+	.header-bottom-money-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: baseline;
+	}
+	/deep/uni-checkbox .uni-checkbox-input{
+		width: 26px;
+		height: 26px;
+		border-radius: 50%;
+	}
+	.youhui-img{
+		width: 111.81rpx;
+		height: 111.81rpx;
+	}
+	.youhui-view-right-btn{
+		width: 158rpx;
+		height: 64rpx;
+		background: linear-gradient(-90deg, #019C88, #2DC48E);
+		border-radius: 32rpx;
+		text-align: center;
+		line-height: 64rpx;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #FFFFFF;
+		text-shadow: 0rpx 2rpx 4rpx rgba(0,119,104,0.44);
+		margin-left: 10px;
+	}
+	.youhui-view-right-time{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #999999;
+	}
+	.youhui-view-right-title{
+		width: 110px;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.youhui-view-right-top{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.youhui-view-right{
+		width: 502.08rpx;
+		height: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-around;
+	}
+	.youhui-view-left-bottom{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #FFFFFF;
+	}
+	.youhui-view-left-yuan{
+		display: flex;
+		flex-direction: row;
+		align-items: baseline;
+		color: #FFFFFF;
+	}
+	.youhui-view-left-num{
+		font-weight: bold;
+		font-size: 89rpx;
+	}
+	.youhui-view-left-text{
+		font-weight: bold;
+		font-size:24.31rpx;
+	}
+	.youhui-view-left{
+		width: 199rpx;
+		height: 242rpx;
+		display: flex;
+		flex-direction:column;
+		align-items: center;
+		justify-content: center;
+	}
+	.youhui-yiyong{
+		background-image: url('../../static/youhuijuan/coupons7.png');
+	}
+	.youhui-weiyong{
+		background-image: url('../../static/youhuijuan/coupons1.png');
+	}
+	.youhui-list{
+		width: 95%;
+		display: flex;
+		flex-direction: row;
+		height: 242rpx;
+		border-radius: 21rpx;
+		background-size: 100%;
+		margin: 20px auto;
+		justify-content: space-between;
+	}
+	.dingwei-image{
+		margin-right: 20rpx;
+		width: 66rpx;
+		height: 66rpx;
+		padding: 10rpx 0;
+		border-radius: 50%;
+		background: linear-gradient(90deg, #029d88, #2fc094);
+		text-align: center;
+		line-height: 66rpx;
+	}
+	/deep/.skeleton-fade{
+		display: none;
+	}
+	/deep/.u-button-pay{
+		width: 381rpx;
+		height: 76rpx;
+		line-height: 76px;
+		text-align: center;
+		color: #fff;
+		font-size: 32rpx;
+		background: linear-gradient(90deg, #029d88, #2fc094);
+		border-radius: 60rpx;
+	}
+	.daizhifu{
+		font-size: 38rpx;
+		color: #333333;
+	}
+	.pay-zhifu{
+		width: 100%;
+		background-color: #f7f7f7 !important;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between !important;
+	}
+	.liliao{
+		margin-top: 17px;
+	}
+	.fuwu-time-view{
+		text-align: right;
+	}
+	.liliao-top span:nth-child(2){
+		width: 78rpx;
+		height: 35rpx;
+		line-height: 35rpx;
+		background: linear-gradient(90deg, #FE912E, #FF9970);
+		border-radius: 17rpx;
+		text-align: center;
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #FFFFFF;
+		margin-left: 5px;
+	}
+	.fuwu-time-view span:nth-child(1),.liliao-bottom span:nth-child(1){
+		font-weight: 400;
+		font-size: 29rpx;
+		color: #888;
+		margin-right: 5px;
+	}
+	.fuwu-time-view,.liliao-top{
+		width: 70%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.fuwu-title,.liliao-top span:nth-child(1){
+		font-size: 29rpx;
+		color: #222222;
+	}
+	.fuwu-time,.liliao{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.adders-view image{
+		margin-top: 5px;
+	}
+	.xuanzhe{
+		margin-left: 5px;
+		border: 1px solid;
+	}
+	.header-view-data{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.adders-view span,.header-view-data{
+		font-size: 29rpx;
+		color: #888;
+		text-align: right;
+	}
+	.adders-view{
+		display: flex;
+		flex-direction: row;
+		position: relative;
+	}
+	.header-view-text{
+		width: 170rpx;
+		font-size: 29rpx;
+		color: #222222;
+	}
+	.header-view{
+		background-color: #fff;
+		margin-bottom: 10px;
+		border-radius: 11px;
+	}
+	.head-foot span:nth-child(1){
+		margin-right: 5px;
+	}
+	.head-foot span{
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #222222;
+	}
+	.head-foot{
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-end;
+		margin-top: 10px;
+	}
+	.head-mian{
+		margin-top: 3px;
+	}
+	.qian-right span:nth-child(1){
+		font-size: 16.67rpx;
+	}
+	.qian-right span:nth-child(2){
+		font-size:25rpx;
+	}
+	.qian-right span{
+		color: #727272;
+	}
+	.qian-left span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.qian-left span:nth-child(2){
+		font-size:29.17rpx;
+	}
+	.qian-left span{
+		color: #F95900;
+	}
+	.head-top-view-right-img,.adders-view image,.fuwu-img{
+		width: 9.38rpx;
+		height: 15.83rpx;
+	}
+	.head-top-title-bottom{
+		margin-top: 10px;
+	}
+	.head-top-title,.head-top-title-bottom,.head-mian{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.head-top-view-right{
+		width: 83%;
+		display: flex;
+		flex-direction: column;
+	}
+	.head-top-view-img{
+		width: 98.61rpx;
+		height: 98.61rpx;
+	}
+	.head-top-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.head-top{
+		width: 100%;
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		padding: 29rpx;
+	}
+	.d-title{
+		font-weight: 400;
+		font-size: 29rpx;
+		color: #222;
+		padding: 10px 15px 0px 15px;
+		width: 100%;
+	}
+	.checkbox-data{
+		padding: 0px 11px;
+		margin: 15px 0px;
+	}
+	.list-pay-text span:nth-child(2){
+		padding-left: 5px;
+	}
+	.list-pay-text{
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #999999;
+		line-height: 42rpx;
+	}
+	.list-pay{
+		width: 100%;
+		padding: 0px 29rpx;
+	}
+	.pay-ding-top{
+		width: 100%;
+		height: 80rpx;
+		padding: 0px 29rpx;
+	}
+	.fei-view-list span,.fei-view-list-z span{
+		font-weight: bold;
+		font-size: 25rpx;
+	}
+	.fei-view-list-z{
+		height: 65rpx;
+		background-color: rgba(247, 247, 247, 0.8);
+		border-radius: 33rpx;
+		padding: 0px 5px;
+	}
+	.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
+		color: #666666;
+	}
+	.fei-view-list span:nth-child(2){
+		color: #333333;
+	}
+	.fei-view-list,.fei-view-list-z{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 5px;
+	}
+	.fei-view{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.fei-title{
+		width: 100%;
+		text-align: center;
+		font-weight: bold;
+		font-size: 29rpx;
+		color: #333333;
+		padding-bottom: 10px;
+		margin-bottom: 10px;
+		border-bottom: 1px solid #E5E5E5;
+	}
+	.feiuong{
+		padding: 29rpx;
+	}
+	/deep/.uni-textarea-textarea{
+		font-weight: 400;
+		font-size: 25rpx;
+	}
+	/deep/.uni-textarea-placeholder{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #C5C5C5;
+	}
+	.textarea-pay-list{
+		width: 100%;
+		height: 126rpx;
+		margin-top: 10px;
+	}
+	.textarea-pay{
+		background-color: #f3f3f3;
+		width: 100%;
+		height: 100%;
+		background: #F3F3F3;
+		border-radius: 14rpx;
+		padding: 7px;
+	}
+	
+	.pay-ding{
+		padding-bottom: 15px;
+	}
+	.pay-ding,.feiuong{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		margin-top: 24rpx;
+		// padding: 29rpx;
+	}
+	.phone-pay{
+		width: 49rpx;
+		height: 44rpx;
+	}
+	
+	.d-touxiang{
+		width: 46rpx;
+		height: 46rpx;
+		border-radius: 50%;
+	}
+	.money-pay-jia{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #666666;
+		text-decoration-line: line-through;
+		margin-left: 5px;
+	}
+	.money-pay-zhen span{
+		color: #FF6000;
+	}
+	.money-pay-zhen span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.money-pay-zhen span:nth-child(2){
+		font-size: 31.25rpx;
+		font-weight: bold;
+	}
+	.money-pay-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.money-pay{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	
+	.content{
+		 padding-top: 1px;
+		 width: 100%;
+		 background-color: #f7f7f7;
+	}
+	.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/order/payModifyTc.vue b/my/order/payModifyTc.vue
new file mode 100644
index 0000000..54e50bd
--- /dev/null
+++ b/my/order/payModifyTc.vue
@@ -0,0 +1,2018 @@
+<template>
+	<view class="content">
+		<view class="padding-bottom u-skeleton">
+			<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
+				<view class="head-top">
+					<view class="pay-title" style="">服务项目</view>
+					<view class="flex">
+						<view class="" style="width: 160upx;height: 160upx;">
+							<image :src="orderXm.massageImg"
+								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+						</view>
+						<view class="head-bottom  margin-left-sm">
+							<view class="flex head-title-right">
+								<view class="margin-right-xs u-skeleton-fillet head-title">
+									{{orderXm.title}}
+								</view>
+								
+							</view>
+							<view class="flex align-center">
+								<view style="width: 100%;">
+									<view class="money-pay">
+										<view class="money-pay-zhen">
+											<span>￥</span>
+											<span>{{orderXm.price}}</span>
+										</view>
+										<view>
+											<uni-number-box :width='27' :min="1" @change="changeValue" />
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+			</view>
+			<view class="detail-foot">
+				<view class="detail-foot-nav">
+					<span class="detail-foot-nav-text">套餐详情</span>
+					<span class="detail-foot-nav-bor"></span>
+				</view>
+				<view class="detail-foot-mian">
+					<view class="detail-foot-list" v-for="(item,index) in detailData" :key="index" @click="detail(item)">
+						<view class="detail-foot-list-top">
+							<span style="margin-right: 5px;">{{item.title}}</span>
+							<span style="display: none;">详情</span>
+							<span>服务时长:{{item.duration}}分钟</span>
+						</view>
+						<view class="header-bottom-money" style="margin: 7px 0px;">
+							<view class="header-bottom-money-zhen">
+								<span>￥</span>
+								<span>{{item.price}}</span>
+								<span>/元套</span>
+							</view>
+							<view class="header-bottom-money-jia" style="margin-left: 20px;">
+								￥{{item.oldPrice}}
+							</view>
+						</view>
+						<view class="tese">
+							<span>项目特色: </span>
+							<span>{{item.jianjie}}</span>
+						</view>
+						<view class="detail-foot-title">
+							服务项目{{index+1}}
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="padding margin-top-sm header-view" style="width: 95%;margin: 0 auto;">
+				
+				<view class="liliao" @click="youhuijuan" style="margin-top: 0px;">
+					<view class="liliao-top" style="width: 30%;">
+						<span>平台优惠劵</span>
+					</view>
+					<view class="header-bottom-money-zhen">
+						<view v-if="couponDataList" class="" style="margin-right: 5px;">
+							<span>-￥{{couponDataList}}</span>
+						</view>
+						<span v-else >选择优惠劵</span>
+						<image class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
+					</view>
+				</view>
+			</view>
+			
+			<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view>
+		
+		</view>
+		<!-- <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">
+					<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="#029d88" :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>
+		<!-- 预约弹窗 -->
+		<u-popup v-model="isTrue" mode="bottom">
+			<view>
+				<scroll-view scroll-y="true">
+					<its-calendar :sta_num="0" :end_num="24" :int_num="msTimeDate" :msTimeList="msTimeList" :classifyId="classifyId"
+						@getTime="TimeData">
+					</its-calendar>
+				</scroll-view>
+			</view>
+		</u-popup>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				startTime: '',
+				msTimeList: [],
+				msTimeDate: 0,
+				isTrue1: false,
+				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: {}
+				},
+				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:'',
+				isTrue: false,
+				jishiName:'',
+				checkbox:false,
+				couponData:[],
+				couponId:'',
+				textareaData:'',
+				ordersId:'',
+				userPackageDetailId:'',
+				couponDataList:'',
+				orderXm:[],
+				detailData:[],
+				number:1
+			}
+		},
+		onLoad(e) {
+			if (this.$queue.getData('msTimeDate')) {
+				this.msTimeDate = parseInt(this.$queue.getData('msTimeDate'));
+			} else {
+				this.msTimeDate = 60;
+			}
+			this.orderXm=this.$queue.getData('mainData')
+			this.detailData=this.$queue.getData('detailData');
+			var date = new Date();
+			var year = date.getFullYear();
+			let month = (parseInt(date.getMonth()) + 1) > 9 ? (parseInt(date.getMonth()) + 1) : "0" + (parseInt(
+				date.getMonth()) + 1) // 当前月份
+			let days = (date.getDate()) > 9 ? date.getDate() : "0" + date.getDate() //当前日期
+			let fullDate = `${month}-${days}`
+			let Time = year + '-' + fullDate
+			this.yearsDate = Time;
+			var classifyId=this.$queue.getData('classifyId')
+			this.classifyId = classifyId;
+			this.getMsTime(Time);
+			this.jishiName=this.$queue.getData('getJishi');
+			this.couponId=this.$queue.getData('youhui');
+			if(this.couponId){
+				this.youhuiF(this.couponId)
+			}
+			
+			this.ordersId = this.$queue.getData('ordersId');
+			this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
+			this.youhui()
+			// 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: {
+			changeValue(value){
+				this.number=value
+			},
+			// 时间段数据
+			TimeData(e) {
+				var date = new Date();
+				var year = date.getFullYear();
+				// if(this.msTimeList.length > 0){
+				// 	let startTime = year + '-' + e.days + ' ' + e.hours
+				// 	for (var i = 0; i < this.msTimeList.length; i++) {
+				// 		let msTime = this.msTimeList[i].artificerDate + ' ' + this.msTimeList[i].artificerTime
+				// 		if(startTime === msTime){
+				// 			this.isTrue = false
+				// 			uni.showModal({
+				// 				title: '温馨提示',
+				// 				content: '当前时段已被预约，请更换预约时段！',
+				// 				showCancel: true,
+				// 				cancelText: '取消',
+				// 				confirmText: '确定',
+				// 				success: res => {
+				// 					if(res.confirm){
+				// 						this.isTrue = true
+				// 					}
+				// 				}
+				// 			});
+				// 			return;
+				// 		}
+				// 	}
+				// }else{
+				this.startTime = year + '-' + e.days + ' ' + e.hours
+				this.isTrue = false
+				// }
+			},
+			getMsTime(artificerDate) {
+				this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + this
+					.artificerId + '&artificerDate=' + artificerDate).then(res => {
+					if (res.code == 0) {
+						this.msTimeList = res.data;
+						console.log(res.data, "获取忙时时间")
+					}
+				})
+			},
+			// 打开弹窗
+			openData() {
+				this.isTrue = true
+			},
+			youhuijuan(){
+				uni.navigateTo({
+					url:'/my/hongbao/youhuijuanList?text='+'套餐'
+				})
+			},
+			openpay() {//验证
+					this.goOrder()
+			},
+			textareaChange(e){//备注
+				this.textareaData=e.detail.value
+				console.log("adsadas0",this.textareaData)
+			},
+			checkboxChange(e){
+				this.couponId=e.detail.value.join(",")
+			},
+			youhuiF(couponId){//获取优惠卷
+				let that = this;
+				let data = {
+							  page: 1,
+							  limit: 10,
+							  id:couponId,
+							}
+				that.$Request.get("/app/coupon/selectCouponUserList", data).then(res => {
+					if (res.code == 0) {
+						var list=res.data.list;
+						that.couponDataList=list.reduce((sum, item) => sum + item.money, 0)
+						console.log("asdasdasdasd",that.couponDataList)
+					} else {
+						that.$queue.showToast(res.msg)
+					}
+							
+				});
+			},
+			youhui(){//获取优惠卷
+				let that = this
+				let data = {
+							  status: 0,
+							  page: 1,
+							  limit: 10
+							}
+				that.$Request.get("/app/coupon/selectCouponUserList", data).then(res => {
+					if (res.code == 0) {
+						that.couponData=res.data.list
+					} else {
+						that.$queue.showToast(res.msg)
+					}
+							
+				});
+			},
+			liliaoshi(){
+				uni.setStorage({
+				  key: 'taocanDd',
+				  data: '支付',
+				  success: function () {
+				   uni.navigateTo({
+				   	url: '/pages/therapist/therapistDingdan'
+				   })
+				  }
+				});
+			},
+			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
+				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.orderXm.oldPrice,
+				  sumMoney: that.orderXm.price,
+				  // oldSumMoney: that.mainData.oldPrice*that.detailData.length,
+				  // sumMoney: that.mainData.price*that.detailData.length,
+				  ordersPackageList:[
+				    {packageId: that.orderXm.id,num: that.number},
+				  ]
+				}
+				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;
+						// console.log("res.data",res.data)
+						uni.navigateTo({
+							url:'/my/order/paydingTc?ordersId='+ res.data.ordersId
+						})
+					} 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;
+				}
+				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>
+	.head-bottom{
+		width: 68%;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+	}
+	.money-pay-jia{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #666666;
+		text-decoration-line: line-through;
+		margin-left: 5px;
+	}
+	.money-pay-zhen span{
+		color: #FF6000;
+	}
+	.money-pay-zhen span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.money-pay-zhen span:nth-child(2){
+		font-size: 31.25rpx;
+		font-weight: bold;
+	}
+	.money-pay-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.money-pay{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.head-top{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		padding: 29rpx;
+		margin-top: 10px;
+	}
+	
+	.pay-title{
+		font-weight: bold;
+		font-size: 38rpx;
+		color: #333333;
+		margin-bottom: 5px;
+	}
+	.header-bottom-money-zhen span{
+		color: #F95900 !important;
+		font-weight: bold !important;
+		font-size: 22rpx !important;
+	}
+	.header-bottom-money-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: baseline;
+	}
+	.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: 8px auto;
+	}
+	.detail-foot-title{
+		    width: 115px;
+		    height: 32px;
+			background-image: url(../../static/servicePackage/horn.png);
+		    background-repeat: no-repeat;
+		    background-size: 100% 100%;
+		    font-weight: 400;
+		    font-size: 13px;
+		    color: #FFFFFF;
+		    text-align: right;
+		    line-height: 32px;
+		    padding-right: 15px;
+			position: absolute;
+			    right: 0;
+			    top: 0;
+	}
+	.detail-foot-list-top{
+		width: 95%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.detail-foot-list{
+		width: 95%;
+		border-radius: 21rpx;
+		position: relative;
+		margin: 10px 0px 5px 0px;
+		padding: 15px;
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+	}
+	.detail-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 15px 0px;
+	}
+	
+	.tese span:nth-child(1){
+		font-weight: bold;
+		font-size: 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: 28rpx;
+		color: #029d88;
+	}
+	
+	.detail-foot-mian{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+	.header-bottom-money-zhen span{
+		color: #F95900 !important;
+		font-weight: bold !important;
+		font-size: 22rpx !important;
+	}
+	.header-bottom-money-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: baseline;
+	}
+	/deep/uni-checkbox .uni-checkbox-input{
+		width: 26px;
+		height: 26px;
+		border-radius: 50%;
+	}
+	.youhui-img{
+		width: 111.81rpx;
+		height: 111.81rpx;
+	}
+	.youhui-view-right-btn{
+		width: 158rpx;
+		height: 64rpx;
+		background: linear-gradient(-90deg, #019C88, #2DC48E);
+		border-radius: 32rpx;
+		text-align: center;
+		line-height: 64rpx;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #FFFFFF;
+		text-shadow: 0rpx 2rpx 4rpx rgba(0,119,104,0.44);
+		margin-left: 10px;
+	}
+	.youhui-view-right-time{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #999999;
+	}
+	.youhui-view-right-title{
+		width: 110px;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.youhui-view-right-top{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.youhui-view-right{
+		width: 502.08rpx;
+		height: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-around;
+	}
+	.youhui-view-left-bottom{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #FFFFFF;
+	}
+	.youhui-view-left-yuan{
+		display: flex;
+		flex-direction: row;
+		align-items: baseline;
+		color: #FFFFFF;
+	}
+	.youhui-view-left-num{
+		font-weight: bold;
+		font-size: 89rpx;
+	}
+	.youhui-view-left-text{
+		font-weight: bold;
+		font-size:24.31rpx;
+	}
+	.youhui-view-left{
+		width: 199rpx;
+		height: 242rpx;
+		display: flex;
+		flex-direction:column;
+		align-items: center;
+		justify-content: center;
+	}
+	.youhui-yiyong{
+		background-image: url('../../static/youhuijuan/coupons7.png');
+	}
+	.youhui-weiyong{
+		background-image: url('../../static/youhuijuan/coupons1.png');
+	}
+	.youhui-list{
+		width: 95%;
+		display: flex;
+		flex-direction: row;
+		height: 242rpx;
+		border-radius: 21rpx;
+		background-size: 100%;
+		margin: 20px auto;
+		justify-content: space-between;
+	}
+	.dingwei-image{
+		margin-right: 20rpx;
+		width: 66rpx;
+		height: 66rpx;
+		padding: 10rpx 0;
+		border-radius: 50%;
+		background: linear-gradient(90deg, #029d88, #2fc094);
+		text-align: center;
+		line-height: 66rpx;
+	}
+	/deep/.skeleton-fade{
+		display: none;
+	}
+	/deep/.u-button-pay{
+		width: 381rpx;
+		height: 76rpx;
+		line-height: 76px;
+		text-align: center;
+		color: #fff;
+		font-size: 32rpx;
+		background: linear-gradient(90deg, #029d88, #2fc094);
+		border-radius: 60rpx;
+	}
+	.daizhifu{
+		font-size: 38rpx;
+		color: #333333;
+	}
+	.pay-zhifu{
+		width: 100%;
+		background-color: #f7f7f7 !important;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between !important;
+	}
+	.liliao{
+		margin-top: 17px;
+	}
+	.fuwu-time-view{
+		text-align: right;
+	}
+	.liliao-top span:nth-child(2){
+		width: 78rpx;
+		height: 35rpx;
+		line-height: 35rpx;
+		background: linear-gradient(90deg, #FE912E, #FF9970);
+		border-radius: 17rpx;
+		text-align: center;
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #FFFFFF;
+		margin-left: 5px;
+	}
+	.fuwu-time-view span:nth-child(1),.liliao-bottom span:nth-child(1){
+		font-weight: 400;
+		font-size: 29rpx;
+		color: #888;
+		margin-right: 5px;
+	}
+	.fuwu-time-view,.liliao-top{
+		width: 70%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.fuwu-title,.liliao-top span:nth-child(1){
+		font-size: 29rpx;
+		color: #222222;
+	}
+	.fuwu-time,.liliao{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.adders-view image{
+		margin-top: 5px;
+	}
+	.xuanzhe{
+		margin-left: 5px;
+		border: 1px solid;
+	}
+	.header-view-data{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.adders-view span,.header-view-data{
+		font-size: 29rpx;
+		color: #888;
+		text-align: right;
+	}
+	.adders-view{
+		display: flex;
+		flex-direction: row;
+		position: relative;
+	}
+	.header-view-text{
+		width: 170rpx;
+		font-size: 29rpx;
+		color: #222222;
+	}
+	.header-view{
+		background-color: #fff;
+		margin-bottom: 10px;
+		border-radius: 11px;
+	}
+	.head-foot span:nth-child(1){
+		margin-right: 5px;
+	}
+	.head-foot span{
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #222222;
+	}
+	.head-foot{
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-end;
+		margin-top: 10px;
+	}
+	.head-mian{
+		margin-top: 3px;
+	}
+	.qian-right span:nth-child(1){
+		font-size: 16.67rpx;
+	}
+	.qian-right span:nth-child(2){
+		font-size:25rpx;
+	}
+	.qian-right span{
+		color: #727272;
+	}
+	.qian-left span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.qian-left span:nth-child(2){
+		font-size:29.17rpx;
+	}
+	.qian-left span{
+		color: #F95900;
+	}
+	.head-top-view-right-img,.adders-view image,.fuwu-img{
+		width: 9.38rpx;
+		height: 15.83rpx;
+	}
+	.head-top-title-bottom{
+		margin-top: 10px;
+	}
+	.head-top-title,.head-top-title-bottom,.head-mian{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.head-top-view-right{
+		width: 83%;
+		display: flex;
+		flex-direction: column;
+	}
+	.head-top-view-img{
+		width: 98.61rpx;
+		height: 98.61rpx;
+	}
+	.head-top-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.head-top{
+		width: 100%;
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		padding: 29rpx;
+	}
+	.d-title{
+		font-weight: 400;
+		font-size: 29rpx;
+		color: #222;
+		padding: 10px 15px 0px 15px;
+		width: 100%;
+	}
+	.checkbox-data{
+		padding: 0px 11px;
+		margin: 15px 0px;
+	}
+	.list-pay-text span:nth-child(2){
+		padding-left: 5px;
+	}
+	.list-pay-text{
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #999999;
+		line-height: 42rpx;
+	}
+	.list-pay{
+		width: 100%;
+		padding: 0px 29rpx;
+	}
+	.pay-ding-top{
+		width: 100%;
+		height: 80rpx;
+		padding: 0px 29rpx;
+	}
+	.fei-view-list span,.fei-view-list-z span{
+		font-weight: bold;
+		font-size: 25rpx;
+	}
+	.fei-view-list-z{
+		height: 65rpx;
+		background-color: rgba(247, 247, 247, 0.8);
+		border-radius: 33rpx;
+		padding: 0px 5px;
+	}
+	.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
+		color: #666666;
+	}
+	.fei-view-list span:nth-child(2){
+		color: #333333;
+	}
+	.fei-view-list,.fei-view-list-z{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 5px;
+	}
+	.fei-view{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.fei-title{
+		width: 100%;
+		text-align: center;
+		font-weight: bold;
+		font-size: 29rpx;
+		color: #333333;
+		padding-bottom: 10px;
+		margin-bottom: 10px;
+		border-bottom: 1px solid #E5E5E5;
+	}
+	.feiuong{
+		padding: 29rpx;
+	}
+	/deep/.uni-textarea-textarea{
+		font-weight: 400;
+		font-size: 25rpx;
+	}
+	/deep/.uni-textarea-placeholder{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #C5C5C5;
+	}
+	.textarea-pay-list{
+		width: 100%;
+		height: 126rpx;
+		margin-top: 10px;
+	}
+	.textarea-pay{
+		background-color: #f3f3f3;
+		width: 100%;
+		height: 100%;
+		background: #F3F3F3;
+		border-radius: 14rpx;
+		padding: 7px;
+	}
+	
+	.pay-ding{
+		padding-bottom: 15px;
+	}
+	.pay-ding,.feiuong{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		margin-top: 24rpx;
+		// padding: 29rpx;
+	}
+	.phone-pay{
+		width: 49rpx;
+		height: 44rpx;
+	}
+	
+	.d-touxiang{
+		width: 46rpx;
+		height: 46rpx;
+		border-radius: 50%;
+	}
+	.money-pay-jia{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #666666;
+		text-decoration-line: line-through;
+		margin-left: 5px;
+	}
+	.money-pay-zhen span{
+		color: #FF6000;
+	}
+	.money-pay-zhen span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.money-pay-zhen span:nth-child(2){
+		font-size: 31.25rpx;
+		font-weight: bold;
+	}
+	.money-pay-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.money-pay{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	
+	.content{
+		 padding-top: 1px;
+		 width: 100%;
+		 background-color: #f7f7f7;
+	}
+	.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:80rpx;
+		border-radius: 80rpx;
+		color: #ffffff;
+		line-height: 80rpx;
+		font-size: 32rpx;
+	}
+	.serverAddress {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/my/order/payding.vue b/my/order/payding.vue
new file mode 100644
index 0000000..c0485fe
--- /dev/null
+++ b/my/order/payding.vue
@@ -0,0 +1,1956 @@
+<template>
+	<view class="content">
+		<view v-if="order.overTimeOrders == 1" class="dingshi" style="font-size: 32upx;height: 150rpx;padding: 26rpx 29rpx 0 29rpx;">
+			<view style="color: red;font-size:26rpx">(订单已超时)</view>
+		</view>
+		<view class="padding-bottom u-skeleton">
+			<view class="bgImg u-skeleton-fillet" v-if="order.ordersMassageList && order.ordersMassageList.length > 0"
+				style="padding: 0 29rpx;">
+				<view class="head-top">
+					<view class="pay-title" style="">服务项目</view>
+					<view class="flex justify-around">
+						<view class="" style="width: 160upx;height: 160upx;">
+							<image :src="order.ordersMassageList[0].massageType.massageImg"
+								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+						</view>
+						<view class="u-flex-1  margin-left-sm">
+							<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>
+									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
+										<view style="justify-content: space-between;">
+											{{order.ordersMassageList[0].massageType.duration}}分钟
+											x{{order.massageNum}}
+										</view>
+									</view>
+										
+									<view class="money-pay">
+										<view class="money-pay-zhen">
+											<span>￥</span>
+											<span>{{order.massagePrice}}</span>
+										</view>
+										<!-- <view class="money-pay-jia">￥298</view> -->
+									</view>
+								</view>
+
+								<!-- <view class="jz_btn"
+									v-if="order.addNum < order.ordersMassageList[0].massageType.addNum && order.status == 6"
+									@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)">
+									加钟/补价</view> -->
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="" style="background-color: #ffffff;border-radius: 24rpx;margin-top: 24rpx;padding: 29rpx;">
+					<view class="" v-if="order.artificer">
+						<view class="flex align-center justify-between">
+							<view class="" style="color: #999;font-size: 26rpx;">下单人</view>
+							<view style="color: #333;font-size: 26rpx;">
+								{{order.userName}}
+							</view>
+						</view>
+						<view class="flex align-center justify-between" style="margin-top: 19rpx;">
+							<view class="" style="color: #999;font-size: 26rpx;">联系方式</view>
+							<view style="color: #333;font-size: 26rpx;">
+								{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
+							</view>
+						</view>
+						<view class="serverAddress">
+							<view style="color: #999;font-size: 26rpx;margin-top: 19rpx;">服务地址</view>
+							<view style="color: #333333;margin-top: 8rpx;font-size: 26rpx;width: 73%;">{{order.address}}</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="margin-top-xl pay-ding">
+					<view class="flex align-center pay-ding-top">
+						<image :src="order.artificer.artificerImg" class="d-touxiang"></image>
+						<view class="margin-left-sm" style="width: 90%;">
+							<view class="flex align-center" style="width: 100%;justify-content: space-between;">
+								<view class="d-title">{{order.artificer.artificerName}}</view>
+								<!-- <image
+									v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2"
+									src="../../static/img/phone.png" style="width: 10px;height: 13px;margin-left: 11px;"
+									@click="bindphone(order.artificer.phone)"></image> -->
+								<!-- <image src="../../static/img/phone.png" class="phone-pay"
+									@click="bindphone(order.artificer.phone)"></image> -->
+							</view>
+							<view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
+								<view class="margin-right">
+									<image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;">
+									</image>
+									<text
+										style="color: #F93731;margin-left: 5rpx;">{{order.artificer.ordersCount}}</text>
+								</view>
+								<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康理疗师</text>
+							</view>
+						</view>
+					</view>
+					<view class="list-pay">
+						<view class="flex justify-between" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">订单编号</view>
+							<view class="flex align-center" @tap="copy(order.ordersNo)"
+								style="color: #333;font-size: 26rpx;">
+								<view class="">{{order.ordersNo}}</view>
+								<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
+							</view>
+						</view>
+						<view class="flex justify-between" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">预约时间</view>
+							<view class="" style="color: #333;font-size: 26rpx;">{{order.serveTime}}</view>
+						</view>
+						<view class="flex justify-between" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">下单时间</view>
+							<view class="" style="color: #333;font-size: 26rpx;">{{order.createTime}}</view>
+						</view>
+						<view class="flex justify-between" v-if="order.startTime" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">开始服务时间</view>
+							<view class="" style="color: #333;font-size: 26rpx;">{{order.startTime}}</view>
+						</view>
+						<view class="flex justify-between" v-if="order.endTimes" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">结束服务时间</view>
+							<view class="" style="color: #333;font-size: 26rpx;">{{order.endTimes}}</view>
+						</view>
+						<view class="flex justify-between" v-if="order.endTime" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">预估结束时间</view>
+							<view class="" style="color: #333;font-size: 26rpx;">{{order.endTime}}</view>
+						</view>
+						<view class="flex justify-between" v-if="order.tripWay" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">出行方式</view>
+							<view v-if="order.tripWay == 1">公交</view>
+							<view v-if="order.tripWay == 2">出租</view>
+							<view v-if="order.tripWay == 3">免费</view>
+						</view>
+						<view class="flex justify-between" v-if="order.km" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">全程距离</view>
+							<view class="" style="color: #333;font-size: 26rpx;">{{order.km}}km</view>
+						</view>
+						<view class="flex justify-between" v-if="order.taxiMoney" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">出行交通费用</view>
+							<view class="" style="color: #F93731;font-size: 26rpx;">￥{{order.taxiMoney}}</view>
+						</view>
+						<view class="flex justify-between" v-if="order.couponMoney" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">优惠券</view>
+							<view class="" style="color: #F93731;font-size: 26rpx;">￥{{order.couponMoney}}</view>
+						</view>
+						<view class="flex justify-between" v-if="order.addNum" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">加钟次数</view>
+							<view class="" style="color: #333;font-size: 26rpx;">{{order.addNum}}</view>
+						</view>
+						<view class="flex justify-between" v-if="order.addTime" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">加钟时长</view>
+							<view class="" style="color: #333;font-size: 26rpx;">{{order.addTime}}分钟</view>
+						</view>
+						<view class="flex justify-between" v-if="order.addMoney" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">加钟费用</view>
+							<view class="" style="color: #F93731;font-size: 26rpx;">￥{{order.addMoney}}</view>
+						</view>
+						<view class="textarea-pay-list">
+							<textarea class="textarea-pay" v-model="order.remark" disabled="disabled" placeholder="请输入备注" name="" maxlength="100"></textarea>
+						</view>
+						<!-- <view class="flex justify-between textarea-pay-list" v-if="order.remark" style="margin-top: 19rpx;background-color: #f3f3f3;padding: 7px;border-radius: 6px;">
+							<view style="color: #999;font-size: 26rpx;">备注内容</view>
+							<view class="flex">
+								<view class="">
+									{{order.remark}}
+								</view>
+							</view>
+						</view> -->
+						<!-- <view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
+							<view style="color: #333;font-size: 26rpx;">合计：</view>
+							<view class="" style="color: #F93731;">￥<text
+									style="font-size: 35rpx;font-weight: bold;">{{order.sumMoney}}</text></view>
+						</view>
+						<view class="flex justify-between" style="margin-top: 19rpx;margin-bottom: 10px;">
+							<view style="color: rgb(249, 55, 49);font-size: 26rpx;">会员折扣{{order.vipRate}}%，技师浮动比例{{order.techniciaRate}}%</view>
+						</view> -->
+					</view>
+				</view>
+				<view class="pay-ding feiuong">
+					<view class="fei-title">费用明细</view>
+					<view class="fei-view">
+						<view class="fei-view-list">
+							<span>服务价格</span>
+							<span>￥{{order.price}}</span>
+						</view>
+						
+						<view class="fei-view-list">
+							<span>优惠券</span>
+							<span>-￥{{order.couponMoney}}</span>
+						</view>
+						<view class="fei-view-list">
+							<span>会员折扣</span>
+							<span>{{order.vipRate}}%</span>
+						</view>
+						<view class="fei-view-list">
+							<span>技师等级</span>
+							<span>{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</span>
+						</view>
+						<view class="fei-view-list">
+							<span>技师服务佣金上浮比例</span>
+							<span>{{order.technicianRate}}%</span>
+						</view>
+						<view class="fei-view-list">
+							<span>服务费用</span>
+							<span>￥{{order.massageMoney}}</span>
+						</view>
+						<view class="fei-view-list">
+							<span>出行费用</span>
+							<span>￥{{order.taxiMoney}}</span>
+						</view>
+						<view class="fei-view-list-z">
+							<span>总金额</span>
+							<span style="color: #FF3939;font-size: 29rpx;">￥{{order.sumMoney}}</span>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
+				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
+					v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">取消订单
+				</u-button>
+				<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
+					v-if="order.status == 1"
+					class="dingshi">立即支付
+				</u-button>
+				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
+					class="dingshi">联系客服</u-button>
+			</view>
+			
+		</view>
+		<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
+		<!--  加钟-->
+		<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
+			<scroll-view scroll-y="true" style="width: 750rpx;height: 600rpx;">
+				<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="showorderS" mode="bottom" :closeable="closeable">
+			<scroll-view scroll-y="true" style="width: 750rpx;height: 600rpx;">
+				<view class="xiangmu" v-for="(item,index) in artificerlist" :key="index">
+					<image class="xiangmu-img" :src="item.massageImg" mode=""></image>
+					<view class="xiangmu-cont">
+						<view class="xiangmu-cont-top">
+							<view class="xiangmu-cont-top-title">
+								{{item.title}}
+							</view>
+							<view class="xiangmu-cont-top-time">
+								<view class="xiangmu-cont-top-left">服务时长：{{item.duration}}分钟</view>
+								<view class="xiangmu-cont-top-left">已售：{{item.sales}}</view>
+							</view>
+						</view>
+						<view class="xiangmu-about">
+							{{item.jianjie}}
+						</view>
+						<view class="xiangmu-foot">
+							<view class="xiangmu-foot-left">
+								<view class="xiangmu-foot-left-shiji">
+									<span>￥</span>
+									<span>{{item.price}}</span>
+									<span>/元套</span>
+								</view>
+								<view class="xiangmu-foot-left-dazhe">{{item.oldPrice}}</view>
+							</view>
+							<view class="xiadan" @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="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 {
+				ordersId: '',
+				tpayMoney: '',
+				paySel: 0,
+				showorder: false,
+				showorderS: false,
+				orderList: [],
+				loading: true,
+				customStyle: {
+					// backgroundColor: '#e5e5e5',
+					// color: '#FFFFFF',
+
+					// #ifdef MP-WEIXIN
+					width: "310upx",
+					// #endif
+					// #ifndef MP-WEIXIN
+					width: '310upx',
+
+					// #endif	
+					margin: '0 10upx',
+				},
+				customStyle2: {
+					backgroundColor: '',
+					color: '#FFFFFF',
+					// #ifdef MP-WEIXIN
+					width: "310upx",
+					// #endif
+					// #ifndef MP-WEIXIN
+					width: '310upx',
+
+					// #endif	
+					margin: '0 10upx',
+				},
+				id: '',
+				order: {
+					user: {},
+					game: {}
+				},
+				isTrue: 0,
+
+				phone: '',
+				isVip: false,
+				birthDate: '',
+				age: '',
+				showpay: false,
+				openLists: [],
+				openWay: 1,
+				closeable: true,
+				yhqxSel: '否',
+				btnShow:false,
+				tiqianData:'',
+				type:'center',
+				earlyFinishReason:'',
+				qurenJd:[],
+				artificerlist:[]
+			}
+		},
+		onLoad(e) {
+			// uni.showLoading({
+			// 	title: '加载中......',
+			// })
+			// setTimeout(() => {
+			// 	// this.loading = false;
+			// }, 2000)
+			this.isTrue = e.isTrue
+			if (this.isTrue) {
+				uni.setNavigationBarTitle({
+					title: '订单详情'
+				})
+			}
+			this.ordersId = e.ordersId
+			this.getOrder()
+		},
+		onShow() {
+			this.yhqxSel = this.$queue.getData("yhqxSel");
+			this.getOrder()
+			if (uni.getStorageSync('token')) {
+				this.getIsVip()
+			}
+
+			// #ifndef MP-WEIXIN
+			this.openLists = [{
+					image: '../../static/images/icon_weixin.png',
+					text: '微信支付',
+					id: 2
+				}, {
+					image: '../../static/images/zhifubao.png',
+					text: '支付宝支付',
+					id: 3
+				}, {
+					image: '../../static/images/lingqian.png',
+					text: '零钱支付',
+					id: 1
+				}],
+				this.openWay = 2;
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			this.openLists = [{
+					image: '../../static/images/icon_weixin.png',
+					text: '微信支付',
+					id: 2
+				}, {
+					image: '../../static/images/lingqian.png',
+					text: '零钱支付',
+					id: 1
+				}],
+				this.openWay = 2;
+			// #endif
+		},
+		methods: {
+			saveJZS(artificerId) {//升级查询技师项目
+				let data = {
+					artificerId: artificerId,
+					status: 0
+				}
+				let that = this;
+				this.$queue.showLoading('查询中...')
+				that.$Request.get("/app/artificer/selectArtificerMassageList", data).then(res => {
+					if (res.code == 0) {
+						if (res.data && res.data.length > 0) {
+							that.artificerlist = res.data
+							// for (let i = 0; i < that.artificerlist.length; i++) {
+							// 	if (that.artificerlist[i].labels) {
+							// 		that.artificerlist[i].labels = that.artificerlist[i].labels.split(",");
+							// 	}
+							// }
+							uni.hideLoading();
+							that.showorderS = true;
+						} else {
+							uni.hideLoading();
+							that.$queue.showToast('暂无可升级项目');
+						}
+					} else {
+						uni.hideLoading();
+						that.$queue.showToast(res.msg);
+					}
+			
+				})
+			},
+			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);
+					}
+			
+				})
+			},
+			getTimeStampWithoutSeconds(date) {
+			    // 将日期转换为标准的UTC时间
+			    var utcDate = new Date(
+						   date.getUTCFullYear(), 
+						   date.getUTCMonth(), 
+						   date.getUTCDate(), 
+						   date.getUTCHours(), 
+						   date.getUTCMinutes(), 
+			                           0);
+			    // 返回不含秒的时间戳
+			    return utcDate.getTime();
+			},
+			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;
+						var date = new Date(); // 当前日期和时间
+						var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
+						const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数
+						var twoTime=parseInt(new Date(twoHoursInMilliseconds).getTime())
+						var time=parseInt(new Date(this.order.serveTime).getTime())
+							if(time-timestamp>twoTime){
+								this.$set(this.order, 'btnShow', 'true')
+							}else{
+								this.$set(this.order, 'btnShow', 'false')
+							}
+							console.log("sadasdsa0",this.order)
+						let aliphone = this.$queue.getData('aliphone');
+						if (aliphone === '是' && this.order.artificer) {
+							this.ysPhone(this.order.phone, this.order.artificer.phone);
+						}
+					}
+				})
+			},
+			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.getOrder()
+							this.$refs.popupQ.close(typeTxte);
+					}else{
+						this.getOrder()
+						uni.showToast({
+							icon:'error',
+							title:'操作失败！'
+						})
+					}
+				
+				}).catch(() => {
+					this.getOrder()
+					//联网失败, 结束加载
+				});
+			},
+			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.getOrder()
+								that.$refs.popup.close(type);
+							}else{
+								that.getOrder()
+								uni.showToast({
+									icon:'error',
+									title:'操作失败！'
+								})
+							}
+						
+						}).catch(() => {
+							//联网失败, 结束加载
+							that.getOrder()
+						});
+						
+					},
+						fail: function(e) {
+							that.getOrder()
+							// #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');
+				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(item) {
+				console.log("item=====>",item)
+				console.log("order=====>",this.order)
+				let that = this
+				let data = {
+				  classifyId:item.classifyId,
+				  ordersId:that.order.ordersId,
+				  ordersMassageList:[
+				    {massageId: item.massageTypeId,num: 1},
+				  ],
+				  massageTypeId:item.massageTypeId,
+				  userPackageDetailId:item.userPackageDetailId,
+				}
+				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.order.sumMoney + '元吗?',
+						success: function(re) {
+							if (re.confirm) {
+								that.$queue.showLoading('支付中...')
+								// console.log('用户点击确定');
+								that.$Request.post("/app/artificer/payOrders", {
+									ordersId: order.ordersId,
+								}).then(ret => {
+									uni.hideLoading();
+									if (ret.code == 0) {
+										uni.showToast({
+											title: '支付成功',
+											icon: 'none'
+										})
+										that.getOrder()
+
+									} else {
+										uni.showToast({
+											title: ret.msg,
+											icon: 'none'
+										})
+									}
+								});
+							} else if (re.cancel) {
+								that.getOrder()
+							}
+						}
+					})
+				} else if (that.openWay == 2) { //微信支付
+					// #ifdef MP-WEIXIN
+					let data = {
+						ordersId: that.ordersId,
+						type: 3
+					}
+					that.$Request.post('/app/wxPay/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.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.ordersId,
+							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.ordersId,
+						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.ordersId,
+						type: 1
+					}
+					that.$Request.post('/app/aliPay/payOrder', data).then(
+						rea => {
+							that.showpay = false
+							that.setPayment('alipay', rea.data);
+						});
+					// #endif
+				}
+
+			},
+			
+			//支付选择
+			selectWay: function(item) {
+				this.openWay = item.id;
+			},
+			//换算年龄
+			getAge(e) {
+				console.log('出生日期：' + e)
+				this.birthDate = e
+				//创建系统日期
+				var today = new Date();
+				//把出生日期转换成日期
+				this.birthDate = new Date(this.birthDate);
+				//分别获取到年份后相减
+				this.age = today.getFullYear() - this.birthDate.getFullYear();
+				// console.log(this.age+'当前年龄')
+			},
+			// 修改订单地址
+			undateAdd(order) {
+				if (order.state == 0) {
+					uni.navigateTo({
+						url: '../address/address?order=' + order.ordersId + '&id=' + 3
+					})
+				}
+			},
+			// 一键导航
+			bindGps(latitude, longitude, name, detailsadd) {
+				console.log(latitude, longitude, name, detailsadd)
+				uni.openLocation({
+					latitude: latitude - 0, //要去的纬度-地址       
+					longitude: longitude - 0, //要去的经度-地址
+					name: name, //地址名称
+					address: detailsadd, //详细地址名称
+					success: function() {
+						console.log('导航成功');
+					},
+					fail: function(error) {
+						console.log(error)
+					}
+				});
+			},
+			ysPhone(phoneA, phoneB) {
+				this.$Request.getT('/app/user/insertVirtualPhone?phoneA=' + phoneA + '&phoneB=' + phoneB).then(res => {
+					if (res.code == 0) {
+						this.order.artificer.phone = res.data;
+					}
+				});
+			},
+			// 拨打电话
+			bindphone(phone) {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '是否拨打电话',
+					success: function(res) {
+						if (res.confirm) {
+							console.log('用户点击确定', phone);
+							uni.makePhoneCall({
+								phoneNumber: phone //仅为示例
+							});
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			goNav(e,item) {
+				this.$queue.setData('daibudan',item);
+				uni.navigateTo({
+					url: e
+				})
+			},
+			
+			delOrder(e) {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '确定删除订单吗?',
+					success: function(res) {
+						if (res.confirm) {
+							let data = {
+								ordersId: e.ordersId,
+							}
+							that.$queue.showLoading('删除中...')
+							that.$Request.post('/app/artificer/removeOrders', data).then(res => {
+								uni.hideLoading();
+								if (res.code == 0) {
+									uni.showToast({
+										name: "删除成功"
+									})
+									uni.navigateBack()
+								} else {
+									that.$queue.showToast(res.msg);
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			getIsVip() {
+				this.$Request.get("/app/UserVip/isUserVip").then(res => {
+					if (res.code == 0) {
+						this.isVip = res.data
+						uni.setStorageSync('isVIP', res.data)
+					}
+				});
+			},
+			openpay(item) {
+				// uni.navigateTo({
+				// 	url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId
+				// })
+				this.showpay = true
+			},
+			// 支付订单
+			pay() {
+				let that = this
+				this.showpay = false
+				if (this.paySel != 0) {
+					this.payJZ();
+					return;
+				}
+				if (that.openWay == 1) { //零钱支付
+				console.log("that.order.sumMoney",that.order)
+					uni.showModal({
+						title: '付款提示',
+						content: '确认支付' + that.order.sumMoney + '元吗?',
+						success: function(re) {
+							if (re.confirm) {
+								that.$queue.showLoading('支付中...')
+								console.log('用户点击确定');
+								that.$Request.post("/app/artificer/payOrders", {
+									ordersId: that.order.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/.u-drawer{
+		z-index:11 !important;
+	}
+	.xiangmu-cont-top-left{
+		font-weight: normal;
+		font-size: 21rpx;
+		color: #049E89;
+		margin-top: 1px;
+	}
+	.xiangmu-cont-top-time{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.xiadan{
+		width: 122rpx;
+		height: 48rpx;
+		line-height: 48rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 24rpx;
+		text-align: center;
+		font-weight: bold;
+		font-size: 24rpx;
+		color: #FFFFFF;
+	}
+	.xiangmu-foot-left{
+		display: flex;
+		flex-direction: row;
+		align-items: flex-end;
+	}
+	.xiangmu-foot-left-shiji span{
+		color: #F95900;
+	}
+	.xiangmu-foot-left-shiji span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.xiangmu-foot-left-shiji span:nth-child(2){
+		font-weight: bold;
+		font-size:36.81rpx;
+	}
+	.xiangmu-foot-left-shiji span:nth-child(3){
+		font-size: 25rpx;
+	}
+	.xiangmu-foot-left-dazhe{
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #848484;
+		text-decoration-line: line-through;
+		margin-left:5px;
+	}
+	.xiangmu-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.xiangmu-about{
+		width: 100%;
+		text-align: left;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #848484;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		margin: 5px 0px;
+	}
+	.xiangmu-cont-top-title{
+		font-weight: bold;
+		font-size: 33rpx;
+		color: #333333;
+	}
+	
+	.xiangmu-cont-top{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.xiangmu-cont{
+		width: 55%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.xiangmu-img{
+		width: 285rpx;
+		height: 218rpx;
+		background: #9F9F9F;
+		border-radius: 14rpx;
+	}
+	.xiangmu{
+		width: 95%;
+		height: 263rpx;
+		background: #FFFFFF;
+		border-radius: 21rpx;
+		margin: 0px auto 10px auto;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		padding: 10px;
+	}
+	
+	.popup-mian-btn span:nth-child(1){
+		background: linear-gradient(90deg, #FE912E, #FF9970);
+	}
+	.popup-mian-btn span:nth-child(2){
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	}
+	.popup-mian-btn span{
+		width: 247rpx;
+		height: 77rpx;
+		line-height: 77rpx;
+		text-align: center;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #FFFEFE;
+		border-radius: 39rpx;
+	}
+	.popup-mian-btn{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 10px;
+	}
+	.popup-mian-textarea{
+		width: 525.69rpx;
+		height: 211.81rpx;
+	}
+	.popup-mian{
+		width: 88%;
+		display: flex;
+		flex-direction: column;
+		margin: 5px auto 0px auto;
+	}
+	.popup-head span:nth-child(2){
+		width: 50rpx;
+		height: 50rpx;
+		line-height: 19px;
+		text-align: center;
+		font-size: 24px;
+		color: #15AB8D;
+		border-radius: 50%;
+		border: 3px solid #15AB8D;
+	}
+	.popup-head span:nth-child(1){
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.popup-head{
+		width: 100%;
+		height: 99.38rpx;
+		background-color: rgba(21, 171, 141, 0.09);
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 15px;
+	}
+	.popup-content{
+		width: 613rpx;
+		height: 479rpx;
+		background: #FFFFFF;
+		border-radius: 56rpx;
+		display: flex;
+		flex-direction: column;
+	}
+	/deep/.btns{
+		background: #019C88 !important;
+		color: #fff !important;
+	}
+	/deep/.u-size-default{
+		margin: 5px 0px 0px 0px;
+	}
+	.showBtn-mian{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		flex-wrap: wrap;
+		justify-content: flex-end;
+	}
+	.gengduo{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #7D7D7D;
+	}
+	.showBtn-view{
+		width: 100%;
+		justify-content: flex-end;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.showBtn,.hideBtn{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		
+	}
+	
+
+	.dingshi{
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	}
+	.zhuangtai{
+		color: #029D88;
+	}
+	.head-title-right{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		font-weight: bold;
+	}
+	.head-title{
+		margin-top: -2px;display: inline-block;
+		width: 300rpx; 
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+	.fei-view-list span,.fei-view-list-z span{
+		font-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;
+	}
+	.list-pay{
+		width: 100%;
+		padding: 10px 29rpx;
+	}
+	.pay-ding-top{
+		width: 100%;
+		height: 80rpx;
+		background-image: linear-gradient(to bottom, rgba(8, 162, 138, 0.5), #fff);
+		border-top-left-radius: 24rpx;
+		border-top-right-radius: 24rpx;
+		padding: 0px 29rpx;
+	}
+	.pay-ding,.feiuong{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		margin-top: 24rpx;
+		// padding: 29rpx;
+	}
+	.phone-pay{
+		width: 49rpx;
+		height: 44rpx;
+	}
+	.d-title{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #333333;
+	}
+	.d-touxiang{
+		width: 46rpx;
+		height: 46rpx;
+		border-radius: 50%;
+	}
+	.money-pay-jia{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #666666;
+		text-decoration-line: line-through;
+		margin-left: 5px;
+	}
+	.money-pay-zhen span{
+		color: #FF6000;
+	}
+	.money-pay-zhen span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.money-pay-zhen span:nth-child(2){
+		font-size: 31.25rpx;
+		font-weight: bold;
+	}
+	.money-pay-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.money-pay{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.head-top{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		padding: 29rpx;
+	}
+	.content{
+		 padding-bottom: 140rpx;
+		 padding-top: 20px;
+		 width: 100%;
+		 background-color: #f7f7f7;
+	}
+	.pay-title{
+		font-weight: bold;
+		font-size: 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: linear-gradient(to right, #223845, #00a85b);
+	}
+
+	.list_item {
+		// width: 650upx;
+		// height: 160upx;
+		width: 92%;
+		// margin: 30rpx 0;
+		background: #FFFFFF;
+		border-radius: 24upx;
+		padding: 20upx;
+		display: flex;
+		margin-top: 26upx;
+
+		.listitem_rightview {
+			margin-left: 20upx;
+			width: 80%;
+			padding-top: 10rpx;
+
+			.btnview {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				margin-top: 12upx;
+				width: 100%;
+			}
+
+			.titleview {
+				display: flex;
+				align-items: flex-end;
+				justify-content: space-between
+			}
+
+			.moneyview {
+				display: flex;
+				align-items: flex-end;
+
+				image {
+					width: 30upx;
+					height: 30upx;
+					margin-left: 20upx;
+					margin-bottom: 2upx;
+				}
+			}
+
+			.item_time {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				margin-left: 10upx;
+			}
+
+			.item_money {
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: 800;
+				color: #FF1200;
+			}
+
+			.item_oldmoney {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				text-decoration: line-through;
+				color: #999999;
+				margin-left: 10upx;
+			}
+
+			.item_btn {
+				width: 140upx;
+				height: 56upx;
+				background-color: #019C88;
+				border-radius: 16upx;
+				text-align: center;
+				line-height: 56upx;
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+			.item_yishou {
+				font-size: 22upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+
+			.item_title {
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #1E1F31;
+			}
+		}
+
+		image {
+			width: 220upx;
+			height: 160upx;
+			border-radius: 24upx;
+		}
+	}
+
+	.jz_btn {
+		width: 170rpx;
+		height: 56upx;
+		background: #096f4b;
+		margin-left: 40rpx;
+		border-radius: 35rpx;
+		line-height: 56upx;
+		text-align: center;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+	}
+
+	.tabber {
+		width: 100%;
+		background: #ffffff;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		justify-content: center;
+		height: 127rpx;
+		padding: 0 30rpx;
+	}
+
+	.box {
+		/* border: 1px solid #005dff; */
+		background: #E8FAE1;
+		border-radius: 4rpx;
+		color: #096f4b;
+		padding: 5upx 10upx;
+		font-size: 22rpx;
+		margin-top: 10rpx;
+	}
+
+	.popup_pay {
+		width: 100%;
+		position: relative;
+		padding-bottom: 45rpx;
+		/* height: 160px; */
+		/* #ifndef MP-WEIXIN */
+		/* height: 130px; */
+		/* #endif */
+
+	}
+
+	.pay_btn {
+		width: 90%;
+		margin: 0 auto;
+		text-align: center;
+		background: linear-gradient(to right, #223845, #00a85b);
+		height: 80rpx;
+		border-radius: 60rpx;
+		color: #ffffff;
+		line-height: 80rpx;
+	}
+
+	.serverAddress {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/my/order/paydingDd.vue b/my/order/paydingDd.vue
new file mode 100644
index 0000000..c0485fe
--- /dev/null
+++ b/my/order/paydingDd.vue
@@ -0,0 +1,1956 @@
+<template>
+	<view class="content">
+		<view v-if="order.overTimeOrders == 1" class="dingshi" style="font-size: 32upx;height: 150rpx;padding: 26rpx 29rpx 0 29rpx;">
+			<view style="color: red;font-size:26rpx">(订单已超时)</view>
+		</view>
+		<view class="padding-bottom u-skeleton">
+			<view class="bgImg u-skeleton-fillet" v-if="order.ordersMassageList && order.ordersMassageList.length > 0"
+				style="padding: 0 29rpx;">
+				<view class="head-top">
+					<view class="pay-title" style="">服务项目</view>
+					<view class="flex justify-around">
+						<view class="" style="width: 160upx;height: 160upx;">
+							<image :src="order.ordersMassageList[0].massageType.massageImg"
+								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+						</view>
+						<view class="u-flex-1  margin-left-sm">
+							<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>
+									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
+										<view style="justify-content: space-between;">
+											{{order.ordersMassageList[0].massageType.duration}}分钟
+											x{{order.massageNum}}
+										</view>
+									</view>
+										
+									<view class="money-pay">
+										<view class="money-pay-zhen">
+											<span>￥</span>
+											<span>{{order.massagePrice}}</span>
+										</view>
+										<!-- <view class="money-pay-jia">￥298</view> -->
+									</view>
+								</view>
+
+								<!-- <view class="jz_btn"
+									v-if="order.addNum < order.ordersMassageList[0].massageType.addNum && order.status == 6"
+									@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)">
+									加钟/补价</view> -->
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="" style="background-color: #ffffff;border-radius: 24rpx;margin-top: 24rpx;padding: 29rpx;">
+					<view class="" v-if="order.artificer">
+						<view class="flex align-center justify-between">
+							<view class="" style="color: #999;font-size: 26rpx;">下单人</view>
+							<view style="color: #333;font-size: 26rpx;">
+								{{order.userName}}
+							</view>
+						</view>
+						<view class="flex align-center justify-between" style="margin-top: 19rpx;">
+							<view class="" style="color: #999;font-size: 26rpx;">联系方式</view>
+							<view style="color: #333;font-size: 26rpx;">
+								{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
+							</view>
+						</view>
+						<view class="serverAddress">
+							<view style="color: #999;font-size: 26rpx;margin-top: 19rpx;">服务地址</view>
+							<view style="color: #333333;margin-top: 8rpx;font-size: 26rpx;width: 73%;">{{order.address}}</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="margin-top-xl pay-ding">
+					<view class="flex align-center pay-ding-top">
+						<image :src="order.artificer.artificerImg" class="d-touxiang"></image>
+						<view class="margin-left-sm" style="width: 90%;">
+							<view class="flex align-center" style="width: 100%;justify-content: space-between;">
+								<view class="d-title">{{order.artificer.artificerName}}</view>
+								<!-- <image
+									v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2"
+									src="../../static/img/phone.png" style="width: 10px;height: 13px;margin-left: 11px;"
+									@click="bindphone(order.artificer.phone)"></image> -->
+								<!-- <image src="../../static/img/phone.png" class="phone-pay"
+									@click="bindphone(order.artificer.phone)"></image> -->
+							</view>
+							<view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
+								<view class="margin-right">
+									<image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;">
+									</image>
+									<text
+										style="color: #F93731;margin-left: 5rpx;">{{order.artificer.ordersCount}}</text>
+								</view>
+								<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康理疗师</text>
+							</view>
+						</view>
+					</view>
+					<view class="list-pay">
+						<view class="flex justify-between" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">订单编号</view>
+							<view class="flex align-center" @tap="copy(order.ordersNo)"
+								style="color: #333;font-size: 26rpx;">
+								<view class="">{{order.ordersNo}}</view>
+								<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
+							</view>
+						</view>
+						<view class="flex justify-between" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">预约时间</view>
+							<view class="" style="color: #333;font-size: 26rpx;">{{order.serveTime}}</view>
+						</view>
+						<view class="flex justify-between" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">下单时间</view>
+							<view class="" style="color: #333;font-size: 26rpx;">{{order.createTime}}</view>
+						</view>
+						<view class="flex justify-between" v-if="order.startTime" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">开始服务时间</view>
+							<view class="" style="color: #333;font-size: 26rpx;">{{order.startTime}}</view>
+						</view>
+						<view class="flex justify-between" v-if="order.endTimes" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">结束服务时间</view>
+							<view class="" style="color: #333;font-size: 26rpx;">{{order.endTimes}}</view>
+						</view>
+						<view class="flex justify-between" v-if="order.endTime" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">预估结束时间</view>
+							<view class="" style="color: #333;font-size: 26rpx;">{{order.endTime}}</view>
+						</view>
+						<view class="flex justify-between" v-if="order.tripWay" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">出行方式</view>
+							<view v-if="order.tripWay == 1">公交</view>
+							<view v-if="order.tripWay == 2">出租</view>
+							<view v-if="order.tripWay == 3">免费</view>
+						</view>
+						<view class="flex justify-between" v-if="order.km" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">全程距离</view>
+							<view class="" style="color: #333;font-size: 26rpx;">{{order.km}}km</view>
+						</view>
+						<view class="flex justify-between" v-if="order.taxiMoney" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">出行交通费用</view>
+							<view class="" style="color: #F93731;font-size: 26rpx;">￥{{order.taxiMoney}}</view>
+						</view>
+						<view class="flex justify-between" v-if="order.couponMoney" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">优惠券</view>
+							<view class="" style="color: #F93731;font-size: 26rpx;">￥{{order.couponMoney}}</view>
+						</view>
+						<view class="flex justify-between" v-if="order.addNum" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">加钟次数</view>
+							<view class="" style="color: #333;font-size: 26rpx;">{{order.addNum}}</view>
+						</view>
+						<view class="flex justify-between" v-if="order.addTime" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">加钟时长</view>
+							<view class="" style="color: #333;font-size: 26rpx;">{{order.addTime}}分钟</view>
+						</view>
+						<view class="flex justify-between" v-if="order.addMoney" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">加钟费用</view>
+							<view class="" style="color: #F93731;font-size: 26rpx;">￥{{order.addMoney}}</view>
+						</view>
+						<view class="textarea-pay-list">
+							<textarea class="textarea-pay" v-model="order.remark" disabled="disabled" placeholder="请输入备注" name="" maxlength="100"></textarea>
+						</view>
+						<!-- <view class="flex justify-between textarea-pay-list" v-if="order.remark" style="margin-top: 19rpx;background-color: #f3f3f3;padding: 7px;border-radius: 6px;">
+							<view style="color: #999;font-size: 26rpx;">备注内容</view>
+							<view class="flex">
+								<view class="">
+									{{order.remark}}
+								</view>
+							</view>
+						</view> -->
+						<!-- <view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
+							<view style="color: #333;font-size: 26rpx;">合计：</view>
+							<view class="" style="color: #F93731;">￥<text
+									style="font-size: 35rpx;font-weight: bold;">{{order.sumMoney}}</text></view>
+						</view>
+						<view class="flex justify-between" style="margin-top: 19rpx;margin-bottom: 10px;">
+							<view style="color: rgb(249, 55, 49);font-size: 26rpx;">会员折扣{{order.vipRate}}%，技师浮动比例{{order.techniciaRate}}%</view>
+						</view> -->
+					</view>
+				</view>
+				<view class="pay-ding feiuong">
+					<view class="fei-title">费用明细</view>
+					<view class="fei-view">
+						<view class="fei-view-list">
+							<span>服务价格</span>
+							<span>￥{{order.price}}</span>
+						</view>
+						
+						<view class="fei-view-list">
+							<span>优惠券</span>
+							<span>-￥{{order.couponMoney}}</span>
+						</view>
+						<view class="fei-view-list">
+							<span>会员折扣</span>
+							<span>{{order.vipRate}}%</span>
+						</view>
+						<view class="fei-view-list">
+							<span>技师等级</span>
+							<span>{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</span>
+						</view>
+						<view class="fei-view-list">
+							<span>技师服务佣金上浮比例</span>
+							<span>{{order.technicianRate}}%</span>
+						</view>
+						<view class="fei-view-list">
+							<span>服务费用</span>
+							<span>￥{{order.massageMoney}}</span>
+						</view>
+						<view class="fei-view-list">
+							<span>出行费用</span>
+							<span>￥{{order.taxiMoney}}</span>
+						</view>
+						<view class="fei-view-list-z">
+							<span>总金额</span>
+							<span style="color: #FF3939;font-size: 29rpx;">￥{{order.sumMoney}}</span>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
+				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
+					v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">取消订单
+				</u-button>
+				<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
+					v-if="order.status == 1"
+					class="dingshi">立即支付
+				</u-button>
+				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
+					class="dingshi">联系客服</u-button>
+			</view>
+			
+		</view>
+		<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
+		<!--  加钟-->
+		<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
+			<scroll-view scroll-y="true" style="width: 750rpx;height: 600rpx;">
+				<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="showorderS" mode="bottom" :closeable="closeable">
+			<scroll-view scroll-y="true" style="width: 750rpx;height: 600rpx;">
+				<view class="xiangmu" v-for="(item,index) in artificerlist" :key="index">
+					<image class="xiangmu-img" :src="item.massageImg" mode=""></image>
+					<view class="xiangmu-cont">
+						<view class="xiangmu-cont-top">
+							<view class="xiangmu-cont-top-title">
+								{{item.title}}
+							</view>
+							<view class="xiangmu-cont-top-time">
+								<view class="xiangmu-cont-top-left">服务时长：{{item.duration}}分钟</view>
+								<view class="xiangmu-cont-top-left">已售：{{item.sales}}</view>
+							</view>
+						</view>
+						<view class="xiangmu-about">
+							{{item.jianjie}}
+						</view>
+						<view class="xiangmu-foot">
+							<view class="xiangmu-foot-left">
+								<view class="xiangmu-foot-left-shiji">
+									<span>￥</span>
+									<span>{{item.price}}</span>
+									<span>/元套</span>
+								</view>
+								<view class="xiangmu-foot-left-dazhe">{{item.oldPrice}}</view>
+							</view>
+							<view class="xiadan" @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="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 {
+				ordersId: '',
+				tpayMoney: '',
+				paySel: 0,
+				showorder: false,
+				showorderS: false,
+				orderList: [],
+				loading: true,
+				customStyle: {
+					// backgroundColor: '#e5e5e5',
+					// color: '#FFFFFF',
+
+					// #ifdef MP-WEIXIN
+					width: "310upx",
+					// #endif
+					// #ifndef MP-WEIXIN
+					width: '310upx',
+
+					// #endif	
+					margin: '0 10upx',
+				},
+				customStyle2: {
+					backgroundColor: '',
+					color: '#FFFFFF',
+					// #ifdef MP-WEIXIN
+					width: "310upx",
+					// #endif
+					// #ifndef MP-WEIXIN
+					width: '310upx',
+
+					// #endif	
+					margin: '0 10upx',
+				},
+				id: '',
+				order: {
+					user: {},
+					game: {}
+				},
+				isTrue: 0,
+
+				phone: '',
+				isVip: false,
+				birthDate: '',
+				age: '',
+				showpay: false,
+				openLists: [],
+				openWay: 1,
+				closeable: true,
+				yhqxSel: '否',
+				btnShow:false,
+				tiqianData:'',
+				type:'center',
+				earlyFinishReason:'',
+				qurenJd:[],
+				artificerlist:[]
+			}
+		},
+		onLoad(e) {
+			// uni.showLoading({
+			// 	title: '加载中......',
+			// })
+			// setTimeout(() => {
+			// 	// this.loading = false;
+			// }, 2000)
+			this.isTrue = e.isTrue
+			if (this.isTrue) {
+				uni.setNavigationBarTitle({
+					title: '订单详情'
+				})
+			}
+			this.ordersId = e.ordersId
+			this.getOrder()
+		},
+		onShow() {
+			this.yhqxSel = this.$queue.getData("yhqxSel");
+			this.getOrder()
+			if (uni.getStorageSync('token')) {
+				this.getIsVip()
+			}
+
+			// #ifndef MP-WEIXIN
+			this.openLists = [{
+					image: '../../static/images/icon_weixin.png',
+					text: '微信支付',
+					id: 2
+				}, {
+					image: '../../static/images/zhifubao.png',
+					text: '支付宝支付',
+					id: 3
+				}, {
+					image: '../../static/images/lingqian.png',
+					text: '零钱支付',
+					id: 1
+				}],
+				this.openWay = 2;
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			this.openLists = [{
+					image: '../../static/images/icon_weixin.png',
+					text: '微信支付',
+					id: 2
+				}, {
+					image: '../../static/images/lingqian.png',
+					text: '零钱支付',
+					id: 1
+				}],
+				this.openWay = 2;
+			// #endif
+		},
+		methods: {
+			saveJZS(artificerId) {//升级查询技师项目
+				let data = {
+					artificerId: artificerId,
+					status: 0
+				}
+				let that = this;
+				this.$queue.showLoading('查询中...')
+				that.$Request.get("/app/artificer/selectArtificerMassageList", data).then(res => {
+					if (res.code == 0) {
+						if (res.data && res.data.length > 0) {
+							that.artificerlist = res.data
+							// for (let i = 0; i < that.artificerlist.length; i++) {
+							// 	if (that.artificerlist[i].labels) {
+							// 		that.artificerlist[i].labels = that.artificerlist[i].labels.split(",");
+							// 	}
+							// }
+							uni.hideLoading();
+							that.showorderS = true;
+						} else {
+							uni.hideLoading();
+							that.$queue.showToast('暂无可升级项目');
+						}
+					} else {
+						uni.hideLoading();
+						that.$queue.showToast(res.msg);
+					}
+			
+				})
+			},
+			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);
+					}
+			
+				})
+			},
+			getTimeStampWithoutSeconds(date) {
+			    // 将日期转换为标准的UTC时间
+			    var utcDate = new Date(
+						   date.getUTCFullYear(), 
+						   date.getUTCMonth(), 
+						   date.getUTCDate(), 
+						   date.getUTCHours(), 
+						   date.getUTCMinutes(), 
+			                           0);
+			    // 返回不含秒的时间戳
+			    return utcDate.getTime();
+			},
+			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;
+						var date = new Date(); // 当前日期和时间
+						var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
+						const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数
+						var twoTime=parseInt(new Date(twoHoursInMilliseconds).getTime())
+						var time=parseInt(new Date(this.order.serveTime).getTime())
+							if(time-timestamp>twoTime){
+								this.$set(this.order, 'btnShow', 'true')
+							}else{
+								this.$set(this.order, 'btnShow', 'false')
+							}
+							console.log("sadasdsa0",this.order)
+						let aliphone = this.$queue.getData('aliphone');
+						if (aliphone === '是' && this.order.artificer) {
+							this.ysPhone(this.order.phone, this.order.artificer.phone);
+						}
+					}
+				})
+			},
+			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.getOrder()
+							this.$refs.popupQ.close(typeTxte);
+					}else{
+						this.getOrder()
+						uni.showToast({
+							icon:'error',
+							title:'操作失败！'
+						})
+					}
+				
+				}).catch(() => {
+					this.getOrder()
+					//联网失败, 结束加载
+				});
+			},
+			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.getOrder()
+								that.$refs.popup.close(type);
+							}else{
+								that.getOrder()
+								uni.showToast({
+									icon:'error',
+									title:'操作失败！'
+								})
+							}
+						
+						}).catch(() => {
+							//联网失败, 结束加载
+							that.getOrder()
+						});
+						
+					},
+						fail: function(e) {
+							that.getOrder()
+							// #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');
+				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(item) {
+				console.log("item=====>",item)
+				console.log("order=====>",this.order)
+				let that = this
+				let data = {
+				  classifyId:item.classifyId,
+				  ordersId:that.order.ordersId,
+				  ordersMassageList:[
+				    {massageId: item.massageTypeId,num: 1},
+				  ],
+				  massageTypeId:item.massageTypeId,
+				  userPackageDetailId:item.userPackageDetailId,
+				}
+				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.order.sumMoney + '元吗?',
+						success: function(re) {
+							if (re.confirm) {
+								that.$queue.showLoading('支付中...')
+								// console.log('用户点击确定');
+								that.$Request.post("/app/artificer/payOrders", {
+									ordersId: order.ordersId,
+								}).then(ret => {
+									uni.hideLoading();
+									if (ret.code == 0) {
+										uni.showToast({
+											title: '支付成功',
+											icon: 'none'
+										})
+										that.getOrder()
+
+									} else {
+										uni.showToast({
+											title: ret.msg,
+											icon: 'none'
+										})
+									}
+								});
+							} else if (re.cancel) {
+								that.getOrder()
+							}
+						}
+					})
+				} else if (that.openWay == 2) { //微信支付
+					// #ifdef MP-WEIXIN
+					let data = {
+						ordersId: that.ordersId,
+						type: 3
+					}
+					that.$Request.post('/app/wxPay/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.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.ordersId,
+							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.ordersId,
+						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.ordersId,
+						type: 1
+					}
+					that.$Request.post('/app/aliPay/payOrder', data).then(
+						rea => {
+							that.showpay = false
+							that.setPayment('alipay', rea.data);
+						});
+					// #endif
+				}
+
+			},
+			
+			//支付选择
+			selectWay: function(item) {
+				this.openWay = item.id;
+			},
+			//换算年龄
+			getAge(e) {
+				console.log('出生日期：' + e)
+				this.birthDate = e
+				//创建系统日期
+				var today = new Date();
+				//把出生日期转换成日期
+				this.birthDate = new Date(this.birthDate);
+				//分别获取到年份后相减
+				this.age = today.getFullYear() - this.birthDate.getFullYear();
+				// console.log(this.age+'当前年龄')
+			},
+			// 修改订单地址
+			undateAdd(order) {
+				if (order.state == 0) {
+					uni.navigateTo({
+						url: '../address/address?order=' + order.ordersId + '&id=' + 3
+					})
+				}
+			},
+			// 一键导航
+			bindGps(latitude, longitude, name, detailsadd) {
+				console.log(latitude, longitude, name, detailsadd)
+				uni.openLocation({
+					latitude: latitude - 0, //要去的纬度-地址       
+					longitude: longitude - 0, //要去的经度-地址
+					name: name, //地址名称
+					address: detailsadd, //详细地址名称
+					success: function() {
+						console.log('导航成功');
+					},
+					fail: function(error) {
+						console.log(error)
+					}
+				});
+			},
+			ysPhone(phoneA, phoneB) {
+				this.$Request.getT('/app/user/insertVirtualPhone?phoneA=' + phoneA + '&phoneB=' + phoneB).then(res => {
+					if (res.code == 0) {
+						this.order.artificer.phone = res.data;
+					}
+				});
+			},
+			// 拨打电话
+			bindphone(phone) {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '是否拨打电话',
+					success: function(res) {
+						if (res.confirm) {
+							console.log('用户点击确定', phone);
+							uni.makePhoneCall({
+								phoneNumber: phone //仅为示例
+							});
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			goNav(e,item) {
+				this.$queue.setData('daibudan',item);
+				uni.navigateTo({
+					url: e
+				})
+			},
+			
+			delOrder(e) {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '确定删除订单吗?',
+					success: function(res) {
+						if (res.confirm) {
+							let data = {
+								ordersId: e.ordersId,
+							}
+							that.$queue.showLoading('删除中...')
+							that.$Request.post('/app/artificer/removeOrders', data).then(res => {
+								uni.hideLoading();
+								if (res.code == 0) {
+									uni.showToast({
+										name: "删除成功"
+									})
+									uni.navigateBack()
+								} else {
+									that.$queue.showToast(res.msg);
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			getIsVip() {
+				this.$Request.get("/app/UserVip/isUserVip").then(res => {
+					if (res.code == 0) {
+						this.isVip = res.data
+						uni.setStorageSync('isVIP', res.data)
+					}
+				});
+			},
+			openpay(item) {
+				// uni.navigateTo({
+				// 	url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId
+				// })
+				this.showpay = true
+			},
+			// 支付订单
+			pay() {
+				let that = this
+				this.showpay = false
+				if (this.paySel != 0) {
+					this.payJZ();
+					return;
+				}
+				if (that.openWay == 1) { //零钱支付
+				console.log("that.order.sumMoney",that.order)
+					uni.showModal({
+						title: '付款提示',
+						content: '确认支付' + that.order.sumMoney + '元吗?',
+						success: function(re) {
+							if (re.confirm) {
+								that.$queue.showLoading('支付中...')
+								console.log('用户点击确定');
+								that.$Request.post("/app/artificer/payOrders", {
+									ordersId: that.order.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/.u-drawer{
+		z-index:11 !important;
+	}
+	.xiangmu-cont-top-left{
+		font-weight: normal;
+		font-size: 21rpx;
+		color: #049E89;
+		margin-top: 1px;
+	}
+	.xiangmu-cont-top-time{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.xiadan{
+		width: 122rpx;
+		height: 48rpx;
+		line-height: 48rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 24rpx;
+		text-align: center;
+		font-weight: bold;
+		font-size: 24rpx;
+		color: #FFFFFF;
+	}
+	.xiangmu-foot-left{
+		display: flex;
+		flex-direction: row;
+		align-items: flex-end;
+	}
+	.xiangmu-foot-left-shiji span{
+		color: #F95900;
+	}
+	.xiangmu-foot-left-shiji span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.xiangmu-foot-left-shiji span:nth-child(2){
+		font-weight: bold;
+		font-size:36.81rpx;
+	}
+	.xiangmu-foot-left-shiji span:nth-child(3){
+		font-size: 25rpx;
+	}
+	.xiangmu-foot-left-dazhe{
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #848484;
+		text-decoration-line: line-through;
+		margin-left:5px;
+	}
+	.xiangmu-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.xiangmu-about{
+		width: 100%;
+		text-align: left;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #848484;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		margin: 5px 0px;
+	}
+	.xiangmu-cont-top-title{
+		font-weight: bold;
+		font-size: 33rpx;
+		color: #333333;
+	}
+	
+	.xiangmu-cont-top{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.xiangmu-cont{
+		width: 55%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.xiangmu-img{
+		width: 285rpx;
+		height: 218rpx;
+		background: #9F9F9F;
+		border-radius: 14rpx;
+	}
+	.xiangmu{
+		width: 95%;
+		height: 263rpx;
+		background: #FFFFFF;
+		border-radius: 21rpx;
+		margin: 0px auto 10px auto;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		padding: 10px;
+	}
+	
+	.popup-mian-btn span:nth-child(1){
+		background: linear-gradient(90deg, #FE912E, #FF9970);
+	}
+	.popup-mian-btn span:nth-child(2){
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	}
+	.popup-mian-btn span{
+		width: 247rpx;
+		height: 77rpx;
+		line-height: 77rpx;
+		text-align: center;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #FFFEFE;
+		border-radius: 39rpx;
+	}
+	.popup-mian-btn{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 10px;
+	}
+	.popup-mian-textarea{
+		width: 525.69rpx;
+		height: 211.81rpx;
+	}
+	.popup-mian{
+		width: 88%;
+		display: flex;
+		flex-direction: column;
+		margin: 5px auto 0px auto;
+	}
+	.popup-head span:nth-child(2){
+		width: 50rpx;
+		height: 50rpx;
+		line-height: 19px;
+		text-align: center;
+		font-size: 24px;
+		color: #15AB8D;
+		border-radius: 50%;
+		border: 3px solid #15AB8D;
+	}
+	.popup-head span:nth-child(1){
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.popup-head{
+		width: 100%;
+		height: 99.38rpx;
+		background-color: rgba(21, 171, 141, 0.09);
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 15px;
+	}
+	.popup-content{
+		width: 613rpx;
+		height: 479rpx;
+		background: #FFFFFF;
+		border-radius: 56rpx;
+		display: flex;
+		flex-direction: column;
+	}
+	/deep/.btns{
+		background: #019C88 !important;
+		color: #fff !important;
+	}
+	/deep/.u-size-default{
+		margin: 5px 0px 0px 0px;
+	}
+	.showBtn-mian{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		flex-wrap: wrap;
+		justify-content: flex-end;
+	}
+	.gengduo{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #7D7D7D;
+	}
+	.showBtn-view{
+		width: 100%;
+		justify-content: flex-end;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.showBtn,.hideBtn{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		
+	}
+	
+
+	.dingshi{
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	}
+	.zhuangtai{
+		color: #029D88;
+	}
+	.head-title-right{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		font-weight: bold;
+	}
+	.head-title{
+		margin-top: -2px;display: inline-block;
+		width: 300rpx; 
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+	.fei-view-list span,.fei-view-list-z span{
+		font-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;
+	}
+	.list-pay{
+		width: 100%;
+		padding: 10px 29rpx;
+	}
+	.pay-ding-top{
+		width: 100%;
+		height: 80rpx;
+		background-image: linear-gradient(to bottom, rgba(8, 162, 138, 0.5), #fff);
+		border-top-left-radius: 24rpx;
+		border-top-right-radius: 24rpx;
+		padding: 0px 29rpx;
+	}
+	.pay-ding,.feiuong{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		margin-top: 24rpx;
+		// padding: 29rpx;
+	}
+	.phone-pay{
+		width: 49rpx;
+		height: 44rpx;
+	}
+	.d-title{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #333333;
+	}
+	.d-touxiang{
+		width: 46rpx;
+		height: 46rpx;
+		border-radius: 50%;
+	}
+	.money-pay-jia{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #666666;
+		text-decoration-line: line-through;
+		margin-left: 5px;
+	}
+	.money-pay-zhen span{
+		color: #FF6000;
+	}
+	.money-pay-zhen span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.money-pay-zhen span:nth-child(2){
+		font-size: 31.25rpx;
+		font-weight: bold;
+	}
+	.money-pay-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.money-pay{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.head-top{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		padding: 29rpx;
+	}
+	.content{
+		 padding-bottom: 140rpx;
+		 padding-top: 20px;
+		 width: 100%;
+		 background-color: #f7f7f7;
+	}
+	.pay-title{
+		font-weight: bold;
+		font-size: 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: linear-gradient(to right, #223845, #00a85b);
+	}
+
+	.list_item {
+		// width: 650upx;
+		// height: 160upx;
+		width: 92%;
+		// margin: 30rpx 0;
+		background: #FFFFFF;
+		border-radius: 24upx;
+		padding: 20upx;
+		display: flex;
+		margin-top: 26upx;
+
+		.listitem_rightview {
+			margin-left: 20upx;
+			width: 80%;
+			padding-top: 10rpx;
+
+			.btnview {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				margin-top: 12upx;
+				width: 100%;
+			}
+
+			.titleview {
+				display: flex;
+				align-items: flex-end;
+				justify-content: space-between
+			}
+
+			.moneyview {
+				display: flex;
+				align-items: flex-end;
+
+				image {
+					width: 30upx;
+					height: 30upx;
+					margin-left: 20upx;
+					margin-bottom: 2upx;
+				}
+			}
+
+			.item_time {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				margin-left: 10upx;
+			}
+
+			.item_money {
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: 800;
+				color: #FF1200;
+			}
+
+			.item_oldmoney {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				text-decoration: line-through;
+				color: #999999;
+				margin-left: 10upx;
+			}
+
+			.item_btn {
+				width: 140upx;
+				height: 56upx;
+				background-color: #019C88;
+				border-radius: 16upx;
+				text-align: center;
+				line-height: 56upx;
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+			.item_yishou {
+				font-size: 22upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+
+			.item_title {
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #1E1F31;
+			}
+		}
+
+		image {
+			width: 220upx;
+			height: 160upx;
+			border-radius: 24upx;
+		}
+	}
+
+	.jz_btn {
+		width: 170rpx;
+		height: 56upx;
+		background: #096f4b;
+		margin-left: 40rpx;
+		border-radius: 35rpx;
+		line-height: 56upx;
+		text-align: center;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+	}
+
+	.tabber {
+		width: 100%;
+		background: #ffffff;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		justify-content: center;
+		height: 127rpx;
+		padding: 0 30rpx;
+	}
+
+	.box {
+		/* border: 1px solid #005dff; */
+		background: #E8FAE1;
+		border-radius: 4rpx;
+		color: #096f4b;
+		padding: 5upx 10upx;
+		font-size: 22rpx;
+		margin-top: 10rpx;
+	}
+
+	.popup_pay {
+		width: 100%;
+		position: relative;
+		padding-bottom: 45rpx;
+		/* height: 160px; */
+		/* #ifndef MP-WEIXIN */
+		/* height: 130px; */
+		/* #endif */
+
+	}
+
+	.pay_btn {
+		width: 90%;
+		margin: 0 auto;
+		text-align: center;
+		background: linear-gradient(to right, #223845, #00a85b);
+		height: 80rpx;
+		border-radius: 60rpx;
+		color: #ffffff;
+		line-height: 80rpx;
+	}
+
+	.serverAddress {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/my/order/paydingTc.vue b/my/order/paydingTc.vue
new file mode 100644
index 0000000..987055f
--- /dev/null
+++ b/my/order/paydingTc.vue
@@ -0,0 +1,1820 @@
+<template>
+	<view class="content">
+		<view v-if="order.overTimeOrders == 1" class="dingshi" style="font-size: 32upx;height: 150rpx;padding: 26rpx 29rpx 0 29rpx;">
+			<view style="color: red;font-size:26rpx">(订单已超时)</view>
+		</view>
+		<view class="padding-bottom u-skeleton">
+			<view class="bgImg u-skeleton-fillet" v-if="order.ordersPackageList && order.ordersPackageList.length > 0"
+				style="padding: 0 29rpx;">
+				<view class="head-top">
+					<view class="pay-title" style="">服务项目</view>
+					<view class="flex justify-around">
+						<view class="" style="width: 160upx;height: 160upx;">
+							<image :src="order.ordersPackageList[0].packageImg"
+								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+						</view>
+						<view class="u-flex-1  margin-left-sm">
+							<view class="flex head-title-right">
+								<view class="margin-right-xs text-df u-skeleton-fillet head-title">
+									{{order.ordersPackageList[0].title}}
+								</view>
+								<view class="zhuangtai">
+									<view v-if="order.ordersPackageList[0].status ==1">待付款...</view>
+								</view>
+							</view>
+							<view class="flex align-center">
+								<view>
+									<!-- <view class="flex justify-between margin-tb-sm" style="color: #999999;">
+										<view style="justify-content: space-between;">
+											{{order.ordersPackageList[0].duration}}分钟
+											x{{order.ordersPackageList[0].num}}
+										</view>
+									</view> -->
+										
+									<view class="money-pay">
+										<view class="money-pay-zhen">
+											<span>￥</span>
+											<span>{{order.sumMoney}}</span>
+										</view>
+										<!-- <view class="money-pay-jia">￥298</view> -->
+									</view>
+								</view>
+
+								<!-- <view class="jz_btn"
+									v-if="order.addNum < order.ordersMassageList[0].massageType.addNum && order.status == 6"
+									@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)">
+									加钟/补价</view> -->
+							</view>
+						</view>
+					</view>
+				</view>
+				
+
+				<view class="margin-top-xl pay-ding">
+					
+					<view class="list-pay">
+						<view class="flex justify-between" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">订单编号</view>
+							<view class="flex align-center" @tap="copy(order.ordersNo)"
+								style="color: #333;font-size: 26rpx;">
+								<view class="">{{order.ordersNo}}</view>
+								<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
+							</view>
+						</view>
+						<view class="flex justify-between" v-if="order.couponMoney" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">优惠券</view>
+							<view class="" style="color: #F93731;font-size: 26rpx;">￥{{order.couponMoney}}</view>
+						</view>
+					</view>
+				</view>
+				<view class="pay-ding feiuong">
+					<view class="fei-title">费用明细</view>
+					<view class="fei-view">
+						<view class="fei-view-list">
+							<span>服务价格</span>
+							<span>￥{{order.sumMoney}}</span>
+						</view>
+						
+						<view class="fei-view-list">
+							<span>优惠券</span>
+							<span>-￥{{order.couponMoney}}</span>
+						</view>
+						<view class="fei-view-list-z">
+							<span>总金额</span>
+							<span style="color: #FF3939;font-size: 29rpx;">￥{{order.payMoney}}</span>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
+				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
+					v-if="(order.status == 3) && yhqxSel != '否'">取消订单
+				</u-button>
+				<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
+					v-if="order.status == 3"
+					class="dingshi">立即支付
+				</u-button>
+				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
+					class="dingshi">联系客服</u-button>
+			</view>
+			
+		</view>
+		<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
+		<!--  加钟-->
+		<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
+			<scroll-view scroll-y="true" style="width: 750rpx;height: 600rpx;">
+				<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="showorderS" mode="bottom" :closeable="closeable">
+			<scroll-view scroll-y="true" style="width: 750rpx;height: 600rpx;">
+				<view class="xiangmu" v-for="(item,index) in artificerlist" :key="index">
+					<image class="xiangmu-img" :src="item.massageImg" mode=""></image>
+					<view class="xiangmu-cont">
+						<view class="xiangmu-cont-top">
+							<view class="xiangmu-cont-top-title">
+								{{item.title}}
+							</view>
+							<view class="xiangmu-cont-top-time">
+								<view class="xiangmu-cont-top-left">服务时长：{{item.duration}}分钟</view>
+								<view class="xiangmu-cont-top-left">已售：{{item.sales}}</view>
+							</view>
+						</view>
+						<view class="xiangmu-about">
+							{{item.jianjie}}
+						</view>
+						<view class="xiangmu-foot">
+							<view class="xiangmu-foot-left">
+								<view class="xiangmu-foot-left-shiji">
+									<span>￥</span>
+									<span>{{item.price}}</span>
+									<span>/元套</span>
+								</view>
+								<view class="xiangmu-foot-left-dazhe">{{item.oldPrice}}</view>
+							</view>
+							<view class="xiadan" @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="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 {
+				ordersId: '',
+				tpayMoney: '',
+				paySel: 0,
+				showorder: false,
+				showorderS: false,
+				orderList: [],
+				loading: true,
+				customStyle: {
+					// backgroundColor: '#e5e5e5',
+					// color: '#FFFFFF',
+
+					// #ifdef MP-WEIXIN
+					width: "310upx",
+					// #endif
+					// #ifndef MP-WEIXIN
+					width: '310upx',
+
+					// #endif	
+					margin: '0 10upx',
+				},
+				customStyle2: {
+					backgroundColor: '',
+					color: '#FFFFFF',
+					// #ifdef MP-WEIXIN
+					width: "310upx",
+					// #endif
+					// #ifndef MP-WEIXIN
+					width: '310upx',
+
+					// #endif	
+					margin: '0 10upx',
+				},
+				id: '',
+				order: {
+					user: {},
+					game: {}
+				},
+				isTrue: 0,
+
+				phone: '',
+				isVip: false,
+				birthDate: '',
+				age: '',
+				showpay: false,
+				openLists: [],
+				openWay: 1,
+				closeable: true,
+				yhqxSel: '否',
+				btnShow:false,
+				tiqianData:'',
+				type:'center',
+				earlyFinishReason:'',
+				qurenJd:[],
+				artificerlist:[]
+			}
+		},
+		onLoad(e) {
+			// uni.showLoading({
+			// 	title: '加载中......',
+			// })
+			// setTimeout(() => {
+			// 	// this.loading = false;
+			// }, 2000)
+			this.isTrue = e.isTrue
+			if (this.isTrue) {
+				uni.setNavigationBarTitle({
+					title: '订单详情'
+				})
+			}
+			this.ordersId = e.ordersId
+			this.getOrder()
+		},
+		onShow() {
+			this.yhqxSel = this.$queue.getData("yhqxSel");
+			this.getOrder()
+			if (uni.getStorageSync('token')) {
+				this.getIsVip()
+			}
+
+			// #ifndef MP-WEIXIN
+			this.openLists = [{
+					image: '../../static/images/icon_weixin.png',
+					text: '微信支付',
+					id: 2
+				}, {
+					image: '../../static/images/zhifubao.png',
+					text: '支付宝支付',
+					id: 3
+				}, {
+					image: '../../static/images/lingqian.png',
+					text: '零钱支付',
+					id: 1
+				}],
+				this.openWay = 2;
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			this.openLists = [{
+					image: '../../static/images/icon_weixin.png',
+					text: '微信支付',
+					id: 2
+				}, {
+					image: '../../static/images/lingqian.png',
+					text: '零钱支付',
+					id: 1
+				}],
+				this.openWay = 2;
+			// #endif
+		},
+		methods: {
+			saveJZS(artificerId) {//升级查询技师项目
+				let data = {
+					artificerId: artificerId,
+					status: 0
+				}
+				let that = this;
+				this.$queue.showLoading('查询中...')
+				that.$Request.get("/app/artificer/selectArtificerMassageList", data).then(res => {
+					if (res.code == 0) {
+						if (res.data && res.data.length > 0) {
+							that.artificerlist = res.data
+							// for (let i = 0; i < that.artificerlist.length; i++) {
+							// 	if (that.artificerlist[i].labels) {
+							// 		that.artificerlist[i].labels = that.artificerlist[i].labels.split(",");
+							// 	}
+							// }
+							uni.hideLoading();
+							that.showorderS = true;
+						} else {
+							uni.hideLoading();
+							that.$queue.showToast('暂无可升级项目');
+						}
+					} else {
+						uni.hideLoading();
+						that.$queue.showToast(res.msg);
+					}
+			
+				})
+			},
+			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);
+					}
+			
+				})
+			},
+			getTimeStampWithoutSeconds(date) {
+			    // 将日期转换为标准的UTC时间
+			    var utcDate = new Date(
+						   date.getUTCFullYear(), 
+						   date.getUTCMonth(), 
+						   date.getUTCDate(), 
+						   date.getUTCHours(), 
+						   date.getUTCMinutes(), 
+			                           0);
+			    // 返回不含秒的时间戳
+			    return utcDate.getTime();
+			},
+			getOrder() {
+				let data = {
+					ordersId: this.ordersId
+				}
+				this.$Request.post('/app/user/package/order/selectOrdersDetails', data).then(res => {
+					if (res.code == 0) {
+						this.loading = false
+						uni.hideLoading()
+						this.order = res.data;
+						var date = new Date(); // 当前日期和时间
+						var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
+						const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数
+						var twoTime=parseInt(new Date(twoHoursInMilliseconds).getTime())
+						var time=parseInt(new Date(this.order.serveTime).getTime())
+							if(time-timestamp>twoTime){
+								this.$set(this.order, 'btnShow', 'true')
+							}else{
+								this.$set(this.order, 'btnShow', 'false')
+							}
+							console.log("sadasdsa0",this.order)
+						let aliphone = this.$queue.getData('aliphone');
+						if (aliphone === '是' && this.order.artificer) {
+							this.ysPhone(this.order.phone, this.order.artificer.phone);
+						}
+					}
+				})
+			},
+			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.getOrder()
+							this.$refs.popupQ.close(typeTxte);
+					}else{
+						this.getOrder()
+						uni.showToast({
+							icon:'error',
+							title:'操作失败！'
+						})
+					}
+				
+				}).catch(() => {
+					this.getOrder()
+					//联网失败, 结束加载
+				});
+			},
+			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.getOrder()
+								that.$refs.popup.close(type);
+							}else{
+								that.getOrder()
+								uni.showToast({
+									icon:'error',
+									title:'操作失败！'
+								})
+							}
+						
+						}).catch(() => {
+							//联网失败, 结束加载
+							that.getOrder()
+						});
+						
+					},
+						fail: function(e) {
+							that.getOrder()
+							// #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');
+				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(item) {
+				console.log("item=====>",item)
+				console.log("order=====>",this.order)
+				let that = this
+				let data = {
+				  classifyId:item.classifyId,
+				  ordersId:that.order.ordersId,
+				  ordersMassageList:[
+				    {massageId: item.massageTypeId,num: 1},
+				  ],
+				  massageTypeId:item.massageTypeId,
+				  userPackageDetailId:item.userPackageDetailId,
+				}
+				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.order.sumMoney + '元吗?',
+						success: function(re) {
+							if (re.confirm) {
+								that.$queue.showLoading('支付中...')
+								// console.log('用户点击确定');
+								that.$Request.post("/app/artificer/payOrders", {
+									ordersId: order.ordersId,
+								}).then(ret => {
+									uni.hideLoading();
+									if (ret.code == 0) {
+										uni.showToast({
+											title: '支付成功',
+											icon: 'none'
+										})
+										that.getOrder()
+
+									} else {
+										uni.showToast({
+											title: ret.msg,
+											icon: 'none'
+										})
+									}
+								});
+							} else if (re.cancel) {
+								that.getOrder()
+							}
+						}
+					})
+				} else if (that.openWay == 2) { //微信支付
+					// #ifdef MP-WEIXIN
+					let data = {
+						ordersId: that.ordersId,
+						type: 3
+					}
+					that.$Request.post('/app/wxPay/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.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.ordersId,
+							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.ordersId,
+						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.ordersId,
+						type: 1
+					}
+					that.$Request.post('/app/aliPay/payOrder', data).then(
+						rea => {
+							that.showpay = false
+							that.setPayment('alipay', rea.data);
+						});
+					// #endif
+				}
+
+			},
+			
+			//支付选择
+			selectWay: function(item) {
+				this.openWay = item.id;
+			},
+			//换算年龄
+			getAge(e) {
+				console.log('出生日期：' + e)
+				this.birthDate = e
+				//创建系统日期
+				var today = new Date();
+				//把出生日期转换成日期
+				this.birthDate = new Date(this.birthDate);
+				//分别获取到年份后相减
+				this.age = today.getFullYear() - this.birthDate.getFullYear();
+				// console.log(this.age+'当前年龄')
+			},
+			// 修改订单地址
+			undateAdd(order) {
+				if (order.state == 0) {
+					uni.navigateTo({
+						url: '../address/address?order=' + order.ordersId + '&id=' + 3
+					})
+				}
+			},
+			// 一键导航
+			bindGps(latitude, longitude, name, detailsadd) {
+				console.log(latitude, longitude, name, detailsadd)
+				uni.openLocation({
+					latitude: latitude - 0, //要去的纬度-地址       
+					longitude: longitude - 0, //要去的经度-地址
+					name: name, //地址名称
+					address: detailsadd, //详细地址名称
+					success: function() {
+						console.log('导航成功');
+					},
+					fail: function(error) {
+						console.log(error)
+					}
+				});
+			},
+			ysPhone(phoneA, phoneB) {
+				this.$Request.getT('/app/user/insertVirtualPhone?phoneA=' + phoneA + '&phoneB=' + phoneB).then(res => {
+					if (res.code == 0) {
+						this.order.artificer.phone = res.data;
+					}
+				});
+			},
+			// 拨打电话
+			bindphone(phone) {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '是否拨打电话',
+					success: function(res) {
+						if (res.confirm) {
+							console.log('用户点击确定', phone);
+							uni.makePhoneCall({
+								phoneNumber: phone //仅为示例
+							});
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			goNav(e,item) {
+				this.$queue.setData('daibudan',item);
+				uni.navigateTo({
+					url: e
+				})
+			},
+			
+			delOrder(e) {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '确定删除订单吗?',
+					success: function(res) {
+						if (res.confirm) {
+							let data = {
+								ordersId: e.ordersId,
+							}
+							that.$queue.showLoading('删除中...')
+							that.$Request.post('/app/artificer/removeOrders', data).then(res => {
+								uni.hideLoading();
+								if (res.code == 0) {
+									uni.showToast({
+										name: "删除成功"
+									})
+									uni.navigateBack()
+								} else {
+									that.$queue.showToast(res.msg);
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			getIsVip() {
+				this.$Request.get("/app/UserVip/isUserVip").then(res => {
+					if (res.code == 0) {
+						this.isVip = res.data
+						uni.setStorageSync('isVIP', res.data)
+					}
+				});
+			},
+			openpay(item) {
+				// uni.navigateTo({
+				// 	url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId
+				// })
+				this.showpay = true
+			},
+			// 支付订单
+			pay() {
+				let that = this
+				this.showpay = false
+				if (this.paySel != 0) {
+					this.payJZ();
+					return;
+				}
+				if (that.openWay == 1) { //零钱支付
+					uni.showModal({
+						title: '付款提示',
+						content: '确认支付' + that.payMoney.sumMoney + '元吗?',
+						success: function(re) {
+							if (re.confirm) {
+								that.$queue.showLoading('支付中...')
+								console.log('用户点击确定');
+								that.$Request.post("/app/artificer/payOrders", {
+									ordersId: that.order.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/.u-drawer{
+		z-index:11 !important;
+	}
+	.xiangmu-cont-top-left{
+		font-weight: normal;
+		font-size: 21rpx;
+		color: #049E89;
+		margin-top: 1px;
+	}
+	.xiangmu-cont-top-time{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.xiadan{
+		width: 122rpx;
+		height: 48rpx;
+		line-height: 48rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 24rpx;
+		text-align: center;
+		font-weight: bold;
+		font-size: 24rpx;
+		color: #FFFFFF;
+	}
+	.xiangmu-foot-left{
+		display: flex;
+		flex-direction: row;
+		align-items: flex-end;
+	}
+	.xiangmu-foot-left-shiji span{
+		color: #F95900;
+	}
+	.xiangmu-foot-left-shiji span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.xiangmu-foot-left-shiji span:nth-child(2){
+		font-weight: bold;
+		font-size:36.81rpx;
+	}
+	.xiangmu-foot-left-shiji span:nth-child(3){
+		font-size: 25rpx;
+	}
+	.xiangmu-foot-left-dazhe{
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #848484;
+		text-decoration-line: line-through;
+		margin-left:5px;
+	}
+	.xiangmu-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.xiangmu-about{
+		width: 100%;
+		text-align: left;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #848484;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		margin: 5px 0px;
+	}
+	.xiangmu-cont-top-title{
+		font-weight: bold;
+		font-size: 33rpx;
+		color: #333333;
+	}
+	
+	.xiangmu-cont-top{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.xiangmu-cont{
+		width: 55%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.xiangmu-img{
+		width: 285rpx;
+		height: 218rpx;
+		background: #9F9F9F;
+		border-radius: 14rpx;
+	}
+	.xiangmu{
+		width: 95%;
+		height: 263rpx;
+		background: #FFFFFF;
+		border-radius: 21rpx;
+		margin: 0px auto 10px auto;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		padding: 10px;
+	}
+	
+	.popup-mian-btn span:nth-child(1){
+		background: linear-gradient(90deg, #FE912E, #FF9970);
+	}
+	.popup-mian-btn span:nth-child(2){
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	}
+	.popup-mian-btn span{
+		width: 247rpx;
+		height: 77rpx;
+		line-height: 77rpx;
+		text-align: center;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #FFFEFE;
+		border-radius: 39rpx;
+	}
+	.popup-mian-btn{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 10px;
+	}
+	.popup-mian-textarea{
+		width: 525.69rpx;
+		height: 211.81rpx;
+	}
+	.popup-mian{
+		width: 88%;
+		display: flex;
+		flex-direction: column;
+		margin: 5px auto 0px auto;
+	}
+	.popup-head span:nth-child(2){
+		width: 50rpx;
+		height: 50rpx;
+		line-height: 19px;
+		text-align: center;
+		font-size: 24px;
+		color: #15AB8D;
+		border-radius: 50%;
+		border: 3px solid #15AB8D;
+	}
+	.popup-head span:nth-child(1){
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.popup-head{
+		width: 100%;
+		height: 99.38rpx;
+		background-color: rgba(21, 171, 141, 0.09);
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 15px;
+	}
+	.popup-content{
+		width: 613rpx;
+		height: 479rpx;
+		background: #FFFFFF;
+		border-radius: 56rpx;
+		display: flex;
+		flex-direction: column;
+	}
+	/deep/.btns{
+		background: #019C88 !important;
+		color: #fff !important;
+	}
+	/deep/.u-size-default{
+		margin: 5px 0px 0px 0px;
+	}
+	.showBtn-mian{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		flex-wrap: wrap;
+		justify-content: flex-end;
+	}
+	.gengduo{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #7D7D7D;
+	}
+	.showBtn-view{
+		width: 100%;
+		justify-content: flex-end;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.showBtn,.hideBtn{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		
+	}
+	
+
+	.dingshi{
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	}
+	.zhuangtai{
+		color: #029D88;
+	}
+	.head-title-right{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		font-weight: bold;
+	}
+	.head-title{
+		margin-top: -2px;display: inline-block;
+		width: 300rpx; 
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+	.fei-view-list span,.fei-view-list-z span{
+		font-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;
+	}
+	.list-pay{
+		width: 100%;
+		padding: 10px 29rpx;
+	}
+	.pay-ding-top{
+		width: 100%;
+		height: 80rpx;
+		background-image: linear-gradient(to bottom, rgba(8, 162, 138, 0.5), #fff);
+		border-top-left-radius: 24rpx;
+		border-top-right-radius: 24rpx;
+		padding: 0px 29rpx;
+	}
+	.pay-ding,.feiuong{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		margin-top: 24rpx;
+		// padding: 29rpx;
+	}
+	.phone-pay{
+		width: 49rpx;
+		height: 44rpx;
+	}
+	.d-title{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #333333;
+	}
+	.d-touxiang{
+		width: 46rpx;
+		height: 46rpx;
+		border-radius: 50%;
+	}
+	.money-pay-jia{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #666666;
+		text-decoration-line: line-through;
+		margin-left: 5px;
+	}
+	.money-pay-zhen span{
+		color: #FF6000;
+	}
+	.money-pay-zhen span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.money-pay-zhen span:nth-child(2){
+		font-size: 31.25rpx;
+		font-weight: bold;
+	}
+	.money-pay-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.money-pay{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.head-top{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		padding: 29rpx;
+	}
+	.content{
+		 padding-bottom: 140rpx;
+		 padding-top: 20px;
+		 width: 100%;
+		 background-color: #f7f7f7;
+	}
+	.pay-title{
+		font-weight: bold;
+		font-size: 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: linear-gradient(to right, #223845, #00a85b);
+	}
+
+	.list_item {
+		// width: 650upx;
+		// height: 160upx;
+		width: 92%;
+		// margin: 30rpx 0;
+		background: #FFFFFF;
+		border-radius: 24upx;
+		padding: 20upx;
+		display: flex;
+		margin-top: 26upx;
+
+		.listitem_rightview {
+			margin-left: 20upx;
+			width: 80%;
+			padding-top: 10rpx;
+
+			.btnview {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				margin-top: 12upx;
+				width: 100%;
+			}
+
+			.titleview {
+				display: flex;
+				align-items: flex-end;
+				justify-content: space-between
+			}
+
+			.moneyview {
+				display: flex;
+				align-items: flex-end;
+
+				image {
+					width: 30upx;
+					height: 30upx;
+					margin-left: 20upx;
+					margin-bottom: 2upx;
+				}
+			}
+
+			.item_time {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				margin-left: 10upx;
+			}
+
+			.item_money {
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: 800;
+				color: #FF1200;
+			}
+
+			.item_oldmoney {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				text-decoration: line-through;
+				color: #999999;
+				margin-left: 10upx;
+			}
+
+			.item_btn {
+				width: 140upx;
+				height: 56upx;
+				background-color: #019C88;
+				border-radius: 16upx;
+				text-align: center;
+				line-height: 56upx;
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+			.item_yishou {
+				font-size: 22upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+
+			.item_title {
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #1E1F31;
+			}
+		}
+
+		image {
+			width: 220upx;
+			height: 160upx;
+			border-radius: 24upx;
+		}
+	}
+
+	.jz_btn {
+		width: 170rpx;
+		height: 56upx;
+		background: #096f4b;
+		margin-left: 40rpx;
+		border-radius: 35rpx;
+		line-height: 56upx;
+		text-align: center;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+	}
+
+	.tabber {
+		width: 100%;
+		background: #ffffff;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		justify-content: center;
+		height: 127rpx;
+		padding: 0 30rpx;
+	}
+
+	.box {
+		/* border: 1px solid #005dff; */
+		background: #E8FAE1;
+		border-radius: 4rpx;
+		color: #096f4b;
+		padding: 5upx 10upx;
+		font-size: 22rpx;
+		margin-top: 10rpx;
+	}
+
+	.popup_pay {
+		width: 100%;
+		position: relative;
+		padding-bottom: 45rpx;
+		/* height: 160px; */
+		/* #ifndef MP-WEIXIN */
+		/* height: 130px; */
+		/* #endif */
+
+	}
+
+	.pay_btn {
+		width: 90%;
+		margin: 0 auto;
+		text-align: center;
+		background: linear-gradient(to right, #223845, #00a85b);
+		height: 80rpx;
+		border-radius: 60rpx;
+		color: #ffffff;
+		line-height: 80rpx;
+	}
+
+	.serverAddress {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/my/vip/index.vue b/my/vip/index.vue
index 67ee277..0c26476 100644
--- a/my/vip/index.vue
+++ b/my/vip/index.vue
@@ -161,7 +161,7 @@
 			this.getIsVip()
 			this.vipData=this.$queue.getData('isVIP')
 			console.log("isVIP------------------->",this.vipData)
-			if(this.vipData.isVip=='1'){
+			if(this.vipData=='1'){
 				this.vipShow=true;
 			}else{
 				this.vipData=[]
diff --git a/pages.json b/pages.json
index 1678d18..83120c6 100644
--- a/pages.json
+++ b/pages.json
@@ -429,6 +429,7 @@
 				"navigationBarTitleText": "注册"
 			}
 		}, 
+		
 		// #ifdef H5
 		{
 			"path": "pages/order/index",
@@ -454,7 +455,7 @@
 			"path": "pages/therapist/therapist",
 			"style": {
 				"navigationBarTitleText": "理疗师",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"app-plus": {
 					"titleNView": false
 				}
@@ -466,7 +467,7 @@
 			"path": "pages/therapist/therapist",
 			"style": {
 				"navigationBarTitleText": "理疗师",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"app-plus": {
 					"titleNView": false
 				}
@@ -484,7 +485,7 @@
 			"path": "pages/therapist/orderDetail",
 			"style": {
 				"navigationBarTitleText": "理疗师详情",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"app-plus": {
 					"titleNView": false
 				}
@@ -510,6 +511,30 @@
 						"titleNView": false
 					}
 				}
+			}, {
+				"path": "order/paydingDd",
+				"style": {
+					"navigationBarTitleText": "订单支付",
+					"enablePullDownRefresh": false
+				}
+			},{
+				"path": "order/payModifyDd",
+				"style": {
+					"navigationBarTitleText": "订单页面详情",
+					"enablePullDownRefresh": false
+				}
+			},{
+				"path": "order/paydingTc",
+				"style": {
+					"navigationBarTitleText": "套餐订单详情",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "order/payModifyTc",
+				"style": {
+					"navigationBarTitleText": "套餐订单",
+					"enablePullDownRefresh": false
+				}
 			}, {
 				"path": "order/payModifyDzhifu",
 				"style": {
@@ -702,6 +727,16 @@
 					}
 				}
 			},
+			{
+				"path": "order/payding",
+				"style": {
+					"navigationBarTitleText": "项目订单详情",
+					"navigationStyle": "custom",
+					"app-plus": {
+						"titleNView": false
+					}
+				}
+			},
 			{
 				"path": "order/payModify",
 				"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c0eb261..9401bcb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -5,6 +5,9 @@
 				<view class="index-top-left font-size-34">盛安到家</view>
         <view class="index-top-left font-size-34" style="display: none;">-{{latitude}}-{{longitude}}-</view>
 				<view class="index-top-mian">
+					--{{latitude}}--
+					--{{longitude}}--
+					--{{cuowu}}--
 					<view class="index-top-mian-text">
 						<image style="margin-top: 4px;" src="../../static/index-nav-1.png" mode=""></image>
 						<span>实名认证</span>
@@ -324,6 +327,7 @@
 				txAppKey: '',
 				tpSel: 0,
 				tpCount: 0,
+				cuowu:''
 			}
 		},
 		onShareAppMessage(res) { //发送给朋友
@@ -423,7 +427,8 @@
 					// #endif
 				},
 				fail: function(e) {
-          console.log("获取定位返回的错误！", e)
+					this.cuowu=e
+					console.log("获取信息失败，请重试！",e)
 					// #ifdef APP-PLUS
 					that.checkPermission();
 					// #endif
@@ -445,7 +450,7 @@
 				}
 				// #endif
 				this.city = uni.getStorageSync('city')
-				console.log(this.city)
+				this.getIsVip()
 				this.getKTCityList();
 				this.getHomeArtificerList();
 				this.latitude = uni.getStorageSync('latitude')
@@ -485,6 +490,18 @@
 			// }
 		},
 		methods: {
+			getIsVip() {
+				this.$Request.get("/app/UserVip/selectUserVip").then(res => {
+					if (res.code == 0) {
+						// this.isVip = res.data
+						if(res.data==undefined){
+							this.$queue.setData('isVIP','0')
+						}else{
+							this.$queue.setData('isVIP','1')
+						}
+					}
+				});
+			},
 			goChat() {
 				let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信 
 				let kefuPhone = this.$queue.getData('kefuPhone');
diff --git a/pages/my/cureOderDrtail.vue b/pages/my/cureOderDrtail.vue
index 66976e2..ec7567f 100644
--- a/pages/my/cureOderDrtail.vue
+++ b/pages/my/cureOderDrtail.vue
@@ -38,6 +38,23 @@
 					</view>	
 				</view>
 				<view class="header-bottom-foot">
+					<view class="header-bottom-foot-cont">
+						<view class="header-fubz">保障</view>
+						<view class="header-bottom-foot-view">
+							<image class="header-bottom-foot-view-img1" src="../../static/servicePackage/idCard.png" mode=""></image>
+							<span>未服务全额退款</span>
+						</view>
+						<view class="header-bottom-foot-view" style="margin: 0px 7px;">
+							<image class="header-bottom-foot-view-img2" src="../../static/servicePackage/money.png" mode=""></image>
+							<span>不满意重做</span>
+						</view>
+						<view class="header-bottom-foot-view">
+							<image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
+							<span>最快30分钟上门</span>
+						</view>
+					</view>	
+				</view>
+				<!--<view class="header-bottom-foot">
 					<view class="header-bottom-foot-title">服务保障</view>
 					<view class="header-bottom-foot-cont">
 						<view class="header-bottom-foot-view">
@@ -53,7 +70,7 @@
 							<span>最快30分钟上门</span>
 						</view>
 					</view>	
-				</view>
+				</view>-->
 			</view>
 		</view>
 		<view class="detail-foot">
@@ -170,21 +187,25 @@
 	}
 </script>
 <style scoped>
+	.header-fubz{
+		font-size: 26rpx;
+		color: #029c88;
+		font-weight: bold;
+	}
 	.header-bottom-title-liao{
 		display: inline-block;
-		padding: 0 7px;
+		padding: 3px 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;
+		margin-left: 5px;		
+		font-size: 11px;
 		border-top-left-radius: 20px;
 		border-bottom-right-radius: 20px;
 		color: #fff;
-	}
+		}
 	.detail-btn{
 		width:95%;
 		height: 92rpx;
@@ -239,8 +260,7 @@
 		width: 100%;
 		display: flex;
 		flex-direction: row;
-		font-weight: bold;
-		font-size: 22rpx;
+		font-size: 26rpx;
 	}
 	.header-bottom-title-bottom span{
 		font-weight: bold;
@@ -287,15 +307,15 @@
 		display: flex;
 		flex-direction: column;
 		position: relative;
-		margin-bottom: 10px;
+		margin-bottom: 15px;
 	}
 	.detail-foot{
 		width: 100%;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		padding: 15px 0px;
-	}
+		padding: 5rpx 0rpx;
+		}
 	
 	.tese span:nth-child(1){
 		font-weight: bold;
@@ -346,6 +366,7 @@
 		background-color: #fff;
 		border-radius: 21rpx;
 		padding: 15px;
+		margin-bottom: 10px;
 	}
 	.jianjie{
 		font-weight: 400;
@@ -378,16 +399,16 @@
 		height: 29.86rpx;
 	}
 	.header-bottom-foot-view-img1{
-		width: 22.92rpx;
-		height: 17.36rpx;
+		width: 30rpx;
+		height: 30rpx;
 	}
 	.header-bottom-foot-view-img2{
-		width: 16.67rpx;
-		height: 16.67rpx;
+		width: 23rpx;
+		height: 23rpx;
 	}
 	.header-bottom-foot-view-img3{
-		width: 15.97rpx;
-		height: 18.06rpx;
+		width: 26rpx;
+		height: 26rpx;
 	}
 	.header-bottom-foot-view image{
 		margin-right: 3px;
@@ -397,14 +418,14 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: center;
-		padding: 0 5px;
+		padding: 1px 8px;
 		height: 22px;
 		line-height: 22px;
-		background-color: rgba(8, 162, 138, 0.1);
-		border-radius: 8px;
+		background-color: rgba(230, 246, 243, 1);
+		border-radius: 15px;
 		font-weight: 400;
-		font-size: 8px;
-		color: #029D88;
+		font-size: 10px;
+		color: #029c88;
 	}
 	.header-bottom-foot-title{
 		width:100%;
@@ -428,9 +449,9 @@
 		display: flex;
 		flex-direction: column;
 		align-items: center;
+		margin-top: 26rpx;
 	}
 	.header-bottom-money-jia{
-		font-weight: bold;
 		font-size: 28rpx;
 		color: #848484;
 		line-height: 37rpx;
@@ -444,7 +465,7 @@
 		font-size: 25rpx;
 	}
 	.header-bottom-money-zhen span:nth-child(2){
-		font-size:36.81rpx;
+		font-size:45.81rpx;
 		font-weight: bold;
 	}
 	.header-bottom-money-zhen span:nth-child(3){
@@ -503,6 +524,7 @@
 		padding: 15px;
 		display: flex;
 		flex-direction: column;
+		margin-bottom: 20rpx;
 	}
 	.header-top image{
 		width: 706.25rpx;
diff --git a/pages/my/fuwuDateil.vue b/pages/my/fuwuDateil.vue
index 8e5e21a..10a2bf6 100644
--- a/pages/my/fuwuDateil.vue
+++ b/pages/my/fuwuDateil.vue
@@ -129,7 +129,7 @@
 					this.$queue.setData('ordersId',this.dataList.id);
 					this.$queue.setData('daibudan','');
 					this.$queue.setData('youhui','');
-					this.$queue.setData('classifyId',item.classifyId)
+					this.$queue.setData('xiangmu',item)
 					uni.navigateTo({
 						url:'/my/order/payModify?ordersId='+this.dataList.id
 					})
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 0bf207f..d8dce75 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -131,7 +131,8 @@
 					{urlImg:'../../static/my-gong-8.png',text:'浏览历史',link:'/pages/my/historyMy'},
 					{urlImg:'../../static/my-gong-9.png',text:'我的团队',link:'/pages/my/myteam'},
 				],
-				token:''
+				token:'',
+				vipData:[]
 			}
 		},
 		onLoad(e) {
@@ -152,6 +153,8 @@
 		
 				this.getAmount()
 				this.getIsVip()
+				
+				
 			} else {
 				this.isShop = 0;
 				this.isAgency = 0;
@@ -428,10 +431,14 @@
 			},
 			
 			getIsVip() {
-				this.$Request.get("/app/UserVip/isUserVip").then(res => {
+				this.$Request.get("/app/UserVip/selectUserVip").then(res => {
 					if (res.code == 0) {
 						this.isVip = res.data
-						this.$queue.setData('isVIP',this.isVip)
+						if(this.isVip==undefined){
+							this.$queue.setData('isVIP','0')
+						}else{
+							this.$queue.setData('isVIP','1')
+						}
 					}
 				});
 			},
diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue
index 210cd32..7511763 100644
--- a/pages/my/indextaociliaoList.vue
+++ b/pages/my/indextaociliaoList.vue
@@ -40,7 +40,7 @@
 								<span>{{item.oldPrice}}</span>
 							</view>
 							<view class="item-view-bottom-btn">
-								查看
+								购买
 							</view>
 						</view>
 					</view>	
@@ -396,7 +396,7 @@
 	}
 	.service-head-top-left span{
 		font-weight: bold;
-		font-size: 36rpx;
+		font-size: 34rpx;
 		color: #171717;
 	}
 	.service-head-top-left{
diff --git a/pages/my/serviceOderDrtail.vue b/pages/my/serviceOderDrtail.vue
index c4a13c7..bf51946 100644
--- a/pages/my/serviceOderDrtail.vue
+++ b/pages/my/serviceOderDrtail.vue
@@ -42,15 +42,15 @@
 					<view class="header-bottom-foot-title">服务保障</view>
 					<view class="header-bottom-foot-view">
 						<image class="header-bottom-foot-view-img1" src="../../static/servicePackage/idCard.png" mode=""></image>
-						<span>持证上岗</span>
+						<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>
+						<span>资质认证</span>
 					</view>
 					<view class="header-bottom-foot-view">
 						<image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
-						<span>爽约包赔</span>
+						<span>平台担保</span>
 					</view>
 				</view>
 			</view>
@@ -87,7 +87,7 @@
 				</view>
 			</view>
 		</view>
-		<checkbox-group @change="checkboxChange" v-if="serviData.name=='index' && serviData.isCanCoupon=='1'">
+	<!-- 	<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">
@@ -108,9 +108,9 @@
 					</label>
 				</view>
 			</view>
-		</checkbox-group>
-		<view class="detail-btn" v-if="serviData.name=='index'" @click="openpay">
-			立即预约
+		</checkbox-group> -->
+		<view class="detail-btn" v-if="serviData.name=='index'" @click="openpay(mainData)">
+			立即购买
 		</view>
 		<!-- 支付方式 -->
 		<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
@@ -257,9 +257,16 @@
 			
 				});
 			},
-			openpay() {
-				this.goOrder()
-				this.showpay = true
+			openpay(item) {
+				this.$queue.setData('mainData',item)
+				this.$queue.setData('detailData',this.detailData)
+				this.$queue.setData('xiangmu',item)
+				this.$queue.setData('youhui','');
+				uni.navigateTo({
+					url:'/my/order/payModifyTc?ordersId='+item.id
+				})
+				// this.goOrder()
+				// this.showpay = true
 			},
 			//支付选择
 			selectWay: function(item) {
@@ -763,16 +770,15 @@
 		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;
+		width: 90%;
+				margin: 0 auto;
+				text-align: center;
+				background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+				height:80rpx;
+				border-radius: 80rpx;
+				color: #ffffff;
+				line-height: 80rpx;
+				font-size: 38rpx;
 	}
 	.header-top image{
 		width: 706.25rpx;
@@ -808,7 +814,7 @@
 	}
 	.detail-foot-nav-text{
 		font-weight: bold;
-		font-size: 32rpx;
+		font-size: 34rpx;
 		color: #000000;
 	}
 	.detail-foot-nav{
@@ -824,7 +830,7 @@
 		    background-repeat: no-repeat;
 		    background-size: 100% 100%;
 		    font-weight: 400;
-		    font-size: 12px;
+		    font-size: 13px;
 		    color: #FFFFFF;
 		    text-align: right;
 		    line-height: 32px;
@@ -859,12 +865,11 @@
 	
 	.tese span:nth-child(1){
 		font-weight: bold;
-		font-size: 22rpx;
-		color: #333333;
+		font-size: 28rpx;
+		color: #666;
 	}
 	.tese span:nth-child(2){
-		font-weight: 400;
-		font-size: 22rpx;
+		font-size: 28rpx;
 		color: #8D9194;
 	}
 	.tese{
@@ -874,6 +879,7 @@
 		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
 		overflow: hidden;
 		text-overflow: ellipsis;
+		margin-top: 8px;
 	}
 	.detail-foot-list-top span:nth-child(1){
 		font-weight: bold;
@@ -893,9 +899,8 @@
 		margin: 0px 25px 0px 5px;
 	}
 	.detail-foot-list-top span:nth-child(3){
-		font-weight: 400;
-		font-size: 22rpx;
-		color: #777777;
+		font-size: 30rpx;
+		color: #029d88;
 	}
 	
 	.detail-foot-mian{
@@ -904,10 +909,11 @@
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
+		margin-top: 8px;
 	}
 	.jianjie{
 		font-weight: 400;
-		font-size: 22rpx;
+		font-size: 28rpx;
 		color: #8D9194;
 		display: -webkit-box;
 		-webkit-box-orient: vertical;
@@ -920,32 +926,30 @@
 	}
 	.header-bottom-mian-title{
 		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		margin-bottom: 6px;
+		margin-bottom: 3px;
 	}
 	.header-bottom-mian-title span{
 		font-weight: 400;
-		font-size: 26rpx;
+		font-size: 28rpx;
 		color: #20AB95;
 		margin-left: 5px;
+		padding: 20rpx 0;
 	}
 	.header-bottom-mian-title image{
 		width: 30.56rpx;
 		height: 29.86rpx;
 	}
 	.header-bottom-foot-view-img1{
-		width: 22.92rpx;
-		height: 17.36rpx;
+		width: 30rpx;
+		height: 30rpx;
 	}
 	.header-bottom-foot-view-img2{
-		width: 16.67rpx;
-		height: 16.67rpx;
+		width: 28rpx;
+		height: 28rpx;
 	}
 	.header-bottom-foot-view-img3{
-		width: 15.97rpx;
-		height: 18.06rpx;
+		width: 30rpx;
+		height: 30rpx;
 	}
 	.header-bottom-foot-view image{
 		margin-right: 3px;
@@ -955,13 +959,13 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: center;
-		width: 69px;
+		width: 80px;
 		height: 22px;
 		line-height: 22px;
 		background-color: rgba(8, 162, 138, 0.1);
 		border-radius: 8px;
 		font-weight: 400;
-		font-size: 8px;
+		font-size: 11px;
 		color: #029D88;
 	}
 	.header-bottom-foot-title{
@@ -970,8 +974,8 @@
 		line-height: 22px;
 		text-align: left;
 		font-weight: 600;
-		font-size: 23rpx;
-		color: #08A28A;
+		font-size: 30rpx;
+		color: #029d88;
 	}
 	.header-bottom-foot{
 		width: 100%;
@@ -980,7 +984,6 @@
 		align-items: center;
 	}
 	.header-bottom-money-jia{
-		font-weight: bold;
 		font-size: 28rpx;
 		color: #848484;
 		line-height: 37rpx;
@@ -994,7 +997,7 @@
 		font-size: 25rpx;
 	}
 	.header-bottom-money-zhen span:nth-child(2){
-		font-size:36.81rpx;
+		font-size:40rpx;
 		font-weight: bold;
 	}
 	.header-bottom-money-zhen span:nth-child(3){
@@ -1011,7 +1014,7 @@
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
-		margin-top:5px;
+		margin-top:8px;
 	}
 	.header-bottom-money{
 		width: 100%;
@@ -1021,7 +1024,7 @@
 	}
 	.header-bottom-title-num span{
 		font-weight: bold;
-		font-size: 25rpx;
+		font-size: 30rpx;
 	}
 	.header-bottom-title-num span:nth-child(1){
 		color: #08A28A;
@@ -1050,7 +1053,7 @@
 	.header-bottom{
 		width: 100%;
 		background-color: #fff;
-		padding: 15px;
+		padding: 15px 20px;
 		display: flex;
 		flex-direction: column;
 	}
diff --git a/pages/order/index.vue b/pages/order/index.vue
index ee49c15..c46c45e 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -19,16 +19,17 @@
 					</image>
 					<view class="margin-left-xs ">{{item.artificerName}}</view>
 				</view>
-				<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 ==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 ==9"><span>202312061140172215</span><span>待确认</span></view>
-				<view class="text-green" v-if="item.status ==10"><span>202312061140172215</span><span>待补单</span></view>
+				<view class="text-green" v-if="item.status ==1"><span>{{item.ordersNo}}</span><span>待付款</span></view>
+				<view class="text-green" v-if="item.status ==2"><span>{{item.ordersNo}}</span><span>待服务</span></view>
+				<view class="text-green" v-if="item.status ==3"><span>{{item.ordersNo}}</span><span>待评价</span></view>
+				<view class="text-green" v-if="item.status ==4" style="color: #333333;"><span>{{item.ordersNo}}</span><span>已取消</span></view>
+				<view class="text-green" v-if="item.status ==5"><span>{{item.ordersNo}}</span><span>已完成</span></view>
+				<view class="text-green" v-if="item.status ==6"><span>{{item.ordersNo}}</span><span>服务中</span></view>
+				<view class="text-green" v-if="item.status ==7"><span>{{item.ordersNo}}</span><span>技师出发</span></view>
+				<view class="text-green" v-if="item.status ==8"><span>{{item.ordersNo}}</span><span>技师到达</span></view>
+				<view class="text-green" v-if="item.status ==9"><span>{{item.ordersNo}}</span><span>待确认</span></view>
+				<view class="text-green" v-if="item.status ==10"><span>{{item.ordersNo}}</span><span>待补单</span></view>
+				<view class="text-green" v-if="item.status == 11"><span>{{item.ordersNo}}</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>
@@ -63,23 +64,23 @@
 						<view class="gengduo" @click.stop="gengBtn(index)" v-show="item.status ==6||item.status ==1">更多</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">
+								@click="goNav('/my/order/payModifyDd?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==null" :custom-style="customStyle1" shape="circle" :plain="true"
+							<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.btnShow == 'true'&&item.status==2||item.status==6||item.status==7||item.status==8||item.status == 9&&item.refusalContent==null" :custom-style="customStyle1" shape="circle" :plain="true"
+							<u-button v-if="item.btnShow == 'true'&&item.status==2||item.status==6||item.status==7||item.status==8||item.status == 9&&!item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true"
 								@click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item)" class="btns">
 								修改订单
 							</u-button>
@@ -313,7 +314,7 @@
 		},
 		methods: {
 			goNav(url,item) {
-				this.$queue.setData('daibudan',item);
+				this.$queue.setData('xiangmu',item);
 				uni.navigateTo({
 					url:url
 				})
@@ -344,6 +345,7 @@
 						uni.showToast({
 							title:'操作完成！'
 						})
+						this.getOrderList()
 							this.$refs.popupQ.close(typeTxte);
 					}else{
 						uni.showToast({
@@ -387,6 +389,7 @@
 								uni.showToast({
 									title:'操作完成！'
 								})
+								that.getOrderList()
 								that.$refs.popup.close(type);
 							}else{
 								console.log('shibai：' + longitude);
diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue
index 7abcd68..f8bc292 100644
--- a/pages/therapist/therapist.vue
+++ b/pages/therapist/therapist.vue
@@ -1221,10 +1221,10 @@ import permision from "@/components/permission.js";
 			this.page = this.page + 1;
 			this.getlist()
 		},
-		// onPullDownRefresh: function() {
-		// 	this.page = 1;
-		// 	this.getlist()
-		// },
+		onPullDownRefresh: function() {
+			this.page = 1;
+			this.getlist()
+		},
 	}
 </script>
 
@@ -1517,7 +1517,7 @@ import permision from "@/components/permission.js";
 		background-position: center center;
 		background-repeat: no-repeat;
 		background-size: cover;
-		overflow: auto;
+		// overflow: auto;
 	}
 	/deep/.u-content{
 		border-radius: 30px !important;
diff --git a/pages/therapist/therapistDingdan.vue b/pages/therapist/therapistDingdan.vue
index c1abe83..3883fec 100644
--- a/pages/therapist/therapistDingdan.vue
+++ b/pages/therapist/therapistDingdan.vue
@@ -1524,7 +1524,7 @@
 		background-position: center center;
 		background-repeat: no-repeat;
 		background-size: cover;
-		overflow: auto;
+		// overflow: auto;
 	}
 	/deep/.u-content{
 		border-radius: 30px !important;
diff --git a/uni_modules/uni-number-box/changelog.md b/uni_modules/uni-number-box/changelog.md
new file mode 100644
index 0000000..adf9221
--- /dev/null
+++ b/uni_modules/uni-number-box/changelog.md
@@ -0,0 +1,39 @@
+## 1.2.8（2024-04-26）
+- 修复 在vue2下H5黑边的bug
+## 1.2.7（2024-04-26）
+- 修复 在vue2手动输入后失焦导致清空数值的严重bug
+## 1.2.6（2024-02-22）
+- 新增 设置宽度属性width(单位：px)
+## 1.2.5（2024-02-21）
+- 修复 step步长小于1时，键盘类型为number的bug
+## 1.2.4（2024-02-02）
+- 修复 加减号垂直位置偏移样式问题
+## 1.2.3（2023-05-23）
+- 更新示例工程
+## 1.2.2（2023-05-08）
+- 修复 change 事件执行顺序错误的问题
+## 1.2.1（2021-11-22）
+- 修复 vue3中某些scss变量无法找到的问题
+## 1.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-number-box](https://uniapp.dcloud.io/component/uniui/uni-number-box)
+## 1.1.2（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 1.1.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-05-12）
+- 新增 组件示例地址
+## 1.0.6（2021-04-20）
+- 修复 uni-number-box 浮点数运算不精确的 bug
+- 修复 uni-number-box change 事件触发不正确的 bug
+- 新增 uni-number-box v-model 双向绑定
+## 1.0.5（2021-02-05）
+- 调整为uni_modules目录规范
+
+## 1.0.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持 v-model
+- 新增 支持 focus、blur 事件
+- 新增 支持 PC 端
diff --git a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
new file mode 100644
index 0000000..4e203cc
--- /dev/null
+++ b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
@@ -0,0 +1,232 @@
+<template>
+	<view class="uni-numbox">
+		<view @click="_calcValue('minus')" class="uni-numbox__minus uni-numbox-btns" :style="{background}">
+			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue <= min || disabled }"
+				:style="{color}">-</text>
+		</view>
+		<input :disabled="disabled" @focus="_onFocus" @blur="_onBlur" class="uni-numbox__value"
+			:type="step<1?'digit':'number'" v-model="inputValue" :style="{background, color, width:widthWithPx}" />
+		<view @click="_calcValue('plus')" class="uni-numbox__plus uni-numbox-btns" :style="{background}">
+			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue >= max || disabled }"
+				:style="{color}">+</text>
+		</view>
+	</view>
+</template>
+<script>
+	/**
+	 * NumberBox 数字输入框
+	 * @description 带加减按钮的数字输入框
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=31
+	 * @property {Number} value 输入框当前值
+	 * @property {Number} min 最小值
+	 * @property {Number} max 最大值
+	 * @property {Number} step 每次点击改变的间隔大小
+	 * @property {String} background 背景色
+	 * @property {String} color 字体颜色（前景色）
+	 * @property {Number} width 输入框宽度(单位:px)
+	 * @property {Boolean} disabled = [true|false] 是否为禁用状态
+	 * @event {Function} change 输入框值改变时触发的事件，参数为输入框当前的 value
+	 * @event {Function} focus 输入框聚焦时触发的事件，参数为 event 对象
+	 * @event {Function} blur 输入框失焦时触发的事件，参数为 event 对象
+	 */
+
+	export default {
+		name: "UniNumberBox",
+		emits: ['change', 'input', 'update:modelValue', 'blur', 'focus'],
+		props: {
+			value: {
+				type: [Number, String],
+				default: 1
+			},
+			modelValue: {
+				type: [Number, String],
+				default: 1
+			},
+			min: {
+				type: Number,
+				default: 0
+			},
+			max: {
+				type: Number,
+				default: 100
+			},
+			step: {
+				type: Number,
+				default: 1
+			},
+			background: {
+				type: String,
+				default: '#f5f5f5'
+			},
+			color: {
+				type: String,
+				default: '#333'
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			width: {
+				type: Number,
+				default: 40,
+			}
+		},
+		data() {
+			return {
+				inputValue: 0
+			};
+		},
+		watch: {
+			value(val) {
+				this.inputValue = +val;
+			},
+			modelValue(val) {
+				this.inputValue = +val;
+			}
+		},
+		computed: {
+			widthWithPx() {
+				return this.width + 'px';
+			}
+		},
+		created() {
+			if (this.value === 1) {
+				this.inputValue = +this.modelValue;
+			}
+			if (this.modelValue === 1) {
+				this.inputValue = +this.value;
+			}
+		},
+		methods: {
+			_calcValue(type) {
+				if (this.disabled) {
+					return;
+				}
+				const scale = this._getDecimalScale();
+				let value = this.inputValue * scale;
+				let step = this.step * scale;
+				if (type === "minus") {
+					value -= step;
+					if (value < (this.min * scale)) {
+						return;
+					}
+					if (value > (this.max * scale)) {
+						value = this.max * scale
+					}
+				}
+
+				if (type === "plus") {
+					value += step;
+					if (value > (this.max * scale)) {
+						return;
+					}
+					if (value < (this.min * scale)) {
+						value = this.min * scale
+					}
+				}
+
+				this.inputValue = (value / scale).toFixed(String(scale).length - 1);
+				// TODO vue2 兼容
+				this.$emit("input", +this.inputValue);
+				// TODO vue3 兼容
+				this.$emit("update:modelValue", +this.inputValue);
+				this.$emit("change", +this.inputValue);
+			},
+			_getDecimalScale() {
+
+				let scale = 1;
+				// 浮点型
+				if (~~this.step !== this.step) {
+					scale = Math.pow(10, String(this.step).split(".")[1].length);
+				}
+				return scale;
+			},
+			_onBlur(event) {
+				this.$emit('blur', event)
+				let value = event.detail.value;
+				if (isNaN(value)) {
+					this.inputValue = this.value;
+					return;
+				}
+				value = +value;
+				if (value > this.max) {
+					value = this.max;
+				} else if (value < this.min) {
+					value = this.min;
+				}
+				const scale = this._getDecimalScale();
+				this.inputValue = value.toFixed(String(scale).length - 1);
+				this.$emit("input", +this.inputValue);
+				this.$emit("update:modelValue", +this.inputValue);
+				this.$emit("change", +this.inputValue);
+			},
+			_onFocus(event) {
+				this.$emit('focus', event)
+			}
+		}
+	};
+</script>
+<style lang="scss">
+	$box-height: 26px;
+	$bg: #f5f5f5;
+	$br: 2px;
+	$color: #333;
+
+	.uni-numbox {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-numbox-btns {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 0 8px;
+		background-color: $bg;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-numbox__value {
+		margin: 0 2px;
+		background-color: $bg;
+		width: 40px;
+		height: $box-height;
+		text-align: center;
+		font-size: 14px;
+		border-width: 0;
+		color: $color;
+	}
+
+	.uni-numbox__minus {
+		border-top-left-radius: $br;
+		border-bottom-left-radius: $br;
+	}
+
+	.uni-numbox__plus {
+		border-top-right-radius: $br;
+		border-bottom-right-radius: $br;
+	}
+
+	.uni-numbox--text {
+		// fix nvue
+		line-height: 20px;
+		margin-bottom: 2px;
+		font-size: 20px;
+		font-weight: 300;
+		color: $color;
+	}
+
+	.uni-numbox .uni-numbox--disabled {
+		color: #c0c0c0 !important;
+		/* #ifdef H5 */
+		cursor: not-allowed;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-number-box/package.json b/uni_modules/uni-number-box/package.json
new file mode 100644
index 0000000..4ac9047
--- /dev/null
+++ b/uni_modules/uni-number-box/package.json
@@ -0,0 +1,83 @@
+{
+  "id": "uni-number-box",
+  "displayName": "uni-number-box 数字输入框",
+  "version": "1.2.8",
+  "description": "NumberBox 带加减按钮的数字输入框组件，用户可以控制每次点击增加的数值，支持小数。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "数字输入框"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-number-box/readme.md b/uni_modules/uni-number-box/readme.md
new file mode 100644
index 0000000..affc56f
--- /dev/null
+++ b/uni_modules/uni-number-box/readme.md
@@ -0,0 +1,13 @@
+
+
+## NumberBox 数字输入框
+> **组件名：uni-number-box**
+> 代码块： `uNumberBox`
+
+
+带加减按钮的数字输入框。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-number-box)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uview-ui/libs/request/index.js b/uview-ui/libs/request/index.js
index e0a53a7..5cc7341 100644
--- a/uview-ui/libs/request/index.js
+++ b/uview-ui/libs/request/index.js
@@ -102,8 +102,8 @@ class Request {
 	constructor() {
 		this.config = {
 			// baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换
-			// baseUrl: 'http://120.46.52.165/', // 请求的根域名	
-			baseUrl: 'http://192.168.2.222:8187/',
+			baseUrl: 'http://120.46.52.165/', // 请求的根域名	
+			// baseUrl: 'http://192.168.2.222:8187/',
 			// baseUrl: 'http://47.75.182.93:8090/',
 			// 默认的请求头
 			header: {},