From fd95ca0fcadb9f267878deeba26f28d4b30331b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 22 Jul 2024 23:50:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/order/pay.vue               | 5542 ++++++++++++++++----------------
 my/order/payModify.vue         |   19 +-
 my/order/payModifyDd.vue       |  242 +-
 my/order/payModifyTcMyDaiB.vue |  834 +++--
 my/order/payShengji.vue        |    6 +-
 my/order/paydingTCX.vue        |   67 +-
 6 files changed, 3477 insertions(+), 3233 deletions(-)

diff --git a/my/order/pay.vue b/my/order/pay.vue
index f06f1b3..a6d8b24 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -1,100 +1,98 @@
 <template>
-  <view class="content">
-    <!-- 		<view v-if="order.overTimeOrders == 1" class="dingshi" style="font-size: 32upx;height: 150rpx;padding: 26rpx 29rpx 0 29rpx;">
+	<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"
-                     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="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;">
-                      <text class="title-font">服务时长：</text><text class="value-font">{{order.duration}}分钟</text>
-                    </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"
+								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="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">
+										<view style="justify-content: space-between;">
+											<text class="title-font">服务时长：</text><text class="value-font">{{order.duration}}分钟</text>
+										</view>
+									</view>
 
-                  <view class="money-pay" style="justify-content: space-between;">
-                    <view class="money-pay-zhen">
-                      <text class="title-font">项目价格：</text>
-                      <span>￥</span>
-                      <span>{{order.priceMarkup}} </span>
-                      <!-- <view style="margin-left: 5px;font-size: 12px;color: #999;text-decoration: line-through;" v-if="order.ordersMassageList[0].userPackageDetail">￥{{order.price}}</view> -->
-                    </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="add-content">
-          <view class="" v-if="order.artificer">
-            <view class="flex align-center justify-between jusitify-line">
-              <view class="line-word title-font">客户姓名</view>
-              <view class="line-word-r value-font">
-                {{order.userName}}
-              </view>
-            </view>
-            <view class="flex align-center justify-between jusitify-line">
-              <view class="line-word title-font">联系方式</view>
-              <view  class="line-word-r value-font">
-                {{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
-              </view>
-            </view>
-            <view class="serverAddress jusitify-line">
-              <view class="line-word title-font">服务地址</view>
-              <view class="line-word-r value-font" style="width: 75%; text-align: right;">{{order.address}}</view>
-            </view>
-          </view>
-        </view>
+									<view class="money-pay" style="justify-content: space-between;">
+										<view class="money-pay-zhen">
+											<text class="title-font">项目价格：</text>
+											<span>￥</span>
+											<span>{{order.priceMarkup}} </span>
+											<!-- <view style="margin-left: 5px;font-size: 12px;color: #999;text-decoration: line-through;" v-if="order.ordersMassageList[0].userPackageDetail">￥{{order.price}}</view> -->
+										</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="add-content">
+					<view class="" v-if="order.artificer">
+						<view class="flex align-center justify-between jusitify-line">
+							<view class="line-word title-font">客户姓名</view>
+							<view class="line-word-r value-font">
+								{{order.userName}}
+							</view>
+						</view>
+						<view class="flex align-center justify-between jusitify-line">
+							<view class="line-word title-font">联系方式</view>
+							<view class="line-word-r value-font">
+								{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
+							</view>
+						</view>
+						<view class="serverAddress jusitify-line">
+							<view class="line-word title-font">服务地址</view>
+							<view class="line-word-r value-font" style="width: 75%; 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
+				<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"
+								<!-- <image src="../../static/img/phone.png" class="phone-pay"
                   @click="bindphone(order.artificer.phone)"></image> -->
-                <view class="level_button">{{order.technicianTypeName}}</view>
-              </view>
-              <view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
+								<view class="level_button">{{order.technicianTypeName}}</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>
@@ -102,246 +100,248 @@
                       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="flex justify-between jusitify-line">
-              <view class="line-word title-font">订单编号</view>
-              <view class="flex line-word-r value-font" @tap="copy(order.ordersNo)">
-                <view class="">{{order.ordersNo}}
-                <u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon>
+              </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="flex justify-between jusitify-line">
+							<view class="line-word title-font">订单编号</view>
+							<view class="flex line-word-r value-font" @tap="copy(order.ordersNo)">
+								<view class="">{{order.ordersNo}}
+									<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
+								</view>
+							</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">预约时间</view>
+							<view class="line-word-r value-font">{{order.serveTime}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">下单时间</view>
+							<view class="line-word-r value-font">{{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 title-font">项目名称</view>
+							<view class="line-word-r value-font">{{order.entryName}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">服务时长</view>
+							<view class="line-word-r value-font">{{order.duration}}分钟</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">项目原价</view>
+							<view class="line-word-r value-font">￥{{order.massagePrice}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">{{order.technicianTypeName}}价格</view>
+							<view class="line-word-r value-font" style="color: #019c88;">￥{{order.priceMarkup}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">会员减免</view>
+							<view class="line-word-r value-font" style="color: #FF6000;">-￥{{order.vipReductionMoney}}</view>
+						</view>
+						<view class="flex align-center jusitify-line" style="justify-content: flex-end;">
+							<view class="line-word title-font">小计：</view>
+							<view class="value-font" style="font-weight: bold;">
+								<text>￥{{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 jusitify-line" v-if="order.tripWay">
+							<view class="line-word title-font">出行方式</view>
+							<view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
+							<view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
+							<view class="line-word-r value-font" v-if="order.tripWay == 3">免费</view>
+						</view>
+						<view class="flex justify-between jusitify-line" v-if="order.km">
+							<view class="line-word title-font">全程距离</view>
+							<view class="line-word-r value-font">{{order.km}}km</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">出行费用</view>
+							<view class="line-word-r value-font">￥{{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 jusitify-line">
+							<view class="line-word title-font">优惠券</view>
+							<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
+								-￥{{order.couponMoney}}</view>
+							<view class="value-font value-font" 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 title-font">订单费用</view>
+							<view class="line-word-r value-font"><text
+									style="font-weight: bold;">￥{{order.massageMoney}}</text></view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">出行费用</view>
+							<view class="line-word-r value-font"><text
+									style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">优惠券</view>
+							<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
+								-<text style="font-weight: bold;">￥{{order.couponMoney}}</text></view>
+							<view class="value-font" v-else>-</view>
+						</view>
+						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
+							<view class="line-word title-font">合计：</view>
+							<view class="value-font">
+								<text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
+									￥{{order.payMoneyTotal}}
+								</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 jusitify-line">
+							<view class="line-word title-font">订单编号</view>
+							<view class="flex line-word-r value-font" @tap="copy(order.ordersNo)">
+								<view class="">{{order.ordersNo}}
+									<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon>
+								</view>
+							</view>
+						</view>
+
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">预约时间</view>
+							<view class="line-word-r value-font">{{order.serveTime}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">下单时间</view>
+							<view class="line-word-r value-font">{{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 title-font">
+								{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称
+							</view>
+							<view class="line-word-r value-font">
+								{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">项目名称</view>
+							<view class="line-word-r value-font">{{order.entryName}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">服务时长</view>
+							<view class="line-word-r value-font">{{order.duration}}分钟</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">项目价格</view>
+							<view class="line-word-r value-font" style="color: #019c88;">￥{{order.massagePrice}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">应付金额</view>
+							<view class="line-word-r value-font">￥{{order.massagePrice}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
+							<view class="line-word title-font">实付金额：</view>
+							<view class="line-word-r value-font" style="font-weight: bold;">
+								￥<text>0</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 jusitify-line" v-if="order.tripWay">
+							<view class="line-word title-font">出行方式</view>
+							<view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
+							<view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
+							<view class="line-word-r value-font" v-if="order.tripWay == 3">免费</view>
+						</view>
+						<view class="flex justify-between jusitify-line" v-if="order.km">
+							<view class="line-word title-font">全程距离</view>
+							<view class="line-word-r value-font">{{order.km}}km</view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">出行费用</view>
+							<view class="line-word-r value-font">￥{{order.taxiMoney}}</view>
+						</view>
+<!-- 						<view class="jusitify-line-end jusitify-line"></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 title-font">优惠券</view>
+							<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
+								-￥{{order.couponMoney}}</view>
+							<view class="value-font" 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 title-font">订单费用</view>
+							<view class="add-con-cont value-font"><text style="font-weight: bold;">￥0</text></view>
+						</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">出行费用</view>
+							<view class="line-word-r value-font"><text
+									style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
+						</view>
+<!-- 						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">优惠券</view>
+							<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
+								-<text style="font-weight: bold;">￥{{order.couponMoney}}</text></view>
+							<view class="value-font" v-else>-</view>
+						</view> -->
+						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
+							<view class="line-word title-font">合计：</view>
+							<view class="value-font">
+								<text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
+									￥{{order.taxiMoney}}
+								</text>
+							</view>
+						</view>
+					</view>
 				</view>
-              </view>
-            </view>
-
-            <view class="flex justify-between jusitify-line">
-              <view class="line-word title-font">预约时间</view>
-              <view class="line-word-r value-font" >{{order.serveTime}}</view>
-            </view>
-            <view class="flex justify-between jusitify-line">
-              <view class="line-word title-font">下单时间</view>
-              <view class="line-word-r value-font">{{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 title-font">项目名称</view>
-              <view class="line-word-r value-font">{{order.entryName}}</view>
-            </view>
-            <view class="flex justify-between jusitify-line">
-              <view class="line-word title-font">服务时长</view>
-              <view class="line-word-r value-font">{{order.duration}}分钟</view>
-            </view>
-            <view class="flex justify-between jusitify-line">
-              <view class="line-word title-font">项目原价</view>
-              <view class="line-word-r value-font">￥{{order.massagePrice}}</view>
-            </view>
-            <view class="flex justify-between jusitify-line">
-              <view class="line-word title-font">{{order.technicianTypeName}}价格</view>
-              <view class="line-word-r value-font" style="color: #019c88;">￥{{order.priceMarkup}}</view>
-            </view>
-            <view class="flex justify-between jusitify-line">
-              <view class="line-word title-font">会员减免</view>
-              <view class="line-word-r value-font" style="color: #FF6000;">-￥{{order.vipReductionMoney}}</view>
-            </view>
-            <view class="flex align-center jusitify-line" style="justify-content: flex-end;">
-              <view class="line-word title-font">小计：</view>
-              <view class="value-font" style="font-weight: bold;">
-                <text>
-                  ￥{{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 jusitify-line" v-if="order.tripWay" >
-              <view class="line-word title-font">出行方式</view>
-              <view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
-              <view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
-              <view class="line-word-r value-font" v-if="order.tripWay == 3">免费</view>
-            </view>
-            <view class="flex justify-between jusitify-line" v-if="order.km">
-              <view class="line-word title-font">全程距离</view>
-              <view class="line-word-r value-font">{{order.km}}km</view>
-            </view>
-            <view class="flex justify-between jusitify-line" >
-              <view class="line-word title-font">出行费用</view>
-              <view class="line-word-r value-font">￥{{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 jusitify-line">
-              <view class="line-word title-font">优惠券</view>
-              <view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
-              <view class="value-font" 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 title-font">订单费用</view>
-              <view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.massageMoney}}</text></view>
-
-            </view>
-            <view class="flex justify-between jusitify-line">
-              <view class="line-word title-font">出行费用</view>
-              <view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
-            </view>
-            <view class="flex justify-between jusitify-line">
-              <view class="line-word title-font">优惠券</view>
-              <view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
-                -<text style="font-weight: bold;">￥{{order.couponMoney}}</text></view>
-              <view class="value-font" v-else>-</view>
-            </view>
-            <view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
-              <view class="line-word title-font">合计：</view>
-              <view class="value-font">
-              	<text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
-              		￥{{order.payMoneyTotal}}
-              	</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 jusitify-line">
-              <view class="line-word title-font">订单编号</view>
-              <view class="flex line-word-r value-font" @tap="copy(order.ordersNo)">
-                <view class="">{{order.ordersNo}}
-                <u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon>
-                </view>
-                </view>
-            </view>
-
-            <view class="flex justify-between jusitify-line">
-              <view class="line-word title-font">预约时间</view>
-              <view class="line-word-r value-font" >{{order.serveTime}}</view>
-            </view>
-            <view class="flex justify-between jusitify-line">
-              <view class="line-word title-font">下单时间</view>
-              <view class="line-word-r value-font">{{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 title-font">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
-              <view class="line-word-r value-font">{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view>
-            </view>
-            <view class="flex justify-between jusitify-line" >
-              <view class="line-word title-font">项目名称</view>
-              <view class="line-word-r value-font">{{order.entryName}}</view>
-            </view>
-            <view class="flex justify-between jusitify-line">
-              <view class="line-word title-font">服务时长</view>
-              <view class="line-word-r value-font">{{order.duration}}分钟</view>
-            </view>
-            <view class="flex justify-between jusitify-line" >
-              <view class="line-word title-font">项目价格</view>
-              <view class="line-word-r value-font">￥{{order.massagePrice}}</view>
-            </view>
-
-            <view class="flex align-center jusitify-line" style="justify-content: flex-end;">
-              <view class="line-word title-font">小计：</view>
-              <view class="value-font" style="font-weight: bold;">
-                <text>
-                  ￥{{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 jusitify-line" v-if="order.tripWay" >
-              <view class="line-word title-font">出行方式</view>
-              <view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
-              <view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
-              <view class="line-word-r value-font" v-if="order.tripWay == 3">免费</view>
-            </view>
-            <view class="flex justify-between jusitify-line" v-if="order.km">
-              <view class="line-word title-font">全程距离</view>
-              <view class="line-word-r value-font">{{order.km}}km</view>
-            </view>
-            <view class="flex justify-between jusitify-line" >
-              <view class="line-word title-font">出行费用</view>
-              <view class="line-word-r value-font">￥{{order.taxiMoney}}</view>
-            </view>
-            <view class="jusitify-line-end jusitify-line"></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 title-font">优惠券</view>
-              <view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
-              <view class="value-font" 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 title-font">订单费用</view>
-              <view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.massageMoney}}</text></view>
-            </view>
-            <view class="flex justify-between jusitify-line">
-              <view class="line-word title-font">出行费用</view>
-              <view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
-            </view>
-            <view class="flex justify-between jusitify-line">
-              <view class="line-word title-font">优惠券</view>
-              <view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
-                -<text style="font-weight: bold;">￥{{order.couponMoney}}</text></view>
-              <view class="value-font" v-else>-</view>
-            </view>
-            <view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
-              <view class="line-word title-font">合计：</view>
-              <view class="value-font">
-                <text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
-                  ￥{{order.payMoneyTotal}}
-                </text>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view style="height: 100rpx;"></view>
-      </view>
-      <view class="showBtn tabber" v-if="order.status ==1">
-        <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
-          取消订单
-        </u-button>
-        <!-- <u-button
+				<view style="height: 100rpx;"></view>
+			</view>
+			<view class="showBtn tabber" v-if="order.status ==1">
+				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
+					取消订单
+				</u-button>
+				<!-- <u-button
           v-if="order.btnShow == 'true'"
           :custom-style="customStyle2"
           shape="circle" :plain="true"
@@ -349,99 +349,85 @@
           class="dingshi">
           修改订单
         </u-button> -->
-        <u-button @click="zhifu(order)" :custom-style="customStyle2" shape="circle" :plain="true"
-                  class="btns">立即支付
-        </u-button>
-        <u-button @click="goChat" :custom-style="customStyle2" shape="circle" :plain="true"
-                  class="btns">联系客服</u-button>
-      </view>
-      <view class="showBtn tabber" v-if="order.status ==2">
-        <u-button @click="cancelOrder(order)" :custom-style="customStyle" shape="circle" :hair-line="false">
-          取消订单
-        </u-button>
-        <u-button
-            v-if="order.btnShow == 'true'"
-            :custom-style="customStyle2"
-            shape="circle" :plain="true"
-            @click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
-            class="btns">
-          修改订单
-        </u-button>
+				<u-button @click="zhifu(order)" :custom-style="customStyle2" shape="circle" :plain="true"
+					class="btns">立即支付
+				</u-button>
+				<u-button @click="goChat" :custom-style="customStyle2" shape="circle" :plain="true"
+					class="btns">联系客服</u-button>
+			</view>
+			<view class="showBtn tabber" v-if="order.status ==2">
+				<u-button @click="cancelOrder(order)" :custom-style="customStyle" shape="circle" :hair-line="false">
+					取消订单
+				</u-button>
+				<u-button v-if="order.btnShow == 'true'" :custom-style="customStyle2" shape="circle" :plain="true"
+					@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')" class="btns">
+					修改订单
+				</u-button>
 
-        <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-                  class="btns">联系客服</u-button>
-      </view>
-      <view class="showBtn tabber" v-if="order.status ==3">
-        <u-button :custom-style="customStyle2" shape="circle" :plain="true"
-                  @click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
-                  class="btns">
-          去评价
-        </u-button>
-        <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="btns">
-          去投诉
-        </u-button>
-        <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-                  class="btns">联系客服</u-button>
-      </view>
-      <view class="showBtn tabber" v-if="order.status ==4">
-        <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-                  class="btns">联系客服</u-button>
-      </view>
-      <view class="showBtn tabber" v-if="order.status ==5">
-        <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-                  class="btns">联系客服</u-button>
-      </view>
-      <view class="showBtn tabber" v-if="order.status==6" :style="{'justify-content':order.status ==6||order.status ==1?'space-between':'flex-end'}">
-        <view class="gengduo" @click.stop="gengBtn">更多</view>
-        <view style="display: flex;flex-direction: row;align-items: center;justify-content: flex-end">
-          <u-button
-              shape="circle" :plain="true"
-              @click="toggle('center',order)"
-              class="btns">
-            提前结束
-          </u-button>
-          <u-button  v-if="order.isSupplement!=2"
-                     shape="circle" :plain="true"
-                     @tap="saveJZS(order.artificerId)"
-                     class="btns">
-            服务升级
-          </u-button>
-          <u-button
-              v-if="order.addNum ==null&&order.ordersMassageList[0].massageType"
-              shape="circle" :plain="true"
-              @tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
-              class="btns">
-            加钟
-          </u-button>
-          <u-button
-              v-if="order.addNum ==null&&order.ordersMassageList[0].userPackageDetail"
-              shape="circle" :plain="true"
-              @tap="saveJZ(order.ordersMassageList[0].userPackageDetail.massageTypeId)"
-              class="btns">
-            加钟
-          </u-button>
-        </view>
-        <view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
-          <view :custom-style="customStyle2"  shape="circle" :plain="true" @click="goChat"
-                class="eject-btns">联系客服</view>
-          <view :custom-style="customStyle2" @click="cancelOrder(order)" shape="circle" class="eject-btns" :hair-line="false">
-            取消订单
-          </view>
-          <view
-              shape="circle" :plain="true"
-              @click="goNav('/my/wallet/index?artificerId='+order.artificerId+'&ordersId='+order.ordersId,)"
-              class="eject-btns">
-            充值
-          </view>
-          <view :custom-style="customStyle2"
-                shape="circle" :plain="true"
-                @click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
-                class="eject-btns">
-            去投诉
-          </view>
+				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
+					class="btns">联系客服</u-button>
+			</view>
+			<view class="showBtn tabber" v-if="order.status ==3">
+				<u-button :custom-style="customStyle2" shape="circle" :plain="true"
+					@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
+					class="btns">
+					去评价
+				</u-button>
+				<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="btns">
+					去投诉
+				</u-button>
+				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
+					class="btns">联系客服</u-button>
+			</view>
+			<view class="showBtn tabber" v-if="order.status ==4">
+				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
+					class="btns">联系客服</u-button>
+			</view>
+			<view class="showBtn tabber" v-if="order.status ==5">
+				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
+					class="btns">联系客服</u-button>
+			</view>
+			<view class="showBtn tabber" v-if="order.status==6"
+				:style="{'justify-content':order.status ==6||order.status ==1?'space-between':'flex-end'}">
+				<view class="gengduo" @click.stop="gengBtn">更多</view>
+				<view style="display: flex;flex-direction: row;align-items: center;justify-content: flex-end">
+					<u-button shape="circle" :plain="true" @click="toggle('center',order)" class="btns">
+						提前结束
+					</u-button>
+					<u-button v-if="order.isSupplement!=2" shape="circle" :plain="true"
+						@tap="saveJZS(order.artificerId)" class="btns">
+						服务升级
+					</u-button>
+					<u-button v-if="order.addNum ==null&&order.ordersMassageList[0].massageType" shape="circle"
+						:plain="true" @tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)" class="btns">
+						加钟
+					</u-button>
+					<u-button v-if="order.addNum ==null&&order.ordersMassageList[0].userPackageDetail" shape="circle"
+						:plain="true" @tap="saveJZ(order.ordersMassageList[0].userPackageDetail.massageTypeId)"
+						class="btns">
+						加钟
+					</u-button>
+				</view>
+				<view class="showBtn-view" v-if="gengBtnShow==true"
+					:style="gengNum==index?{display:'inline-block'}:{display:'none'}">
+					<view :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" class="eject-btns">
+						联系客服</view>
+					<view :custom-style="customStyle2" @click="cancelOrder(order)" shape="circle" class="eject-btns"
+						:hair-line="false">
+						取消订单
+					</view>
+					<view shape="circle" :plain="true"
+						@click="goNav('/my/wallet/index?artificerId='+order.artificerId+'&ordersId='+order.ordersId,)"
+						class="eject-btns">
+						充值
+					</view>
+					<view :custom-style="customStyle2" shape="circle" :plain="true"
+						@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
+						class="eject-btns">
+						去投诉
+					</view>
 
         </view>
       </view>
@@ -461,7 +447,7 @@
                   class="btns">联系客服</u-button>
       </view>
       <view class="showBtn tabber" v-if="order.status ==8">
-        <u-button class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
+        <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
           取消订单
         </u-button>
         <u-button
@@ -489,7 +475,7 @@
                   class="btns">联系客服</u-button>
       </view>
       <view class="showBtn tabber" v-if="order.status ==10">
-        <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"S>
+        <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
           取消订单
         </u-button>
         <u-button :custom-style="customStyle2"
@@ -644,2366 +630,2446 @@
 							<span @click="closePopup(type)">
 								取消
 							</span>
-              <span @click="tiqian('center')">
+							<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">
+						</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 @click="TuiPopup(type,'3')">
 								全额退款
 							</span>
-            </view>
-          </view>
-        </view>
-      </uni-popup>
-    </view>
-  </view>
+						</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+	</view>
 
 </template>
 
 <script>
-// 调用手机系统权限
-// #ifdef APP-PLUS
-import permision from "@/components/permission.js";
-// #endif
-export default {
-  data() {
-    return {
-      showpayL:false,
-      ordersId: '',
-      tpayMoney: '',
-      paySel: 0,
-      showorder: false,
-      showorderS: false,
-      orderList: [],
-      loading: true,
-      customStyle: {
-        backgroundColor: '#ffffff',
-        color: '',
-
-        // #ifdef MP-WEIXIN
-        width: "310upx",
-        // #endif
-        // #ifndef MP-WEIXIN
-        width: '310upx',
-
-        // #endif
-        margin: '0 10upx',
-      },
-      customStyle2: {
-        backgroundColor: '#ffffff',
-        border: '1px solid #ffffff',
-        color: '#333',
-        // #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:'',
-      jiazhong:'',
-      shengji:'',
-      gengBtnShow:false,
-    }
-  },
-  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
-  },
-  mounted() {
-  },
-  methods: {
-    zhifu(){//立即支付
-      this.showpayL=true
-    },
-    // 套餐 次卡 疗程立即支付订单
-    // 支付订单
-    payTc() {
-      let that = this
-      that.showpayL = false
-      uni.showModal({
-        title: '付款提示',
-        content: '确认支付' + that.order.taxiMoney + '元吗?',
-        success: function(re) {
-          if (re.confirm) {
-            that.$queue.showLoading('支付中...')
-            console.log('用户点击确定');
-            if (that.openWay == 1) { //零钱支付
-              that.$Request.post("/app/artificer/payOrders", {
-                ordersId: that.order.ordersId,
-                userPackageDetailId : that.order.userPackageDetailId
-              }).then(res => {
-                uni.hideLoading();
-                if (res.code == 0) {
-                  uni.showToast({
-                    title: '支付成功'
-                  })
-                  that.getOrder()
-                  that.showpayL = false;
-                  uni.switchTab({
-                    url:'/pages/order/index'
-                  })
-                } else {
-                  uni.showToast({
-                    title: res.msg,
-                    icon: 'none'
-                  })
-                }
-              });
-            } else if (that.openWay == 2) { //微信支付
-              that.$queue.showLoading('支付中...')
-              // #ifdef MP-WEIXIN
-              let data = {
-                ordersId: that.order.ordersId,
-                type: 3,
-                userPackageDetailId : that.order.userPackageDetailId
-              }
-              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'
-                      })
-                      uni.switchTab({
-                        url:'/pages/order/index'
-                      })
-                      that.getOrder()
-                      // this.$queue.showToast('支付成功');
-
-                      that.showpayL = false
-                    },
-                    fail: function(err) {
-                      uni.hideLoading();
-                      // 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,
-                  userPackageDetailId : that.order.userPackageDetailId
-                }
-                that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
-
-                  if (rea.code == 0) {
-                    uni.hideLoading();
-                    uni.showToast({
-                      title: '支付成功'
-                    })
-                    that.getOrder()
-                    that.showpayL = false;
-                    uni.switchTab({
-                      url:'/pages/order/index'
-                    })
-                    that.callPay(rea.data);
-
-                  } else {
-                    uni.hideLoading();
-                    uni.showToast({
-                      title: rea.msg,
-                      icon: 'none'
-                    })
-                  }
-                });
-              } else {
-                let data = {
-                  ordersId: that.order.ordersId,
-                  type: 4,
-                  userPackageDetailId : that.order.userPackageDetailId
-                }
-                // 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) {
-                    uni.showToast({
-                      title: '支付成功'
-                    })
-                    that.getOrder()
-                    uni.switchTab({
-                      url:'/pages/order/index'
-                    })
-                    that.showpayL = false
-                    uni.hideLoading();
-                    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.hideLoading();
-                    uni.showToast({
-                      title: rea.msg,
-                      icon: 'none'
-                    })
-                  }
-                });
-              }
-
-              // #endif
-
-              // #ifdef APP
-              let data = {
-                ordersId: that.order.ordersId,
-                type: 1,
-                userPackageDetailId : that.order.userPackageDetailId
-              }
-              that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
-
-                if (rea.code == 0) {
-                  uni.hideLoading();
-                  uni.showToast({
-                    title: '支付成功'
-                  })
-                  that.getOrder()
-                  uni.switchTab({
-                    url:'/pages/order/index'
-                  })
-                  that.showpayL = false
-                  that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
-
-                }else{
-                  uni.hideLoading();
-                }
-              });
-              // #endif
-            } else if (that.openWay == 3) { //支付宝支付
-              that.$queue.showLoading('支付中...')
-              // #ifdef H5
-              let data = {
-                ordersId: that.order.ordersId,
-                type: 2,
-                userPackageDetailId : that.order.userPackageDetailId
-              }
-              that.$Request.post('/app/aliPay/payOrder', data).then(
-                  rea => {
-                    uni.hideLoading();
-                    uni.showToast({
-                      title: '支付成功'
-                    })
-                    that.getOrder()
-                    uni.switchTab({
-                      url:'/pages/order/index'
-                    })
-                    that.showpayL = 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.order.ordersId,
-                type: 1,
-                userPackageDetailId : that.order.userPackageDetailId
-              }
-              that.$Request.post('/app/aliPay/payOrder', data).then(
-                  rea => {
-                    uni.hideLoading();
-                    uni.showToast({
-                      title: '支付成功'
-                    })
-                    that.getOrder()
-                    uni.switchTab({
-                      url:'/pages/order/index'
-                    })
-                    that.showpayL = false
-                    that.setPayment('alipay', rea.data);
-
-                  });
-              // #endif
-            }
-
-          } else if (re.cancel) {
-            uni.hideLoading();
-            console.log('用户点击取消');
-          }
-        }
-
-      })
-
-    },
-
-    taocanDaiBd(url,item){
-      this.$queue.setData('getJishi','');
-      this.$queue.setData('mainData',item);
-      uni.navigateTo({
-        url:url
-      })
-    },
-    // 立即支付订单
-    payLj() {
-      let that = this
-      that.showpayL = false;
-      uni.showModal({
-        title: '付款提示',
-        content: '确认支付' + that.order.payMoney + '元吗?',
-        success: function(re) {
-          if (re.confirm) {
-            that.$queue.showLoading('支付中...')
-            console.log('用户点击确定');
-            if (that.openWay == 1) { //零钱支付
-              that.$Request.post("/app/artificer/payOrders", {
-                ordersId: that.order.ordersId,
-              }).then(res => {
-                uni.hideLoading();
-                if (res.code == 0) {
-                  uni.showToast({
-                    title: '支付成功'
-                  })
-                  that.showpayL = false
-                  that.getOrder()
-                  uni.switchTab({
-                    url:'/pages/order/index'
-                  })
-                  // that.showorderS=false;
-
-                } else {
-                  uni.showToast({
-                    title: res.msg,
-                    icon: 'none'
-                  })
-                }
-              });
-            } else if (that.openWay == 2) { //微信支付
-              that.$queue.showLoading('支付中...')
-              // #ifdef MP-WEIXIN
-              let data = {
-                ordersId: that.order.ordersId,
-                type: 3
-              }
-              that.$Request.post('/app/wxPay/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()
-                      uni.switchTab({
-                        url:'/pages/order/index'
-                      })
-                      that.showpayL = false
-                      // 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 => {
-
-                  if (rea.code == 0) {
-                    uni.showToast({
-                      title: '支付成功'
-                    })
-                    that.showpayL = false
-                    that.getOrder()
-                    uni.switchTab({
-                      url:'/pages/order/index'
-                    })
-                    that.callPay(rea.data);
-
-                  } else {
-                    uni.showToast({
-                      title: rea.msg,
-                      icon: 'none'
-                    })
-                  }
-                });
-              } else {
-                let data = {
-                  ordersId: that.order.ordersId,
-                  type: 4
-                }
-                // debugger;
-                that.$Request.post('/app/wxPay/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) {
-                    uni.showToast({
-                      title: '支付成功'
-                    })
-                    that.showpayL = false
-                    that.getOrder()
-                    uni.switchTab({
-                      url:'/pages/order/index'
-                    })
-                    const urlArr = window.location.href;
-                    const hostUrl = urlArr.split("/");
-                    const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
-                    const url = '&redirect_url=' + callBack + 'my/order/pay';
-                    window.location = rea.data.mweb_url + url
-
-                  } else {
-                    uni.showToast({
-                      title: rea.msg,
-                      icon: 'none'
-                    })
-                  }
-                });
-              }
-
-              // #endif
-
-              // #ifdef APP
-              let data = {
-                ordersId: that.order.ordersId,
-                type: 1
-              }
-              that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
-                console.log(rea)
-
-                if (rea.code == 0) {
-                  uni.showToast({
-                    title: '支付成功'
-                  })
-                  that.showpayL = false
-                  that.getOrder()
-                  uni.switchTab({
-                    url:'/pages/order/index'
-                  })
-                  that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
-
-                }
-              });
-              // #endif
-            } else if (that.openWay == 3) { //支付宝支付
-              that.$queue.showLoading('支付中...')
-              // #ifdef H5
-              let data = {
-                ordersId: that.order.ordersId,
-                type: 2
-              }
-              that.$Request.post('/app/aliPay/payOrder', data).then(
-                  rea => {
-                    uni.showToast({
-                      title: '支付成功'
-                    })
-                    that.showpayL = false
-                    that.getOrder()
-                    uni.switchTab({
-                      url:'/pages/order/index'
-                    })
-                    const div = document.createElement('div')
-                    div.innerHTML = rea.data //此处form就是后台返回接收到的数据
-                    document.body.appendChild(div)
-                    document.forms[0].submit()
-
-                  });
-              // #endif
-
-              // #ifdef APP-PLUS
-              let data = {
-                ordersId: that.order.ordersId,
-                type: 1
-              }
-              that.$Request.post('/app/aliPay/payOrder', data).then(
-                  rea => {
-                    uni.showToast({
-                      title: '支付成功'
-                    })
-                    that.showpayL = false
-                    that.getOrder()
-                    uni.switchTab({
-                      url:'/pages/order/index'
-                    })
-                    that.setPayment('alipay', rea.data);
-
-                  });
-              // #endif
-            }
-
-          } else if (re.cancel) {
-            uni.hideLoading();
-            console.log('用户点击取消');
-          }
-        }
-
-      })
-
-    },
-
-    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;
-          if(res.data["technicianType"] == 3){
-            this.order["technicianTypeName"] = "新手"
-          }
-          if(res.data["technicianType"] == 4){
-            this.order["technicianTypeName"] = "专家"
-          }
-          if(res.data["technicianType"] == 5){
-            this.order["technicianTypeName"] = "资深"
-          }
-          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')
-          }
-          let aliphone = this.$queue.getData('aliphone');
-          if (aliphone === '是' && this.order.artificer) {
-            this.ysPhone(this.order.phone, this.order.artificer.phone);
-          }
-        }
-      })
-    },
-    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,text) {//加钟 生成订单
-      let that = this
-      let payMoney = item.price;
-      that.jiazhong=text
-      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,text) {//升级 生成订单
-      let that = this
-      that.shengji=text
-      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;
-      // }
-      uni.showModal({
-        title: '付款提示',
-        content: '确认支付' + that.tpayMoney + '元吗?',
-        success: function(re) {
-          if (re.confirm) {
-            that.$queue.showLoading('支付中...')
-            console.log('用户点击确定');
-            if (that.openWay == 1) { //零钱支付
-              that.$Request.post("/app/artificer/payOrders", {
-                ordersId: that.tordersId,
-              }).then(res => {
-                uni.hideLoading();
-                if (res.code == 0) {
-                  uni.showToast({
-                    title: '支付成功'
-                  })
-                  uni.switchTab({
-                    url:'/pages/order/index'
-                  })
-                  // uni.navigateTo({
-                  // 	url:'/my/order/payShengji?ordersId='+that.tordersId
-                  // })
-                  // that.getOrder()
-                  // that.showorderS=false;
-
-                } else {
-                  uni.showToast({
-                    title: res.msg,
-                    icon: 'none'
-                  })
-                }
-              });
-            } else if (that.openWay == 2) { //微信支付
-              that.$queue.showLoading('支付中...')
-              // #ifdef MP-WEIXIN
-              let data = {
-                ordersId: that.order.ordersId,
-                type: 3
-              }
-              that.$Request.post('/app/wxPay/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: '支付成功'
-                      })
-                      uni.switchTab({
-                        url:'/pages/order/index'
-                      })
-
-                      // this.$queue.showToast('支付成功');
-
-                      // uni.switchTab({
-                      // 	url: '/pages/my/index'
-                      // })
-                    },
-                    fail: function(err) {
-                      // this.$queue.showToast('支付失败');
-                      uni.showToast({
-                        title: '支付失败',
-                        icon: 'nones'
-                      });
-                      that.getOrder()
-                    }
-                  });
-                }
-              });
-              // #endif
-
-              // #ifdef H5
-              let ua = navigator.userAgent.toLowerCase();
-              if (ua.indexOf('micromessenger') != -1) {
-                let data = {
-                  ordersId: that.order.ordersId,
-                  type: 2
-                }
-                that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
-                  that.showpay = false
-                  if (rea.code == 0) {
-                    uni.showToast({
-                      title: '支付成功'
-                    })
-                    uni.switchTab({
-                      url:'/pages/order/index'
-                    })
-
-                    that.callPay(rea.data);
-                  } else {
-                    uni.showToast({
-                      title: rea.msg,
-                      icon: 'none'
-                    })
-                  }
-                });
-              } else {
-                let data = {
-                  ordersId: that.order.ordersId,
-                  type: 4
-                }
-                // debugger;
-                that.$Request.post('/app/wxPay/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) {
-                    uni.showToast({
-                      title: '支付成功'
-                    })
-                    uni.switchTab({
-                      url:'/pages/order/index'
-                    })
-                    const urlArr = window.location.href;
-                    const hostUrl = urlArr.split("/");
-                    const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
-                    const url = '&redirect_url=' + callBack + 'my/order/pay';
-                    window.location = rea.data.mweb_url + url
-                  } else {
-                    uni.showToast({
-                      title: rea.msg,
-                      icon: 'none'
-                    })
-                  }
-                });
-              }
-
-              // #endif
-
-              // #ifdef APP
-              let data = {
-                ordersId: that.order.ordersId,
-                type: 1
-              }
-              that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
-                console.log(rea)
-                that.showpay = false
-                if (rea.code == 0) {
-                  uni.showToast({
-                    title: '支付成功'
-                  })
-                  uni.switchTab({
-                    url:'/pages/order/index'
-                  })
-                  that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
-                }
-              });
-              // #endif
-            } else if (that.openWay == 3) { //支付宝支付
-              that.$queue.showLoading('支付中...')
-              // #ifdef H5
-              let data = {
-                ordersId: that.order.ordersId,
-                type: 2
-              }
-              that.$Request.post('/app/aliPay/payOrder', data).then(
-                  rea => {
-                    uni.showToast({
-                      title: '支付成功'
-                    })
-                    uni.switchTab({
-                      url:'/pages/order/index'
-                    })
-                    const div = document.createElement('div')
-                    div.innerHTML = rea.data //此处form就是后台返回接收到的数据
-                    document.body.appendChild(div)
-                    document.forms[0].submit()
-                  });
-              // #endif
-
-              // #ifdef APP-PLUS
-              let data = {
-                ordersId: that.order.ordersId,
-                type: 1
-              }
-              that.$Request.post('/app/aliPay/payOrder', data).then(
-                  rea => {
-                    uni.showToast({
-                      title: '支付成功'
-                    })
-                    uni.switchTab({
-                      url:'/pages/order/index'
-                    })
-                    that.setPayment('alipay', rea.data);
-                  });
-              // #endif
-            }
-
-          } else if (re.cancel) {
-            uni.hideLoading();
-            console.log('用户点击取消');
-          }
-        }
-      })
-
-    },
-
-    getTimeStampWithoutSeconds(date) {
-      // 将日期转换为标准的UTC时间
-      var utcDate = new Date(
-          date.getUTCFullYear(),
-          date.getUTCMonth(),
-          date.getUTCDate(),
-          date.getUTCHours(),
-          date.getUTCMinutes(),
-          0);
-      // 返回不含秒的时间戳
-      return utcDate.getTime();
-    },
-
-    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,id){//确认拒单 全额退款.同意按钮   关闭弹出框
-      var that=this;
-      that.type = typeTxte
-      let data = {
-        ordersId: that.qurenJd.ordersId?that.qurenJd.ordersId:id.ordersId,
-        isAuto: '0',
-        type: type,
-      }
-      that.$Request.post('/app/artificer/cancelSupplementOrders', data).then(res => {
-        if (res.code == 0) {
-          uni.showToast({
-            title:'操作完成！'
-          })
-          that.getOrder()
-          that.$refs.popupQ.close(typeTxte);
-          uni.showToast({
-            title:'操作成功！'
-          })
-        }else{
-          that.getOrder()
-          uni.showToast({
-            icon:'error',
-            title:res.msg
-          })
-        }
-
-      }).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){
-        console.log("earlyFinishReason",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.$queue.showLoading('提交中...')
-            that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
-              if (res.code == 0||res.code == 200) {
-                uni.showToast({
-                  title:'操作完成！'
-                })
-                that.getOrder()
-                that.$refs.popup.close(type);
-                uni.switchTab({
-                  url:'/pages/order/index'
-                })
-                uni.hideLoading();
-              }else{
-                uni.hideLoading();
-                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.hideLoading();
-        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.gengBtnShow=!this.gengBtnShow
-    },
-    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'
-                  })
-
-                  if(that.jiazhong=='加钟'){
-                    uni.navigateTo({
-                      url:'/my/order/payJaZ?ordersId='+that.order.ordersId
-                    })
-                  }else if(that.shengji=='升级'){
-                    uni.navigateTo({
-                      url:'/my/order/payShengji?ordersId='+that.tordersId
-                    })
-                  }
-
-                  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);
-      this.$queue.setData('getJishi','');
-      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) {
-      this.$queue.setData('xiangmu',item);
-      if(item.userPackageDetailId!=null){
-        uni.navigateTo({
-          url:'/my/order/payModifyTcMy?ordersId='+item.ordersId
-        })
-      }else if(item.userPackageDetailId!=null&&isSupplement=='1'){
-        uni.navigateTo({
-          url:'/my/order/payModifyDd?ordersId='+item.ordersId
-        })
-      }else{
-        uni.navigateTo({
-          url:'/my/order/payModify?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();
-        }
-      });
-    },
-    cancelOrders(data){//取消订单
-      let that = this
-      that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
-        uni.hideLoading();
-        if (res.code == 0) {
-          that.page = 1;
-          uni.showToast({
-            title:'操作成功！'
-          })
-          that.getOrder()
-        } else {
-          that.$queue.showToast(res.msg);
-        }
-      })
-    },
-    // 取消订单待确认
-    cancelOrder(e) {
-      let that = this
-      let data = {
-        ordersId: e.ordersId
-      }
-      //取消订单扣费
-      that.$Request.post('/app/artificer/cancelOrdersMoney', data).then(resa => {
-        uni.hideLoading();
-        if (resa.code == 0) {
-          that.page = 1;
-          uni.showModal({
-            title: '温馨提示',
-            content: '是否确认取消订单？' + resa.data,
-            success: function(res) {
-              if (res.confirm) {
-                that.cancelOrders(data)
-                that.$queue.showLoading('取消中...')
-
-              } else if (res.cancel) {
-                console.log('用户点击取消');
-              }
-            }
-          });
-        } else {
-          that.$queue.showToast(res.msg);
-        }
-      })
-    },
-    // 完成订单
-    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.showToast({
-                  title:'操作成功！'
-                })
-                that.getOrder()
-                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
-          })
-        }
-      })
-    },
-  }
-}
+	// 调用手机系统权限
+	// #ifdef APP-PLUS
+	import permision from "@/components/permission.js";
+	// #endif
+	export default {
+		data() {
+			return {
+				showpayL: false,
+				ordersId: '',
+				tpayMoney: '',
+				paySel: 0,
+				showorder: false,
+				showorderS: false,
+				orderList: [],
+				loading: true,
+				customStyle: {
+					backgroundColor: '#ffffff',
+					color: '',
+
+					// #ifdef MP-WEIXIN
+					width: "310upx",
+					// #endif
+					// #ifndef MP-WEIXIN
+					width: '310upx',
+
+					// #endif
+					margin: '0 10upx',
+				},
+				customStyle2: {
+					backgroundColor: '#ffffff',
+					border: '1px solid #ffffff',
+					color: '#333',
+					// #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: '',
+				jiazhong: '',
+				shengji: '',
+				gengBtnShow: false,
+			}
+		},
+		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
+		},
+		mounted() {},
+		methods: {
+			zhifu() { //立即支付
+				this.showpayL = true
+			},
+			// 套餐 次卡 疗程立即支付订单
+			// 支付订单
+			payTc() {
+				let that = this
+				that.showpayL = false
+				uni.showModal({
+					title: '付款提示',
+					content: '确认支付' + that.order.taxiMoney + '元吗?',
+					success: function(re) {
+						if (re.confirm) {
+							that.$queue.showLoading('支付中...')
+							console.log('用户点击确定');
+							if (that.openWay == 1) { //零钱支付
+								that.$Request.post("/app/artificer/payOrders", {
+									ordersId: that.order.ordersId,
+									userPackageDetailId: that.order.userPackageDetailId
+								}).then(res => {
+									uni.hideLoading();
+									if (res.code == 0) {
+										uni.showToast({
+											title: '支付成功'
+										})
+										that.getOrder()
+										that.showpayL = false;
+										uni.switchTab({
+											url: '/pages/order/index'
+										})
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: 'none'
+										})
+									}
+								});
+							} else if (that.openWay == 2) { //微信支付
+								that.$queue.showLoading('支付中...')
+								// #ifdef MP-WEIXIN
+								let data = {
+									ordersId: that.order.ordersId,
+									type: 3,
+									userPackageDetailId: that.order.userPackageDetailId
+								}
+								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'
+												})
+												uni.switchTab({
+													url: '/pages/order/index'
+												})
+												that.getOrder()
+												// this.$queue.showToast('支付成功');
+
+												that.showpayL = false
+											},
+											fail: function(err) {
+												uni.hideLoading();
+												// 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,
+										userPackageDetailId: that.order.userPackageDetailId
+									}
+									that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
+
+										if (rea.code == 0) {
+											uni.hideLoading();
+											uni.showToast({
+												title: '支付成功'
+											})
+											that.getOrder()
+											that.showpayL = false;
+											uni.switchTab({
+												url: '/pages/order/index'
+											})
+											that.callPay(rea.data);
+
+										} else {
+											uni.hideLoading();
+											uni.showToast({
+												title: rea.msg,
+												icon: 'none'
+											})
+										}
+									});
+								} else {
+									let data = {
+										ordersId: that.order.ordersId,
+										type: 4,
+										userPackageDetailId: that.order.userPackageDetailId
+									}
+									// 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) {
+											uni.showToast({
+												title: '支付成功'
+											})
+											that.getOrder()
+											uni.switchTab({
+												url: '/pages/order/index'
+											})
+											that.showpayL = false
+											uni.hideLoading();
+											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.hideLoading();
+											uni.showToast({
+												title: rea.msg,
+												icon: 'none'
+											})
+										}
+									});
+								}
+
+								// #endif
+
+								// #ifdef APP
+								let data = {
+									ordersId: that.order.ordersId,
+									type: 1,
+									userPackageDetailId: that.order.userPackageDetailId
+								}
+								that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
+
+									if (rea.code == 0) {
+										uni.hideLoading();
+										uni.showToast({
+											title: '支付成功'
+										})
+										that.getOrder()
+										uni.switchTab({
+											url: '/pages/order/index'
+										})
+										that.showpayL = false
+										that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
+
+									} else {
+										uni.hideLoading();
+									}
+								});
+								// #endif
+							} else if (that.openWay == 3) { //支付宝支付
+								that.$queue.showLoading('支付中...')
+								// #ifdef H5
+								let data = {
+									ordersId: that.order.ordersId,
+									type: 2,
+									userPackageDetailId: that.order.userPackageDetailId
+								}
+								that.$Request.post('/app/aliPay/payOrder', data).then(
+									rea => {
+										uni.hideLoading();
+										uni.showToast({
+											title: '支付成功'
+										})
+										that.getOrder()
+										uni.switchTab({
+											url: '/pages/order/index'
+										})
+										that.showpayL = 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.order.ordersId,
+									type: 1,
+									userPackageDetailId: that.order.userPackageDetailId
+								}
+								that.$Request.post('/app/aliPay/payOrder', data).then(
+									rea => {
+										uni.hideLoading();
+										uni.showToast({
+											title: '支付成功'
+										})
+										that.getOrder()
+										uni.switchTab({
+											url: '/pages/order/index'
+										})
+										that.showpayL = false
+										that.setPayment('alipay', rea.data);
+
+									});
+								// #endif
+							}
+
+						} else if (re.cancel) {
+							uni.hideLoading();
+							console.log('用户点击取消');
+						}
+					}
+
+				})
+
+			},
+
+			taocanDaiBd(url, item) {
+				this.$queue.setData('getJishi', '');
+				this.$queue.setData('mainData', item);
+				uni.navigateTo({
+					url: url
+				})
+			},
+			// 立即支付订单
+			payLj() {
+				let that = this
+				that.showpayL = false;
+				uni.showModal({
+					title: '付款提示',
+					content: '确认支付' + that.order.payMoney + '元吗?',
+					success: function(re) {
+						if (re.confirm) {
+							that.$queue.showLoading('支付中...')
+							console.log('用户点击确定');
+							if (that.openWay == 1) { //零钱支付
+								that.$Request.post("/app/artificer/payOrders", {
+									ordersId: that.order.ordersId,
+								}).then(res => {
+									uni.hideLoading();
+									if (res.code == 0) {
+										uni.showToast({
+											title: '支付成功'
+										})
+										that.showpayL = false
+										that.getOrder()
+										uni.switchTab({
+											url: '/pages/order/index'
+										})
+										// that.showorderS=false;
+
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: 'none'
+										})
+									}
+								});
+							} else if (that.openWay == 2) { //微信支付
+								that.$queue.showLoading('支付中...')
+								// #ifdef MP-WEIXIN
+								let data = {
+									ordersId: that.order.ordersId,
+									type: 3
+								}
+								that.$Request.post('/app/wxPay/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()
+												uni.switchTab({
+													url: '/pages/order/index'
+												})
+												that.showpayL = false
+												// 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 => {
+
+										if (rea.code == 0) {
+											uni.showToast({
+												title: '支付成功'
+											})
+											that.showpayL = false
+											that.getOrder()
+											uni.switchTab({
+												url: '/pages/order/index'
+											})
+											that.callPay(rea.data);
+
+										} else {
+											uni.showToast({
+												title: rea.msg,
+												icon: 'none'
+											})
+										}
+									});
+								} else {
+									let data = {
+										ordersId: that.order.ordersId,
+										type: 4
+									}
+									// debugger;
+									that.$Request.post('/app/wxPay/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) {
+											uni.showToast({
+												title: '支付成功'
+											})
+											that.showpayL = false
+											that.getOrder()
+											uni.switchTab({
+												url: '/pages/order/index'
+											})
+											const urlArr = window.location.href;
+											const hostUrl = urlArr.split("/");
+											const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
+											const url = '&redirect_url=' + callBack + 'my/order/pay';
+											window.location = rea.data.mweb_url + url
+
+										} else {
+											uni.showToast({
+												title: rea.msg,
+												icon: 'none'
+											})
+										}
+									});
+								}
+
+								// #endif
+
+								// #ifdef APP
+								let data = {
+									ordersId: that.order.ordersId,
+									type: 1
+								}
+								that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
+									console.log(rea)
+
+									if (rea.code == 0) {
+										uni.showToast({
+											title: '支付成功'
+										})
+										that.showpayL = false
+										that.getOrder()
+										uni.switchTab({
+											url: '/pages/order/index'
+										})
+										that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
+
+									}
+								});
+								// #endif
+							} else if (that.openWay == 3) { //支付宝支付
+								that.$queue.showLoading('支付中...')
+								// #ifdef H5
+								let data = {
+									ordersId: that.order.ordersId,
+									type: 2
+								}
+								that.$Request.post('/app/aliPay/payOrder', data).then(
+									rea => {
+										uni.showToast({
+											title: '支付成功'
+										})
+										that.showpayL = false
+										that.getOrder()
+										uni.switchTab({
+											url: '/pages/order/index'
+										})
+										const div = document.createElement('div')
+										div.innerHTML = rea.data //此处form就是后台返回接收到的数据
+										document.body.appendChild(div)
+										document.forms[0].submit()
+
+									});
+								// #endif
+
+								// #ifdef APP-PLUS
+								let data = {
+									ordersId: that.order.ordersId,
+									type: 1
+								}
+								that.$Request.post('/app/aliPay/payOrder', data).then(
+									rea => {
+										uni.showToast({
+											title: '支付成功'
+										})
+										that.showpayL = false
+										that.getOrder()
+										uni.switchTab({
+											url: '/pages/order/index'
+										})
+										that.setPayment('alipay', rea.data);
+
+									});
+								// #endif
+							}
+
+						} else if (re.cancel) {
+							uni.hideLoading();
+							console.log('用户点击取消');
+						}
+					}
+
+				})
+
+			},
+
+			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;
+						if (res.data["technicianType"] == 3) {
+							this.order["technicianTypeName"] = "新手"
+						}
+						if (res.data["technicianType"] == 4) {
+							this.order["technicianTypeName"] = "专家"
+						}
+						if (res.data["technicianType"] == 5) {
+							this.order["technicianTypeName"] = "资深"
+						}
+						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')
+						}
+						let aliphone = this.$queue.getData('aliphone');
+						if (aliphone === '是' && this.order.artificer) {
+							this.ysPhone(this.order.phone, this.order.artificer.phone);
+						}
+					}
+				})
+			},
+			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, text) { //加钟 生成订单
+				let that = this
+				let payMoney = item.price;
+				that.jiazhong = text
+				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, text) { //升级 生成订单
+				let that = this
+				that.shengji = text
+				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;
+				// }
+				uni.showModal({
+					title: '付款提示',
+					content: '确认支付' + that.tpayMoney + '元吗?',
+					success: function(re) {
+						if (re.confirm) {
+							that.$queue.showLoading('支付中...')
+							console.log('用户点击确定');
+							if (that.openWay == 1) { //零钱支付
+								that.$Request.post("/app/artificer/payOrders", {
+									ordersId: that.tordersId,
+								}).then(res => {
+									uni.hideLoading();
+									if (res.code == 0) {
+										uni.showToast({
+											title: '支付成功'
+										})
+										uni.switchTab({
+											url: '/pages/order/index'
+										})
+										// uni.navigateTo({
+										// 	url:'/my/order/payShengji?ordersId='+that.tordersId
+										// })
+										// that.getOrder()
+										// that.showorderS=false;
+
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: 'none'
+										})
+									}
+								});
+							} else if (that.openWay == 2) { //微信支付
+								that.$queue.showLoading('支付中...')
+								// #ifdef MP-WEIXIN
+								let data = {
+									ordersId: that.order.ordersId,
+									type: 3
+								}
+								that.$Request.post('/app/wxPay/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: '支付成功'
+												})
+												uni.switchTab({
+													url: '/pages/order/index'
+												})
+
+												// this.$queue.showToast('支付成功');
+
+												// uni.switchTab({
+												// 	url: '/pages/my/index'
+												// })
+											},
+											fail: function(err) {
+												// this.$queue.showToast('支付失败');
+												uni.showToast({
+													title: '支付失败',
+													icon: 'nones'
+												});
+												that.getOrder()
+											}
+										});
+									}
+								});
+								// #endif
+
+								// #ifdef H5
+								let ua = navigator.userAgent.toLowerCase();
+								if (ua.indexOf('micromessenger') != -1) {
+									let data = {
+										ordersId: that.order.ordersId,
+										type: 2
+									}
+									that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
+										that.showpay = false
+										if (rea.code == 0) {
+											uni.showToast({
+												title: '支付成功'
+											})
+											uni.switchTab({
+												url: '/pages/order/index'
+											})
+
+											that.callPay(rea.data);
+										} else {
+											uni.showToast({
+												title: rea.msg,
+												icon: 'none'
+											})
+										}
+									});
+								} else {
+									let data = {
+										ordersId: that.order.ordersId,
+										type: 4
+									}
+									// debugger;
+									that.$Request.post('/app/wxPay/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) {
+											uni.showToast({
+												title: '支付成功'
+											})
+											uni.switchTab({
+												url: '/pages/order/index'
+											})
+											const urlArr = window.location.href;
+											const hostUrl = urlArr.split("/");
+											const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
+											const url = '&redirect_url=' + callBack + 'my/order/pay';
+											window.location = rea.data.mweb_url + url
+										} else {
+											uni.showToast({
+												title: rea.msg,
+												icon: 'none'
+											})
+										}
+									});
+								}
+
+								// #endif
+
+								// #ifdef APP
+								let data = {
+									ordersId: that.order.ordersId,
+									type: 1
+								}
+								that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
+									console.log(rea)
+									that.showpay = false
+									if (rea.code == 0) {
+										uni.showToast({
+											title: '支付成功'
+										})
+										uni.switchTab({
+											url: '/pages/order/index'
+										})
+										that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
+									}
+								});
+								// #endif
+							} else if (that.openWay == 3) { //支付宝支付
+								that.$queue.showLoading('支付中...')
+								// #ifdef H5
+								let data = {
+									ordersId: that.order.ordersId,
+									type: 2
+								}
+								that.$Request.post('/app/aliPay/payOrder', data).then(
+									rea => {
+										uni.showToast({
+											title: '支付成功'
+										})
+										uni.switchTab({
+											url: '/pages/order/index'
+										})
+										const div = document.createElement('div')
+										div.innerHTML = rea.data //此处form就是后台返回接收到的数据
+										document.body.appendChild(div)
+										document.forms[0].submit()
+									});
+								// #endif
+
+								// #ifdef APP-PLUS
+								let data = {
+									ordersId: that.order.ordersId,
+									type: 1
+								}
+								that.$Request.post('/app/aliPay/payOrder', data).then(
+									rea => {
+										uni.showToast({
+											title: '支付成功'
+										})
+										uni.switchTab({
+											url: '/pages/order/index'
+										})
+										that.setPayment('alipay', rea.data);
+									});
+								// #endif
+							}
+
+						} else if (re.cancel) {
+							uni.hideLoading();
+							console.log('用户点击取消');
+						}
+					}
+				})
+
+			},
+
+			getTimeStampWithoutSeconds(date) {
+				// 将日期转换为标准的UTC时间
+				var utcDate = new Date(
+					date.getUTCFullYear(),
+					date.getUTCMonth(),
+					date.getUTCDate(),
+					date.getUTCHours(),
+					date.getUTCMinutes(),
+					0);
+				// 返回不含秒的时间戳
+				return utcDate.getTime();
+			},
+
+			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, id) { //确认拒单 全额退款.同意按钮   关闭弹出框
+				var that = this;
+				that.type = typeTxte
+				let data = {
+					ordersId: that.qurenJd.ordersId ? that.qurenJd.ordersId : id.ordersId,
+					isAuto: '0',
+					type: type,
+				}
+				that.$Request.post('/app/artificer/cancelSupplementOrders', data).then(res => {
+					if (res.code == 0) {
+						uni.showToast({
+							title: '操作完成！'
+						})
+						that.getOrder()
+						that.$refs.popupQ.close(typeTxte);
+						uni.showToast({
+							title: '操作成功！'
+						})
+					} else {
+						that.getOrder()
+						uni.showToast({
+							icon: 'error',
+							title: res.msg
+						})
+					}
+
+				}).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) {
+					console.log("earlyFinishReason", 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.$queue.showLoading('提交中...')
+							that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
+								if (res.code == 0 || res.code == 200) {
+									uni.showToast({
+										title: '操作完成！'
+									})
+									that.getOrder()
+									that.$refs.popup.close(type);
+									uni.switchTab({
+										url: '/pages/order/index'
+									})
+									uni.hideLoading();
+								} else {
+									uni.hideLoading();
+									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.hideLoading();
+					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.gengBtnShow = !this.gengBtnShow
+			},
+			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'
+										})
+
+										if (that.jiazhong == '加钟') {
+											uni.navigateTo({
+												url: '/my/order/payJaZ?ordersId=' + that.order
+													.ordersId
+											})
+										} else if (that.shengji == '升级') {
+											uni.navigateTo({
+												url: '/my/order/payShengji?ordersId=' + that
+													.tordersId
+											})
+										}
+
+										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);
+				this.$queue.setData('getJishi', '');
+				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) {
+				this.$queue.setData('xiangmu', item);
+				if (item.userPackageDetailId != null) {
+					uni.navigateTo({
+						url: '/my/order/payModifyTcMy?ordersId=' + item.ordersId
+					})
+				} else if (item.userPackageDetailId != null && isSupplement == '1') {
+					uni.navigateTo({
+						url: '/my/order/payModifyDd?ordersId=' + item.ordersId
+					})
+				} else {
+					uni.navigateTo({
+						url: '/my/order/payModify?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();
+					}
+				});
+			},
+			cancelOrders(data) { //取消订单
+				let that = this
+				that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
+					uni.hideLoading();
+					if (res.code == 0) {
+						that.page = 1;
+						uni.showToast({
+							title: '操作成功！'
+						})
+						that.getOrder()
+					} else {
+						that.$queue.showToast(res.msg);
+					}
+				})
+			},
+			// 取消订单待确认
+			cancelOrder(e) {
+				let that = this
+				let data = {
+					ordersId: e.ordersId
+				}
+				//取消订单扣费
+				that.$Request.post('/app/artificer/cancelOrdersMoney', data).then(resa => {
+					uni.hideLoading();
+					if (resa.code == 0) {
+						that.page = 1;
+						uni.showModal({
+							title: '温馨提示',
+							content: '是否确认取消订单？' + resa.data,
+							success: function(res) {
+								if (res.confirm) {
+									that.cancelOrders(data)
+									that.$queue.showLoading('取消中...')
+
+								} else if (res.cancel) {
+									console.log('用户点击取消');
+								}
+							}
+						});
+					} else {
+						that.$queue.showToast(res.msg);
+					}
+				})
+			},
+			// 完成订单
+			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.showToast({
+										title: '操作成功！'
+									})
+									that.getOrder()
+									uni.navigateBack()
+								} else {
+									that.$queue.showToast(res.msg);
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			goMsg() {
+				let data = {
+					userId: uni.getStorageSync('userId'),
+					focusedUserId: this.order.user.userId
+				}
+				this.$Request.postJson('/app/chat/insertChatConversation ', data).then(res => {
+					if (res.code == 0) {
+						let id = this.order.user.userId == res.data.userId ? res.data.focusedUserId : this.order
+							.user.userId
+						uni.navigateTo({
+							url: '/pages/msg/im?chatConversationId=' + res.data.chatConversationId +
+								'&byUserId=' + id
+						})
+					}
+				})
+			},
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
+	/deep/.u-size-default {
+		width: 85px !important;
+		height: 34rpx;
+		line-height: 34rpx;
+		font-size: 28rpx;
+	}
 
-/deep/.u-size-default{
-  width: 85px !important;
-  height:34rpx;
-  line-height: 34rpx;
-  font-size: 28rpx;
-}
-/deep/.padding-bottom{
-  padding-bottom: 20rpx;
-}
+	/deep/.padding-bottom {
+		padding-bottom: 20rpx;
+	}
 
-/deep/.u-drawer{
-  z-index:11 !important;
-}
-.xiangmu-cont-top-left{
-  font-weight: normal;
-  font-size: 23rpx;
-  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-size: 30rpx;
-  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;
-}
+	/deep/.u-drawer {
+		z-index: 11 !important;
+	}
 
-.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;
-}
+	.xiangmu-cont-top-left {
+		font-weight: normal;
+		font-size: 23rpx;
+		color: #049E89;
+		margin-top: 1px;
+	}
 
-.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: 28px;
-}
-.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;
-}
-.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: 36rpx;
-  display: flex;
-  flex-direction: column;
-}
-/deep/.btns{
- color: #019C88 !important;
- margin-left: 10rpx !important;
- height:70rpx;
- font-size: 30rpx;
-}
-.eject-btns{
-  height:60rpx;
-  line-height: 60rpx;
-  border-bottom: 1px solid #f7f7f7;
-  padding: 0 20rpx;
-  color: #666666;
-}
-/deep/.u-size-default{
-  // margin: 5px 0px 0px 0px;
-}
+	.xiangmu-cont-top-time {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
 
-.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: 28rpx;
-  color: #7D7D7D;
-  margin-left: 26rpx;
-}
-.showBtn-view{
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  position: absolute;
-  background-color: #ffffff;
-  padding: 10px;
-  bottom:90rpx;
-  left:50rpx;
-  box-shadow: 0px 0px 3px 0px #b5b5b5;
-  border-radius: 10rpx;
-}
-.showBtn-view:before {
-  position: absolute;
-  left: 20rpx;
-  bottom:-12rpx;
-  width: 20rpx;
-  height: 20rpx;
-  background: #ffffff;
-  margin-top: -2px;
-  border-right: 1px solid #e5e5e5;
-  border-bottom: 1px solid #e5e5e5;
-  transform: rotate(45deg);
-  -webkit-transform: rotate(45deg);
-  content: '';
-}
-.showBtn{
-  width: 100%;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  margin-top: 20rpx;
-}
-.hideBtn{
-  width: 100%;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  flex-wrap: wrap;
-  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-size: 30rpx;
+		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: 28px;
+	}
+
+	.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;
+	}
+
+	.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: 36rpx;
+		display: flex;
+		flex-direction: column;
+	}
+
+	/deep/.btns {
+		color: #019C88 !important;
+		margin-left: 10rpx !important;
+    height:70rpx;
+    font-size: 30rpx;
+	}
+
+	.eject-btns {
+		height: 60rpx;
+		line-height: 60rpx;
+		border-bottom: 1px solid #f7f7f7;
+		padding: 0 20rpx;
+		color: #666666;
+	}
+
+	/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: 28rpx;
+		color: #7D7D7D;
+		margin-left: 26rpx;
+	}
+
+	.showBtn-view {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		position: absolute;
+		background-color: #ffffff;
+		padding: 10px;
+		bottom: 90rpx;
+		left: 50rpx;
+		box-shadow: 0px 0px 3px 0px #b5b5b5;
+		border-radius: 10rpx;
+	}
+
+	.showBtn-view:before {
+		position: absolute;
+		left: 20rpx;
+		bottom: -12rpx;
+		width: 20rpx;
+		height: 20rpx;
+		background: #ffffff;
+		margin-top: -2px;
+		border-right: 1px solid #e5e5e5;
+		border-bottom: 1px solid #e5e5e5;
+		transform: rotate(45deg);
+		-webkit-transform: rotate(45deg);
+		content: '';
+	}
+
+	.showBtn {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		margin-top: 20rpx;
+	}
+
+	.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;
-  font-size: 32rpx;
-}
-.head-title-right{
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-}
+	.dingshi {
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	}
 
-.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: 32rpx;
-  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: 10rpx 29rpx;
-	margin-bottom: 40rpx;
-}
-.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: bold;
-	font-size: 32rpx;
-	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;
-	font-size: 32rpx;
-	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-top: 20px;
-  width: 100%;
-  background-color: #f7f7f7;
-}
-.pay-title{
-  font-weight: bold;
-  font-size: 32rpx;
-  color: #333333;
-  margin-bottom: 12px;
-}
-page {
-  background: #f7f7f7;
-}
+	.zhuangtai {
+		color: #029D88;
+		font-weight: bold;
+		font-size: 32rpx;
+	}
 
-.bgImg {
-  background-image: url('https://admin.sjajk.com/file/uploadPath/2023/01/03/02952e7260e553d0f3bb26a1cd154921.png');
-  background-size: 100% 1161rpx;
-}
+	.head-title-right {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
 
-.bg {
-  background: linear-gradient(to right, #223845, #00a85b);
-}
+	.fei-view-list span,
+	.fei-view-list-z span {
+		font-weight: bold;
+		font-size: 25rpx;
+	}
 
-.list_item {
-  // width: 650upx;
-  // height: 160upx;
-  width: 92%;
-  // margin: 30rpx 0;
-  background: #FFFFFF;
-  border-radius: 24upx;
-  padding: 20upx;
-  display: flex;
-  margin-top: 26upx;
+	.fei-view-list-z {
+		height: 65rpx;
+		border-top: 1px solid #f3f3f3;
+		padding-top: 20rpx;
+		font-weight: bold;
+	}
 
-  .listitem_rightview {
-    margin-left: 20upx;
-    width: 80%;
-    padding-top: 10rpx;
+	.fei-view-list span:nth-child(1),
+	.fei-view-list-z span:nth-child(1) {
+		color: #666666;
+	}
 
-    .btnview {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin-top: 12upx;
-      width: 100%;
-    }
+	.fei-view-list span:nth-child(2) {
+		color: #333333;
+	}
 
-    .titleview {
-      display: flex;
-      align-items: flex-end;
-      justify-content: space-between
-    }
+	.fei-view-list,
+	.fei-view-list-z {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 5px;
+	}
 
-    .moneyview {
-      display: flex;
-      align-items: flex-end;
+	.fei-view {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
 
-      image {
-        width: 30upx;
-        height: 30upx;
-        margin-left: 20upx;
-        margin-bottom: 2upx;
-      }
-    }
+	.fei-title {
+		width: 100%;
+		text-align: center;
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+		padding-bottom: 10px;
+		margin-bottom: 10px;
+		border-bottom: 1px solid #E5E5E5;
+	}
 
-    .item_time {
-      font-size: 24upx;
-      font-family: PingFang SC;
-      font-weight: 500;
-      color: #999999;
-      margin-left: 10upx;
-    }
+	.feiuong {
+		padding: 29rpx;
+	}
 
-    .item_money {
-      font-size: 32upx;
-      font-family: PingFang SC;
-      font-weight: 800;
-      color: #FF1200;
-    }
+	/deep/.uni-textarea-textarea {
+		font-weight: 400;
+		font-size: 25rpx;
+	}
 
-    .item_oldmoney {
-      font-size: 24upx;
-      font-family: PingFang SC;
-      font-weight: 500;
-      text-decoration: line-through;
-      color: #999999;
-      margin-left: 10upx;
-    }
+	/deep/.uni-textarea-placeholder {
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #C5C5C5;
+	}
 
-    .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;
-    }
+	.textarea-pay-list {
+		width: 100%;
+		height: 126rpx;
+		margin-top: 10px;
+	}
 
-    .item_yishou {
-      font-size: 22upx;
-      font-family: PingFang SC;
-      font-weight: 500;
-      color: #999999;
-    }
+	.textarea-pay {
+		background-color: #f3f3f3;
+		width: 100%;
+		height: 100%;
+		background: #F3F3F3;
+		border-radius: 14rpx;
+		padding: 7px;
+	}
 
-    .item_title {
-      font-size: 28upx;
-      font-family: PingFang SC;
-      font-weight: bold;
-      color: #1E1F31;
-    }
-  }
+	.list-pay {
+		width: 100%;
+		padding: 10rpx 29rpx;
+		margin-bottom: 40rpx;
+	}
 
-  image {
-    width: 220upx;
-    height: 160upx;
-    border-radius: 24upx;
-  }
-}
+	.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;
+	}
 
-.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;
-}
+	.pay-ding,
+	.feiuong {
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		margin-top: 24rpx;
+		// padding: 29rpx;
+	}
 
-.tabber {
-  width: 100%;
-  background: #ffffff;
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  justify-content: center;
-  height: 110rpx;
-  padding: 0 30rpx;
-  border-top: 1px solid #f0f0f0;
-}
+	.phone-pay {
+		width: 49rpx;
+		height: 44rpx;
+	}
 
-.box {
-  /* border: 1px solid #005dff; */
-  background: #E8FAE1;
-  border-radius: 4rpx;
-  color: #096f4b;
-  padding: 5upx 10upx;
-  font-size: 22rpx;
-  margin-top: 10rpx;
-}
+	.d-title {
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+	}
 
-.popup_pay {
-  width: 100%;
-  position: relative;
-  padding-bottom: 45rpx;
-  /* height: 160px; */
-  /* #ifndef MP-WEIXIN */
-  /* height: 130px; */
-  /* #endif */
+	.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;
+	}
 
-.pay_btn {
-  width: 90%;
-  margin: 0 auto;
-  text-align: center;
-  background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
-  height: 80rpx;
-  border-radius: 60rpx;
-  color: #ffffff;
-  line-height: 80rpx;
-  font-size: 36rpx;
-}
+	.money-pay-zhen span {
+		color: #FF6000;
+		font-size: 32rpx;
+		font-weight: bold;
+	}
 
-.serverAddress {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-.add-content{
-  background: #fff;
-  padding: 30rpx;
-  border-radius: 24rpx;
-  margin-top: 24rpx;
-}
-.add-lin{
-  height: 74rpx;
-  line-height: 74rpx;
-}
-.add-con-title{
-  color: #999;
-  font-size: 30rpx;
-}
-.add-con-cont{
-  color: #666;
-  font-size: 30rpx;
-  line-height: 74rpx;
-  text-align:right;
-}
-.level_button{
-  padding: 4rpx 20rpx;
-  background: linear-gradient(to right, #ffc1a9,#fedec9, #fdbb9f);
-  border-radius: 16rpx 16rpx 16rpx 1rpx ;
-  color: #e95c3b;
-  font-size: 12px;
-  border: 1px solid #fd967c;
-}
-.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{
-	height: 78rpx;
-	padding: 20rpx 0;
-	font-size: 30rpx;
-}
-.jusitify-line-end{
-	height:1px;
-	border-bottom: 1px #e5e5e5 solid;
-	margin: 30rpx 0;
-}
-.prompt-text{
-  width: 100%;
-  padding: 4px 7px;
-  border: #FE912E 1px dashed;
-  color: #fe912E;
-  border-radius: 5px;
-  font-size: 12px;
-}
-.show-btn-lin{
-  width: 86%;
-  display: flex;
-  justify-content: space-between;
-}
-.head-title{
-	font-weight: bold;
-	font-size: 32rpx;
-	color: #333333;
-}
-.title-font{
-	font-size: 30rpx;
-	color: #666666;
-}
-.value-font{
-	font-size: 30rpx;
-	color: #333333;
-}
+	.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-top: 20px;
+		width: 100%;
+		background-color: #f7f7f7;
+	}
+
+	.pay-title {
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+		margin-bottom: 12px;
+	}
+
+	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: 110rpx;
+		padding: 0 30rpx;
+		border-top: 1px solid #f0f0f0;
+	}
+
+	.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: 60rpx;
+		color: #ffffff;
+		line-height: 80rpx;
+		font-size: 36rpx;
+	}
+
+	.serverAddress {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.add-content {
+		background: #fff;
+		padding: 30rpx;
+		border-radius: 24rpx;
+		margin-top: 24rpx;
+	}
+
+	.add-lin {
+		height: 74rpx;
+		line-height: 74rpx;
+	}
+
+	.add-con-title {
+		color: #999;
+		font-size: 30rpx;
+	}
+
+	.add-con-cont {
+		color: #666;
+		font-size: 30rpx;
+		line-height: 74rpx;
+		text-align: right;
+	}
+
+	.level_button {
+		padding: 4rpx 20rpx;
+		background: linear-gradient(to right, #ffc1a9, #fedec9, #fdbb9f);
+		border-radius: 16rpx 16rpx 16rpx 1rpx;
+		color: #e95c3b;
+		font-size: 12px;
+		border: 1px solid #fd967c;
+	}
+
+	.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 {
+		height: 78rpx;
+		padding: 20rpx 0;
+		font-size: 30rpx;
+	}
+
+	.jusitify-line-end {
+		height: 1px;
+		border-bottom: 1px #e5e5e5 solid;
+		margin: 30rpx 0;
+	}
+
+	.prompt-text {
+		width: 100%;
+		padding: 4px 7px;
+		border: #FE912E 1px dashed;
+		color: #fe912E;
+		border-radius: 5px;
+		font-size: 12px;
+	}
+
+	.show-btn-lin {
+		width: 86%;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.head-title {
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+	}
+
+	.title-font {
+		font-size: 30rpx;
+		color: #666666;
+	}
+
+	.value-font {
+		font-size: 30rpx;
+		color: #333333;
+	}
 </style>
diff --git a/my/order/payModify.vue b/my/order/payModify.vue
index 2bcbaa2..f7335e4 100644
--- a/my/order/payModify.vue
+++ b/my/order/payModify.vue
@@ -44,7 +44,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="header-view header-padd header-margin ">
+			<view class="header-view header-padd header-margin">
 				<view v-if="!detailaddress">请选择地址</view>
 				<view class="margin-right-xs">
 					<view class="jusitify-line">
@@ -78,7 +78,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="header-view header-padd header-margin ">
+			<view class="header-view header-padd header-margin">
 				<view class="jusitify-line" @click="liliaoshi">
 					<view class="line-word title-font" >
 						<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
@@ -1811,21 +1811,6 @@
 		text-decoration-line: line-through;
 		margin-left: 5px;
 	}
-	.money-pay-zhen span{
-		color: #FF6000;
-	}
-	.money-pay-zhen span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.money-pay-zhen span:nth-child(2){
-		font-size: 31.25rpx;
-		font-weight: bold;
-	}
-	.money-pay-zhen{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
 	.money-pay{
 		width: 100%;
 		display: flex;
diff --git a/my/order/payModifyDd.vue b/my/order/payModifyDd.vue
index b4390ea..a0fa5a6 100644
--- a/my/order/payModifyDd.vue
+++ b/my/order/payModifyDd.vue
@@ -3,14 +3,14 @@
 		<view class="padding-bottom u-skeleton">
 			<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
 				<view class="head-top">
-					<view class="pay-title" style="">服务项目</view>
+					<view class="pay-title">服务项目</view>
 					<view class="flex">
 						<view class="" style="width: 160upx;height: 160upx;">
 							<image :src="(orderXm.ordersMassageList && orderXm.ordersMassageList.length > 0 && orderXm.ordersMassageList[0].massageType && orderXm.ordersMassageList[0].massageType.massageImg)?orderXm.ordersMassageList[0].massageType.massageImg: '../../static/logo.png'"
 								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
 
 						</view>
-						<view class="head-bottom  margin-left-sm">
+						<view class="u-flex-1  margin-left-sm">
 							<view class="flex head-title-right">
 								<view class="margin-right-xs text-df u-skeleton-fillet head-title">
 									{{orderXm.entryName}}
@@ -19,14 +19,14 @@
 							</view>
 							<view class="flex align-center">
 								<view style="width: 100%;">
-									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
+									<view class="flex justify-between margin-tb-sm">
 										<view style="justify-content: space-between;">
-											{{orderXm.duration}}分钟
-
+											<text class="title-font">服务时长：</text><text class="value-font">{{orderXm.duration}}分钟</text>
 										</view>
 									</view>
 									<view class="money-pay">
 										<view class="money-pay-zhen" v-if="orderXm.userPackageDetailId==null">
+											<text class="title-font">项目价格：</text>
 											<span>￥</span>
 											<span v-if="jishiName!=null||jishiName==''">
 												{{technicianRate}}
@@ -34,6 +34,7 @@
 											<span v-else>{{orderXm.priceMarkup}}</span>
 										</view>
 										<view class="money-pay-zhen" v-else>
+											<text class="title-font">项目价格：</text>
 											<span>￥</span>
 											<span>{{orderXm.priceMarkup}}</span>
 										</view>
@@ -46,105 +47,116 @@
 						</view>
 					</view>
 				</view>
-				<view class="padding margin-top-sm header-view">
-					<view v-if="!detailaddress">请选择地址</view>
-					<view class="margin-right-xs">
-						<view class="jusitify-line">
-							<view class="line-word">联系人</view>
-							<view class="line-word-r">
-								<text>{{name}}</text>
-								<text class="xuanzhe" @click="getAddressList()">修改</text>
+			</view>
+			<view class="header-view header-padd header-margin">
+				<view v-if="!detailaddress">请选择地址</view>
+				<view class="margin-right-xs">
+					<view class="jusitify-line">
+						<view class="line-word title-font">客户姓名</view>
+						<view class="line-word-r value-font">
+							<text>{{name}}</text>
+							<text class="xuanzhe" @click="getAddressList()">更换</text>
+						</view>
+					</view>
+					<view class="jusitify-line">
+						<view class="line-word title-font">联系方式</view>
+						<view class="line-word-r value-font">
+							{{mobile}}
+						</view>
+					</view>
+					<view class="jusitify-line" style="align-items: center;">
+						<view class="line-word title-font">服务地址</view>
+						<view class="line-word-r value-font" style="width: 75%; text-align: right;">
+								<span>
+									{{province}}/{{city}}/{{district}}/{{detailaddress}}
+								</span>
+						</view>
+					</view>
+					<!-- <view class="jusitify-line" v-if="order.remark">
+						<view style="width: 170rpx;">备注内容</view>
+						<view class="flex">
+							<view class="">
+								{{order.remark}}
 							</view>
 						</view>
-						<view class="jusitify-line">
-							<view class="line-word">手机号码</view>
-							<view class="line-word-r">
-								{{mobile}}
-							</view>
-						</view>
-						<view class="jusitify-line" style="align-items: center;">
-							<view class="line-word">详细地址</view>
-							<view class="line-word-r" style="width: 73%; text-align: right;">
-									<span>
-										{{province}}/{{city}}/{{district}}/{{detailaddress}}
-									</span>
-							</view>
-						</view>
-						<!-- <view class="jusitify-line" v-if="order.remark">
-							<view style="width: 170rpx;">备注内容</view>
-							<view class="flex">
-								<view class="">
-									{{order.remark}}
-								</view>
-							</view>
-						</view> -->
+					</view> -->
+				</view>
+			</view>
+			<view class="header-view header-padd header-margin">
+				<view class="jusitify-line" @click="liliaoshi(orderXm)">
+					<view class="line-word title-font">
+						<span>技师</span>
+						<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
+					</view>
+					<view>
+						<span class="line-word-r value-font" v-if="jishiName">{{jishiName.artificerName}}</span>
+						<span class="line-word-r value-font" v-else>选择不同等级的技师价格不同哦~</span>
+						<span class="view-more"></span>
 					</view>
 				</view>
-				<view class="padding margin-top-sm header-view">
-
-					<view class="jusitify-line" @click="liliaoshi(orderXm)">
-						<view class="line-word" >
-							<span>技师</span>
-							<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
-						</view>
-						<view>
-							<span class="line-word-r" v-if="jishiName">{{jishiName.artificerName}}</span>
-							<span class="line-word-r" v-else>选择不同技师价格可能不一样哦~</span>
-							<span class="view-more"></span>
-						</view>
-					</view>
+				<view v-if="orderXm.userPackageDetailId==null">
 					<view class="jusitify-line" v-if="jishiName">
-					 	<view class="line-word" >
+						<view class="line-word title-font">
 							<span >项目原价</span>
 						</view>
 						<view >
-							<span class="line-word-r">￥{{orderXm.price}}</span>
+							<span class="line-word-r value-font">￥{{orderXm.price}}</span>
 						</view>
 					</view>
 					<view class="jusitify-line" v-if="jishiName">
-					 	<view class="line-word" >
+						<view class="line-word title-font">
 							<span>{{jishiName.technicianTypeName}}</span>
 							<span >价格</span>
 						</view>
 						<view >
-							<span class="line-word-r" style="color: #FF6000">￥{{technicianRate}}</span>
+							<span class="line-word-r value-font" style="color: #019c88">￥{{technicianRate}}</span>
 						</view>
 					</view>
-					<!-- <view class="liliao">
-						<view class="liliao-top" style="width: 30%;">
-							<span>平台优惠劵</span>
+				</view>
+				<view v-else>
+					<view class="jusitify-line" v-if="jishiName">
+						<view class="line-word title-font">
+							<span >项目价格</span>
 						</view>
-						<view class="header-bottom-money-zhen">
-							<view class="" style="margin-right: 5px;">
-								<span>-￥{{orderXm.couponMoney}}</span>
-							</view>
+						<view >
+							<span class="line-word-r value-font">￥{{orderXm.price}}</span>
 						</view>
+					</view>
+				</view>
+				<!-- <view class="liliao">
+					<view class="liliao-top" style="width: 30%;">
+						<span>平台优惠劵</span>
+					</view>
+					<view class="header-bottom-money-zhen">
+						<view class="" style="margin-right: 5px;">
+							<span>-￥{{orderXm.couponMoney}}</span>
+						</view>
+					</view>
+				</view> -->
+				<view class="jusitify-line">
+					<view class="line-word title-font">
+						服务时间
+					</view>
+					<!-- <view class="fuwu-time-view" @change="changeLog">
+						<uni-datetime-picker :hide-second='true' v-model="single" type="datetime">{{single==''?order.serveTime:single}}</uni-datetime-picker>
+						<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
 					</view> -->
-					<view class="jusitify-line">
-						<view class="line-word">
-							服务时间
-						</view>
-						<!-- <view class="fuwu-time-view" @change="changeLog">
-							<uni-datetime-picker :hide-second='true' v-model="single" type="datetime">{{single==''?order.serveTime:single}}</uni-datetime-picker>
-							<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
-						</view> -->
-						<view>
-							<view class="line-word-r" @click="openData()" style="align-items: center;">
-								<view v-if="startTime">{{startTime}}</view>
-								<view class="line-word-r" v-else>请选择预约时间<span class="view-more"></span></view>
-							</view>
+					<view>
+						<view class="line-word-r value-font" @click="openData()" style="align-items: center;">
+							<view v-if="startTime">{{startTime}}</view>
+							<view class="line-word-r value-font" v-else>请选择预约时间<span class="view-more"></span></view>
 						</view>
 					</view>
 				</view>
-				<view class="margin-top-xl pay-ding">
-					<view class="d-title">备注</view>
-					<view class="list-pay">
-						<view class="textarea-pay-list">
-							<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
-						</view>
-
+			</view>
+			<view class="header-view header-padd header-margin">
+				<view class="d-title title-font">备注</view>
+				<view class="list-pay">
+					<view class="textarea-pay-list">
+						<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
 					</view>
 				</view>
+			</view>
 				<!-- <view class="margin-top-xl pay-ding">
 					<view class="d-title" style="margin-bottom: 5px;">服务保障</view>
 					<view class="list-pay">
@@ -165,7 +177,6 @@
 						<uni-data-checkbox v-model="radio1" :localdata="sex"></uni-data-checkbox>
 					</view>
 				</view> -->
-			</view>
 
 
 			<view class="push-button">
@@ -1395,12 +1406,7 @@
 	}
 	.money-pay-zhen span{
 		color: #FF6000;
-	}
-	.money-pay-zhen span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.money-pay-zhen span:nth-child(2){
-		font-size: 31.25rpx;
+		font-size: 32rpx;
 		font-weight: bold;
 	}
 	.money-pay-zhen{
@@ -1606,11 +1612,15 @@
 	}
 	.xuanzhe{
 		background: linear-gradient(90deg, #029d88, #2fc094);
-		    color: #ffffff;
-		    margin-left: 5px;
-		    border-radius: 15px;
-		    padding: 3px 8px;
-		    font-size: 13px;
+		color: #ffffff;
+		margin-left: 5px;
+		border-radius: 15px;
+		height: 25px;
+		line-height: 25px;
+		width: 50px;
+		text-align: center;
+		font-size: 14px;
+		padding:6rpx 16rpx
 	}
 	.header-view-data{
 		display: flex;
@@ -1639,14 +1649,19 @@
 		}
 	.header-view-text{
 		width: 170rpx;
-		font-size: 30rpx;
-		color: #999999;
+		font-size: 29rpx;
+		color: #222222;
 	}
 	.header-view{
 		background-color: #fff;
-		margin-bottom: 10px;
 		border-radius: 11px;
 	}
+	.header-padd{
+		padding: 36rpx;
+	}
+	.header-margin{
+		margin: 26rpx;
+	}
 	.head-foot span:nth-child(1){
 		margin-right: 5px;
 	}
@@ -1717,6 +1732,7 @@
 		background-color: #ffffff;
 		border-radius: 24rpx;
 		padding: 29rpx;
+		margin-top: 10px;
 	}
 	.d-title{
 		font-weight: bold;
@@ -1741,7 +1757,6 @@
 	}
 	.list-pay{
 		width: 100%;
-		padding: 0px 29rpx;
 	}
 	.pay-ding-top{
 		width: 100%;
@@ -1828,9 +1843,10 @@
 	}
 
 	.d-touxiang{
-		width: 46rpx;
-		height: 46rpx;
+		width: 55rpx;
+		height: 55rpx;
 		border-radius: 50%;
+		border: 1px solid #f2fffd;
 	}
 	.money-pay-jia{
 		font-weight: 400;
@@ -1839,21 +1855,6 @@
 		text-decoration-line: line-through;
 		margin-left: 5px;
 	}
-	.money-pay-zhen span{
-		color: #FF6000;
-	}
-	.money-pay-zhen span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.money-pay-zhen span:nth-child(2){
-		font-size: 31.25rpx;
-		font-weight: bold;
-	}
-	.money-pay-zhen{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
 	.money-pay{
 		width: 100%;
 		display: flex;
@@ -1868,9 +1869,9 @@
 	}
 	.pay-title{
 		font-weight: bold;
-		font-size: 30rpx;
+		font-size: 32rpx;
 		color: #333333;
-		margin-bottom: 8px;
+		margin-bottom: 12px;
 	}
 	page {
 		background: #f7f7f7;
@@ -2061,4 +2062,17 @@
 		justify-content: space-between;
 		align-items: center;
 	}
+	.head-title{
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.title-font{
+		font-size: 30rpx;
+		color: #666666;
+	}
+	.value-font{
+		font-size: 30rpx;
+		color: #333333;
+	}
 </style>
diff --git a/my/order/payModifyTcMyDaiB.vue b/my/order/payModifyTcMyDaiB.vue
index 18eb7fd..7da9597 100644
--- a/my/order/payModifyTcMyDaiB.vue
+++ b/my/order/payModifyTcMyDaiB.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="content">
-		<view v-if="order.overTimeOrders == 1" class="dingshi" style="font-size: 32upx;height: 150rpx;padding: 26rpx 29rpx 0 29rpx;">
+		<!-- 		<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> -->
 		<view class="padding-bottom u-skeleton">
 			<view class="bgImg u-skeleton-fillet" v-if="order.ordersMassageList && order.ordersMassageList.length > 0"
 				style="padding: 0 29rpx;">
@@ -10,18 +10,19 @@
 					<view class="pay-title">服务项目</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"
+							<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="head-text">
+								<view class="head-title">
 									{{order.entryName}}
 								</view>
 								<view class="zhuangtai">
-									<view v-if="order.status ==1">待付款...</view>
+									<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>
@@ -35,20 +36,23 @@
 							</view>
 							<view class="flex align-center">
 								<view style="width: 100%;">
-									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
+									<view class="flex justify-between margin-tb-sm">
 										<view style="justify-content: space-between;">
-											{{order.duration}}分钟
+											<text class="title-font">服务时长：</text><text
+												class="value-font">{{order.duration}}分钟</text>
 										</view>
 									</view>
 
 									<view class="money-pay" style="justify-content: space-between;">
 										<view class="money-pay-zhen">
+											<text class="title-font">项目价格：</text>
 											<span>￥</span>
 											<span>{{order.priceMarkup}} </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" />
+											<uni-number-box :disabled="true" :value="order.massageNum" :width='27'
+												:min="1" @change="changeValue" />
 										</view>
 										<!-- <view class="money-pay-jia">￥298</view> -->
 									</view>
@@ -62,23 +66,24 @@
 						</view>
 					</view>
 				</view>
-				<view class="" style="background-color: #ffffff;border-radius: 24rpx;margin-top: 24rpx;padding: 29rpx;">
+				<view class="add-content">
 					<view class="" v-if="order.artificer">
-						<view class="flex justify-between add-lin">
-							<view class="add-con-title">下单人</view>
-							<view class="add-con-cont">
+						<view class="flex align-center justify-between jusitify-line">
+							<view class="line-word title-font">客户姓名</view>
+							<view class="line-word-r value-font">
 								{{order.userName}}
 							</view>
 						</view>
-						<view class="flex justify-between add-lin">
-							<view class="add-con-title">联系方式</view>
-							<view class="add-con-cont">
+						<view class="flex align-center justify-between jusitify-line">
+							<view class="line-word title-font">联系方式</view>
+							<view class="line-word-r value-font">
 								{{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 class="serverAddress jusitify-line">
+							<view class="line-word title-font">服务地址</view>
+							<view class="line-word-r value-font" style="width: 75%; text-align: right;">
+								{{order.address}}</view>
 						</view>
 					</view>
 				</view>
@@ -86,17 +91,17 @@
 				<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>
+						<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.technicianTypeName}}</view>
 							</view>
-							<view class="level_button">{{order.technicianTypeName}}</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;">
@@ -113,128 +118,177 @@
 							<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 class="flex justify-between jusitify-line">
+							<view class="line-word title-font">订单编号</view>
+							<view class="flex line-word-r value-font" @tap="copy(order.ordersNo)">
+								<view class="">{{order.ordersNo}}
+									<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
+								</view>
 							</view>
 						</view>
-						<view class="flex justify-between add-lin">
-							<view  class="add-con-title">预约时间</view>
-							<view class="add-con-cont">{{order.serveTime}}</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">预约时间</view>
+							<view class="line-word-r value-font">{{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 class="flex justify-between jusitify-line">
+							<view class="line-word title-font">下单时间</view>
+							<view class="line-word-r value-font">{{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 v-if="order.userPackageDetailId!=null">
+							<view class="flex justify-between jusitify-line">
+								<view class="add-con-title title-font"> {{order.packageType=='105'?'项目次卡':order.packageType=='106'?'服务疗程':'套餐名称'}}</view>
+								<view class="add-con-cont value-font">
+									{{order.ordersMassageList[0].userPackageDetail.mainTitle}}
+								</view>
+							</view>
 						</view>
-						<view class="flex justify-between add-lin">
-							<view class="add-con-title">服务时长</view>
-							<view class="add-con-cont">{{order.duration}}分钟</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">项目名称</view>
+							<view class="line-word-r value-font">{{order.entryName}}</view>
 						</view>
-						<view class="flex justify-between add-lin">
-							<view class="add-con-title">项目原价</view>
-							<view class="add-con-cont">￥{{order.massagePrice}}</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">服务时长</view>
+							<view class="line-word-r value-font">{{order.duration}}分钟</view>
 						</view>
-						<view class="flex justify-between add-lin">
-							<view class="add-con-title">{{order.technicianTypeName}}价格</view>
-							<view class="add-con-cont" style="color: #F93731;">￥{{order.priceMarkup}}</view>
+						<view v-if="order.userPackageDetailId==null">
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word title-font">项目原价</view>
+								<view class="line-word-r value-font">￥{{order.massagePrice}}</view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word title-font">{{order.technicianTypeName}}价格</view>
+								<view class="line-word-r value-font" style="color: #019c88;">￥{{order.priceMarkup}}</view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word title-font">会员减免</view>
+								<view class="line-word-r value-font" style="color: #FF6000;">-￥{{order.vipReductionMoney}}</view>
+							</view>
+							<view class="flex align-center jusitify-line" style="justify-content: flex-end;">
+								<view class="line-word title-font">小计：</view>
+								<view class="value-font" style="font-weight: bold;">
+									<text>￥{{order.massageMoney}}</text></view>
+							</view>
 						</view>
-						<view class="flex justify-between add-lin" >
-							<view class="add-con-title">会员减免</view>
-							<view class="add-con-cont">-￥{{order.vipReductionMoney}}</view>
+						<view v-else>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word title-font">项目价格</view>
+								<view class="line-word-r value-font" style="color: #019c88;">￥{{order.massagePrice}}</view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word title-font">应付金额</view>
+								<view class="line-word-r value-font">￥{{order.massagePrice}}</view>
+							</view>
+							<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
+								<view class="line-word title-font">实付金额：</view>
+								<view class="line-word-r value-font" style="font-weight: bold;">
+									￥<text>0</text>
+								</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: #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 class="flex justify-between jusitify-line" v-if="order.tripWay">
+							<view class="line-word title-font">出行方式</view>
+							<view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
+							<view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
+							<view class="line-word-r value-font" 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 class="flex justify-between jusitify-line" v-if="order.km">
+							<view class="line-word title-font">全程距离</view>
+							<view class="line-word-r value-font">{{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 class="flex justify-between jusitify-line" v-if="order.taxiMoney">
+							<view class="line-word title-font">出行费用</view>
+							<view class="line-word-r value-font">￥{{order.taxiMoney}}</view>
+						</view>
+						<view v-if="order.userPackageDetailId==null">
+							<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 title-font">优惠券</view>
+								<view class="line-word-r value-font" style="color: #FF6000;"
+									v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
+								<view class="line-word-r value-font" v-else>-</view>
+							</view>
+						</view>
+						<view class="textarea-pay-list" v-if="order.remark">
+							<view class="jusitify-line-end"></view>
+							<view class="line-word title-font">备注</view>
+							<view class="value-font">{{order.remark}}</view>
 						</view>
 						<view class="jusitify-line-end"></view>
-						<view class="justify-title-nav ">
-							<view class="justify-title">优惠券信息</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: rgb(249, 55, 49); font-weight: bold;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
-							<view class="add-con-cont" v-else>-</view>
+						<view v-if="order.userPackageDetailId==null">
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word title-font">订单费用</view>
+								<view class="line-word-r value-font"><text
+										style="font-weight: bold;">￥{{order.massageMoney}}</text></view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word title-font">出行费用</view>
+								<view class="line-word-r value-font"><text
+										style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word title-font">优惠券</view>
+								<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
+									-<text style="font-weight: bold;">￥{{order.couponMoney}}</text></view>
+								<view class="value-font" v-else>-</view>
+							</view>
+							<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
+								<view class="line-word title-font">合计：</view>
+								<view class="value-font">
+									<text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
+										￥{{order.payMoneyTotal}}
+									</text>
+								</view>
+							</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>
+						<view v-else>
+							<view class="flex justify-between jusitify-line">
+								<view class="add-con-title title-font">订单费用</view>
+								<view class="add-con-cont value-font"><text style="font-weight: bold;">￥0</text></view>
+							</view>
+							<view class="flex justify-between jusitify-line">
+								<view class="line-word title-font">出行费用</view>
+								<view class="line-word-r value-font"><text
+										style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
+							</view>
+							<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
+								<view class="line-word title-font">合计：</view>
+								<text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
+									￥{{order.taxiMoney}}
+								</text>
+							</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.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" 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>
-							<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-z">
-						<span>总金额</span>
-						<span style="color: #FF3939;font-size: 32rpx;">￥{{order.payMoneyTotal}}</span>
-					</view>
-					</view>
-				</view>
+				<view style="height: 100rpx;"></view>
 			</view>
 
-			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
+			<view class="showBtn tabber">
 				<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">立即支付
+					v-if="order.status == 1" class="dingshi">立即支付
 				</u-button>
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 
 		</view>
@@ -283,8 +337,8 @@
 				orderList: [],
 				loading: true,
 				customStyle: {
-					// backgroundColor: '#e5e5e5',
-					// color: '#FFFFFF',
+					backgroundColor: '#ffffff',
+					color: '',
 
 					// #ifdef MP-WEIXIN
 					width: "310upx",
@@ -296,8 +350,9 @@
 					margin: '0 10upx',
 				},
 				customStyle2: {
-					backgroundColor: '',
-					color: '#FFFFFF',
+					backgroundColor: '#ffffff',
+					border: '1px solid #ffffff',
+					color: '#333',
 					// #ifdef MP-WEIXIN
 					width: "310upx",
 					// #endif
@@ -323,12 +378,12 @@
 				openWay: 1,
 				closeable: true,
 				yhqxSel: '否',
-				btnShow:false,
-				tiqianData:'',
-				type:'center',
-				earlyFinishReason:'',
-				qurenJd:[],
-				artificerlist:[]
+				btnShow: false,
+				tiqianData: '',
+				type: 'center',
+				earlyFinishReason: '',
+				qurenJd: [],
+				artificerlist: []
 			}
 		},
 		onLoad(e) {
@@ -385,7 +440,7 @@
 			// #endif
 		},
 		methods: {
-			saveJZS(artificerId) {//升级查询技师项目
+			saveJZS(artificerId) { //升级查询技师项目
 				let data = {
 					artificerId: artificerId,
 					status: 0
@@ -446,16 +501,16 @@
 				})
 			},
 			getTimeStampWithoutSeconds(date) {
-			    // 将日期转换为标准的UTC时间
-			    var utcDate = new Date(
-						   date.getUTCFullYear(),
-						   date.getUTCMonth(),
-						   date.getUTCDate(),
-						   date.getUTCHours(),
-						   date.getUTCMinutes(),
-			                           0);
-			    // 返回不含秒的时间戳
-			    return utcDate.getTime();
+				// 将日期转换为标准的UTC时间
+				var utcDate = new Date(
+					date.getUTCFullYear(),
+					date.getUTCMonth(),
+					date.getUTCDate(),
+					date.getUTCHours(),
+					date.getUTCMinutes(),
+					0);
+				// 返回不含秒的时间戳
+				return utcDate.getTime();
 			},
 			getOrder() {
 				let data = {
@@ -466,26 +521,26 @@
 						this.loading = false
 						uni.hideLoading()
 						this.order = res.data;
-						if(res.data["technicianType"] == 3){
+						if (res.data["technicianType"] == 3) {
 							this.order["technicianTypeName"] = "新手"
 						}
-						if(res.data["technicianType"] == 4){
+						if (res.data["technicianType"] == 4) {
 							this.order["technicianTypeName"] = "专家"
 						}
-						if(res.data["technicianType"] == 5){
+						if (res.data["technicianType"] == 5) {
 							this.order["technicianTypeName"] = "资深"
 						}
 						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)
+						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);
@@ -493,18 +548,18 @@
 					}
 				})
 			},
-			closePopupQ(type){//提前结束    关闭弹出框
+			closePopupQ(type) { //提前结束    关闭弹出框
 				this.type = type
 				this.$refs.popupQ.close(type);
 			},
-			toggleQ(type,item) {//确认拒单 弹出框
-				this.qurenJd=item;
+			toggleQ(type, item) { //确认拒单 弹出框
+				this.qurenJd = item;
 
 				this.type = type
 				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
 				this.$refs.popupQ.open(type)
 			},
-			TuiPopup(typeTxte,type){//确认拒单 全额退款.同意按钮   关闭弹出框
+			TuiPopup(typeTxte, type) { //确认拒单 全额退款.同意按钮   关闭弹出框
 				this.type = typeTxte
 				let data = {
 					ordersId: this.qurenJd.ordersId,
@@ -514,15 +569,15 @@
 				this.$Request.post('/app/artificer/cancelSupplementOrders', data).then(res => {
 					if (res.code == 0) {
 						uni.showToast({
-							title:'操作完成！'
+							title: '操作完成！'
 						})
 						this.getOrder()
-							this.$refs.popupQ.close(typeTxte);
-					}else{
+						this.$refs.popupQ.close(typeTxte);
+					} else {
 						this.getOrder()
 						uni.showToast({
-							icon:'error',
-							title:'操作失败！'
+							icon: 'error',
+							title: '操作失败！'
 						})
 					}
 
@@ -531,46 +586,46 @@
 					//联网失败, 结束加载
 				});
 			},
-			closePopup(type){//提前结束    关闭弹出框
+			closePopup(type) { //提前结束    关闭弹出框
 				this.type = type
 				this.$refs.popup.close(type);
 			},
-			textareaInp(e){//提前结束 输入框
-				this.earlyFinishReason=e.detail.value;
-				console.log("earlyFinishReason",this.earlyFinishReason)
+			textareaInp(e) { //提前结束 输入框
+				this.earlyFinishReason = e.detail.value;
+				console.log("earlyFinishReason", this.earlyFinishReason)
 			},
-			tiqian(type){//提前结束 确认按钮
-				var that=this;
+			tiqian(type) { //提前结束 确认按钮
+				var that = this;
 				that.type = type;
-				if(that.earlyFinishReason){
+				if (that.earlyFinishReason) {
 					uni.getLocation({
 						type: 'wgs84',
-						success: function (resa) {
-							var longitude=resa.longitude;
-							var latitude=resa.latitude;
+						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,
+								accomplishLongitude: longitude,
+								accomplishLatitude: latitude,
 								earlyFinishReason: that.earlyFinishReason,
 							}
 							that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
 								if (res.code == 0) {
 									uni.showToast({
-										title:'操作完成！'
+										title: '操作完成！'
 									})
 									that.getOrder()
 									that.$refs.popup.close(type);
 									uni.switchTab({
-										url:'/pages/order/index'
+										url: '/pages/order/index'
 									})
-								}else{
+								} else {
 									that.getOrder()
 									uni.showToast({
-										icon:'error',
-										title:'操作失败！'
+										icon: 'error',
+										title: '操作失败！'
 									})
 								}
 
@@ -580,36 +635,36 @@
 							});
 
 						},
-							fail: function(e) {
-								that.getOrder()
-								// #ifdef H5
-									uni.showToast({
-										title:'获取地址失败！'
-									})
-								// #endif
-								// #ifdef APP-PLUS
-								that.checkPermission();
-								// #endif
-							}
+						fail: function(e) {
+							that.getOrder()
+							// #ifdef H5
+							uni.showToast({
+								title: '获取地址失败！'
+							})
+							// #endif
+							// #ifdef APP-PLUS
+							that.checkPermission();
+							// #endif
+						}
 					});
 
-				}else{
+				} else {
 					uni.showToast({
-						icon:'error',
-						title:'请输入提前结束原因！'
+						icon: 'error',
+						title: '请输入提前结束原因！'
 					})
 				}
 
 			},
-			toggle(type,item) {//提前结束 弹出框
-				this.tiqianData=item;
+			toggle(type, item) { //提前结束 弹出框
+				this.tiqianData = item;
 				this.type = type;
 				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
 				this.$refs.popup.open(type);
 			},
 
-			gengBtn(){
-				this.btnShow=!this.btnShow
+			gengBtn() {
+				this.btnShow = !this.btnShow
 			},
 			goChat() {
 				let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信
@@ -688,17 +743,18 @@
 				});
 			},
 			goOrder(item) {
-				console.log("item=====>",item)
-				console.log("order=====>",this.order)
+				console.log("item=====>", item)
+				console.log("order=====>", this.order)
 				let that = this
 				let data = {
-				  classifyId:item.classifyId,
-				  ordersId:that.order.ordersId,
-				  oldOrdersMassageList:[
-				    {massageId: item.massageTypeId,num: 1},
-				  ],
-				  massageTypeId:item.massageTypeId,
-				  userPackageDetailId:item.userPackageDetailId,
+					classifyId: item.classifyId,
+					ordersId: that.order.ordersId,
+					oldOrdersMassageList: [{
+						massageId: item.massageTypeId,
+						num: 1
+					}, ],
+					massageTypeId: item.massageTypeId,
+					userPackageDetailId: item.userPackageDetailId,
 				}
 				that.$Request.postJson("/app/artificer/updateOrders", data).then(res => {
 					that.showorder = false
@@ -734,7 +790,7 @@
 											icon: 'none'
 										})
 										uni.switchTab({
-											url:'/pages/order/index'
+											url: '/pages/order/index'
 										})
 										that.getOrder()
 
@@ -804,7 +860,7 @@
 							that.showpay = false
 							if (rea.code == 0) {
 								uni.switchTab({
-									url:'/pages/order/index'
+									url: '/pages/order/index'
 								})
 								that.callPay(rea.data);
 							} else {
@@ -828,7 +884,7 @@
 								const url = '&redirect_url=' + callBack + 'my/order/pay';
 								window.location = rea.data.mweb_url + url;
 								uni.switchTab({
-									url:'/pages/order/index'
+									url: '/pages/order/index'
 								})
 							} else {
 								uni.showToast({
@@ -851,7 +907,7 @@
 						that.showpay = false
 						if (rea.code == 0) {
 							uni.switchTab({
-								url:'/pages/order/index'
+								url: '/pages/order/index'
 							})
 							that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
 						}
@@ -871,7 +927,7 @@
 							document.body.appendChild(div)
 							document.forms[0].submit()
 							uni.switchTab({
-								url:'/pages/order/index'
+								url: '/pages/order/index'
 							})
 						});
 					// #endif
@@ -885,7 +941,7 @@
 						rea => {
 							that.showpay = false
 							uni.switchTab({
-								url:'/pages/order/index'
+								url: '/pages/order/index'
 							})
 							that.setPayment('alipay', rea.data);
 						});
@@ -959,8 +1015,8 @@
 					}
 				});
 			},
-			goNav(e,item) {
-				this.$queue.setData('daibudan',item);
+			goNav(e, item) {
+				this.$queue.setData('daibudan', item);
 				uni.navigateTo({
 					url: e
 				})
@@ -1028,7 +1084,7 @@
 											title: '支付成功'
 										})
 										uni.switchTab({
-											url:'/pages/order/index'
+											url: '/pages/order/index'
 										})
 										that.getOrder()
 									} else {
@@ -1063,7 +1119,7 @@
 													icon: 'none'
 												})
 												uni.switchTab({
-													url:'/pages/order/index'
+													url: '/pages/order/index'
 												})
 												that.getOrder()
 											},
@@ -1094,7 +1150,7 @@
 												icon: 'none'
 											})
 											uni.switchTab({
-												url:'/pages/order/index'
+												url: '/pages/order/index'
 											})
 											that.callPay(rea.data);
 										} else {
@@ -1123,7 +1179,7 @@
 												icon: 'none'
 											})
 											uni.switchTab({
-												url:'/pages/order/index'
+												url: '/pages/order/index'
 											})
 											const urlArr = window.location.href;
 											const hostUrl = urlArr.split("/");
@@ -1156,11 +1212,11 @@
 											icon: 'none'
 										})
 										uni.switchTab({
-											url:'/pages/order/index'
+											url: '/pages/order/index'
 										})
 										that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
 
-									}else{
+									} else {
 										uni.showToast({
 											title: '支付失败',
 											icon: 'nones'
@@ -1183,7 +1239,7 @@
 											icon: 'none'
 										})
 										uni.switchTab({
-											url:'/pages/order/index'
+											url: '/pages/order/index'
 										})
 										const div = document.createElement('div')
 										div.innerHTML = rea.data //此处form就是后台返回接收到的数据
@@ -1205,7 +1261,7 @@
 											icon: 'none'
 										})
 										uni.switchTab({
-											url:'/pages/order/index'
+											url: '/pages/order/index'
 										})
 										that.setPayment('alipay', rea.data);
 									});
@@ -1297,17 +1353,17 @@
 					}
 				});
 			},
-			cancelOrders(data){//取消订单
+			cancelOrders(data) { //取消订单
 				let that = this
 				that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
 					uni.hideLoading();
 					if (res.code == 0) {
 						that.page = 1;
 						uni.showToast({
-							title:'操作成功！'
+							title: '操作成功！'
 						})
 						uni.switchTab({
-							url:'/pages/order/index'
+							url: '/pages/order/index'
 						})
 						that.getOrder()
 					} else {
@@ -1351,7 +1407,7 @@
 								uni.hideLoading();
 								if (res.code == 0) {
 									uni.switchTab({
-										url:'/pages/order/index'
+										url: '/pages/order/index'
 									})
 								} else {
 									that.$queue.showToast(res.msg);
@@ -1384,37 +1440,47 @@
 </script>
 
 <style lang="scss" scoped>
-	.beizhu{
+	/deep/.padding-bottom {
+		padding-bottom: 20rpx;
+	}
+
+	.beizhu {
 		width: 100%;
-	    display: -webkit-box;
+		display: -webkit-box;
 		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		-webkit-line-clamp: 2;
+		/* 显示的行数，可以根据需要修改 */
 		overflow: hidden;
 		text-overflow: ellipsis;
 	}
-	.bottom-view{
+
+	.bottom-view {
 		margin-top: 9px;
 		border-bottom: 1px solid #ccc;
 		padding-bottom: 5px;
 		margin-bottom: 5px;
 	}
-	/deep/.u-drawer{
-		z-index:11 !important;
+
+	/deep/.u-drawer {
+		z-index: 11 !important;
 	}
-	.xiangmu-cont-top-left{
+
+	.xiangmu-cont-top-left {
 		font-weight: normal;
 		font-size: 21rpx;
 		color: #049E89;
 		margin-top: 1px;
 	}
-	.xiangmu-cont-top-time{
+
+	.xiangmu-cont-top-time {
 		width: 100%;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
 	}
-	.xiadan{
+
+	.xiadan {
 		width: 122rpx;
 		height: 48rpx;
 		line-height: 48rpx;
@@ -1425,39 +1491,47 @@
 		font-size: 24rpx;
 		color: #FFFFFF;
 	}
-	.xiangmu-foot-left{
+
+	.xiangmu-foot-left {
 		display: flex;
 		flex-direction: row;
 		align-items: flex-end;
 	}
-	.xiangmu-foot-left-shiji span{
+
+	.xiangmu-foot-left-shiji span {
 		color: #F95900;
 	}
-	.xiangmu-foot-left-shiji span:nth-child(1){
+
+	.xiangmu-foot-left-shiji span:nth-child(1) {
 		font-size: 25rpx;
 	}
-	.xiangmu-foot-left-shiji span:nth-child(2){
+
+	.xiangmu-foot-left-shiji span:nth-child(2) {
 		font-weight: bold;
-		font-size:36.81rpx;
+		font-size: 36.81rpx;
 	}
-	.xiangmu-foot-left-shiji span:nth-child(3){
+
+	.xiangmu-foot-left-shiji span:nth-child(3) {
 		font-size: 25rpx;
 	}
-	.xiangmu-foot-left-dazhe{
+
+	.xiangmu-foot-left-dazhe {
 		font-weight: bold;
 		font-size: 31rpx;
 		color: #848484;
 		text-decoration-line: line-through;
-		margin-left:5px;
+		margin-left: 5px;
 	}
-	.xiangmu-foot{
+
+	.xiangmu-foot {
 		width: 100%;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
 	}
-	.xiangmu-about{
+
+	.xiangmu-about {
 		width: 100%;
 		text-align: left;
 		font-weight: 400;
@@ -1470,30 +1544,34 @@
 		text-overflow: ellipsis;
 		margin: 5px 0px;
 	}
-	.xiangmu-cont-top-title{
+
+	.xiangmu-cont-top-title {
 		font-weight: bold;
 		font-size: 33rpx;
 		color: #333333;
 	}
 
-	.xiangmu-cont-top{
+	.xiangmu-cont-top {
 		width: 100%;
 		display: flex;
 		flex-direction: column;
 	}
-	.xiangmu-cont{
+
+	.xiangmu-cont {
 		width: 55%;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 	}
-	.xiangmu-img{
+
+	.xiangmu-img {
 		width: 285rpx;
 		height: 218rpx;
 		background: #9F9F9F;
 		border-radius: 14rpx;
 	}
-	.xiangmu{
+
+	.xiangmu {
 		width: 95%;
 		height: 263rpx;
 		background: #FFFFFF;
@@ -1506,13 +1584,15 @@
 		padding: 10px;
 	}
 
-	.popup-mian-btn span:nth-child(1){
+	.popup-mian-btn span:nth-child(1) {
 		background: linear-gradient(90deg, #FE912E, #FF9970);
 	}
-	.popup-mian-btn span:nth-child(2){
+
+	.popup-mian-btn span:nth-child(2) {
 		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
 	}
-	.popup-mian-btn span{
+
+	.popup-mian-btn span {
 		width: 247rpx;
 		height: 77rpx;
 		line-height: 77rpx;
@@ -1522,7 +1602,8 @@
 		color: #FFFEFE;
 		border-radius: 39rpx;
 	}
-	.popup-mian-btn{
+
+	.popup-mian-btn {
 		width: 100%;
 		display: flex;
 		flex-direction: row;
@@ -1530,17 +1611,20 @@
 		align-items: center;
 		margin-top: 10px;
 	}
-	.popup-mian-textarea{
+
+	.popup-mian-textarea {
 		width: 525.69rpx;
 		height: 211.81rpx;
 	}
-	.popup-mian{
+
+	.popup-mian {
 		width: 88%;
 		display: flex;
 		flex-direction: column;
 		margin: 5px auto 0px auto;
 	}
-	.popup-head span:nth-child(2){
+
+	.popup-head span:nth-child(2) {
 		width: 50rpx;
 		height: 50rpx;
 		line-height: 19px;
@@ -1550,12 +1634,14 @@
 		border-radius: 50%;
 		border: 3px solid #15AB8D;
 	}
-	.popup-head span:nth-child(1){
+
+	.popup-head span:nth-child(1) {
 		font-weight: bold;
 		font-size: 32rpx;
 		color: #333333;
 	}
-	.popup-head{
+
+	.popup-head {
 		width: 100%;
 		height: 99.38rpx;
 		background-color: rgba(21, 171, 141, 0.09);
@@ -1565,7 +1651,8 @@
 		justify-content: space-between;
 		padding: 0 15px;
 	}
-	.popup-content{
+
+	.popup-content {
 		width: 613rpx;
 		height: 479rpx;
 		background: #FFFFFF;
@@ -1573,14 +1660,20 @@
 		display: flex;
 		flex-direction: column;
 	}
-	/deep/.btns{
-		background: #019C88 !important;
-		color: #fff !important;
+
+	/deep/.btns {
+		color: #019C88 !important;
+		margin-left: 10rpx !important;
 	}
-	/deep/.u-size-default{
-		margin: 5px 0px 0px 0px;
+
+	/deep/.u-size-default {
+		width: 85px !important;
+		height: 34rpx;
+		line-height: 34rpx;
+		font-size: 28rpx;
 	}
-	.showBtn-mian{
+
+	.showBtn-mian {
 		width: 100%;
 		display: flex;
 		flex-direction: column;
@@ -1588,19 +1681,31 @@
 		flex-wrap: wrap;
 		justify-content: flex-end;
 	}
-	.gengduo{
+
+	.gengduo {
 		font-weight: 400;
 		font-size: 25rpx;
 		color: #7D7D7D;
 	}
-	.showBtn-view{
+
+	.showBtn-view {
 		width: 100%;
 		justify-content: flex-end;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 	}
-	.showBtn,.hideBtn{
+
+	.showBtn {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		margin-top: 20rpx;
+	}
+
+	.hideBtn {
 		width: 100%;
 		display: flex;
 		flex-direction: row;
@@ -1611,43 +1716,46 @@
 	}
 
 
-	.dingshi{
+	.dingshi {
 		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
 	}
-	.zhuangtai{
+
+	.zhuangtai {
 		color: #029D88;
 		font-weight: bold;
 	}
-	.head-title-right{
+
+	.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{
+
+	.fei-view-list span,
+	.fei-view-list-z span {
 		font-weight: bold;
 		font-size: 25rpx;
 	}
-	.fei-view-list-z{
+
+	.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){
+
+	.fei-view-list span:nth-child(1),
+	.fei-view-list-z span:nth-child(1) {
 		color: #666666;
 	}
-	.fei-view-list span:nth-child(2){
+
+	.fei-view-list span:nth-child(2) {
 		color: #333333;
 	}
-	.fei-view-list,.fei-view-list-z{
+
+	.fei-view-list,
+	.fei-view-list-z {
 		width: 100%;
 		display: flex;
 		flex-direction: row;
@@ -1655,12 +1763,14 @@
 		justify-content: space-between;
 		margin-top: 5px;
 	}
-	.fei-view{
+
+	.fei-view {
 		width: 100%;
 		display: flex;
 		flex-direction: column;
 	}
-	.fei-title{
+
+	.fei-title {
 		width: 100%;
 		text-align: center;
 		font-weight: bold;
@@ -1670,24 +1780,29 @@
 		margin-bottom: 10px;
 		border-bottom: 1px solid #E5E5E5;
 	}
-	.feiuong{
+
+	.feiuong {
 		padding: 29rpx;
 	}
-	/deep/.uni-textarea-textarea{
+
+	/deep/.uni-textarea-textarea {
 		font-weight: 400;
 		font-size: 25rpx;
 	}
-	/deep/.uni-textarea-placeholder{
+
+	/deep/.uni-textarea-placeholder {
 		font-weight: 400;
 		font-size: 25rpx;
 		color: #C5C5C5;
 	}
-	.textarea-pay-list{
+
+	.textarea-pay-list {
 		width: 100%;
 		height: 126rpx;
 		margin-top: 10px;
 	}
-	.textarea-pay{
+
+	.textarea-pay {
 		background-color: #f3f3f3;
 		width: 100%;
 		height: 100%;
@@ -1695,83 +1810,94 @@
 		border-radius: 14rpx;
 		padding: 7px;
 	}
-	.list-pay{
+
+	.list-pay {
 		width: 100%;
-		padding: 10px 29rpx;
+		padding: 10rpx 29rpx;
+		margin-bottom: 40rpx;
 	}
-	.pay-ding-top{
+
+	.pay-ding-top {
 		width: 100%;
-		height: 50px;
+		height: 100rpx;
 		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;
+		border-top-left-radius: 24rpx;
+		border-top-right-radius: 24rpx;
+		padding: 0px 29rpx;
 	}
-	.pay-ding,.feiuong{
+
+	.pay-ding,
+	.feiuong {
 		background-color: #ffffff;
 		border-radius: 24rpx;
 		margin-top: 24rpx;
 		// padding: 29rpx;
 	}
-	.phone-pay{
+
+	.phone-pay {
 		width: 49rpx;
 		height: 44rpx;
 	}
-	.d-title{
+
+	.d-title {
 		font-weight: bold;
 		font-size: 32rpx;
 		color: #333333;
 	}
-	.d-touxiang{
-		width: 46rpx;
-		height: 46rpx;
+
+	.d-touxiang {
+		width: 55rpx;
+		height: 55rpx;
 		border-radius: 50%;
+		border: 1px solid #f2fffd;
 	}
-	.money-pay-jia{
+
+	.money-pay-jia {
 		font-weight: 400;
 		font-size: 25rpx;
 		color: #666666;
 		text-decoration-line: line-through;
 		margin-left: 5px;
 	}
-	.money-pay-zhen span{
+
+	.money-pay-zhen span {
 		color: #FF6000;
-	}
-	.money-pay-zhen span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.money-pay-zhen span:nth-child(2){
-		font-size: 31.25rpx;
+		font-size: 32rpx;
 		font-weight: bold;
 	}
-	.money-pay-zhen{
+
+	.money-pay-zhen {
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 	}
-	.money-pay{
+
+	.money-pay {
 		width: 100%;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 	}
-	.head-top{
+
+	.head-top {
 		background-color: #ffffff;
 		border-radius: 24rpx;
 		padding: 29rpx;
 	}
-	.content{
-		 padding-bottom: 140rpx;
-		 padding-top: 20px;
-		 width: 100%;
-		 background-color: #f7f7f7;
+
+	.content {
+		padding-top: 20px;
+		width: 100%;
+		background-color: #f7f7f7;
 	}
-	.pay-title{
+
+	.pay-title {
 		font-weight: bold;
 		font-size: 32rpx;
 		color: #333333;
-		margin-bottom: 8px;
+		margin-bottom: 12px;
 	}
+
 	page {
 		background: #f7f7f7;
 	}
@@ -1908,8 +2034,9 @@
 		left: 0;
 		right: 0;
 		justify-content: center;
-		height: 127rpx;
+		height: 110rpx;
 		padding: 0 30rpx;
+		border-top: 1px solid #f0f0f0;
 	}
 
 	.box {
@@ -1938,7 +2065,7 @@
 		margin: 0 auto;
 		text-align: center;
 		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
-		height:80rpx;
+		height: 80rpx;
 		border-radius: 80rpx;
 		color: #ffffff;
 		line-height: 80rpx;
@@ -1950,48 +2077,59 @@
 		justify-content: space-between;
 		align-items: center;
 	}
-	.head-text{
-		font-size:30rpx;
+
+	.add-content {
+		background: #fff;
+		padding: 30rpx;
+		border-radius: 24rpx;
+		margin-top: 24rpx;
 	}
-	.zhuangtai{
+
+	.head-text {
+		font-size: 30rpx;
+	}
+
+	.zhuangtai {
 		color: #029D88;
+		font-weight: bold;
+		font-size: 32rpx;
 	}
-	.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{
+
+	.add-lin {
 		height: 80rpx;
 		line-height: 80rpx;
 	}
-	.add-con-title{
+
+	.add-con-title {
 		color: #999;
 		font-size: 30rpx;
 	}
-	.add-con-cont{
+
+	.add-con-cont {
 		color: #666;
 		font-size: 30rpx;
 		line-height: 80rpx;
-		text-align:right;
+		text-align: right;
 	}
-	.level_button{
-		padding: 3rpx 13rpx;
-		background: linear-gradient(to right, #fe9131, #ff9869);
-		border-radius: 16rpx 16rpx 16rpx 1rpx ;
-		color: #fff;
+
+	.level_button {
+		padding: 4rpx 20rpx;
+		background: linear-gradient(to right, #ffc1a9, #fedec9, #fdbb9f);
+		border-radius: 16rpx 16rpx 16rpx 1rpx;
+		color: #e95c3b;
 		font-size: 12px;
+		border: 1px solid #fd967c;
 	}
-	.justify-title-nav{
+
+	.justify-title-nav {
 		width: 90%;
 		display: flex;
 		flex-direction: column;
 		position: relative;
 		margin: 10px 0;
 	}
-	.justify-title-nav-bor{
+
+	.justify-title-nav-bor {
 		width: 64px;
 		height: 5px;
 		border-radius: 3px;
@@ -1999,14 +2137,38 @@
 		bottom: 0;
 		background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7));
 	}
-	.justify-title{
+
+	.justify-title {
 		font-weight: bold;
 		font-size: 32rpx;
 		color: #333;
 	}
-	.jusitify-line-end{
-	    height: 1px;
-	    border-bottom: 1px #f4f4f4 solid;
-	    margin: 15px 0;
+
+	.jusitify-line {
+		height: 78rpx;
+		padding: 20rpx 0;
+		font-size: 30rpx;
+	}
+
+	.jusitify-line-end {
+		height: 1px;
+		border-bottom: 1px #e5e5e5 solid;
+		margin: 30rpx 0;
+	}
+
+	.head-title {
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+	}
+
+	.title-font {
+		font-size: 30rpx;
+		color: #666666;
+	}
+
+	.value-font {
+		font-size: 30rpx;
+		color: #333333;
 	}
 </style>
diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue
index c1da3ae..29fd7e0 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -233,8 +233,8 @@
 								<view class="value-font" style="font-weight: bold;"><text>￥{{order.payMoney}}</text></view>
 							</view>
 						</view>
-						<view class="jusitify-line-end"></view>
 						<view v-if="order.addNum!=null">
+							<view class="jusitify-line-end"></view>
 							<view class="justify-title-nav">
 								<view class="justify-title">加钟信息</view>
 								<view class="justify-title-nav-bor"></view>
@@ -439,8 +439,8 @@
 								<view class="value-font" style="font-weight: bold;"><text>￥{{order.payMoney}}</text></view>
 							</view>
 						</view>
-						<view class="jusitify-line-end"></view>
 						<view v-if="order.addNum!=null">
+							<view class="jusitify-line-end"></view>
 							<view class="justify-title-nav">
 								<view class="justify-title">加钟信息</view>
 								<view class="justify-title-nav-bor"></view>
@@ -2341,7 +2341,7 @@
 		color: #7D7D7D;
 		margin-left: 26rpx;
 	}
-	
+
 	.showBtn,.hideBtn{
 		width: 100%;
 		display: flex;
diff --git a/my/order/paydingTCX.vue b/my/order/paydingTCX.vue
index 72e8ac5..2470240 100644
--- a/my/order/paydingTCX.vue
+++ b/my/order/paydingTCX.vue
@@ -61,23 +61,23 @@
 						</view>
 					</view>
 				</view>
-				<view class="" style="background-color: #ffffff;border-radius: 24rpx;margin-top: 24rpx;padding: 29rpx;">
+				<view class="add-content">
 					<view class="" v-if="order.artificer">
-						<view class="flex justify-between add-lin">
-							<view class="add-con-title title-font">客户姓名</view>
-							<view class="add-con-cont value-font">
+						<view class="flex align-center justify-between jusitify-line">
+							<view class="line-word title-font">客户姓名</view>
+							<view class="line-word-r value-font">
 								{{order.userName}}
 							</view>
 						</view>
-						<view class="flex justify-between add-lin">
-							<view class="add-con-title title-font">联系方式</view>
-							<view class="add-con-cont value-font">
+						<view class="flex align-center justify-between jusitify-line">
+							<view class="line-word title-font">联系方式</view>
+							<view class="line-word-r value-font">
 								{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
 							</view>
 						</view>
-						<view class="serverAddress">
-							<view class="add-con-title title-font">服务地址</view>
-							<view class="value-font" style="width: 73%; text-align: right;">{{order.address}}</view>
+						<view class="serverAddress jusitify-line">
+							<view class="line-word title-font">服务地址</view>
+							<view class="line-word-r value-font" style="width: 75%; text-align: right;">{{order.address}}</view>
 						</view>
 					</view>
 				</view>
@@ -85,8 +85,8 @@
 				<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="margin-left-sm" style="width: 90%;">
+							<view class="flex align-center" style="width: 100%;justify-content: space-between;">
 								<view class="d-title">{{order.artificer.artificerName}}</view>
 								<!-- <image
 									v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2"
@@ -94,8 +94,8 @@
 									@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.technicianTypeName}}</view>
 							</view>
-							<view class="level_button">{{order.technicianTypeName}}</view>
 						</view>
 					</view>
 					<view class="list-pay">
@@ -152,7 +152,7 @@
 							<view class="add-con-cont value-font">￥{{order.massagePrice}}</view>
 						</view>
 						<view class="flex justify-between add-lin" style="justify-content: flex-end;">
-							<view class="title-font">实付金额：</view>
+							<view class="title-font title-font">实付金额：</view>
 							<view class="add-con-cont value-font" style="font-weight: bold;">
 								￥<text>0</text>
 							</view>
@@ -1811,11 +1811,11 @@
 	}
 	.pay-ding-top{
 		width: 100%;
-		height: 50px;
+		height: 100rpx;
 		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;
+		border-top-left-radius: 24rpx;
+		border-top-right-radius: 24rpx;
+		padding: 0px 29rpx;
 	}
 	.pay-ding,.feiuong{
 		background-color: #ffffff;
@@ -1828,14 +1828,15 @@
 		height: 44rpx;
 	}
 	.d-title{
+		font-weight: bold;
 		font-size: 32rpx;
 		color: #333333;
-		font-weight: bold;
 	}
 	.d-touxiang{
-		width: 60rpx;
-		height: 60rpx;
+		width: 55rpx;
+		height: 55rpx;
 		border-radius: 50%;
+		border: 1px solid #f2fffd;
 	}
 	.money-pay-jia{
 		font-weight: 400;
@@ -2055,6 +2056,14 @@
 		justify-content: space-between;
 		align-items: center;
 	}
+
+	.add-content {
+		background: #fff;
+		padding: 30rpx;
+		border-radius: 24rpx;
+		margin-top: 24rpx;
+	}
+
 	.head-text{
 		font-size:30rpx;
 	}
@@ -2073,11 +2082,12 @@
 		text-align:right;
 	}
 	.level_button{
-		padding: 3rpx 13rpx;
-		background: linear-gradient(to right, #fe9131, #ff9869);
-		border-radius: 16rpx 16rpx 16rpx 1rpx ;
-		color: #fff;
+		padding: 4rpx 20rpx;
+		background: linear-gradient(to right, #ffc1a9, #fedec9, #fdbb9f);
+		border-radius: 16rpx 16rpx 16rpx 1rpx;
+		color: #e95c3b;
 		font-size: 12px;
+		border: 1px solid #fd967c;
 	}
 	.justify-title-nav{
 		width: 90%;
@@ -2099,6 +2109,13 @@
 		font-size: 32rpx;
 		color: #333;
 	}
+
+	.jusitify-line {
+		height: 78rpx;
+		padding: 20rpx 0;
+		font-size: 30rpx;
+	}
+
 	.jusitify-line-end{
 		height:1px;
 		border-bottom: 1px #e5e5e5 solid;