diff --git a/my/order/pay.vue b/my/order/pay.vue
index f06f1b3..e414632 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -3,98 +3,96 @@
     <!-- 		<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,264 @@
                       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="value-font">{{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.usualTravelMoney}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line" v-if="order.nightTravelMoney">
+							<view class="line-word title-font">夜间出行</view>
+							<view class="line-word-r value-font">￥{{order.nightTravelMoney}}</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>{{order.taxiMoney}}</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">
+							<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.usualTravelMoney}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line" v-if="order.nightTravelMoney">
+							<view class="line-word title-font">夜间出行</view>
+							<view class="line-word-r value-font">￥{{order.nightTravelMoney}}</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>{{order.taxiMoney}}</text></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="true" class="btns">
+					取消订单
+				</u-button>
+				<!-- <u-button
           v-if="order.btnShow == 'true'"
           :custom-style="customStyle2"
           shape="circle" :plain="true"
@@ -349,104 +365,104 @@
           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 :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>
+				<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="true" class="btns">
+					取消订单
+				</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 v-if="order.earlyFinishReason==null" class="gengduo" @click.stop="gengBtn">更多</view>
+				<view v-else class="gengduo"></view>
+				<view v-if="order.earlyFinishReason==null">
+					<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" @click="cancelOrder(order)" shape="circle" class="eject-btns"
+							:hair-line="true">
+							取消订单
+						</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 :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" class="eject-btns">
+							联系客服</view>
+					</view>
+				</view>
+				<view v-else>
+					<view class="showBtn tabber">
+						<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goNav('/my/wallet/index?artificerId='+order.artificerId+'&ordersId='+order.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>
+			</view>
       <view class="showBtn tabber" v-if="order.status ==7">
-        <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
+        <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true" class="btns">
           取消订单
         </u-button>
         <u-button
@@ -461,7 +477,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 class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true">
           取消订单
         </u-button>
         <u-button
@@ -476,7 +492,7 @@
                   class="btns">联系客服</u-button>
       </view>
       <view class="showBtn tabber" v-if="order.status ==9">
-        <u-button class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
+        <u-button class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true">
           取消订单
         </u-button>
         <u-button v-if="order.refusalContent" :custom-style="customStyle2"
@@ -489,7 +505,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="true" class="btns">
           取消订单
         </u-button>
         <u-button :custom-style="customStyle2"
diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue
index 5af4666..6d373b2 100644
--- a/my/order/payJaZ.vue
+++ b/my/order/payJaZ.vue
@@ -183,11 +183,18 @@
               <view class="line-word title-font">全程距离</view>
               <view class="line-word-r value-font" >{{order.km}}km</view>
             </view>
-
-            <view class="jusitify-line">
-              <view class="line-word title-font">出行费用</view>
-              <view class="line-word-r value-font">￥{{order.taxiMoney}}</view>
-            </view>
+			<view class="jusitify-line">
+				<view class="line-word title-font">出行费用</view>
+				<view class="line-word-r value-font">￥{{order.usualTravelMoney}}</view>
+			</view>
+			<view class="jusitify-line" v-if="order.nightTravelMoney">
+				<view class="line-word title-font">夜间出行</view>
+				<view class="line-word-r value-font">￥{{order.nightTravelMoney}}</view>
+			</view>
+			<view class="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>{{order.taxiMoney}}</text></view>
+			</view>
 			<view class="jusitify-line-end"></view>
             <view class="justify-title-nav">
               <view class="justify-title">优惠券信息</view>
@@ -346,10 +353,18 @@
               <view class="line-word title-font">全程距离</view>
               <view class="line-word-r value-font" >{{order.km}}km</view>
             </view>
-            <view class="jusitify-line">
-              <view class="line-word title-font">出行费用</view>
-              <view class="line-word-r value-font">￥{{order.taxiMoney}}</view>
-            </view>
+			<view class="jusitify-line">
+				<view class="line-word title-font">出行费用</view>
+				<view class="line-word-r value-font">￥{{order.usualTravelMoney}}</view>
+			</view>
+			<view class="jusitify-line" v-if="order.nightTravelMoney">
+				<view class="line-word title-font">夜间出行</view>
+				<view class="line-word-r value-font">￥{{order.nightTravelMoney}}</view>
+			</view>
+			<view class="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>{{order.taxiMoney}}</text></view>
+			</view>
 			<view class="jusitify-line-end"></view>
             <view class="justify-title-nav">
               <view class="justify-title">优惠券信息</view>
diff --git a/my/order/payModifyDd.vue b/my/order/payModifyDd.vue
index a0fa5a6..5d9a8eb 100644
--- a/my/order/payModifyDd.vue
+++ b/my/order/payModifyDd.vue
@@ -119,7 +119,7 @@
 							<span >项目价格</span>
 						</view>
 						<view >
-							<span class="line-word-r value-font">￥{{orderXm.price}}</span>
+							<span class="line-word-r value-font">￥{{orderXm.priceMarkup}}</span>
 						</view>
 					</view>
 				</view>
diff --git a/my/order/payModifyTcMyDaiB.vue b/my/order/payModifyTcMyDaiB.vue
index 18eb7fd..25cb9b7 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,185 @@
 							<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">
+							<view class="line-word title-font">出行费用</view>
+							<view class="line-word-r value-font">￥{{order.usualTravelMoney}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line" v-if="order.nightTravelMoney">
+							<view class="line-word title-font">夜间出行</view>
+							<view class="line-word-r value-font">￥{{order.nightTravelMoney}}</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>{{order.taxiMoney}}</text></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">
-				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
+			<view class="showBtn tabber">
+				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true" class="btns"
 					v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">取消订单
 				</u-button>
-				<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
-					v-if="order.status == 1"
-					class="dingshi">立即支付
+				<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="true"
+					v-if="order.status == 1" class="btns">立即支付
 				</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 +345,8 @@
 				orderList: [],
 				loading: true,
 				customStyle: {
-					// backgroundColor: '#e5e5e5',
-					// color: '#FFFFFF',
+					backgroundColor: '#ffffff',
+					color: '',
 
 					// #ifdef MP-WEIXIN
 					width: "310upx",
@@ -296,8 +358,9 @@
 					margin: '0 10upx',
 				},
 				customStyle2: {
-					backgroundColor: '',
-					color: '#FFFFFF',
+					backgroundColor: '#ffffff',
+					border: '1px solid #ffffff',
+					color: '#333',
 					// #ifdef MP-WEIXIN
 					width: "310upx",
 					// #endif
@@ -323,12 +386,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 +448,7 @@
 			// #endif
 		},
 		methods: {
-			saveJZS(artificerId) {//升级查询技师项目
+			saveJZS(artificerId) { //升级查询技师项目
 				let data = {
 					artificerId: artificerId,
 					status: 0
@@ -446,16 +509,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 +529,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 +556,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 +577,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 +594,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 +643,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 +751,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 +798,7 @@
 											icon: 'none'
 										})
 										uni.switchTab({
-											url:'/pages/order/index'
+											url: '/pages/order/index'
 										})
 										that.getOrder()
 
@@ -804,7 +868,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 +892,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 +915,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 +935,7 @@
 							document.body.appendChild(div)
 							document.forms[0].submit()
 							uni.switchTab({
-								url:'/pages/order/index'
+								url: '/pages/order/index'
 							})
 						});
 					// #endif
@@ -885,7 +949,7 @@
 						rea => {
 							that.showpay = false
 							uni.switchTab({
-								url:'/pages/order/index'
+								url: '/pages/order/index'
 							})
 							that.setPayment('alipay', rea.data);
 						});
@@ -959,8 +1023,8 @@
 					}
 				});
 			},
-			goNav(e,item) {
-				this.$queue.setData('daibudan',item);
+			goNav(e, item) {
+				this.$queue.setData('daibudan', item);
 				uni.navigateTo({
 					url: e
 				})
@@ -1028,7 +1092,7 @@
 											title: '支付成功'
 										})
 										uni.switchTab({
-											url:'/pages/order/index'
+											url: '/pages/order/index'
 										})
 										that.getOrder()
 									} else {
@@ -1063,7 +1127,7 @@
 													icon: 'none'
 												})
 												uni.switchTab({
-													url:'/pages/order/index'
+													url: '/pages/order/index'
 												})
 												that.getOrder()
 											},
@@ -1094,7 +1158,7 @@
 												icon: 'none'
 											})
 											uni.switchTab({
-												url:'/pages/order/index'
+												url: '/pages/order/index'
 											})
 											that.callPay(rea.data);
 										} else {
@@ -1123,7 +1187,7 @@
 												icon: 'none'
 											})
 											uni.switchTab({
-												url:'/pages/order/index'
+												url: '/pages/order/index'
 											})
 											const urlArr = window.location.href;
 											const hostUrl = urlArr.split("/");
@@ -1156,11 +1220,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 +1247,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 +1269,7 @@
 											icon: 'none'
 										})
 										uni.switchTab({
-											url:'/pages/order/index'
+											url: '/pages/order/index'
 										})
 										that.setPayment('alipay', rea.data);
 									});
@@ -1297,17 +1361,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 +1415,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 +1448,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 +1499,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 +1552,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 +1592,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 +1610,8 @@
 		color: #FFFEFE;
 		border-radius: 39rpx;
 	}
-	.popup-mian-btn{
+
+	.popup-mian-btn {
 		width: 100%;
 		display: flex;
 		flex-direction: row;
@@ -1530,17 +1619,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 +1642,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 +1659,8 @@
 		justify-content: space-between;
 		padding: 0 15px;
 	}
-	.popup-content{
+
+	.popup-content {
 		width: 613rpx;
 		height: 479rpx;
 		background: #FFFFFF;
@@ -1573,14 +1668,22 @@
 		display: flex;
 		flex-direction: column;
 	}
-	/deep/.btns{
-		background: #019C88 !important;
-		color: #fff !important;
+
+	/deep/.btns {
+		color: #019C88 !important;
+		margin-left: 10rpx !important;
+		height:70rpx;
+		font-size: 30rpx;
 	}
-	/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 +1691,51 @@
 		flex-wrap: wrap;
 		justify-content: flex-end;
 	}
-	.gengduo{
+
+	.gengduo {
 		font-weight: 400;
 		font-size: 25rpx;
 		color: #7D7D7D;
 	}
-	.showBtn-view{
+
+	.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%;
-		justify-content: flex-end;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
+		justify-content: center;
+		margin-top: 20rpx;
 	}
-	.showBtn,.hideBtn{
+
+	.hideBtn {
 		width: 100%;
 		display: flex;
 		flex-direction: row;
@@ -1610,44 +1745,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 +1792,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 +1809,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 +1839,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 +2063,9 @@
 		left: 0;
 		right: 0;
 		justify-content: center;
-		height: 127rpx;
+		height: 110rpx;
 		padding: 0 30rpx;
+		border-top: 1px solid #f0f0f0;
 	}
 
 	.box {
@@ -1938,7 +2094,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 +2106,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 +2166,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 29fd7e0..964499a 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -172,7 +172,6 @@
 							</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>
@@ -189,7 +188,15 @@
 						</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 class="line-word-r value-font">￥{{order.usualTravelMoney}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line" v-if="order.nightTravelMoney">
+							<view class="line-word title-font">夜间出行</view>
+							<view class="line-word-r value-font">￥{{order.nightTravelMoney}}</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>{{order.taxiMoney}}</text></view>
 						</view>
 						<view class="jusitify-line-end"></view>
 						<view class="justify-title-nav">
@@ -378,7 +385,7 @@
 							</view>
 						</view>
 						<view class="jusitify-line-end"></view>
-						<view class="justify-title-nav jusitify-line">
+						<view class="justify-title-nav">
 							<view class="justify-title">出行费用</view>
 							<view class="justify-title-nav-bor"></view>
 						</view>
@@ -394,9 +401,17 @@
 						</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 class="line-word-r value-font">￥{{order.usualTravelMoney}}</view>
 						</view>
-						<view class="jusitify-line-end"></view>
+						<view class="flex justify-between jusitify-line" v-if="order.nightTravelMoney">
+							<view class="line-word title-font">夜间出行</view>
+							<view class="line-word-r value-font">￥{{order.nightTravelMoney}}</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>{{order.taxiMoney}}</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>
@@ -405,7 +420,7 @@
 							<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="jusitify-line-end"></view>
 						<view>
 							<view class="justify-title-nav">
@@ -486,13 +501,13 @@
 							<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="flex justify-between jusitify-line">
 							<view class="line-word title-font">优惠券</view>
 							<view class="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> -->
 						<view class="flex justify-between jusitify-line">
 							<view class="line-word title-font">升级费用</view>
 							<view class="value-font">
@@ -548,33 +563,38 @@
 						</view>
 					</view>
 					<view class="showBtn-view" v-show="btnShow==true">
-						<view style="margin:0px !important;" shape="circle" :plain="true" @click="goChat"
-							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 style="margin:0px !important;" shape="circle" :plain="true" @click="goChat"
+							class="eject-btns">联系客服</view>
 					</view>
 				</view>
 				<view class="showBtn-mian" v-else>
 					<view class="showBtn" style="justify-content: center;">
-						<u-button style="margin:0px !important;" shape="circle" :plain="true" @click="goChat"
-							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="dingshi">
-							去投诉
-						</u-button>
 						<u-button :custom-style="customStyle2"
 							v-if="order.status=='1'"
 							shape="circle" :plain="true"
 							@click="quzhifu(order)"
-							class="dingshi">
+							class="btns">
 							去支付
 						</u-button>
+						<u-button :custom-style="customStyle2" shape="circle" :plain="true"
+							@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
+							class="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>
diff --git a/my/order/payding.vue b/my/order/payding.vue
index 0e6a4ef..f90e7ba 100644
--- a/my/order/payding.vue
+++ b/my/order/payding.vue
@@ -67,23 +67,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="value-font" style="width: 75%; text-align: right;">{{order.address}}</view>
 						</view>
 					</view>
 				</view>
@@ -91,8 +91,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 flex" 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"
@@ -100,9 +100,10 @@
 									@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.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</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;">
@@ -119,51 +120,50 @@
 							<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 title-font">订单编号</view>
-							<view class="flex align-center" @tap="copy(order.ordersNo)">
+						<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="value-font">{{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 title-font">预约时间</view>
-							<view class="add-con-cont value-font">{{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 title-font">下单时间</view>
-							<view class="add-con-cont value-font">{{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 title-font">项目名称</view>
-							<view class="add-con-cont value-font">{{order.entryName}}</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 title-font">服务时长</view>
-							<view class="add-con-cont value-font">{{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.duration}}分钟</view>
 						</view>
-						<view class="flex justify-between add-lin">
-							<view class="add-con-title title-font">项目原价</view>
-							<view class="add-con-cont value-font">￥{{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.massagePrice}}</view>
 						</view>
-						<view class="flex justify-between add-lin">
-							<view class="add-con-title title-font">{{order.technicianTypeName}}价格</view>
-							<view class="add-con-cont value-font" style="color: #019c88;">￥{{order.priceMarkup}}</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 add-lin" v-if="order.userPackageDetailId==null">
-							<view class="add-con-title title-font">会员减免</view>
-							<view class="add-con-cont value-font" style="color: #FF6000;">-￥{{order.vipReductionMoney}}</view>
+						<view class="flex justify-between jusitify-line" v-if="order.userPackageDetailId==null">
+							<view class="line-word title-font">会员减免</view>
+							<view class="line-word-r value-font" style="color: #FF6000;">-￥{{order.vipReductionMoney}}</view>
 						</view>
-
-						<view class="flex justify-between add-lin" style="justify-content: flex-end;">
-							<view class="add-con-title title-font">小计：</view>
-							<view class="add-con-cont value-font" style="font-weight: bold;">￥<text>{{order.massageMoney}}</text></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>{{order.massageMoney}}</text></view>
 						</view>
 
 						<view class="jusitify-line-end"></view>
@@ -172,29 +172,37 @@
 							<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 title-font">出行方式</view>
-							<view class="add-con-cont value-font" v-if="order.tripWay == 1">公交</view>
-							<view class="add-con-cont value-font" v-if="order.tripWay == 2">出租</view>
-							<view class="add-con-cont value-font" 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 title-font">全程距离</view>
-							<view class="add-con-cont value-font">{{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">
-							<view class="add-con-title title-font">出行费用</view>
-							<view class="add-con-cont value-font">￥{{order.taxiMoney}}</view>
+						<view class="flex justify-between jusitify-line">
+							<view class="line-word title-font">出行费用</view>
+							<view class="line-word-r value-font">￥{{order.usualTravelMoney}}</view>
+						</view>
+						<view class="flex justify-between jusitify-line" v-if="order.nightTravelMoney">
+							<view class="line-word title-font">夜间出行</view>
+							<view class="line-word-r value-font">￥{{order.nightTravelMoney}}</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>{{order.taxiMoney}}</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">
-							<view class="add-con-title title-font">优惠券</view>
-							<view class="add-con-cont value-font" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
-							<view class="add-con-cont value-font" v-else>-</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 class="textarea-pay-list" v-if="order.remark">
 							<view class="jusitify-line-end"></view>
@@ -209,19 +217,19 @@
 						<view class="justify-title-nav-bor"></view>
 					</view>
 					<view class="fei-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 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 add-lin">
-							<view class="add-con-title title-font">出行费用</view>
-							<view class="add-con-cont value-font"><text style="font-weight: bold;">￥{{order.taxiMoney}}</text></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 add-lin">
-							<view class="add-con-title title-font">优惠券</view>
-							<view class="add-con-cont value-font" style="color: #FF6000;" v-if="order.couponMoney">
+						<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>
@@ -1584,7 +1592,7 @@
   color: #019C88 !important;
   margin-left: 10rpx !important;
   height:64rpx;
-  font-size: 28rpx;
+  font-size: 30rpx;
 }
 	/deep/.u-size-default{
 		margin: 5px 0px 0px 0px;
@@ -1697,15 +1705,16 @@
 	}
 	.list-pay{
 		width: 100%;
-		padding: 10px 29rpx;
+		padding: 10rpx 29rpx;
+		margin-bottom: 40rpx;
 	}
 	.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;
@@ -1723,9 +1732,10 @@
 		color: #333333;
 	}
 	.d-touxiang{
-		width: 60rpx;
-		height: 60rpx;
+		width: 55rpx;
+		height: 55rpx;
 		border-radius: 50%;
+		border: 1px solid #f2fffd;
 	}
 	.money-pay-jia{
 		font-weight: 400;
@@ -1946,37 +1956,29 @@
 		justify-content: space-between;
 		align-items: center;
 	}
+
+	.add-content {
+		background: #fff;
+		padding: 30rpx;
+		border-radius: 24rpx;
+		margin-top: 24rpx;
+	}
+
 	.head-text{
 		font-size:30rpx;
 	}
 	.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;
 	}
 	.add-lin{
 		height: 74rpx;
 		line-height: 74rpx;
 	}
-	.add-con-title{
-		color: #666;
-		font-size: 30rpx;
-	}
-	.add-con-cont{
-		color: #333;
-		font-size: 30rpx;
-		line-height: 80rpx;
-		text-align:right;
-	}
-	.level_button{
-		padding: 3rpx 13rpx;
-		background: linear-gradient(to right, #fe9131, #ff9869);
-		border-radius: 16rpx 16rpx 16rpx 1rpx ;
-		color: #fff;
-		font-size: 12px;
-	}
 	.justify-title-nav{
 		width: 90%;
 		display: flex;
@@ -1997,6 +1999,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;
diff --git a/my/order/paydingTCX.vue b/my/order/paydingTCX.vue
index 2470240..e6ad45d 100644
--- a/my/order/paydingTCX.vue
+++ b/my/order/paydingTCX.vue
@@ -174,7 +174,15 @@
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title title-font">出行费用</view>
-							<view class="add-con-cont value-font">￥{{order.taxiMoney}}</view>
+							<view class="add-con-cont value-font">￥{{order.usualTravelMoney}}</view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.nightTravelMoney">
+							<view class="add-con-title title-font">夜间出行</view>
+							<view class="add-con-cont value-font">￥{{order.nightTravelMoney}}</view>
+						</view>
+						<view class="flex justify-between add-lin" style="justify-content: flex-end;">
+							<view class="add-con-title title-font">小计：</view>
+							<view class="add-con-cont value-font" style="font-weight: bold;">￥<text>{{order.taxiMoney}}</text></view>
 						</view>
 						<view class="textarea-pay-list" v-if="order.remark">
 							<view class="jusitify-line-end"></view>
@@ -206,20 +214,20 @@
 			</view>
 
 			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
-				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
+				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true"
 					v-if="order.status != 3 &&
 						order.status != 4 &&
 						order.status != 5
 						"
-					>取消订单
+					class="btns">取消订单
 				</u-button>
 
-				<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
+				<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="true"
 					v-if="order.status == 1||order.status == 10"
-					class="dingshi">立即支付
+					class="btns">立即支付
 				</u-button>
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 
 		</view>
@@ -1694,8 +1702,10 @@
 		flex-direction: column;
 	}
 	/deep/.btns{
-		background: #019C88 !important;
-		color: #fff !important;
+		color: #019C88 !important;
+		margin-left: 10rpx !important;
+		height:70rpx;
+		font-size: 30rpx;
 	}
 	/deep/.u-size-default{
 		margin: 5px 0px 0px 0px;
@@ -1713,21 +1723,51 @@
 		font-size: 25rpx;
 		color: #7D7D7D;
 	}
-	.showBtn-view{
+
+	.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%;
-		justify-content: flex-end;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
+		justify-content: center;
+		margin-top: 20rpx;
 	}
-	.showBtn,.hideBtn{
+
+	.hideBtn {
 		width: 100%;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		flex-wrap: wrap;
 		justify-content: space-between;
-
 	}
 
 	.dingshi{
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 983367d..0b0436a 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -41,7 +41,7 @@
 					</u-avatar>
 				</view>
 				<view class="u-flex-1" style="margin-left: 20rpx;">
-					<view class="text-bold u-line-1" style="width: 560rpx;">
+					<view class="text-bold u-line-1">
 						<view class=" text-lg "
 							style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
 							{{item.ordersMassageList[0].massageType?item.ordersMassageList[0].massageType.title:item.ordersMassageList[0].userPackageDetail.title}}
@@ -95,7 +95,7 @@
 							修改订单
 						</u-button>
 						<u-button :custom-style="customStyle1" shape="circle" :plain="true"
-							@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
+							@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
 							联系客服
 						</u-button>
 					</view>
@@ -109,19 +109,19 @@
 							去投诉
 						</u-button>
 						<u-button :custom-style="customStyle1" shape="circle" :plain="true"
-							@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
+							@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
 							联系客服
 						</u-button>
 					</view>
 					<view class="showBtn" v-if="item.status ==4">
 						<u-button :custom-style="customStyle1" shape="circle" :plain="true"
-							@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
+							@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
 							联系客服
 						</u-button>
 					</view>
 					<view class="showBtn" v-if="item.status ==5">
 						<u-button :custom-style="customStyle1" shape="circle" :plain="true"
-							@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
+							@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
 							联系客服
 						</u-button>
 					</view>
@@ -147,10 +147,8 @@
 								加钟
 							</u-button>
 						</view>
-
-
 						<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
-							<view @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="gengduoBtn">
+							<view @click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="gengduoBtn">
 								联系客服
 							</view>
 							<view v-if="item.addNum==null&&item.oldOrdersId==null"
@@ -193,7 +191,7 @@
 							修改订单
 						</u-button>
 						<u-button :custom-style="customStyle1" shape="circle" :plain="true"
-							@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
+							@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
 							联系客服
 						</u-button>
 					</view>
@@ -210,7 +208,7 @@
 							修改订单
 						</u-button>
 						<u-button :custom-style="customStyle1" shape="circle" :plain="true"
-							@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
+							@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
 							联系客服
 						</u-button>
 					</view>
@@ -226,7 +224,7 @@
 							拒单详情
 						</u-button>
 						<u-button :custom-style="customStyle1" shape="circle" :plain="true"
-							@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
+							@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
 							联系客服
 						</u-button>
 					</view>
@@ -246,7 +244,7 @@
 							立即预约
 						</u-button>
 						<u-button :custom-style="customStyle1" shape="circle" :plain="true"
-							@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
+							@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
 							联系客服
 						</u-button>
 					</view>
@@ -823,13 +821,13 @@
 		onReachBottom: function() {
 			this.page = this.page + 1;
 			this.getOrderList();
-			console.log("asd",this.totalCount)
-			if (this.totalCount==undefined&&this.orderList!='') {
-				uni.showToast({
-					title: '已经到底了~',
-					icon: 'none'
-				})
-			}
+			// console.log("asd",this.totalCount)
+			// if (this.totalCount==undefined&&this.orderList!='') {
+			// 	uni.showToast({
+			// 		title: '已经到底了~',
+			// 		icon: 'none'
+			// 	})
+			// }
 		},
 		onPullDownRefresh: function() {
 			this.page = 1;
@@ -1001,7 +999,7 @@
 		width: 164rpx !important;
 		border-radius: 23rpx !important;
 		font-size: 30rpx!important;
-		}
+	}
 	.text-green span:nth-child(1){
 		font-weight: 400;
 		font-size: 25rpx;