From 2cf6f91820a9d8e8137efc8b5393ab36a7a67190 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Fri, 5 Jul 2024 23:39:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/order/pay.vue               |  182 ++-
 my/order/payCLDetail.vue       |  309 ++---
 my/order/payJaZ - 副本.vue     | 2372 ++++++++++++++++++++++++++++++++
 my/order/payJaZ.vue            |  290 +++-
 my/order/payShengji.vue        |  404 ++++--
 my/order/payding - 副本.vue    | 2139 ++++++++++++++++++++++++++++
 my/order/payding.vue           |  210 +--
 my/order/paydingTCX.vue        |   27 +-
 pages/my/cikarDrtail.vue       |    2 +-
 pages/my/cureOderDrtail.vue    |    2 +-
 pages/my/orderDetailsList.vue  |   56 +-
 pages/my/serviceOderDrtail.vue |   11 +-
 12 files changed, 5446 insertions(+), 558 deletions(-)
 create mode 100644 my/order/payJaZ - 副本.vue
 create mode 100644 my/order/payding - 副本.vue

diff --git a/my/order/pay.vue b/my/order/pay.vue
index ef9d87d..e2aff59 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -10,13 +10,15 @@
 					<view class="pay-title">服务项目</view>
 					<view class="flex justify-around">
 						<view class="" style="width: 160upx;height: 160upx;">
-							<image :src="order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.massageImg:order.ordersMassageList[0].userPackageDetail.massageImg"
-								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+							<image :src="order.ordersMassageList[0].massageType.massageImg"
+								v-if="order.userPackageDetailId==null" style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+								<image :src="order.ordersMassageList[0].userPackageDetail.massageImg"
+									v-else 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 u-skeleton-fillet head-title" style="font-size: 30rpx;">
-									{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.title:order.ordersMassageList[0].userPackageDetail.title}}
+									{{order.entryName}}
 								</view>
 								<view class="zhuangtai">
 									<view v-if="order.status ==1">待支付</view>
@@ -35,17 +37,17 @@
 								<view style="width: 100%;">
 									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
 										<view style="justify-content: space-between;">
-											{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.duration:order.ordersMassageList[0].userPackageDetail.duration}}分钟
+											{{order.duration}}分钟
 										</view>
 									</view>
 										
 									<view class="money-pay" style="justify-content: space-between;">
 										<view class="money-pay-zhen">
 											<span>￥</span>
-											<span>{{order.price}}</span>
+											<span>{{order.massagePrice}}</span>
 										</view>
 										<view>
-											<uni-number-box :disabled="true" :value="order.ordersMassageList[0].num" :width='27' :min="1" @change="changeValue" />
+											<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
 										</view>
 									</view>
 								</view>
@@ -101,7 +103,8 @@
 							</view>
 						</view>
 					</view>
-					<view class="list-pay">
+					<!-- 普通项目信息 -->
+					<view class="list-pay" v-if="order.userPackageDetailId==null">
 						<view class="justify-title-nav ">
 							<view class="justify-title">订单信息</view>
 							<view class="justify-title-nav-bor"></view>
@@ -122,18 +125,6 @@
 							<view class="add-con-title">下单时间</view>
 							<view class="add-con-cont">{{order.createTime}}</view>
 						</view>
-						<view class="flex justify-between add-lin" v-if="order.startTime">
-							<view class="add-con-title">开始服务时间</view>
-							<view class="add-con-cont">{{order.startTime}}</view>
-						</view>
-						<view class="flex justify-between add-lin" v-if="order.endTimes" >
-							<view class="add-con-title">结束服务时间</view>
-							<view class="add-con-cont">{{order.endTimes}}</view>
-						</view>
-						<view class="flex justify-between add-lin" v-if="order.endTime">
-							<view class="add-con-title">预估结束时间</view>
-							<view class="add-con-cont" >{{order.endTime}}</view>
-						</view>
 						<view class="jusitify-line-end"></view>
 						
 						<view class="justify-title-nav">
@@ -142,27 +133,31 @@
 						</view>
 						<view class="flex justify-between add-lin" >
 							<view class="add-con-title">项目名称</view>
-							<view class="add-con-cont" >{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.title:order.ordersMassageList[0].userPackageDetail.title}}</view>
+							<view class="add-con-cont">{{order.entryName}}</view>
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">服务时长</view>
-							<view class="add-con-cont" >{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.duration:order.ordersMassageList[0].userPackageDetail.duration}}分钟</view>
+							<view class="add-con-cont">{{order.duration}}分钟</view>
 						</view>
 						<view class="flex justify-between add-lin" >
 							<view class="add-con-title">项目价格</view>
-							<view class="add-con-cont" >￥{{order.price}}</view>
+							<view class="add-con-cont">￥{{order.massagePrice}}</view>
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">会员折扣</view>
 							<view class="add-con-cont" >{{order.vipRate}}%</view>
 						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">技师加成</view>
+							<view class="add-con-cont" >{{order.technicianRate}}%</view>
+						</view>
 						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;">
 							<view style="color: #333;font-size: 26rpx;">
 								小计：
 						    </view>
 							<view class="" style="color: #333;">
 								<text style="font-size: 35rpx;font-weight: bold;">
-									￥{{order.massageCouponMoney}}
+									￥{{order.massageMoney}}
 								</text>
 							</view>
 						</view>
@@ -184,7 +179,8 @@
 						</view>
 						<view class="flex justify-between add-lin" >
 							<view class="add-con-title">出行费用</view>
-							<view class="add-con-cont">￥{{order.taxiMoney}}</view>
+							<view class="add-con-cont" v-if="order.taxiMoney">￥{{order.taxiMoney}}</view>
+							<view class="add-con-cont" v-else>-</view>
 						</view>
 						<view class="jusitify-line-end add-lin"></view>
 						<view class="justify-title-nav">
@@ -203,12 +199,12 @@
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">订单费用：</view>
-							<view class="add-con-cont">￥<text style="font-size: 26rpx; font-weight: bold;">{{order.massageCouponMoney}}</text></view>
+							<view class="add-con-cont">￥<text style="font-size: 26rpx; font-weight: bold;">{{order.massageMoney}}</text></view>
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">出行费用：</view>
-							<view class="add-con-cont">￥<text
-									>{{order.taxiMoney}}</text></view>
+							<view class="add-con-cont" v-if="order.taxiMoney">￥<text>{{order.taxiMoney}}</text></view>
+							<view class="add-con-cont" v-else>-</view>
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">优惠券：</view>
@@ -221,7 +217,7 @@
 							<view class="add-con-title">合计：</view>
 							<view class="add-con-cont" style="color: #FF3939;font-size: 32rpx;">￥
 								<text style="font-size: 35rpx;font-weight: bold;">
-									{{order.payMoney}}
+									{{order.payMoneyTotal}}
 								</text>
 							</view>
 						</view>
@@ -230,6 +226,135 @@
 							<view class="prompt-text">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
 						</view>
 					</view>
+					
+					<!-- 套餐 次卡 疗程 信息 -->
+					<view class="list-pay" v-else>
+						<view class="justify-title-nav ">
+							<view class="justify-title">订单信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">订单编号</view>
+							<view class="flex add-con-cont" @tap="copy(order.ordersNo)">
+								<view class="">{{order.ordersNo}}</view>
+								<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon>
+							</view>
+						</view>
+						
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">预约时间</view>
+							<view class="add-con-cont" >{{order.serveTime}}</view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">下单时间</view>
+							<view class="add-con-cont">{{order.createTime}}</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						
+						<view class="justify-title-nav">
+							<view class="justify-title">订单费用</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between add-lin" >
+							<view class="add-con-title">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
+							<view class="add-con-cont">{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view>
+						</view>
+						<view class="flex justify-between add-lin" >
+							<view class="add-con-title">项目名称</view>
+							<view class="add-con-cont">{{order.entryName}}</view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">服务时长</view>
+							<view class="add-con-cont">{{order.duration}}分钟</view>
+						</view>
+						<view class="flex justify-between add-lin" >
+							<view class="add-con-title">项目价格</view>
+							<view class="add-con-cont">￥{{order.massagePrice}}</view>
+						</view>
+						<!-- <view class="flex justify-between add-lin">
+							<view class="add-con-title">会员折扣</view>
+							<view class="add-con-cont" >{{order.vipRate}}%</view>
+						</view> -->
+						<!-- <view class="flex justify-between add-lin">
+							<view class="add-con-title">技师加成</view>
+							<view class="add-con-cont" >{{order.technicianRate}}%</view>
+						</view> -->
+						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;">
+							<view style="color: #333;font-size: 26rpx;">
+								小计：
+						    </view>
+							<view class="" style="color: #333;">
+								<text style="font-size: 35rpx;font-weight: bold;">
+									￥{{order.massagePrice}}
+								</text>
+							</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						
+						<view class="justify-title-nav">
+							<view class="justify-title">出行费用</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.tripWay" >
+							<view class="add-con-title">出行方式</view>
+							<view class="add-con-cont" v-if="order.tripWay == 1">公交</view>
+							<view class="add-con-cont" v-if="order.tripWay == 2">出租</view>
+							<view class="add-con-cont" v-if="order.tripWay == 3">免费</view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.km">
+							<view class="add-con-title">全程距离</view>
+							<view class="add-con-cont">{{order.km}}km</view>
+						</view>
+						<view class="flex justify-between add-lin" >
+							<view class="add-con-title">出行费用</view>
+							<view class="add-con-cont" v-if="order.taxiMoney">￥{{order.taxiMoney}}</view>
+							<view class="add-con-cont" v-else>-</view>
+						</view>
+						<view class="jusitify-line-end add-lin"></view>
+						<view class="justify-title-nav">
+							<view class="justify-title">优惠券信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">优惠券</view>
+							<view class="add-con-cont" style="color: #F93731;font-size: 30rpx;font-weight: bold;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
+							<view class="" v-else>-</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view class="justify-title-nav">
+							<view class="justify-title">费用明细</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">订单费用：</view>
+							<view class="add-con-cont">￥<text style="font-size: 26rpx; font-weight: bold;">{{order.massageMoney}}</text></view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">出行费用：</view>
+							<view class="add-con-cont" v-if="order.taxiMoney">￥<text>{{order.taxiMoney}}</text></view>
+							<view class="add-con-cont" v-else>-</view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">优惠券：</view>
+							<view class="add-con-cont" style="color: #F93731;" v-if="order.couponMoney">
+								-￥<text style="font-weight: bold;">{{order.couponMoney}}</text></view>
+							<view class="" v-else>-</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view class="flex justify-between add-lin" >
+							<view class="add-con-title">合计：</view>
+							<view class="add-con-cont" style="color: #FF3939;font-size: 32rpx;">￥
+								<text style="font-size: 35rpx;font-weight: bold;">
+									{{order.payMoneyTotal}}
+								</text>
+							</view>
+						</view>
+						
+						<view class="flex justify-between" style="margin-top: 19rpx;">
+							<view class="prompt-text">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
+						</view>
+					</view>
+					
 				</view>
 			</view>
 			<view class="showBtn" v-if="order.status ==1">
@@ -1665,6 +1790,7 @@
 </script>
 
 <style lang="scss" scoped>
+	
 	/deep/.u-size-default{
 		width: 80px !important;
 	}
diff --git a/my/order/payCLDetail.vue b/my/order/payCLDetail.vue
index b57da3b..0dfa81e 100644
--- a/my/order/payCLDetail.vue
+++ b/my/order/payCLDetail.vue
@@ -7,15 +7,17 @@
 					<view class="pay-title" style="">服务项目</view>
 					<view class="flex justify-around">
 						<view class="" style="width: 160upx;height: 160upx;">
-							<image :src="order.ordersMassageList[0].userPackageDetail.massageImg"
+							<image v-if="order.ordersMassageList[0].massageType" :src="order.ordersMassageList[0].massageType.massageImg"
+								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+							<image v-else :src="order.ordersMassageList[0].userPackageDetail.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 u-skeleton-fillet head-title" style="font-size: 30rpx;">
-									{{order.ordersMassageList[0].userPackageDetail.title}}
+									{{order.entryName}}
 								</view>
-								<view class="zhuangtai">
+								<!-- <view class="zhuangtai">
 									<view v-if="order.status ==1">待支付</view>
 									<view v-if="order.status ==2">待服务</view>
 									<view v-if="order.status ==5">已完成</view>
@@ -26,20 +28,20 @@
 									<view v-if="order.status ==4">已取消</view>
 									<view v-if="order.status ==9">待确认</view>
 									<view v-if="order.status ==10">待补单</view>
-								</view>
+								</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;">
-											{{order.ordersMassageList[0].userPackageDetail.duration}}分钟
+											{{order.duration}}分钟
 										</view>
 									</view>
 										
 									<view class="money-pay" style="justify-content: space-between;">
 										<view class="money-pay-zhen">
 											<span>￥</span>
-											<span>{{order.ordersMassageList[0].userPackageDetail.packagePrice}}</span>
+											<span>{{order.massagePrice}}</span>
 										</view>
 										<view>
 											<!-- <uni-number-box :disabled="true" :value="order.ordersMassageList[0].num" :width='27' :min="1" @change="changeValue" /> -->
@@ -64,7 +66,7 @@
 								{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
 							</view>
 						</view>
-						<view class="serverAddress add-lin">
+						<view class="serverAddress add-lin" style="line-height: 15px;">
 							<view class="add-con-title">服务地址</view>
 							<view class="add-con-cont" style="width: 73%;">{{order.address}}</view>
 						</view>
@@ -98,7 +100,142 @@
 							</view>
 						</view>
 					</view>
-					<view class="list-pay">
+					<!-- 次卡 疗程 升级项目 -->
+					<view class="list-pay" v-if="order.ordersMassageList[0].userPackageDetail==null">
+						<view class="justify-title-nav">
+							<view class="justify-title">订单信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">订单编号</view>
+							<view class="flex add-con-cont" @tap="copy(order.ordersNo)">
+								<view class="">{{order.ordersNo}}</view>
+								<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon>
+							</view>
+						</view>
+						
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">预约时间</view>
+							<view class="add-con-cont" >{{order.serveTime}}</view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">下单时间</view>
+							<view class="add-con-cont">{{order.createTime}}</view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.startTime">
+							<view class="add-con-title">开始服务时间</view>
+							<view class="add-con-cont">{{order.startTime}}</view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.endTimes" >
+							<view class="add-con-title">结束服务时间</view>
+							<view class="add-con-cont">{{order.endTimes}}</view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.endTime">
+							<view class="add-con-title">预估结束时间</view>
+							<view class="add-con-cont" >{{order.endTime}}</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						
+						<view class="justify-title-nav">
+							<view class="justify-title">订单费用</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between" style="margin-top: 19rpx;">
+							<view class="add-con-title">{{order.packageType=='105'?'次卡':'疗程'}}名称</view>
+							<view class="add-con-cont" >{{order.oldOrdersMassageList[0].userPackageDetail.mainTitle}}</view>
+						</view>
+						<view class="flex justify-between" style="margin-top: 19rpx;">
+							<view class="add-con-title">项目名称</view>
+							<view class="add-con-cont" >{{order.ordersMassageList[0].massageType.title}}</view>
+						</view>
+						<view class="flex justify-between" style="margin-top: 19rpx;">
+							<view class="add-con-title">服务时长</view>
+							<view class="add-con-cont" >{{order.ordersMassageList[0].massageType.duration}}分钟</view>
+						</view>
+						<view class="flex justify-between" style="margin-top: 19rpx;">
+							<view class="add-con-title">项目价格</view>
+							<view class="add-con-cont" >￥{{order.oldMassagePrice}}</view>
+						</view>
+						<view class="flex justify-between" style="margin-top: 19rpx;">
+							<view class="add-con-title">会员折扣</view>
+							<view class="add-con-cont" >{{order.vipRate}}%</view>
+						</view>
+						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;">
+							<view style="color: #333;font-size: 26rpx;">
+								小计：
+						    </view>
+							<view class="" style="color: #333;">
+								<text style="font-size: 35rpx;font-weight: bold;">
+									￥{{order.oldMassageMoney}}
+								</text>
+							</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						
+						<view class="justify-title-nav">
+							<view class="justify-title">出行费用</view>
+							<view class="justify-title-nav-bor"></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" style="margin-top: 19rpx;padding-bottom:5px ;margin-bottom: 5px;">
+							<view style="color: #999;font-size: 26rpx;">出行费用</view>
+							<view class="" style="color: #333;font-size: 26rpx;">￥{{order.taxiMoney}}</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view class="justify-title-nav">
+							<view class="justify-title">优惠券信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between" style="margin-top: 19rpx;padding-bottom:5px ;margin: 5px 0px;">
+							<view style="color: #999;font-size: 26rpx;">优惠券</view>
+							<view class="" style="color: #F93731;font-size: 26rpx;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
+							<view class="" v-else>-</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view class="justify-title-nav">
+							<view class="justify-title">费用明细</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex align-center margin-top-lg justify-between">
+							<view style="color: #333;font-size: 26rpx;">订单费用：</view>
+							<view class="" style="color: #333;">￥<text
+									style="font-size: 26rpx;font-weight: bold;">{{order.ordersMassageList[0].massageType.packagePrice}}</text></view>
+						</view>
+						<view class="flex align-center margin-top-lg justify-between">
+							<view style="color: #333;font-size: 26rpx;">出行费用：</view>
+							<view class="" style="color: #333;">￥<text
+									style="font-size: 26rpx;font-weight: bold;">{{order.taxiMoney}}</text></view>
+						</view>
+						<view class="flex align-center margin-top-lg justify-between">
+							<view style="color: #333;font-size: 26rpx;">优惠券：</view>
+							<view class="" style="color: #F93731;" v-if="order.couponMoney">
+								-￥<text style="font-size: 26rpx;font-weight: bold;">{{order.couponMoney}}</text></view>
+							<view class="" v-else>-</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: #333;">￥
+								<text style="font-size: 35rpx;font-weight: bold;">
+									{{order.payMoney}}
+								</text>
+							</view>
+						</view>
+						
+						<view class="flex justify-between" style="margin-top: 19rpx;">
+							<view class="prompt-text">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
+						</view>
+					</view>
+					<!-- 次卡 疗程 项目 -->
+					<view class="list-pay" v-else>
 						<view class="justify-title-nav">
 							<view class="justify-title">订单信息</view>
 							<view class="justify-title-nav-bor"></view>
@@ -231,165 +368,17 @@
 							<view class="prompt-text">温馨提示：费用随会员等级及技师等级不同而上下浮动</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>￥268</span>
-						</view>
-						<view class="fei-view-list">
-							<span>出行费用</span>
-							<span>￥{{order.taxiMoney}}</span>
-						</view>
-						<view class="fei-view-list">
-							<span>优惠券</span>
-							<span style="color: #FF3939;">-￥2</span>
-						</view>
-						<view class="fei-view-list-z">
-							<span>总金额</span>
-							<span style="color: #FF3939;font-size: 29rpx;">￥286</span>
-						</view>
-					</view>
-				</view> -->
 			</view>
 
 
-			<!-- <view class="bg padding radius margin-top-sm">
-				<view class="text-lg text-bold">
-					服务信息
-				</view>
-				<view class="margin-right-xs">
-					<view class="flex justify-between margin-top-lg">
-						<view style="width: 170rpx;">服务时间</view>
-						<view class="">
-							<text>{{order.serveTime}}</text>
-						</view>
-					</view>
-					<view class="flex justify-between margin-top-lg">
-						<view style="width: 170rpx;">服务地点</view>
-						<view class="flex" @tap="bindGps(order.latitude,order.longitude,order.address)">
-							<view class="">
-								{{order.address}}
-								<image src="../../static/images/address.png" style="width: 13px;height: 15px;"></image>
-							</view>
-						</view>
-					</view>
-
-					<view class="flex justify-between margin-top-lg">
-						<view style="width: 170rpx;">联系方式</view>
-						<view class="" @click="bindphone(order.phone)">
-							{{order.phone}}
-							<image src="../../static/images/phone.png" style="width: 15px;height: 15px;"></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 v-if="order.status !=6" class="flex tabber padding-top-sm padding-bottom-sm align-center">
-				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
-					v-if="order.status != 3 && 
-						order.status != 4 && 
-						order.status != 5&& 
-						order.status != 10"
-						>
-					取消订单
-				</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 v-if="order.status == 6|| order.status == 3" :custom-style="customStyle2"
-					shape="circle" :plain="true"
-					@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
-					class="dingshi">
-					去投诉
-				</u-button>
-				<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"
-					@click="goNav('/my/order/payModifyDd?ordersId='+order.ordersId,order)"
-					class="dingshi">
-					立即预约
-				</u-button>
-				<u-button 
-					v-if="order.btnShow == 'true'&&order.oldOrdersId==null&&(order.status==1||order.status==2||order.status==7||order.status==8)&&!order.refusalContent"
-					:custom-style="customStyle2"
-					shape="circle" :plain="true"
-					@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
-					class="dingshi">
-					修改订单
-				</u-button>
-				<u-button v-if="order.status == 3" :custom-style="customStyle2" shape="circle" :plain="true"
-					@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
-					class="dingshi">
-					去评价
-				</u-button>
+			
+			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
 					class="dingshi">联系客服</u-button>
 			</view>
-			<view v-else class="flex tabber padding-top-sm padding-bottom-sm align-center">
-				<view class="showBtn-mian">
-					<view class="showBtn">
-						<view class="gengduo" @click.stop="gengBtn">更多</view>
-						<view class="show-btn-lin">
-							<u-button shape="circle" :plain="true" @click="goChat"
-								class="btns">联系客服</u-button>
-							<u-button
-								 v-if="order.status == 6"
-								shape="circle" :plain="true"
-								@click="toggle('center',order)"
-								class="btns">
-								提前结束
-							</u-button>
-							<u-button
-								v-if="order.status == 6"
-								shape="circle" :plain="true"
-								@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
-								class="btns">
-								充值
-							</u-button>
-							<u-button
-								v-if="order.btnShow == 'true'&&order.oldOrdersId==null&&(order.status==1||order.status==2||order.status==7||order.status==8)&&!order.refusalContent" :custom-style="customStyle1"
-								shape="circle" :plain="true"
-								@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order)"
-								class="btns">
-								修改订单
-							</u-button>
-						</view>
-					</view>
-					<view class="showBtn-view" v-show="btnShow">
-						
-						<u-button
-							 v-if="order.addNum ==null && order.status == 6"
-							shape="circle" :plain="true"
-							@tap="saveJZ(order.ordersMassageList[0].userPackageDetail.userPackageDetailId)"
-							class="btns">
-							加钟
-						</u-button>
-						<u-button  v-if="order.oldOrdersId==null && order.status == 6&&order.addNum==null"
-							shape="circle" :plain="true"
-							@tap="saveJZS(order.artificerId)"
-							class="btns">
-							服务升级
-						</u-button>
-					</view>
-				</view>
-				
-			</view>
+			
 		</view>
 		<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
 		<!--  加钟-->
diff --git a/my/order/payJaZ - 副本.vue b/my/order/payJaZ - 副本.vue
new file mode 100644
index 0000000..813a29a
--- /dev/null
+++ b/my/order/payJaZ - 副本.vue	
@@ -0,0 +1,2372 @@
+<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 v-if="order.userPackageDetailId==null" :src="order.ordersMassageList[0].massageType.massageImg"
+								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+							<image v-else :src="order.ordersMassageList[0].userPackageDetail.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.entryName}}
+								</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 style="width: 100%;">
+									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
+										<view style="justify-content: space-between;">
+											{{order.duration}}分钟
+										</view>
+									</view>
+									<view class="money-pay" style="justify-content: space-between;">
+										<view class="money-pay-zhen">
+											<span>￥</span>
+											<span>{{order.massagePrice}}</span>
+										</view>
+										<view>
+											<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
+										</view>
+									</view>
+								</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 jusitify-line">
+							<view class="line-word">客户姓名</view>
+							<view class="line-word-r">
+								{{order.userName}}
+							</view>
+						</view>
+						<view class="flex align-center jusitify-line">
+							<view class="line-word">联系方式</view>
+							<view class="line-word-r">
+								{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
+							</view>
+						</view>
+						<view class="serverAddress jusitify-line">
+							<view class="line-word">服务地址</view>
+							<view class="line-word-r" style="width: 73%; text-align: right;">{{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">
+									<span>{{order.artificer.artificerName}}</span>
+								</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 class="level_button">{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</view>
+							</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" v-if="order.userPackageDetailId==null">
+						<view class="justify-title-nav">
+							<view class="justify-title">订单信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">订单编号</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="jusitify-line">
+							<view class="line-word">预约时间</view>
+							<view class="line-word-r">{{order.serveTime}}</view>
+						</view>
+						<view class="jusitify-line">
+							<view  class="line-word">下单时间</view>
+							<view  class="flex line-word-r">{{order.createTime}}</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view class="justify-title-nav">
+							<view class="justify-title">订单费用</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">项目名称</view>
+							<view class="line-word-r" v-if="order.oldEntryName==null">{{order.entryName}}</view>
+							<view class="line-word-r" v-else>{{order.oldEntryName}}</view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">服务时长</view>
+							<view class="line-word-r" v-if="order.oldMassageDuration==null">{{order.duration}}分钟</view>
+							<view class="line-word-r" v-else>{{order.oldMassageDuration}}分钟</view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">项目价格</view>
+							<view class="line-word-r" v-if="order.oldMassagePrice==null">￥{{order.massagePrice}}</view>
+							<view class="line-word-r" v-else>￥{{order.oldMassagePrice}}</view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">会员折扣</view>
+							<view class="line-word-r">{{order.vipRate}}%</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view style="color: #999;font-size: 26rpx;">技师加成</view>
+							<view class="line-word-r">{{order.technicianRate}}%</view>
+						</view>
+						<view class="jusitify-line">
+							<view style="color: #333;font-size: 26rpx;">
+								小计：
+						    </view>
+							<view class="" style="color: #333;">
+									<text v-if="order.oldMassageMoney==null" style="font-size: 35rpx;font-weight: bold;">
+										￥{{order.massageMoney}}
+									</text>
+									<text v-else style="font-size: 35rpx;font-weight: bold;">
+										￥{{order.oldMassageMoney}}
+									</text>
+							</view>
+						</view>
+						
+						<view class="jusitify-line-end"></view>
+						
+						<view class="justify-title-nav">
+							<view class="justify-title">出行费用</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="jusitify-line" v-if="order.tripWay" >
+							<view class="line-word">出行方式</view>
+							<view class="line-word-r" v-if="order.tripWay == 1">公交</view>
+							<view class="line-word-r" v-if="order.tripWay == 2">出租</view>
+							<view class="line-word-r" v-if="order.tripWay == 3">免费</view>
+						</view>
+						<view class="jusitify-line" v-if="order.km">
+							<view class="line-word">全程距离</view>
+							<view class="line-word-r" >{{order.km}}km</view>
+						</view>
+						
+						<view class="jusitify-line">
+							<view class="line-word">出行费用</view>
+							<view class="line-word-r" v-if="order.taxiMoney">￥{{order.taxiMoney}}</view>
+							<view class="line-word-r" v-else>-</view>
+						</view>
+						<view class="justify-title-nav">
+							<view class="justify-title">优惠券信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="jusitify-line" >
+							<view class="line-word">优惠券</view>
+							<view class="line-word" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
+							<view class="" v-else>-</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view>
+							<view class="justify-title-nav">
+								<view class="justify-title">加钟信息</view>
+								<view class="justify-title-nav-bor"></view>
+							</view>
+							<view class="jusitify-line" >
+								<view class="line-word">加钟项目</view>
+								<view class="line-word-r">{{order.addEntryName}}</view>
+							</view>
+							<view class="jusitify-line">
+								<view class="line-word">加钟价格</view>
+								<view class="line-word-r">￥{{order.addPrice}}</view>
+							</view>
+							<view class="jusitify-line">
+								<view class="line-word">加钟时长</view>
+								<view class="line-word-r">{{order.addTime}}分钟</view>
+							</view>
+							<view class="jusitify-line">
+								<view class="line-word">加钟次数</view>
+								<view class="line-word-r">{{order.addNum}}</view>
+							</view>
+							<view class="jusitify-line">
+								<view class="line-word">会员折扣</view>
+								<view class="line-word-r">{{order.vipRate}}%</view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view style="color: #999;font-size: 26rpx;">技师加成</view>
+								<view class="line-word-r">{{order.technicianRate}}%</view>
+							</view>
+							<view class="jusitify-line">
+								<view style="color: #333;font-size: 26rpx;">小计：</view>
+								<view class="" style="color: #333;">￥<text
+										style="font-size: 35rpx;font-weight: bold;">{{order.addMoney}}</text></view>
+							</view>
+						</view>
+						
+						<view class="jusitify-line-end"></view>
+					
+						<view class="justify-title-nav">
+							<view class="justify-title">费用明细</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">订单费用：</view>
+							<view class="line-word-r" v-if="order.oldMassageMoney==null">￥<text
+									style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
+							<view class="line-word-r" v-else>￥<text
+									style="font-size: 26rpx;font-weight: bold;">{{order.oldMassageMoney}}</text></view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">出行费用：</view>
+							<view class="line-word-r" v-if="order.taxiMoney">￥<text>{{order.taxiMoney}}</text></view>
+							<view class="line-word-r" v-else>-</view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">优惠券：</view>
+							<view class="" style="color: #F93731;" v-if="order.couponMoney">
+								-￥<text style="font-size: 26rpx;font-weight: bold;">
+									{{order.couponMoney}}
+								</text>
+							</view>
+							<view class="" v-else>-</view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">加钟费用：</view>
+							<view class="" style="color: #333;" >
+								<text style="font-size: 26rpx;font-weight: bold;" v-if="order.addMoney">
+									￥{{order.addMoney}}
+								</text>
+								<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
+							</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="line-word-r">￥
+								<text style="font-size: 35rpx;font-weight: bold;">
+									{{order.payMoneyTotal}}
+								</text>
+							</view>
+						</view>
+						
+						<view class="flex justify-between" style="margin-top: 19rpx;">
+							<view class="prompt-text">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
+						</view>
+					</view>
+					<!-- 套餐 次卡 疗程 加钟信息 -->
+					<view class="list-pay" v-else>
+						<view class="justify-title-nav">
+							<view class="justify-title">订单信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">订单编号</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="jusitify-line">
+							<view class="line-word">预约时间</view>
+							<view class="line-word-r">{{order.serveTime}}</view>
+						</view>
+						<view class="jusitify-line">
+							<view  class="line-word">下单时间</view>
+							<view  class="flex line-word-r">{{order.createTime}}</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view class="justify-title-nav">
+							<view class="justify-title">订单费用</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
+							<view class="line-word-r">{{order.oldOrdersMassageList[0].userPackageDetail.mainTitle}}</view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">项目名称</view>
+							<view class="line-word-r" v-if="order.oldEntryName==null">{{order.entryName}}</view>
+							<view class="line-word-r" v-else>{{order.oldEntryName}}</view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">服务时长</view>
+							<view class="line-word-r" v-if="order.oldMassageDuration==null">{{order.duration}}分钟</view>
+							<view class="line-word-r" v-else>{{order.oldMassageDuration}}分钟</view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">项目价格</view>
+							<view class="line-word-r" v-if="order.oldMassagePrice==null">￥{{order.massagePrice}}</view>
+							<view class="line-word-r" v-else>￥{{order.oldMassagePrice}}</view>
+						</view>
+						<!-- <view class="jusitify-line">
+							<view class="line-word">会员折扣</view>
+							<view class="line-word-r">{{order.vipRate}}%</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view style="color: #999;font-size: 26rpx;">技师加成</view>
+							<view class="line-word-r">{{order.technicianRate}}%</view>
+						</view> -->
+						<view class="jusitify-line">
+							<view style="color: #333;font-size: 26rpx;">
+								小计：
+						    </view>
+							<view class="" style="color: #333;">
+									<text v-if="order.oldMassageMoney==null" style="font-size: 35rpx;font-weight: bold;">
+										￥{{order.massageMoney}}
+									</text>
+									<text v-else style="font-size: 35rpx;font-weight: bold;">
+										￥{{order.oldMassageMoney}}
+									</text>
+							</view>
+						</view>
+						
+						<view class="jusitify-line-end"></view>
+						
+						<view class="justify-title-nav">
+							<view class="justify-title">出行费用</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="jusitify-line" v-if="order.tripWay" >
+							<view class="line-word">出行方式</view>
+							<view class="line-word-r" v-if="order.tripWay == 1">公交</view>
+							<view class="line-word-r" v-if="order.tripWay == 2">出租</view>
+							<view class="line-word-r" v-if="order.tripWay == 3">免费</view>
+						</view>
+						<view class="jusitify-line" v-if="order.km">
+							<view class="line-word">全程距离</view>
+							<view class="line-word-r" >{{order.km}}km</view>
+						</view>
+						
+						<view class="jusitify-line">
+							<view class="line-word">出行费用</view>
+							<view class="line-word-r" v-if="order.taxiMoney">￥{{order.taxiMoney}}</view>
+							<view class="line-word-r" v-else>-</view>
+						</view>
+						<view class="justify-title-nav">
+							<view class="justify-title">优惠券信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="jusitify-line" >
+							<view class="line-word">优惠券</view>
+							<view class="line-word" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
+							<view class="" v-else>-</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view>
+							<view class="justify-title-nav">
+								<view class="justify-title">加钟信息</view>
+								<view class="justify-title-nav-bor"></view>
+							</view>
+							<view class="jusitify-line" >
+								<view class="line-word">加钟项目</view>
+								<view class="line-word-r">{{order.addEntryName}}</view>
+							</view>
+							<view class="jusitify-line">
+								<view class="line-word">加钟价格</view>
+								<view class="line-word-r">￥{{order.addPrice}}</view>
+							</view>
+							<view class="jusitify-line">
+								<view class="line-word">加钟时长</view>
+								<view class="line-word-r">{{order.addTime}}分钟</view>
+							</view>
+							<view class="jusitify-line">
+								<view class="line-word">加钟次数</view>
+								<view class="line-word-r">{{order.addNum}}</view>
+							</view>
+							<view class="jusitify-line">
+								<view class="line-word">会员折扣</view>
+								<view class="line-word-r">{{order.vipRate}}%</view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view style="color: #999;font-size: 26rpx;">技师加成</view>
+								<view class="line-word-r">{{order.technicianRate}}%</view>
+							</view>
+							<view class="jusitify-line">
+								<view style="color: #333;font-size: 26rpx;">小计：</view>
+								<view class="" style="color: #333;">￥<text
+										style="font-size: 35rpx;font-weight: bold;">{{order.addMoney}}</text></view>
+							</view>
+						</view>
+						
+						<view class="jusitify-line-end"></view>
+					
+						<view class="justify-title-nav">
+							<view class="justify-title">费用明细</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">订单费用：</view>
+							<view class="line-word-r" v-if="order.oldMassageMoney==null">￥<text
+									style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
+							<view class="line-word-r" v-else>￥<text
+									style="font-size: 26rpx;font-weight: bold;">{{order.oldMassageMoney}}</text></view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">出行费用：</view>
+							<view class="line-word-r" v-if="order.taxiMoney">￥<text>{{order.taxiMoney}}</text></view>
+							<view class="line-word-r" v-else>-</view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">优惠券：</view>
+							<view class="" style="color: #F93731;" v-if="order.couponMoney">
+								-￥<text style="font-size: 26rpx;font-weight: bold;">
+									{{order.couponMoney}}
+								</text>
+							</view>
+							<view class="" v-else>-</view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">加钟费用：</view>
+							<view class="" style="color: #333;" >
+								<text style="font-size: 26rpx;font-weight: bold;" v-if="order.addMoney">
+									￥{{order.addMoney}}
+								</text>
+								<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
+							</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="line-word-r">￥
+								<text style="font-size: 35rpx;font-weight: bold;">
+									{{order.payMoneyTotal}}
+								</text>
+							</view>
+						</view>
+						
+						<view class="flex justify-between" style="margin-top: 19rpx;">
+							<view class="prompt-text">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
+						</view>
+					</view>
+									
+				</view>
+			</view>
+			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
+				<view class="showBtn-mian">
+					<view class="showBtn">
+						<view class="gengduo" @click.stop="gengBtn">更多</view>
+						<u-button
+							shape="circle" :plain="true"
+							@click="toggle('center',order)"
+							class="btns">
+							提前结束
+						</u-button>
+						<u-button
+							 v-if="order.ordersMassageList[0].massageType"
+							shape="circle" :plain="true"
+							@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
+							class="btns">
+							加钟
+						</u-button>
+						<u-button
+							 v-if="order.ordersMassageList[0].userPackageDetail"
+							shape="circle" :plain="true"
+							@tap="saveJZ(order.ordersMassageList[0].userPackageDetail.massageTypeId)"
+							class="btns">
+							加钟
+						</u-button>
+						<u-button
+							shape="circle" :plain="true"
+							@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
+							class="btns">
+							充值
+						</u-button>
+					</view>
+					<view v-if="btnShow==true" class="showBtnClass">
+						<u-button :custom-style="customStyle2"
+							shape="circle" :plain="true"
+							@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
+							class="dingshi">
+							去投诉
+						</u-button>
+						<u-button :custom-style="customStyle2" shape="circle" :plain="true"
+							@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
+							class="dingshi">
+							去评价
+						</u-button>
+						<u-button shape="circle" :plain="true" @click="goChat"
+							class="btns">联系客服</u-button>
+					</view>
+				</view>
+				
+			</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="xiangmu" v-for="(item,index) in orderList" :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="goOrderJ(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="goOrderS(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:[],
+				tordersId:''
+			}
+		},
+		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,
+					artificerId:this.order.artificerId
+				}
+				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);
+					}
+			
+				})
+			},
+			goOrderJ(item) {//加钟 生成订单
+				let that = this
+				let data = {
+					parentId: that.order.ordersId,
+					artificerId: that.order.artificerId,
+					ordersMassageList: [{
+						massageId: item.massageTypeId,
+						num: 1,
+					}],
+					couponId: '',
+					userId: uni.getStorageSync('userId'),
+					addMassageTypeId:item.massageTypeId,
+					addEntryName:item.title
+				}
+				that.$Request.postJson("/app/artificer/insertOrders", data).then(res => {
+					that.showorder = false
+					if (res.code == 0) {
+						that.tordersId = res.data.ordersId;
+						that.tpayMoney = res.data.payMoney;
+						that.showpay = true;
+						that.paySel = 1;
+					} else {
+						that.$queue.showToast(res.msg)
+					}
+				
+				});
+			},
+			goOrderS(item) {//升级 生成订单
+				
+				let that = this
+				let data = {
+				  classifyId:item.classifyId,
+				  ordersId:that.order.ordersId,
+				  massageTypeId:that.order.massageTypeId,
+				  userPackageDetailId:that.order.userPackageDetailId,
+				  ordersMassageList:[
+				    {massageId: item.massageTypeId,num: 1},
+				  ],
+				}
+				that.$Request.postJson("/app/artificer/updateOrders", data).then(res => {
+					that.showorder = false
+					if (res.code == 0) {
+						that.tordersId = res.data.ordersId;
+						that.ordersId = res.data.ordersId;
+						that.tpayMoney = res.data.payMoney;
+						that.showpay = true;
+						that.paySel = 1;
+					} else {
+						that.$queue.showToast(res.msg)
+					}
+							
+				});
+			},
+			// 支付订单
+			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.tordersId,
+								}).then(res => {
+									uni.hideLoading();
+									if (res.code == 0) {
+										uni.showToast({
+											title: '支付成功'
+										})
+										that.getOrder()
+										that.showorderS=false;
+										uni.switchTab({
+											url:'/pages/order/index'
+										})
+									} 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
+				}
+			},
+			
+			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;
+				if(that.earlyFinishReason){
+					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);
+									uni.switchTab({
+										url:'/pages/order/index'
+									})
+								}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
+							}
+					});
+				}else{
+					uni.showToast({
+						icon:'error',
+						title:'请输入提前结束原因！'
+					})
+				}
+				
+				
+			},
+			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('复制成功');
+					}
+				});
+			},
+			
+			payJZ() {
+				let that = this;
+				if (that.openWay == 1) { //零钱支付
+				console.log('1111')
+					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.tordersId,
+								}).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('xiangmu',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
+			},
+			
+			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>
+	.showBtnClass{
+		position: absolute;
+		background: #f7f7f7;
+		display: flex;
+		flex-direction: column;
+		width: 100px;
+		left: 0;
+		margin-bottom: 50px;
+		margin-left: 20px;
+	}
+	.dingshi,.btns{
+		width: 0px !important;
+		padding: 0px 42px !important;
+	}
+	/deep/.padding-bottom{
+		padding-bottom: 50px;
+	}
+	
+	/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{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.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: 0px 29rpx;
+	}
+	.pay-ding-top{
+		width: 100%;
+		height: 100rpx;
+		background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #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: 550;
+		font-size: 30rpx;
+		color: #333333;
+	}
+	.d-touxiang{
+		width: 55rpx;
+		height: 55rpx;
+		border-radius: 50%;
+		border: 1px solid #f2fffd;
+	}
+	.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: 32rpx;
+		color: #333333;
+		margin-bottom: 12px;
+	}
+	.page {
+		background: #f7f7f7;
+	}
+	.jusitify-line{
+		height: 78rpx;
+		padding: 20rpx 0;
+		font-size: 30rpx;
+		display: flex;
+		justify-content: space-between;
+	}
+	.jusitify-line-end{
+		height:1px;
+		border-bottom: 1px #e5e5e5 solid;
+		margin: 30rpx 0;
+	}
+	.line-word{
+		color: #999;
+	}
+	.line-word-r{
+		color: #333;
+	}
+	.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;
+	}
+	.level_button{
+		background: #019C88;
+		border-radius: 20rpx 8rpx 20rpx 8rpx;
+		padding: 10rpx 20rpx;
+		color: #fff;
+		font-size: 12px;
+	}
+	.justify-title-nav{
+		width: 90%;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+		margin: 10px 0;
+	}
+	.justify-title{
+		font-weight: bold;
+		font-size: 16px;
+		color: #333;
+		}
+	.justify-title-nav-bor{
+		width: 64px;
+		height: 5px;
+		border-radius: 3px;
+		position: absolute;
+		bottom: 0;
+		background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7));
+	}
+</style>
\ No newline at end of file
diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue
index f409c2d..97c82a1 100644
--- a/my/order/payJaZ.vue
+++ b/my/order/payJaZ.vue
@@ -10,13 +10,15 @@
 					<view class="pay-title" style="">服务项目</view>
 					<view class="flex justify-around">
 						<view class="" style="width: 160upx;height: 160upx;">
-							<image :src="order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.massageImg:order.ordersMassageList[0].userPackageDetail.massageImg"
+							<image v-if="order.userPackageDetailId==null" :src="order.ordersMassageList[0].massageType.massageImg"
+								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+							<image v-else :src="order.ordersMassageList[0].userPackageDetail.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?order.ordersMassageList[0].massageType.title:order.ordersMassageList[0].userPackageDetail.title}}
+									{{order.entryName}}
 								</view>
 								<view class="zhuangtai">
 									<view v-if="order.status ==1">待支付</view>
@@ -35,18 +37,16 @@
 								<view style="width: 100%;">
 									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
 										<view style="justify-content: space-between;">
-											{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.duration:order.ordersMassageList[0].userPackageDetail.duration}}分钟
+											{{order.duration}}分钟
 										</view>
-										
 									</view>
-										
 									<view class="money-pay" style="justify-content: space-between;">
 										<view class="money-pay-zhen">
 											<span>￥</span>
 											<span>{{order.massagePrice}}</span>
 										</view>
 										<view>
-											<uni-number-box :disabled="true" :value="order.oldOrdersId==null?order.ordersMassageList[0].num:order.oldMassageNum" :width='27' :min="1" @change="changeValue" />
+											<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
 										</view>
 									</view>
 								</view>
@@ -102,7 +102,8 @@
 							</view>
 						</view>
 					</view>
-					<view class="list-pay">
+					<!-- 普通项目 加钟信息 -->
+					<view class="list-pay" v-if="order.userPackageDetailId==null">
 						<view class="justify-title-nav">
 							<view class="justify-title">订单信息</view>
 							<view class="justify-title-nav-bor"></view>
@@ -124,49 +125,45 @@
 							<view  class="line-word">下单时间</view>
 							<view  class="flex line-word-r">{{order.createTime}}</view>
 						</view>
-						<view class="jusitify-line" v-if="order.startTime">
-							<view class="line-word">开始服务时间</view>
-							<view class="flex line-word-r">{{order.startTime}}</view>
-						</view>
-						<view class="jusitify-line" v-if="order.endTimes" >
-							<view class="line-word">结束服务时间</view>
-							<view class="line-word-r">{{order.endTimes}}</view>
-						</view>
-						<view class="jusitify-line" v-if="order.endTime">
-							<view class="line-word">预估结束时间</view>
-							<view class="line-word-r">{{order.endTime}}</view>
-						</view>
-						
 						<view class="jusitify-line-end"></view>
-						
 						<view class="justify-title-nav">
 							<view class="justify-title">订单费用</view>
 							<view class="justify-title-nav-bor"></view>
 						</view>
 						<view class="jusitify-line">
 							<view class="line-word">项目名称</view>
-							<view class="line-word-r">{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.title:order.ordersMassageList[0].userPackageDetail.title}}</view>
+							<view class="line-word-r" v-if="order.oldEntryName==null">{{order.entryName}}</view>
+							<view class="line-word-r" v-else>{{order.oldEntryName}}</view>
 						</view>
 						<view class="jusitify-line">
 							<view class="line-word">服务时长</view>
-							<view class="line-word-r">{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.duration:order.ordersMassageList[0].userPackageDetail.duration}}分钟</view>
+							<view class="line-word-r" v-if="order.oldMassageDuration==null">{{order.duration}}分钟</view>
+							<view class="line-word-r" v-else>{{order.oldMassageDuration}}分钟</view>
 						</view>
 						<view class="jusitify-line">
 							<view class="line-word">项目价格</view>
-							<view class="line-word-r">￥{{order.massagePrice}}</view>
+							<view class="line-word-r" v-if="order.oldMassagePrice==null">￥{{order.massagePrice}}</view>
+							<view class="line-word-r" v-else>￥{{order.oldMassagePrice}}</view>
 						</view>
 						<view class="jusitify-line">
 							<view class="line-word">会员折扣</view>
 							<view class="line-word-r">{{order.vipRate}}%</view>
 						</view>
+						<view class="flex justify-between jusitify-line">
+							<view style="color: #999;font-size: 26rpx;">技师加成</view>
+							<view class="line-word-r">{{order.technicianRate}}%</view>
+						</view>
 						<view class="jusitify-line">
 							<view style="color: #333;font-size: 26rpx;">
 								小计：
 						    </view>
 							<view class="" style="color: #333;">
-								<text style="font-size: 35rpx;font-weight: bold;">
-									￥{{order.massageCouponMoney}}
-								</text>
+									<text v-if="order.oldMassageMoney==null" style="font-size: 35rpx;font-weight: bold;">
+										￥{{order.massageMoney}}
+									</text>
+									<text v-else style="font-size: 35rpx;font-weight: bold;">
+										￥{{order.oldMassageMoney}}
+									</text>
 							</view>
 						</view>
 						
@@ -187,9 +184,10 @@
 							<view class="line-word-r" >{{order.km}}km</view>
 						</view>
 						
-						<view class="jusitify-line" v-if="order.taxiMoney">
+						<view class="jusitify-line">
 							<view class="line-word">出行费用</view>
-							<view class="line-word-r">￥{{order.taxiMoney}}</view>
+							<view class="line-word-r" v-if="order.taxiMoney">￥{{order.taxiMoney}}</view>
+							<view class="line-word-r" v-else>-</view>
 						</view>
 						<view class="justify-title-nav">
 							<view class="justify-title">优惠券信息</view>
@@ -226,6 +224,10 @@
 								<view class="line-word">会员折扣</view>
 								<view class="line-word-r">{{order.vipRate}}%</view>
 							</view>
+							<view class="flex justify-between jusitify-line">
+								<view style="color: #999;font-size: 26rpx;">技师加成</view>
+								<view class="line-word-r">{{order.technicianRate}}%</view>
+							</view>
 							<view class="jusitify-line">
 								<view style="color: #333;font-size: 26rpx;">小计：</view>
 								<view class="" style="color: #333;">￥<text
@@ -241,38 +243,232 @@
 						</view>
 						<view class="jusitify-line">
 							<view class="line-word">订单费用：</view>
-							<view class="" style="color: #333;">￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{order.massageCouponMoney}}</text></view>
+							<view class="line-word-r" v-if="order.oldMassageMoney==null">￥<text
+									style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
+							<view class="line-word-r" v-else>￥<text
+									style="font-size: 26rpx;font-weight: bold;">{{order.oldMassageMoney}}</text></view>
 						</view>
 						<view class="jusitify-line">
 							<view class="line-word">出行费用：</view>
-							<view class="line-word-r">￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{order.taxiMoney}}</text></view>
+							<view class="line-word-r" v-if="order.taxiMoney">￥<text>{{order.taxiMoney}}</text></view>
+							<view class="line-word-r" v-else>-</view>
 						</view>
 						<view class="jusitify-line">
 							<view class="line-word">优惠券：</view>
-							<view class="line-word-r" style="color: #F93731;" v-if="order.couponMoney">
-								-￥<text style="font-size: 26rpx;font-weight: bold;">{{order.couponMoney}}</text></view>
+							<view class="" style="color: #F93731;" v-if="order.couponMoney">
+								-￥<text style="font-size: 26rpx;font-weight: bold;">
+									{{order.couponMoney}}
+								</text>
+							</view>
 							<view class="" v-else>-</view>
 						</view>
 						<view class="jusitify-line">
 							<view class="line-word">加钟费用：</view>
-							<view class="line-word-r">￥
-							<text style="font-size: 26rpx;font-weight: bold;">{{order.addMoney}}</text></view>
+							<view class="" style="color: #333;" >
+								<text style="font-size: 26rpx;font-weight: bold;" v-if="order.addMoney">
+									￥{{order.addMoney}}
+								</text>
+								<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
+							</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="line-word-r">￥<text
-									style="font-size: 35rpx;font-weight: bold;">
+							<view class="line-word-r">￥
+								<text style="font-size: 35rpx;font-weight: bold;">
 									{{order.payMoneyTotal}}
-								</text></view>
+								</text>
+							</view>
 						</view>
 						
-						<view class="flex justify-between" style="margin-top: 19rpx;">
-							<view class="prompt-text">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
-						</view>
+						<view class="be-remarks">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
 					</view>
+					<!-- 套餐 次卡 疗程 加钟信息 -->
+					<view class="list-pay" v-else>
+						<view class="justify-title-nav">
+							<view class="justify-title">订单信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">订单编号</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="jusitify-line">
+							<view class="line-word">预约时间</view>
+							<view class="line-word-r">{{order.serveTime}}</view>
+						</view>
+						<view class="jusitify-line">
+							<view  class="line-word">下单时间</view>
+							<view  class="flex line-word-r">{{order.createTime}}</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view class="justify-title-nav">
+							<view class="justify-title">订单费用</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
+							<view class="line-word-r">{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">项目名称</view>
+							<view class="line-word-r" v-if="order.oldEntryName==null">{{order.entryName}}</view>
+							<view class="line-word-r" v-else>{{order.oldEntryName}}</view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">服务时长</view>
+							<view class="line-word-r" v-if="order.oldMassageDuration==null">{{order.duration}}分钟</view>
+							<view class="line-word-r" v-else>{{order.oldMassageDuration}}分钟</view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">项目价格</view>
+							<view class="line-word-r" v-if="order.oldMassagePrice==null">￥{{order.massagePrice}}</view>
+							<view class="line-word-r" v-else>￥{{order.oldMassagePrice}}</view>
+						</view>
+						<!-- <view class="jusitify-line">
+							<view class="line-word">会员折扣</view>
+							<view class="line-word-r">{{order.vipRate}}%</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view style="color: #999;font-size: 26rpx;">技师加成</view>
+							<view class="line-word-r">{{order.technicianRate}}%</view>
+						</view> -->
+						<view class="jusitify-line">
+							<view style="color: #333;font-size: 26rpx;">
+								小计：
+						    </view>
+							<view class="" style="color: #333;">
+									<text v-if="order.oldMassageMoney==null" style="font-size: 35rpx;font-weight: bold;">
+										￥{{order.massageMoney}}
+									</text>
+									<text v-else style="font-size: 35rpx;font-weight: bold;">
+										￥{{order.oldMassageMoney}}
+									</text>
+							</view>
+						</view>
+						
+						<view class="jusitify-line-end"></view>
+						
+						<view class="justify-title-nav">
+							<view class="justify-title">出行费用</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="jusitify-line" v-if="order.tripWay" >
+							<view class="line-word">出行方式</view>
+							<view class="line-word-r" v-if="order.tripWay == 1">公交</view>
+							<view class="line-word-r" v-if="order.tripWay == 2">出租</view>
+							<view class="line-word-r" v-if="order.tripWay == 3">免费</view>
+						</view>
+						<view class="jusitify-line" v-if="order.km">
+							<view class="line-word">全程距离</view>
+							<view class="line-word-r" >{{order.km}}km</view>
+						</view>
+						
+						<view class="jusitify-line">
+							<view class="line-word">出行费用</view>
+							<view class="line-word-r" v-if="order.taxiMoney">￥{{order.taxiMoney}}</view>
+							<view class="line-word-r" v-else>-</view>
+						</view>
+						<view class="justify-title-nav">
+							<view class="justify-title">优惠券信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="jusitify-line" >
+							<view class="line-word">优惠券</view>
+							<view class="line-word" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
+							<view class="" v-else>-</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view>
+							<view class="justify-title-nav">
+								<view class="justify-title">加钟信息</view>
+								<view class="justify-title-nav-bor"></view>
+							</view>
+							<view class="jusitify-line" >
+								<view class="line-word">加钟项目</view>
+								<view class="line-word-r">{{order.addEntryName}}</view>
+							</view>
+							<view class="jusitify-line">
+								<view class="line-word">加钟价格</view>
+								<view class="line-word-r">￥{{order.addPrice}}</view>
+							</view>
+							<view class="jusitify-line">
+								<view class="line-word">加钟时长</view>
+								<view class="line-word-r">{{order.addTime}}分钟</view>
+							</view>
+							<view class="jusitify-line">
+								<view class="line-word">加钟次数</view>
+								<view class="line-word-r">{{order.addNum}}</view>
+							</view>
+							<view class="jusitify-line">
+								<view class="line-word">会员折扣</view>
+								<view class="line-word-r">{{order.vipRate}}%</view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view style="color: #999;font-size: 26rpx;">技师加成</view>
+								<view class="line-word-r">{{order.technicianRate}}%</view>
+							</view>
+							<view class="jusitify-line">
+								<view style="color: #333;font-size: 26rpx;">小计：</view>
+								<view class="" style="color: #333;">￥<text
+										style="font-size: 35rpx;font-weight: bold;">{{order.addMoney}}</text></view>
+							</view>
+						</view>
+						
+						<view class="jusitify-line-end"></view>
+					
+						<view class="justify-title-nav">
+							<view class="justify-title">费用明细</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">订单费用：</view>
+							<view class="line-word-r" v-if="order.oldMassageMoney==null">￥<text
+									style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
+							<view class="line-word-r" v-else>￥<text
+									style="font-size: 26rpx;font-weight: bold;">{{order.oldMassageMoney}}</text></view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">出行费用：</view>
+							<view class="line-word-r" v-if="order.taxiMoney">￥<text>{{order.taxiMoney}}</text></view>
+							<view class="line-word-r" v-else>-</view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">优惠券：</view>
+							<view class="" style="color: #F93731;" v-if="order.couponMoney">
+								-￥<text style="font-size: 26rpx;font-weight: bold;">
+									{{order.couponMoney}}
+								</text>
+							</view>
+							<view class="" v-else>-</view>
+						</view>
+						<view class="jusitify-line">
+							<view class="line-word">加钟费用：</view>
+							<view class="" style="color: #333;" >
+								<text style="font-size: 26rpx;font-weight: bold;" v-if="order.addMoney">
+									￥{{order.addMoney}}
+								</text>
+								<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
+							</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="line-word-r">￥
+								<text style="font-size: 35rpx;font-weight: bold;">
+									{{order.payMoneyTotal}}
+								</text>
+							</view>
+						</view>
+						
+						<view class="be-remarks">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
+					</view>
+									
 				</view>
 			</view>
 			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
@@ -1548,6 +1744,14 @@
 </script>
 
 <style lang="scss" scoped>
+	.be-remarks{
+		border: 1px dashed #FE912E;
+		padding: 10rpx 20rpx;
+		border-radius: 8rpx;
+		color: #fe912E;
+		font-size: 24rpx;
+		margin: 10px 0px;
+	}
 	.showBtnClass{
 		position: absolute;
 		background: #f7f7f7;
diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue
index 50facf8..c3a2098 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -10,13 +10,15 @@
 					<view class="pay-title" style="">服务项目</view>
 					<view class="flex justify-around">
 						<view class="" style="width: 160upx;height: 160upx;">
-							<image :src="order.oldOrdersMassageList[0].massageType?order.oldOrdersMassageList[0].massageType.massageImg:order.oldOrdersMassageList[0].userPackageDetail.massageImg"
+							<image v-if="order.userPackageDetailId==null" :src="order.ordersMassageList[0].massageType.massageImg"
+								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+							<image v-else :src="order.ordersMassageList[0].userPackageDetail.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 pay-word u-skeleton-fillet head-title">
-									{{order.oldEntryName}}
+									{{order.entryName}}
 								</view>
 								<view class="zhuangtai">
 									<view v-if="order.status ==1">待支付</view>
@@ -35,20 +37,17 @@
 								<view style="width: 100%;">
 									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
 										<view style="justify-content: space-between;">
-											{{order.oldMassageDuration}}分钟
-										</view>
-										<!-- <view style="justify-content: space-between;" v-else>
 											{{order.duration}}分钟
-										</view> -->
+										</view>
 									</view>
 										
 									<view class="money-pay" style="justify-content: space-between;">
 										<view class="money-pay-zhen">
 											<span>￥</span>
-											<span>{{order.oldMassagePrice}}</span>
+											<span>{{order.massagePrice}}</span>
 										</view>
 										<view>
-											<uni-number-box :disabled="true" :value="order.oldOrdersId==null?order.ordersMassageList[0].num:order.oldMassageNum" :width='27' :min="1" @change="changeValue" />
+											<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
 										</view>
 									</view>
 								</view>
@@ -104,7 +103,8 @@
 							</view>
 						</view>
 					</view>
-					<view class="list-pay">
+					<!-- 普通项目 升级 加钟 -->
+					<view class="list-pay" v-if="order.oldOrdersMassageList[0].userPackageDetail==null">
 						<view class="justify-title-nav">
 							<view class="justify-title">订单信息</view>
 							<view class="justify-title-nav-bor"></view>
@@ -125,18 +125,6 @@
 							<view  class="line-word">下单时间</view>
 							<view  class="line-word-r">{{order.createTime}}</view>
 						</view>
-						<view class="flex justify-between jusitify-line" v-if="order.startTime">
-							<view  class="line-word">开始服务时间</view>
-							<view class="line-word-r">{{order.startTime}}</view>
-						</view>
-						<view class="flex justify-between jusitify-line" v-if="order.endTimes">
-							<view  class="line-word">结束服务时间</view>
-							<view  class="line-word-r">{{order.endTimes}}</view>
-						</view>
-						<view class="flex justify-between jusitify-line" v-if="order.endTime" >
-							<view  class="line-word">预估结束时间</view>
-							<view class="line-word-r">{{order.endTime}}</view>
-						</view>
 						<view class="jusitify-line-end"></view>
 						<view class="justify-title-nav">
 							<view class="justify-title">订单费用</view>
@@ -144,31 +132,41 @@
 						</view>
 						<view class="flex justify-between jusitify-line">
 							<view class="line-word">项目名称</view>
-							<view class="line-word-r">{{order.oldEntryName}}</view>
+							<view class="line-word-r" v-if="order.oldEntryName==null">{{order.entryName}}</view>
+							<view class="line-word-r" v-else>{{order.oldEntryName}}</view>
 						</view>
 						<view class="flex justify-between jusitify-line">
 							<view style="color: #999;font-size: 26rpx;">服务时长</view>
-							<view class="line-word-r">{{order.oldMassageDuration}}分钟</view>
+							<view class="line-word-r" v-if="order.oldMassageDuration==null">{{order.duration}}分钟</view>
+							<view class="line-word-r" v-else>{{order.oldMassageDuration}}分钟</view>
 						</view>
 						<view class="flex justify-between jusitify-line">
 							<view style="color: #999;font-size: 26rpx;">项目价格</view>
-							<view class="line-word-r">￥{{order.oldMassagePrice}}</view>
+							<view class="line-word-r" v-if="order.oldMassagePrice==null">￥{{order.massagePrice}}</view>
+							<view class="line-word-r" v-else>￥{{order.oldMassagePrice}}</view>
 						</view>
 						<view class="flex justify-between jusitify-line" >
 							<view style="color: #999;font-size: 26rpx;">下单数量</view>
-							<view class="line-word-r">{{order.oldMassageNum}}</view>
+							<view class="line-word-r">{{order.massageNum}}</view>
 						</view>
 						<view class="flex justify-between jusitify-line">
 							<view style="color: #999;font-size: 26rpx;">会员折扣</view>
 							<view class="line-word-r">{{order.vipRate}}%</view>
 						</view>
+						<view class="flex justify-between jusitify-line">
+							<view style="color: #999;font-size: 26rpx;">技师加成</view>
+							<view class="line-word-r">{{order.technicianRate}}%</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: #333;">
-								<text style="font-size: 35rpx;font-weight: bold;">
-									￥{{order.massageCouponMoney}}
+								<text v-if="order.oldMassageMoney==null" style="font-size: 35rpx;font-weight: bold;">
+									￥{{order.massageMoney}}
+								</text>
+								<text v-else style="font-size: 35rpx;font-weight: bold;">
+									￥{{order.oldMassageMoney}}
 								</text>
 							</view>
 						</view>
@@ -188,9 +186,10 @@
 							<view class="line-word">全程距离</view>
 							<view class="line-word-r">{{order.km}}km</view>
 						</view>
-						<view class="flex justify-between jusitify-line" v-if="order.taxiMoney" >
+						<view class="flex justify-between jusitify-line">
 							<view class="line-word">出行费用</view>
-							<view class="line-word-r">￥{{order.taxiMoney}}</view>
+							<view class="line-word-r" v-if="order.taxiMoney">￥{{order.taxiMoney}}</view>
+							<view class="line-word-r" v-else>-</view>
 						</view>
 						<view class="jusitify-line-end"></view>
 						<view class="justify-title-nav">
@@ -227,6 +226,10 @@
 								<view class="line-word">会员折扣</view>
 								<view class="line-word-r">{{order.vipRate}}%</view>
 							</view>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word">技师加成</view>
+								<view class="line-word-r">{{order.technicianRate}}%</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: #333;">￥<text
@@ -234,31 +237,265 @@
 							</view>
 						</view>
 						<view class="jusitify-line-end"></view>
-						<view v-if="order.oldOrdersId!=null">
+						<view>
 							<view class="justify-title-nav">
 								<view class="justify-title">升级服务</view>
 								<view class="justify-title-nav-bor"></view>
 							</view>
+							
 							<view class="flex justify-between jusitify-line">
 								<view class="line-word">升级项目</view>
-								<view class="line-word-r">{{order.ordersMassageList[0].massageType.title}}</view>
+								<view class="line-word-r">{{order.entryName}}</view>
 							</view>
 							<view class="flex justify-between jusitify-line">
 								<view class="line-word">项目价格</view>
-								<view class="line-word-r">￥{{order.massagePrice}}</view>
+								<view class="line-word-r">￥{{order.oldMassagePrice}}</view>
 							</view>
 							<view class="flex justify-between jusitify-line" >
 								<view class="line-word">服务时长</view>
 								<view class="line-word-r">{{order.duration}}分钟</view>
 							</view>
 							<view class="flex justify-between jusitify-line">
-								<view class="line-word">升级价格</view>
-								<view class="line-word-r">￥{{order.payMoney}}</view>
+								<view class="line-word">升级差额</view>
+								<view class="line-word-r">￥{{(order.massagePrice-order.oldMassagePrice).toFixed(2)}}</view>
 							</view>
 							<view class="flex justify-between jusitify-line">
 								<view class="line-word">会员折扣</view>
 								<view class="line-word-r">{{order.vipRate}}%</view>
 							</view>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word">技师加成</view>
+								<view class="line-word-r">{{order.technicianRate}}%</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: #333;">
+									<text style="font-size: 35rpx;font-weight: bold;">
+										￥{{order.payMoney}}
+									</text>
+								</view>
+							</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view class="justify-title-nav">
+							<view class="justify-title">费用明细</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word">订单费用：</view>
+							<view class="line-word-r" v-if="order.oldMassageMoney==null">￥<text
+									style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
+							<view class="line-word-r" v-else>￥<text
+									style="font-size: 26rpx;font-weight: bold;">{{order.oldMassageMoney}}</text></view>
+							
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word">出行费用：</view>
+							<view class="line-word-r" v-if="order.taxiMoney">￥<text>{{order.taxiMoney}}</text></view>
+							<view class="line-word-r" v-else>-</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word">优惠券：</view>
+							<view class="" style="color: #F93731;" v-if="order.couponMoney">
+								-￥<text style="font-size: 26rpx;font-weight: bold;">
+									{{order.couponMoney}}
+								</text>
+							</view>
+							<view class="" v-else>-</view>
+						</view>
+						<view class="flex justify-between jusitify-line" v-if="order.addMoney">
+							<view class="line-word">加钟费用：</view>
+							<view class="" style="color: #333;" >
+								<text style="font-size: 26rpx;font-weight: bold;" v-if="order.addMoney">
+									￥{{order.addMoney}}
+								</text>
+								<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
+							</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word">升级费用：</view>
+							<view class="" style="color: #333;">
+								<text style="font-size: 26rpx;font-weight: bold;" v-if="order.payMoney">￥{{order.payMoney}}</text>
+								<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
+							</view>
+						</view>
+						<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
+							<view class="line-word">合计：</view>
+							<view class="" style="color: #333;">
+								￥<text style="font-size: 35rpx;font-weight: bold;">
+									{{order.payMoneyTotal}}
+								</text>
+							</view>
+						</view>
+						
+						<view class="be-remarks">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
+					</view>
+					
+					<!-- 套餐 次卡 疗程 升级 加钟 -->
+					<view class="list-pay" v-else>
+						<view class="justify-title-nav">
+							<view class="justify-title">订单信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word">订单编号</view>
+							<view class="flex line-word-r" @tap="copy(order.ordersNo)">
+								<view class="">{{order.ordersNo}}</view>
+								<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
+							</view>
+						</view>
+						
+						<view class="flex justify-between jusitify-line">
+							<view  class="line-word">预约时间</view>
+							<view  class="line-word-r">{{order.serveTime}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line" >
+							<view  class="line-word">下单时间</view>
+							<view  class="line-word-r">{{order.createTime}}</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view class="justify-title-nav">
+							<view class="justify-title">订单费用</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
+							<view class="line-word-r">{{order.oldOrdersMassageList[0].userPackageDetail.mainTitle}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word">项目名称</view>
+							<view class="line-word-r" v-if="order.oldEntryName==null">{{order.entryName}}</view>
+							<view class="line-word-r" v-else>{{order.oldEntryName}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view style="color: #999;font-size: 26rpx;">服务时长</view>
+							<view class="line-word-r" v-if="order.oldMassageDuration==null">{{order.duration}}分钟</view>
+							<view class="line-word-r" v-else>{{order.oldMassageDuration}}分钟</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view style="color: #999;font-size: 26rpx;">项目价格</view>
+							<view class="line-word-r" v-if="order.oldMassagePrice==null">￥{{order.massagePrice}}</view>
+							<view class="line-word-r" v-else>￥{{order.oldMassagePrice}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line" >
+							<view style="color: #999;font-size: 26rpx;">下单数量</view>
+							<view class="line-word-r">{{order.massageNum}}</view>
+						</view>
+						<!-- <view class="flex justify-between jusitify-line">
+							<view style="color: #999;font-size: 26rpx;">会员折扣</view>
+							<view class="line-word-r">100%</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: #333;">
+								<text v-if="order.oldMassageMoney==null" style="font-size: 35rpx;font-weight: bold;">
+									￥{{order.massageMoney}}
+								</text>
+								<text v-else style="font-size: 35rpx;font-weight: bold;">
+									￥{{order.oldMassageMoney}}
+								</text>
+							</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+					
+						<view class="justify-title-nav jusitify-line">
+							<view class="justify-title">出行费用</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between jusitify-line" v-if="order.tripWay">
+							<view class="line-word">出行方式</view>
+							<view class="line-word-r" v-if="order.tripWay == 1">公交</view>
+							<view class="line-word-r" v-if="order.tripWay == 2">出租</view>
+							<view class="line-word-r" v-if="order.tripWay == 3">免费</view>
+						</view>
+						<view class="flex justify-between jusitify-line" v-if="order.km" >
+							<view class="line-word">全程距离</view>
+							<view class="line-word-r">{{order.km}}km</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word">出行费用</view>
+							<view class="line-word-r" v-if="order.taxiMoney">￥{{order.taxiMoney}}</view>
+							<view class="line-word-r" v-else>-</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view class="justify-title-nav">
+							<view class="justify-title">优惠券信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word">优惠券</view>
+							<view class="line-word-r" style="color: #F93731;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
+							<view class="line-word-r" v-else>-</view>
+						</view>
+						<view v-if="order.addNum!=null">
+							<view class="justify-title-nav">
+								<view class="justify-title">加钟信息</view>
+								<view class="justify-title-nav-bor"></view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word">加钟项目</view>
+								<view class="line-word-r">{{order.addEntryName}}</view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word">加钟价格</view>
+								<view class="line-word-r">￥{{order.addPrice}}</view>
+							</view>
+							<view class="flex justify-between jusitify-line" >
+								<view class="line-word">加钟时长</view>
+								<view class="line-word-r">{{order.addTime}}分钟</view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word">加钟次数</view>
+								<view class="line-word-r">{{order.addNum}}</view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word">会员折扣</view>
+								<view class="line-word-r">{{order.vipRate}}%</view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word">技师加成</view>
+								<view class="line-word-r">{{order.technicianRate}}%</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: #333;">￥<text
+										style="font-size: 35rpx;font-weight: bold;">{{order.addMoney}}</text></view>
+							</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view>
+							<view class="justify-title-nav">
+								<view class="justify-title">升级服务</view>
+								<view class="justify-title-nav-bor"></view>
+							</view>
+							
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word">升级项目</view>
+								<view class="line-word-r">{{order.entryName}}</view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word">项目价格</view>
+								<view class="line-word-r">￥{{order.oldMassagePrice}}</view>
+							</view>
+							<view class="flex justify-between jusitify-line" >
+								<view class="line-word">服务时长</view>
+								<view class="line-word-r">{{order.duration}}分钟</view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word">升级差额</view>
+								<view class="line-word-r">￥{{(order.massagePrice-order.oldMassagePrice).toFixed(2)}}</view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word">会员折扣</view>
+								<view class="line-word-r">{{order.vipRate}}%</view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word">技师加成</view>
+								<view class="line-word-r">{{order.technicianRate}}%</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: #333;">￥<text
@@ -272,28 +509,41 @@
 						</view>
 						<view class="flex justify-between jusitify-line">
 							<view class="line-word">订单费用：</view>
-							<view class="line-word-r">￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{order.massageCouponMoney}}</text></view>
+							<view class="line-word-r" v-if="order.oldMassageMoney==null">￥<text
+									style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
+							<view class="line-word-r" v-else>￥<text
+									style="font-size: 26rpx;font-weight: bold;">{{order.oldMassageMoney}}</text></view>
+							
 						</view>
 						<view class="flex justify-between jusitify-line">
 							<view class="line-word">出行费用：</view>
-							<view class="line-word-r">￥<text
-									>{{order.taxiMoney}}</text></view>
+							<view class="line-word-r" v-if="order.taxiMoney">￥<text>{{order.taxiMoney}}</text></view>
+							<view class="line-word-r" v-else>-</view>
 						</view>
-						<view class="flex justify-between jusitify-line" v-if="order.couponMoney">
+						<view class="flex justify-between jusitify-line">
 							<view class="line-word">优惠券：</view>
-							<view class="" style="color: #F93731;">
-								-￥<text style="font-size: 26rpx;font-weight: bold;">{{order.couponMoney?order.couponMoney:0}}</text></view>
+							<view class="" style="color: #F93731;" v-if="order.couponMoney">
+								-￥<text style="font-size: 26rpx;font-weight: bold;">
+									{{order.couponMoney}}
+								</text>
+							</view>
+							<view class="" v-else>-</view>
 						</view>
 						<view class="flex justify-between jusitify-line" v-if="order.addMoney">
 							<view class="line-word">加钟费用：</view>
-							<view class="" style="color: #333;" >￥
-							<text style="font-size: 26rpx;font-weight: bold;">{{order.addMoney?order.addMoney:0}}</text></view>
+							<view class="" style="color: #333;" >
+								<text style="font-size: 26rpx;font-weight: bold;" v-if="order.addMoney">
+									￥{{order.addMoney}}
+								</text>
+								<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
+							</view>
 						</view>
-						<view class="flex justify-between jusitify-line" v-if="order.oldOrdersId!=null">
+						<view class="flex justify-between jusitify-line">
 							<view class="line-word">升级费用：</view>
-							<view class="" style="color: #333;">￥
-							<text style="font-size: 26rpx;font-weight: bold;">{{order.payMoney}}</text></view>
+							<view class="" style="color: #333;">
+								<text style="font-size: 26rpx;font-weight: bold;" v-if="order.payMoney">￥{{order.payMoney}}</text>
+								<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
+							</view>
 						</view>
 						<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
 							<view class="line-word">合计：</view>
@@ -306,69 +556,11 @@
 						
 						<view class="be-remarks">温馨提示：费用随会员等级及技师等级不同而上下浮动</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>￥268</span>
-						</view>
-						<view class="fei-view-list">
-							<span>出行费用</span>
-							<span>￥{{order.taxiMoney}}</span>
-						</view>
-						<view class="fei-view-list">
-							<span>优惠券</span>
-							<span style="color: #FF3939;">-￥2</span>
-						</view>
-						<view class="fei-view-list-z">
-							<span>总金额</span>
-							<span style="color: #FF3939;font-size: 29rpx;">￥286</span>
-						</view>
-					</view>
-				</view> -->
+				
 			</view>
 
-
-			<!-- <view class="bg padding radius margin-top-sm">
-				<view class="text-lg text-bold">
-					服务信息
-				</view>
-				<view class="margin-right-xs">
-					<view class="flex justify-between margin-top-lg">
-						<view style="width: 170rpx;">服务时间</view>
-						<view class="">
-							<text>{{order.serveTime}}</text>
-						</view>
-					</view>
-					<view class="flex justify-between margin-top-lg">
-						<view style="width: 170rpx;">服务地点</view>
-						<view class="flex" @tap="bindGps(order.latitude,order.longitude,order.address)">
-							<view class="">
-								{{order.address}}
-								<image src="../../static/images/address.png" style="width: 13px;height: 15px;"></image>
-							</view>
-						</view>
-					</view>
-
-					<view class="flex justify-between margin-top-lg">
-						<view style="width: 170rpx;">联系方式</view>
-						<view class="" @click="bindphone(order.phone)">
-							{{order.phone}}
-							<image src="../../static/images/phone.png" style="width: 15px;height: 15px;"></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 style="position: relative;" class="flex tabber padding-top-sm padding-bottom-sm align-center">
 				<view class="showBtn-mian">
 					<view class="showBtn">
diff --git a/my/order/payding - 副本.vue b/my/order/payding - 副本.vue
new file mode 100644
index 0000000..b4a9b5d
--- /dev/null
+++ b/my/order/payding - 副本.vue	
@@ -0,0 +1,2139 @@
+<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">服务项目</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="head-text">
+									{{order.entryName}}
+								</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 style="width: 100%;">
+									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
+										<view style="justify-content: space-between;">
+											{{order.duration}}分钟
+										</view>
+									</view>
+										
+									<view class="money-pay" style="justify-content: space-between;">
+										<view class="money-pay-zhen">
+											<span>￥</span>
+											<span>{{order.massagePrice}} </span>
+											<!-- <span style="color: #666;font-size: 12px;margin-left: 3px;"> x{{order.massageNum}}</span> -->
+										</view>
+										<view>
+											<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
+										</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 justify-between add-lin">
+							<view class="add-con-title">下单人</view>
+							<view class="add-con-cont">
+								{{order.userName}}
+							</view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">联系方式</view>
+							<view class="add-con-cont">
+								{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
+							</view>
+						</view>
+						<view class="serverAddress">
+							<view class="add-con-title">服务地址</view>
+							<view style="color: #666;margin-top: 8rpx;font-size: 30rpx;width: 73%; text-align: right;">{{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 flex" style="width: 90%;justify-content: space-between;flex-direction: row;align-items: center;">
+							<view class="flex align-center" style="width: 80%;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="level_button">{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</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}}2</text>
+								</view>
+								<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康技师</text>
+							</view> -->
+						</view>
+					</view>
+					<view class="list-pay">
+						<view class="justify-title-nav ">
+							<view class="justify-title">订单信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view  class="add-con-title">订单编号</view>
+							<view class="flex align-center" @tap="copy(order.ordersNo)"
+								style="color: #333;font-size: 30rpx;">
+								<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 add-lin">
+							<view  class="add-con-title">预约时间</view>
+							<view class="add-con-cont">{{order.serveTime}}</view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">下单时间</view>
+							<view class="add-con-cont">{{order.createTime}}</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view class="justify-title-nav ">
+							<view class="justify-title">订单费用</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">项目名称</view>
+							<view class="add-con-cont">{{order.entryName}}</view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">服务时长</view>
+							<view class="add-con-cont">{{order.duration}}分钟</view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">项目价格</view>
+							<view class="add-con-cont">￥{{order.massagePrice}}</view>
+						</view> 
+						<view class="flex justify-between add-lin" >
+							<view class="add-con-title">会员折扣</view>
+							<view class="add-con-cont">{{order.vipRate}}%</view>
+						</view>
+						 <view class="flex justify-between add-lin" >
+						 	<view class="add-con-title">技师加成</view>
+						 	<view class="add-con-cont">{{order.technicianRate}}%</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: #333;">￥<text
+									style="font-size: 35rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
+						</view>
+						
+						<view class="jusitify-line-end"></view>
+						
+						<view class="justify-title-nav ">
+							<view class="justify-title">出行费用</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.tripWay">
+							<view class="add-con-title">出行方式</view>
+							<view class="add-con-cont" v-if="order.tripWay == 1">公交</view>
+							<view class="add-con-cont" v-if="order.tripWay == 2">出租</view>
+							<view class="add-con-cont" v-if="order.tripWay == 3">免费</view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.km">
+							<view class="add-con-title">全程距离</view>
+							<view class="add-con-cont">{{order.km}}km</view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.taxiMoney">
+							<view class="add-con-title">出行交通费用</view>
+							<view class="add-con-cont">￥{{order.taxiMoney}}</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view class="justify-title-nav ">
+							<view class="justify-title">优惠券信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.couponMoney">
+							<view class="add-con-title">优惠券</view>
+							<view class="add-con-cont" style="color: rgb(249, 55, 49); font-weight: bold;">-￥{{order.couponMoney}}</view>
+						</view>
+						
+						
+						<view class="flex justify-between add-lin" v-if="order.addNum" style="margin-top: 19rpx;">
+							<view class="add-con-title">加钟次数</view>
+							<view class="add-con-cont">{{order.addNum}}</view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.addTime" style="margin-top: 19rpx;">
+							<view class="add-con-title">加钟时长</view>
+							<view class="add-con-cont">{{order.addTime}}分钟</view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.addMoney" style="margin-top: 19rpx;">
+							<view class="add-con-title">加钟费用</view>
+							<view class="add-con-cont">￥{{order.addMoney}}</view>
+						</view>
+						<!-- <view class="textarea-pay-list">
+							<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
+							<textarea class="textarea-pay" v-model="order.remark" disabled="disabled" placeholder="请输入备注" name="" maxlength="100"></textarea>
+						</view> -->
+						<view class="textarea-pay-list" v-if="order.remark">
+							<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
+							<view class="beizhu">{{order.remark}}</view>
+							<!-- <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="flex justify-between add-lin">
+							<view class="add-con-title">订单费用：</view>
+							<view class="add-con-cont">￥<text
+									style="font-size: 26rpx;font-weight: bold;">{{order.massagePrice}}</text></view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.taxiMoney">
+							<view class="add-con-title">出行费用：</view>
+							<view class="add-con-cont">￥<text
+									style="font-size: 26rpx;font-weight: bold;">{{order.taxiMoney}}</text></view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">优惠券：</view>
+							<view class="add-con-cont" style="color: #F93731;" v-if="order.couponMoney">
+								-￥<text style="font-size: 26rpx;font-weight: bold;">{{order.couponMoney}}</text></view>
+							<view class="" v-else>-</view>
+						</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.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: 32rpx;">￥{{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="#019c88" :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;
+				if(that.earlyFinishReason){
+					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);
+									uni.switchTab({
+										url:'/pages/order/index'
+									})
+								}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
+							}
+					});
+					
+				}else{
+					uni.showToast({
+						icon:'error',
+						title:'请输入提前结束原因！'
+					})
+				}
+			
+			},
+			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'
+										})
+										uni.switchTab({
+											url:'/pages/order/index'
+										})
+										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) {
+								uni.switchTab({
+									url:'/pages/order/index'
+								})
+								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;
+								uni.switchTab({
+									url:'/pages/order/index'
+								})
+							} 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) {
+							uni.switchTab({
+								url:'/pages/order/index'
+							})
+							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()
+							uni.switchTab({
+								url:'/pages/order/index'
+							})
+						});
+					// #endif
+
+					// #ifdef APP-PLUS
+					let data = {
+						ordersId: that.ordersId,
+						type: 1
+					}
+					that.$Request.post('/app/aliPay/payOrder', data).then(
+						rea => {
+							that.showpay = false
+							uni.switchTab({
+								url:'/pages/order/index'
+							})
+							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: '支付成功'
+										})
+										uni.switchTab({
+											url:'/pages/order/index'
+										})
+										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/order/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);
+								uni.switchTab({
+									url:'/pages/order/index'
+								})
+							} 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
+								uni.switchTab({
+									url:'/pages/order/index'
+								})
+							} 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));
+							uni.switchTab({
+								url:'/pages/order/index'
+							})
+						}
+					});
+					// #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()
+							uni.switchTab({
+								url:'/pages/order/index'
+							})
+						});
+					// #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);
+							uni.switchTab({
+								url:'/pages/order/index'
+							})
+						});
+					// #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()
+									uni.switchTab({
+										url:'/pages/order/index'
+									})
+								} 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.switchTab({
+										url:'/pages/order/index'
+									})
+								} 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>
+	.beizhu{
+		width: 100%;
+	    display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.bottom-view{
+		margin-top: 9px;
+		border-bottom: 1px solid #ccc;
+		padding-bottom: 5px;
+		margin-bottom: 5px;
+	}
+	/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;
+		font-weight: bold;
+	}
+	.head-title-right{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.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;
+		border-top: 1px solid #f3f3f3;
+		padding-top: 20rpx;
+		font-weight: bold;
+	}
+	.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
+		color: #666666;
+	}
+	.fei-view-list span:nth-child(2){
+		color: #333333;
+	}
+	.fei-view-list,.fei-view-list-z{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 5px;
+	}
+	.fei-view{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.fei-title{
+		width: 100%;
+		text-align: center;
+		font-weight: bold;
+		font-size: 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: 50px;
+		background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff);
+		border-top-left-radius: 12px;
+		border-top-right-radius: 12px;
+		padding: 0px 14px;
+	}
+	.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: 32rpx;
+		color: #333333;
+		font-weight: bold;
+	}
+	.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: 32rpx;
+		color: #333333;
+		margin-bottom: 8px;
+	}
+	page {
+		background: #f7f7f7;
+	}
+
+	.bgImg {
+		background-image: url('https://admin.sjajk.com/file/uploadPath/2023/01/03/02952e7260e553d0f3bb26a1cd154921.png');
+		background-size: 100% 1161rpx;
+	}
+
+	.bg {
+		background: linear-gradient(to right, #223845, #00a85b);
+	}
+
+	.list_item {
+		// width: 650upx;
+		// height: 160upx;
+		width: 92%;
+		// margin: 30rpx 0;
+		background: #FFFFFF;
+		border-radius: 24upx;
+		padding: 20upx;
+		display: flex;
+		margin-top: 26upx;
+
+		.listitem_rightview {
+			margin-left: 20upx;
+			width: 80%;
+			padding-top: 10rpx;
+
+			.btnview {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				margin-top: 12upx;
+				width: 100%;
+			}
+
+			.titleview {
+				display: flex;
+				align-items: flex-end;
+				justify-content: space-between
+			}
+
+			.moneyview {
+				display: flex;
+				align-items: flex-end;
+
+				image {
+					width: 30upx;
+					height: 30upx;
+					margin-left: 20upx;
+					margin-bottom: 2upx;
+				}
+			}
+
+			.item_time {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				margin-left: 10upx;
+			}
+
+			.item_money {
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: 800;
+				color: #FF1200;
+			}
+
+			.item_oldmoney {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				text-decoration: line-through;
+				color: #999999;
+				margin-left: 10upx;
+			}
+
+			.item_btn {
+				width: 140upx;
+				height: 56upx;
+				background-color: #019C88;
+				border-radius: 16upx;
+				text-align: center;
+				line-height: 56upx;
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+			.item_yishou {
+				font-size: 22upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+
+			.item_title {
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #1E1F31;
+			}
+		}
+
+		image {
+			width: 220upx;
+			height: 160upx;
+			border-radius: 24upx;
+		}
+	}
+
+	.jz_btn {
+		width: 170rpx;
+		height: 56upx;
+		background: #096f4b;
+		margin-left: 40rpx;
+		border-radius: 35rpx;
+		line-height: 56upx;
+		text-align: center;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+	}
+
+	.tabber {
+		width: 100%;
+		background: #ffffff;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		justify-content: center;
+		height: 127rpx;
+		padding: 0 30rpx;
+	}
+
+	.box {
+		/* border: 1px solid #005dff; */
+		background: #E8FAE1;
+		border-radius: 4rpx;
+		color: #096f4b;
+		padding: 5upx 10upx;
+		font-size: 22rpx;
+		margin-top: 10rpx;
+	}
+
+	.popup_pay {
+		width: 100%;
+		position: relative;
+		padding-bottom: 45rpx;
+		/* height: 160px; */
+		/* #ifndef MP-WEIXIN */
+		/* height: 130px; */
+		/* #endif */
+
+	}
+
+	.pay_btn {
+		width: 90%;
+		margin: 0 auto;
+		text-align: center;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		height:80rpx;
+		border-radius: 80rpx;
+		color: #ffffff;
+		line-height: 80rpx;
+		font-size: 32rpx;
+	}
+
+	.serverAddress {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.head-text{
+		font-size:30rpx;
+	}
+	.zhuangtai{
+		color: #029D88;
+	}
+	.level_button{
+		padding: 3rpx 13rpx;
+		background: linear-gradient(to right, #fe9131, #ff9869);
+		border-radius: 16rpx 16rpx 16rpx 1rpx ;
+		color: #fff;
+		font-size: 12px;
+	}
+	.add-lin{
+		height: 80rpx;
+		line-height: 80rpx;
+	}
+	.add-con-title{
+		color: #999;
+		font-size: 30rpx;
+	}
+	.add-con-cont{
+		color: #666;
+		font-size: 30rpx;
+		line-height: 80rpx;
+		text-align:right;
+	}
+	.level_button{
+		padding: 3rpx 13rpx;
+		background: linear-gradient(to right, #fe9131, #ff9869);
+		border-radius: 16rpx 16rpx 16rpx 1rpx ;
+		color: #fff;
+		font-size: 12px;
+	}
+	.justify-title-nav{
+		width: 90%;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+		margin: 10px 0;
+	}
+	.justify-title-nav-bor{
+		width: 64px;
+		height: 5px;
+		border-radius: 3px;
+		position: absolute;
+		bottom: 0;
+		background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7));
+	}
+	.justify-title{
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333;
+	}
+	.jusitify-line-end{
+	    height: 1px;
+	    border-bottom: 1px #f4f4f4 solid;
+	    margin: 15px 0;
+	}
+</style>
\ No newline at end of file
diff --git a/my/order/payding.vue b/my/order/payding.vue
index 4132f66..83d4cbc 100644
--- a/my/order/payding.vue
+++ b/my/order/payding.vue
@@ -16,7 +16,7 @@
 						<view class="u-flex-1  margin-left-sm">
 							<view class="flex head-title-right">
 								<view class="head-text">
-									{{order.ordersMassageList[0].massageType.title}}
+									{{order.entryName}}
 								</view>
 								<view class="zhuangtai">
 									<view v-if="order.status ==1">待付款...</view>
@@ -35,7 +35,7 @@
 								<view style="width: 100%;">
 									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
 										<view style="justify-content: space-between;">
-											{{order.ordersMassageList[0].massageType.duration}}分钟
+											{{order.duration}}分钟
 										</view>
 									</view>
 										
@@ -123,23 +123,6 @@
 							<view  class="add-con-title">预约时间</view>
 							<view class="add-con-cont">{{order.serveTime}}</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" 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" 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 add-lin">
 							<view class="add-con-title">下单时间</view>
 							<view class="add-con-cont">{{order.createTime}}</view>
@@ -151,11 +134,11 @@
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">项目名称</view>
-							<view class="add-con-cont">{{order.ordersMassageList[0].massageType.title}}</view>
+							<view class="add-con-cont">{{order.entryName}}</view>
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">服务时长</view>
-							<view class="add-con-cont">{{order.ordersMassageList[0].massageType.duration}}分钟</view>
+							<view class="add-con-cont">{{order.duration}}分钟</view>
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">项目价格</view>
@@ -164,11 +147,15 @@
 						<view class="flex justify-between add-lin" >
 							<view class="add-con-title">会员折扣</view>
 							<view class="add-con-cont">{{order.vipRate}}%</view>
-						</view> 
+						</view>
+						 <view class="flex justify-between add-lin" >
+						 	<view class="add-con-title">技师加成</view>
+						 	<view class="add-con-cont">{{order.technicianRate}}%</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: #333;">￥<text
-									style="font-size: 35rpx;font-weight: bold;">{{order.massagePrice}}</text></view>
+									style="font-size: 35rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
 						</view>
 						
 						<view class="jusitify-line-end"></view>
@@ -196,49 +183,16 @@
 							<view class="justify-title">优惠券信息</view>
 							<view class="justify-title-nav-bor"></view>
 						</view>
-						<view class="flex justify-between add-lin" v-if="order.couponMoney">
+						<view class="flex justify-between add-lin">
 							<view class="add-con-title">优惠券</view>
-							<view class="add-con-cont" style="color: rgb(249, 55, 49); font-weight: bold;">-￥{{order.couponMoney}}</view>
+							<view class="add-con-cont" style="color: rgb(249, 55, 49); font-weight: bold;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
+							<view class="add-con-cont" v-else>-</view>
 						</view>
 						
-						
-						<view class="flex justify-between add-lin" v-if="order.addNum" style="margin-top: 19rpx;">
-							<view class="add-con-title">加钟次数</view>
-							<view class="add-con-cont">{{order.addNum}}</view>
-						</view>
-						<view class="flex justify-between add-lin" v-if="order.addTime" style="margin-top: 19rpx;">
-							<view class="add-con-title">加钟时长</view>
-							<view class="add-con-cont">{{order.addTime}}分钟</view>
-						</view>
-						<view class="flex justify-between add-lin" v-if="order.addMoney" style="margin-top: 19rpx;">
-							<view class="add-con-title">加钟费用</view>
-							<view class="add-con-cont">￥{{order.addMoney}}</view>
-						</view>
-						<!-- <view class="textarea-pay-list">
-							<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
-							<textarea class="textarea-pay" v-model="order.remark" disabled="disabled" placeholder="请输入备注" name="" maxlength="100"></textarea>
-						</view> -->
 						<view class="textarea-pay-list" v-if="order.remark">
 							<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
 							<view class="beizhu">{{order.remark}}</view>
-							<!-- <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">
@@ -247,12 +201,12 @@
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">订单费用：</view>
 							<view class="add-con-cont">￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{order.massagePrice}}</text></view>
+									style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
 						</view>
 						<view class="flex justify-between add-lin" v-if="order.taxiMoney">
 							<view class="add-con-title">出行费用：</view>
-							<view class="add-con-cont">￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{order.taxiMoney}}</text></view>
+							<view class="add-con-cont" v-if="order.taxiMoney">￥<text style="font-size: 26rpx;font-weight: bold;">{{order.taxiMoney}}</text></view>
+							<view class="add-con-cont" v-else>-</view>
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">优惠券：</view>
@@ -260,32 +214,9 @@
 								-￥<text style="font-size: 26rpx;font-weight: bold;">{{order.couponMoney}}</text></view>
 							<view class="" v-else>-</view>
 						</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.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: 32rpx;">￥{{order.sumMoney}}</span>
+						<span style="color: #FF3939;font-size: 32rpx;">￥{{order.payMoneyTotal}}</span>
 					</view>	
 					</view>
 				</view>
@@ -305,65 +236,6 @@
 			
 		</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">
@@ -388,54 +260,6 @@
 				<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>
diff --git a/my/order/paydingTCX.vue b/my/order/paydingTCX.vue
index 64eeed1..88b73d7 100644
--- a/my/order/paydingTCX.vue
+++ b/my/order/paydingTCX.vue
@@ -10,7 +10,7 @@
 					<view class="pay-title" style="">服务项目</view>
 					<view class="flex justify-around">
 						<view class="" style="width: 160upx;height: 160upx;">
-							<image :src="order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.massageImg:order.ordersMassageList[0].userPackageDetail.massageImg"
+							<image :src="order.ordersMassageList[0].userPackageDetail.massageImg"
 								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
 						</view>
 						<view class="u-flex-1  margin-left-sm">
@@ -35,14 +35,14 @@
 								<view style="width: 100%;">
 									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
 										<view style="justify-content: space-between;">
-											{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.duration:order.ordersMassageList[0].userPackageDetail.duration}}分钟
+											{{order.duration}}分钟
 										</view>
 									</view>
 										
 									<view class="money-pay" style="justify-content: space-between;">
 										<view class="money-pay-zhen">
 											<span>￥</span>
-											<span>{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.packagePrice:order.ordersMassageList[0].userPackageDetail.packagePrice}} </span>
+											<span>{{order.massagePrice}} </span>
 											<!-- <span style="color: #666;font-size: 12px;margin-left: 3px;"> x{{order.massageNum}}</span> -->
 										</view>
 										<view>
@@ -128,7 +128,7 @@
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title"> {{order.packageType=='105'?'项目次卡':order.packageType=='106'?'服务疗程':'套餐名称'}}</view>
 							<view class="add-con-cont">
-								{{order.ordersMassageList[0].userPackageDetail?order.ordersMassageList[0].userPackageDetail.mainTitle:order.ordersMassageList[0].massageType.mainTitle}}
+								{{order.ordersMassageList[0].userPackageDetail.mainTitle}}
 							</view>
 						</view>
 						<view class="flex justify-between add-lin">
@@ -147,6 +147,14 @@
 							<view class="add-con-title">会员折扣</view>
 							<view class="add-con-cont">{{order.vipRate}}%</view>
 						</view> 
+						<view class="flex justify-between add-lin" >
+							<view class="add-con-title">技师加成</view>
+							<view class="add-con-cont">{{order.technicianRate}}%</view>
+						</view> 
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">应付金额</view>
+							<view class="add-con-cont">￥{{order.massagePrice}}</view>
+						</view> 
 						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;">
 							<view style="color: #333;font-size: 26rpx;">实付金额：</view>
 							<view class="" style="color: #333;">
@@ -170,14 +178,14 @@
 							<view class="add-con-title">全程距离</view>
 							<view class="add-con-cont">{{order.km}}km</view>
 						</view>
-						<view class="flex justify-between add-lin" v-if="order.taxiMoney">
+						<view class="flex justify-between add-lin">
 							<view class="add-con-title">出行交通费用</view>
-							<view class="add-con-cont">￥{{order.taxiMoney}}</view>
+							<view class="add-con-cont" v-if="order.taxiMoney">￥{{order.taxiMoney}}</view>
+							<view class="add-con-cont" v-else>-</view>
 						</view>
 						<view class="textarea-pay-list" v-if="order.remark">
 							<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
 							<view class="beizhu">{{order.remark}}</view>
-							<!-- <textarea class="textarea-pay" v-model="order.remark" disabled="disabled" placeholder="请输入备注" name="" maxlength="100"></textarea> -->
 						</view>
 					</view>
 				</view>
@@ -188,9 +196,10 @@
 							<view class="add-con-title">订单费用：</view>
 							<view class="add-con-cont">￥<text style="font-weight: bold;">0</text></view>
 						</view>
-						<view class="flex justify-between add-lin" v-if="order.taxiMoney">
+						<view class="flex justify-between add-lin">
 							<view class="add-con-title">出行费用：</view>
-							<view class="add-con-cont">￥<text style="font-weight: bold;">{{order.taxiMoney}}</text></view>
+							<view class="add-con-cont" v-if="order.taxiMoney">￥<text style="font-weight: bold;">{{order.taxiMoney}}</text></view>
+							<view class="add-con-cont" v-else>-</view>
 						</view>
 						<view class="fei-view-list-z">
 							<span>总金额</span>
diff --git a/pages/my/cikarDrtail.vue b/pages/my/cikarDrtail.vue
index 7c0b83d..b3668f1 100644
--- a/pages/my/cikarDrtail.vue
+++ b/pages/my/cikarDrtail.vue
@@ -224,7 +224,7 @@
 		},
 		methods:{
 			detail(item){//详情
-			console.log("item=====>",item)
+				console.log("item=====>",item)
 				if(item.usedQuantity){
 					item.id=this.mainData.id
 					uni.navigateTo({
diff --git a/pages/my/cureOderDrtail.vue b/pages/my/cureOderDrtail.vue
index 5e9b9db..89de3b7 100644
--- a/pages/my/cureOderDrtail.vue
+++ b/pages/my/cureOderDrtail.vue
@@ -115,7 +115,7 @@
 				</view> -->
 			</view>
 		</view>
-		<view class="detail-btn" v-if="dataList.name=='my'" @click="goumai(getList)">
+		<view class="detail-btn" v-if="dataList.name=='my'&&dataList.status=='0'" @click="goumai(getList)">
 			立即预约
 		</view>
 	</view>
diff --git a/pages/my/orderDetailsList.vue b/pages/my/orderDetailsList.vue
index dd4236d..0665402 100644
--- a/pages/my/orderDetailsList.vue
+++ b/pages/my/orderDetailsList.vue
@@ -17,15 +17,17 @@
 		</view>
 		<t-refresh ref="refresh"  v-if="dataList.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
 			<template slot="content">
+				<!-- 升级订单 -->
 				<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
 					<view class="flex justify-between">
 						<view class="flex align-center profile-img">
+							
 							<image src="../../static/logo.png" style="width: 55rpx;height: 55rpx;border: 1px solid#d7f2ee;border-radius: 50%;">
 							</image>
 							<view class="margin-left-xs ">{{item.artificerName}}</view>
 						</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"><span>{{item.ordersNo}}</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"><span>{{item.ordersNo}}</span><span>已取消</span></view>
 						<view class="text-green" v-if="item.status ==5"><span>{{item.ordersNo}}</span><span>已完成</span></view>
@@ -33,35 +35,53 @@
 						<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 ==10"><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>
-					<view class=" u-flex u-p-t-30">
+					<view class=" u-flex u-p-t-30" v-if="item.ordersMassageList[0].userPackageDetail==null">
 						<view class="u-m-r-10">
-							<u-avatar
-								:src="(item.ordersMassageList && item.ordersMassageList.length > 0 && item.ordersMassageList[0].massageType && item.ordersMassageList[0].massageType.massageImg)?item.ordersMassageList[0].massageType.massageImg: '../../static/logo.png'"
-								mode="square" size="100" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;">
-							</u-avatar>
+							<image :src="item.ordersMassageList[0].massageType.massageImg" mode="" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;"></image>
 						</view>
+						
 						<view class="u-flex-1" style="margin-left: 20rpx;">
 							<view class="text-bold u-line-1" style="width: 560rpx;">
 								<view class=" text-lg "
 									style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
-									{{item.ordersMassageList[0].userPackageDetail.title}}
+									{{item.entryName}}
 								</view>
 							</view>
 							<view class="u-font-12 u-tips-color flex justify-between" style="margin-top: 6rpx;">
 								预约时间：{{item.serveTime}}
 							</view>
 							<view class="flex-sub u-font-12 margin-top-xs" style="color: #999999;">
-								实付：<text class="text-df" style="color: #FF1200;">￥</text><text class="text-xl text-bold" style="color: #FF1200;">{{item.ordersMassageList[0].userPackageDetail.packagePrice}}</text>
+								实付：<text class="text-df" style="color: #FF1200;">￥</text><text class="text-xl text-bold" style="color: #FF1200;">{{item.payMoneyTotal}}</text>
+							</view>
+						</view>
+					</view>
+					<view class=" u-flex u-p-t-30" v-else>
+						<view class="u-m-r-10">
+							<image :src="item.ordersMassageList[0].userPackageDetail.massageImg" mode="" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;"></image>
+						</view>
+						<view class="u-flex-1" style="margin-left: 20rpx;">
+							<view class="text-bold u-line-1" style="width: 560rpx;">
+								<view class=" text-lg "
+									style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+									{{item.entryName}}
+								</view>
+							</view>
+							<view class="u-font-12 u-tips-color flex justify-between" style="margin-top: 6rpx;">
+								预约时间：{{item.serveTime}}
+							</view>
+							<view class="flex-sub u-font-12 margin-top-xs" style="color: #999999;">
+								实付：<text class="text-df" style="color: #FF1200;">￥</text><text class="text-xl text-bold" style="color: #FF1200;">{{item.payMoneyTotal}}</text>
 							</view>
 						</view>
-						
 					</view>
 				</view>
+				
+				
 			</template> 
 		</t-refresh>
 		<empty v-if="dataList.length==0"></empty>
@@ -142,7 +162,7 @@
 				});
 			},
 			backImg(){//返回上一页
-				if(this.previousPage=='次卡'){
+				if(this.previousPage.name=='次卡'){
 					uni.reLaunch({
 						url:'/pages/my/cikarDrtail?id='+this.previousPage.id+'&limit='+10+'&page='+1+'&name='+'my'
 					})
@@ -157,9 +177,9 @@
 				this.getData()
 			},
 			itemClick(item) {
-				uni.navigateTo({
-					url:'/my/order/payCLDetail?ordersId='+item.ordersId
-				})
+				// uni.navigateTo({
+				// 	url:'/my/order/payCLDetail?ordersId='+item.ordersId
+				// })
 				
 			}
 		}
@@ -167,6 +187,12 @@
 </script>
 
 <style scoped>
+	.dingdan-cont{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
 	/deep/.justify-between{
 		align-items: center;
 	}
diff --git a/pages/my/serviceOderDrtail.vue b/pages/my/serviceOderDrtail.vue
index c97c31f..e9ce769 100644
--- a/pages/my/serviceOderDrtail.vue
+++ b/pages/my/serviceOderDrtail.vue
@@ -79,7 +79,7 @@
 										￥{{item.oldPrice}}
 									</view>
 								</view>
-								<view class="service-more">详情</view>
+								<view class="service-more" @click.stop="xiangqing(item)">详情</view>
 							</view>
 							<view style="color: #019c88;">服务时长:{{item.duration}}分钟</view>
 							<view class="tese">
@@ -602,7 +602,14 @@
 					// #endif
 				}
 			},
-			
+			xiangqing(item){
+				uni.navigateTo({
+					url:'/pages/my/cureOderDrtail?mainId='+item.mainId+'&id='+item.id+
+						'&massageTypeId='+item.massageTypeId+
+						'&status='+item.status+
+						'&name='+this.nameText
+				})
+			},
 			detail(item){
 				if(item.status=='1'&&this.serviData.name!='index'){
 					uni.showToast({