diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index ef40920..770d15a 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -7,8 +7,9 @@
 		</view>
 		<view class="header"></view>
 		<view class="mian">
+			
 			<!-- 普通项目订单 -->
-			<view v-if="order.ordersMassageList[0].userPackageDetail==null">
+			<view v-if="order.userPackageDetailId==null">
 				<!-- 普通订单 升级 或者 有升级有加钟 -->
 				<view v-if="order.isSupplement=='2'">
 					<view class="mian-top">
@@ -23,7 +24,7 @@
 							<view class="mian-top-head-right">
 								<view class="mian-title" v-if="order && order.ordersMassageList">
 									
-									<view class="mian-title-view">{{(order.ordersMassageList[0].massageType || {}).title}}</view>
+									<view class="mian-title-view">{{order.entryName}}</view>
 									<!-- <view class="nav-btn" v-if="order.status ==1">待支付</view> -->
 									<view class="nav-btn" v-if="order.status ==2">待服务</view>
 									<view class="nav-btn" v-if="order.status ==3">待评价</view>
@@ -35,7 +36,7 @@
 									<view class="nav-btn" v-if="order.status ==9">确认接单</view>
 								</view>
 								<view class="mian-time" v-if="order && order.ordersMassageList">
-									服务时长： {{(order.ordersMassageList[0].massageType || {}).duration}}分钟
+									服务时长： {{order.duration}}分钟
 								</view>
 								
 								<view class="mian-money" style="justify-content: space-between;">
@@ -51,7 +52,7 @@
 									
 									<view class="jiajian">
 										<view class="jian">-</view>
-										<view class="view-num">{{order.ordersMassageList[0].num}}</view>
+										<view class="view-num">{{order.massageNum}}</view>
 										<view class="jia">+</view>
 										<!-- <uni-number-box :disabled="true" :value="order.ordersMassageList[0].num" :width='27' :min="1" @change="changeValue" /> -->
 									</view>
@@ -94,12 +95,7 @@
 								<u-icon name="file-text"/>
 							</span>
 						</view>
-						<view class="mian-view-list">
-							<span class="mian-view-list-title">服务项目</span>
-							<span class="mian-view-list-text" v-if="order && order.ordersMassageList">
-								{{order.oldEntryName}}
-							</span>
-						</view>
+						
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">下单时间</span>
 							<span class="mian-view-list-text">{{order.createTime}}</span>
@@ -120,7 +116,21 @@
 						</view>
 						<view class="mian-content-list">
 							<span class="mian-content-list-title">车费收益</span>
-							<span class="mian-content-list-text">￥ {{order.taxiMoney}}</span>
+							<span class="mian-content-list-text" v-if="order.artificerTaxiMoney">￥{{order.artificerTaxiMoney}}</span>
+							<span class="mian-content-list-text" v-else>-</span>
+							
+						</view>
+						<view class="mian-view-list" v-if="order.oldOrdersMassageList[0].userPackageDetail">
+							<view class="mian-view-list-title">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
+							<span class="mian-view-list-text">
+								{{order.oldOrdersMassageList[0].userPackageDetail.mainTitle}}
+							</span>
+						</view>
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">服务项目</span>
+							<span class="mian-view-list-text" v-if="order && order.ordersMassageList">
+								{{order.oldEntryName}}
+							</span>
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目金额</span>
@@ -131,6 +141,11 @@
 							<span class="mian-view-list-text" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</span>
 							<span class="mian-view-list-text" v-else>-</span>
 						</view>
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">项目收益</span>
+							<span class="mian-view-list-text">￥{{order.oldProjectBenefits}}</span>
+						</view>
+						
 						<view class="mian-content-list">
 							<span class="mian-content-list-title">是否提前结束</span>
 							<span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
@@ -163,13 +178,13 @@
 							<span class="mian-view-list-text">{{order.addNum!=null?order.addNum:'-'}}</span>
 						</view>
 						
-						<view class="mian-view-list">
+						<!-- <view class="mian-view-list">
 							<span class="mian-view-list-title">加钟费用</span>
 							<span class="mian-view-list-text" v-if="order.addArtificerMoney!=null">￥{{order.addArtificerMoney}}</span>
 							<span class="mian-view-list-text" v-else>-</span>
-						</view>
+						</view> -->
 						<view class="yingde" style="background: #EBEBEB;">
-							<view class="yingde-title">小计</view>
+							<view class="yingde-title">加钟收益</view>
 							<view class="yingde-money" v-if="order.addArtificerMoney!=null">
 								<span class="fuhao-hei">￥</span>
 								<span class="num-hei">{{order.addArtificerMoney}}</span>
@@ -184,11 +199,11 @@
 					<view class="mian-view">
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">是否升级</span>
-							<span class="mian-view-list-text">{{order.isSupplement!=null?'是':'否'}}</span>
+							<span class="mian-view-list-text">{{order.oldOrdersId!=null?'是':'否'}}</span>
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">升级前项目</span>
-							<span class="mian-view-list-text">{{order.oldEntryName!=null?order.oldEntryName:'-'}}</span>
+							<span class="mian-view-list-text">{{order.oldEntryName}}</span>
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">升级前价格</span>
@@ -197,7 +212,7 @@
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">升级后项目</span>
-							<span class="mian-view-list-text">{{order.entryName!=null?order.entryName:'-'}}</span>
+							<span class="mian-view-list-text">{{order.entryName}}</span>
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">升级后价格</span>
@@ -215,7 +230,7 @@
 							<span class="mian-view-list-text" v-else>-</span>
 						</view>
 						<view class="yingde" style="background: #EBEBEB;">
-							<view class="yingde-title">小计</view>
+							<view class="yingde-title">升级收益</view>
 							<view class="yingde-money" v-if="order.artificerMoney!=null">
 								<span class="fuhao-hei">￥</span>
 								<span class="num-hei">{{order.artificerMoney}}</span>
@@ -234,24 +249,24 @@
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目收益</span>
-							<span class="mian-view-list-text"> ￥{{order.projectBenefits}}</span>
+							<span class="mian-view-list-text"> ￥{{order.oldProjectBenefits}}</span>
 						</view>
-						<view class="mian-view-list">
+						<!-- <view class="mian-view-list">
 							<span class="mian-view-list-title">优惠券</span>
 							<span class="mian-view-list-text" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</span>
-							<span class="mian-view-list-text" v-else>-</span>
-						</view>
+							<span class="mian-view-list-text" style="color: #FF6000;" v-else>-</span>
+						</view> -->
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">车费收益</span>
 							<span class="mian-view-list-text"> ￥{{order.taxiMoney}}</span>
 						</view>
 						<view class="mian-view-list" v-if="order.addNum!=null">
 							<span class="mian-view-list-title">加钟收益</span>
-							<span class="mian-view-list-text"> ￥{{order.addArtificerMoney!=null?order.addArtificerMoney:0}}</span>
+							<span class="mian-view-list-text"> ￥{{order.addArtificerMoney!=null?order.addArtificerMoney:'-'}}</span>
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">升级收益</span>
-							<span class="mian-view-list-text"> ￥{{order.artificerMoney!=null?order.artificerMoney:0}}</span>
+							<span class="mian-view-list-text"> ￥{{order.artificerMoney!=null?order.artificerMoney:'-'}}</span>
 						</view>
 					</view>
 					<view class="yiji">
@@ -319,7 +334,7 @@
 							<view class="mian-top-head-right">
 								<view class="mian-title" v-if="order && order.ordersMassageList">
 									
-									<view class="mian-title-view">{{(order.ordersMassageList[0].massageType || {}).title}}</view>
+									<view class="mian-title-view">{{order.entryName}}</view>
 									<!-- <view class="nav-btn" v-if="order.status ==1">待支付</view> -->
 									<view class="nav-btn" v-if="order.status ==2">待服务</view>
 									<view class="nav-btn" v-if="order.status ==3">待评价</view>
@@ -331,7 +346,7 @@
 									<view class="nav-btn" v-if="order.status ==9">确认接单</view>
 								</view>
 								<view class="mian-time" v-if="order && order.ordersMassageList">
-									服务时长： {{(order.ordersMassageList[0].massageType || {}).duration}}分钟
+									服务时长： {{order.duration}}分钟
 								</view>
 								
 								<view class="mian-money" style="justify-content: space-between;">
@@ -347,7 +362,7 @@
 									
 									<view class="jiajian">
 										<view class="jian">-</view>
-										<view class="view-num">{{order.ordersMassageList[0].num}}</view>
+										<view class="view-num">{{order.massageNum}}</view>
 										<view class="jia">+</view>
 										<!-- <uni-number-box :disabled="true" :value="order.ordersMassageList[0].num" :width='27' :min="1" @change="changeValue" /> -->
 									</view>
@@ -390,12 +405,7 @@
 								<u-icon name="file-text"/>
 							</span>
 						</view>
-						<view class="mian-view-list">
-							<span class="mian-view-list-title">服务项目</span>
-							<span class="mian-view-list-text">
-								{{order.entryName}}
-							</span>
-						</view>
+						
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">下单时间</span>
 							<span class="mian-view-list-text">{{order.createTime}}</span>
@@ -416,7 +426,13 @@
 						</view>
 						<view class="mian-content-list">
 							<span class="mian-content-list-title">车费收益</span>
-							<span class="mian-content-list-text">￥ {{order.taxiMoney}}</span>
+							<span class="mian-content-list-text">￥ {{order.artificerTaxiMoney}}</span>
+						</view>
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">服务项目</span>
+							<span class="mian-view-list-text">
+								{{order.entryName}}
+							</span>
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目金额</span>
@@ -427,6 +443,10 @@
 							<span class="mian-view-list-text" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</span>
 							<span class="mian-view-list-text" v-else>-</span>
 						</view>
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">项目收益</span>
+							<span class="mian-view-list-text">￥{{order.projectBenefits}}</span>
+						</view>
 						<view class="mian-content-list">
 							<span class="mian-content-list-title">是否提前结束</span>
 							<span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
@@ -443,11 +463,11 @@
 					<view class="mian-view">
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">是否加钟</span>
-							<span class="mian-view-list-text">{{order.addNum!=null?'是':'否'}}</span>
+							<span class="mian-view-list-text">{{order.addNum!=null?'是':'-'}}</span>
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">服务项目</span>
-							<span class="mian-view-list-text">{{order.addEntryName!=null?order.addEntryName:'-'}}</span>
+							<span class="mian-view-list-text">{{order.addEntryName}}</span>
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目价格</span>
@@ -461,7 +481,7 @@
 						
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">加钟费用</span>
-							<span class="mian-view-list-text" v-if="order.addArtificerMoney!=null">￥{{order.addArtificerMoney}}</span>
+							<span class="mian-view-list-text" v-if="order.addMoney!=null">￥{{order.addMoney}}</span>
 							<span class="mian-view-list-text" v-else>-</span>
 						</view>
 						<view class="yingde" style="background: #EBEBEB;">
@@ -486,18 +506,18 @@
 							<span class="mian-view-list-title">项目收益</span>
 							<span class="mian-view-list-text"> ￥{{order.projectBenefits}}</span>
 						</view>
-						<view class="mian-view-list">
+						<!-- <view class="mian-view-list">
 							<span class="mian-view-list-title">优惠券</span>
 							<span class="mian-view-list-text" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</span>
 							<span class="mian-view-list-text" v-else>-</span>
-						</view>
+						</view> -->
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">车费收益</span>
-							<span class="mian-view-list-text"> ￥{{order.taxiMoney}}</span>
+							<span class="mian-view-list-text"> ￥{{order.artificerTaxiMoney}}</span>
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">加钟收益</span>
-							<span class="mian-view-list-text"> ￥{{order.addArtificerMoney!=null?order.addArtificerMoney:0}}</span>
+							<span class="mian-view-list-text"> ￥{{order.addArtificerMoney!=null?order.addArtificerMoney:'-'}}</span>
 						</view>
 					</view>
 					<view class="yiji">
@@ -505,7 +525,6 @@
 						<view class="yingde-money">
 							<span class="fuhao-heis">￥</span>
 							<span class="num-heis">
-								<!-- {{jishishouyi}} -->
 								{{order.artificerMoneyTotal}}
 							</span>
 						</view>
@@ -552,6 +571,7 @@
 					</view>
 				
 				</view>
+			
 				<!-- 普通订单 没有加钟 没有升级 -->
 				<view v-if="order.isSupplement!='2'&&order.addNum==null">
 					<view class="mian-top">
@@ -566,7 +586,7 @@
 							<view class="mian-top-head-right">
 								<view class="mian-title" v-if="order && order.ordersMassageList">
 									
-									<view class="mian-title-view">{{(order.ordersMassageList[0].massageType || {}).title}}</view>
+									<view class="mian-title-view">{{order.entryName}}</view>
 									<!-- <view class="nav-btn" v-if="order.status ==1">待支付</view> -->
 									<view class="nav-btn" v-if="order.status ==2">待服务</view>
 									<view class="nav-btn" v-if="order.status ==3">待评价</view>
@@ -578,7 +598,7 @@
 									<view class="nav-btn" v-if="order.status ==9">确认接单</view>
 								</view>
 								<view class="mian-time" v-if="order && order.ordersMassageList">
-									服务时长： {{(order.ordersMassageList[0].massageType || {}).duration}}分钟
+									服务时长： {{order.duration}}分钟
 								</view>
 								
 								<view class="mian-money" style="justify-content: space-between;">
@@ -594,9 +614,8 @@
 									
 									<view class="jiajian">
 										<view class="jian">-</view>
-										<view class="view-num">{{order.ordersMassageList[0].num}}</view>
+										<view class="view-num">{{order.massageNum}}</view>
 										<view class="jia">+</view>
-										<!-- <uni-number-box :disabled="true" :value="order.ordersMassageList[0].num" :width='27' :min="1" @change="changeValue" /> -->
 									</view>
 								</view>
 							</view>
@@ -663,7 +682,8 @@
 						</view>
 						<view class="mian-content-list">
 							<span class="mian-content-list-title">车费收益</span>
-							<span class="mian-content-list-text">￥ {{order.taxiMoney}}</span>
+							<span class="mian-content-list-text" v-if="order.artificerTaxiMoney">￥ {{order.artificerTaxiMoney}}</span>
+							<span class="mian-content-list-text" v-else>-</span>
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目金额</span>
@@ -674,6 +694,10 @@
 							<span class="mian-view-list-text" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</span>
 							<span class="mian-view-list-text" v-else>-</span>
 						</view>
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">项目收益</span>
+							<span class="mian-view-list-text"> ￥{{order.projectBenefits}}</span>
+						</view>
 						<view class="mian-content-list">
 							<span class="mian-content-list-title">是否提前结束</span>
 							<span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
@@ -696,14 +720,15 @@
 							<span class="mian-view-list-title">项目收益</span>
 							<span class="mian-view-list-text"> ￥{{order.projectBenefits}}</span>
 						</view>
-						<view class="mian-view-list">
+						<!-- <view class="mian-view-list">
 							<span class="mian-view-list-title">优惠券</span>
 							<span class="mian-view-list-text" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</span>
 							<span class="mian-view-list-text" v-else>-</span>
-						</view>
+						</view> -->
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">车费收益</span>
-							<span class="mian-view-list-text"> ￥{{order.taxiMoney}}</span>
+							<span class="mian-view-list-text" v-if="order.artificerTaxiMoney"> ￥{{order.artificerTaxiMoney}}</span>
+							<span class="mian-view-list-text" v-else>-</span>
 						</view>
 					</view>
 					<view class="yiji">
@@ -711,7 +736,6 @@
 						<view class="yingde-money">
 							<span class="fuhao-heis">￥</span>
 							<span class="num-heis">
-								<!-- {{jishishouyi}} -->
 								{{order.artificerMoneyTotal}}
 							</span>
 						</view>
@@ -775,7 +799,7 @@
 							<view class="mian-top-head-right">
 								<view class="mian-title" v-if="order && order.ordersMassageList">
 									
-									<view class="mian-title-view">{{(order.ordersMassageList[0].userPackageDetail || {}).title}}</view>
+									<view class="mian-title-view">{{order.entryName}}</view>
 									<!-- <view class="nav-btn" v-if="order.status ==1">待支付</view> -->
 									<view class="nav-btn" v-if="order.status ==2">待服务</view>
 									<view class="nav-btn" v-if="order.status ==3">待评价</view>
@@ -787,7 +811,7 @@
 									<view class="nav-btn" v-if="order.status ==9">确认接单</view>
 								</view>
 								<view class="mian-time" v-if="order && order.ordersMassageList">
-									服务时长： {{(order.ordersMassageList[0].userPackageDetail || {}).duration}}分钟
+									服务时长： {{order.duration}}分钟
 								</view>
 								
 								<view class="mian-money" style="justify-content: space-between;">
@@ -803,7 +827,7 @@
 									
 									<view class="jiajian">
 										<view class="jian">-</view>
-										<view class="view-num">{{order.ordersMassageList[0].num}}</view>
+										<view class="view-num">{{order.massageNum}}</view>
 										<view class="jia">+</view>
 										<!-- <uni-number-box :disabled="true" :value="order.ordersMassageList[0].num" :width='27' :min="1" @change="changeValue" /> -->
 									</view>
@@ -846,12 +870,7 @@
 								<u-icon name="file-text"/>
 							</span>
 						</view>
-						<view class="mian-view-list">
-							<span class="mian-view-list-title">服务项目</span>
-							<span class="mian-view-list-text">
-								{{order.entryName}}
-							</span>
-						</view>
+						
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">下单时间</span>
 							<span class="mian-view-list-text">{{order.createTime}}</span>
@@ -872,7 +891,21 @@
 						</view>
 						<view class="mian-content-list">
 							<span class="mian-content-list-title">车费收益</span>
-							<span class="mian-content-list-text">￥ {{order.taxiMoney}}</span>
+							<span class="mian-content-list-text">￥ {{order.artificerTaxiMoney}}</span>
+						</view>
+						
+						<view class="mian-view-list">
+							<view class="mian-view-list-title">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
+							
+							<span class="mian-view-list-text">
+								{{order.ordersMassageList[0].userPackageDetail.mainTitle}}
+							</span>
+						</view>
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">服务项目</span>
+							<span class="mian-view-list-text">
+								{{order.entryName}}
+							</span>
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目金额</span>
@@ -883,6 +916,10 @@
 							<span class="mian-view-list-text" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</span>
 							<span class="mian-view-list-text" v-else>-</span>
 						</view>
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">项目收益</span>
+							<span class="mian-view-list-text">￥{{order.projectBenefits}}</span>
+						</view>
 						<view class="mian-content-list">
 							<span class="mian-content-list-title">是否提前结束</span>
 							<span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
@@ -905,14 +942,14 @@
 							<span class="mian-view-list-title">项目收益</span>
 							<span class="mian-view-list-text"> ￥{{order.projectBenefits}}</span>
 						</view>
-						<view class="mian-view-list">
+						<!-- <view class="mian-view-list">
 							<span class="mian-view-list-title">优惠券</span>
 							<span class="mian-view-list-text" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</span>
 							<span class="mian-view-list-text" v-else>-</span>
-						</view>
+						</view> -->
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">车费收益</span>
-							<span class="mian-view-list-text"> ￥{{order.taxiMoney}}</span>
+							<span class="mian-view-list-text"> ￥{{order.artificerTaxiMoney}}</span>
 						</view>
 					</view>
 					<view class="yiji">
@@ -920,7 +957,6 @@
 						<view class="yingde-money">
 							<span class="fuhao-heis">￥</span>
 							<span class="num-heis">
-								<!-- {{jishishouyi}} -->
 								{{order.artificerMoneyTotal}}
 							</span>
 						</view>
@@ -967,6 +1003,264 @@
 					</view>
 				
 				</view>
+				<!-- 套餐疗程次卡 加钟 没有升级 -->
+				<view v-if="order.isSupplement!='2'&&order.addNum!=null">
+					<view class="mian-top">
+						<view class="countDown" style="text-align: center;" v-if="order.status == 6">
+							<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
+								font-size="74" separator-size="74" @change="onCountdownChange"></u-count-down>
+						</view>
+						<view class="mian-top-head">
+							<image v-if="order && order.ordersMassageList"
+								:src="(order.ordersMassageList[0].userPackageDetail || {}).massageImg"
+								 class="mian-top-head-img"></image>
+							<view class="mian-top-head-right">
+								<view class="mian-title" v-if="order && order.ordersMassageList">
+									
+									<view class="mian-title-view">{{order.entryName}}</view>
+									<!-- <view class="nav-btn" v-if="order.status ==1">待支付</view> -->
+									<view class="nav-btn" v-if="order.status ==2">待服务</view>
+									<view class="nav-btn" v-if="order.status ==3">待评价</view>
+									<!-- <view class="nav-btn" v-if="order.status ==4">已取消</view> -->
+									<view class="nav-btn" v-if="order.status ==5">已完成</view>
+									<view class="nav-btn" v-if="order.status ==6">服务中</view>
+									<view class="nav-btn" v-if="order.status ==7">技师出发</view>
+									<view class="nav-btn" v-if="order.status ==8">技师到达</view>
+									<view class="nav-btn" v-if="order.status ==9">确认接单</view>
+								</view>
+								<view class="mian-time" v-if="order && order.ordersMassageList">
+									服务时长： {{order.duration}}分钟
+								</view>
+								
+								<view class="mian-money" style="justify-content: space-between;">
+									<view class="flex" style="flex-direction: row;align-items: center;">
+										<view class="mian-money-title">项目价格：</view>
+										<view class="mian-money-num">
+											<span class="fuhao">￥</span>
+											<span class="number">
+												{{order.massagePrice}}
+											</span>
+										</view>
+									</view>
+									
+									<view class="jiajian">
+										<view class="jian">-</view>
+										<view class="view-num">{{order.massageNum}}</view>
+										<view class="jia">+</view>
+										<!-- <uni-number-box :disabled="true" :value="order.ordersMassageList[0].num" :width='27' :min="1" @change="changeValue" /> -->
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="mian-top-foot" @tap="bindGps(order.latitude,order.longitude,order.address)">
+							<view class="mian-top-foot-view">
+								<view class="mian-top-foot-view-title">客户信息: </view>
+								<view class="mian-top-foot-view-img">
+									<span @tap.stop="copyAddress()" v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4">
+										{{order.userName}}
+										{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
+										<u-icon name="file-text"></u-icon>
+									</span>
+									<span v-else>
+										{{order.userName}}
+										{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
+									</span>
+									<!-- <image src="../../static/index/dianhua.png" mode=""></image> -->
+								</view>
+							</view>
+							<view class="mian-top-foot-view" style="margin-top: 5px;">
+								<view class="mian-top-foot-view-title">服务地址: </view>
+								<view class="mian-top-foot-view-text" style="width: 70%;text-align: right;">
+									{{order.address}}
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="mina-title">
+						<span class="mina-title-text">项目信息</span>
+						<span class="mina-title-bor"></span>
+					</view>
+					<view class="mian-view">
+						<view class="mian-view-list" @tap="copy(order.ordersNo)">
+							<span class="mian-view-list-title">订单编号</span>
+							<span class="mian-view-list-text">
+								{{order.ordersNo}}
+								<u-icon name="file-text"/>
+							</span>
+						</view>
+						
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">下单时间</span>
+							<span class="mian-view-list-text">{{order.createTime}}</span>
+						</view>
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">预约时间</span>
+							<span class="mian-view-list-text">{{order.serveTime}}</span>
+						</view>
+						<view class="mian-content-list" v-if="order.tripWay">
+							<view class="mian-content-list-title">出行方式</view>
+							<view v-if="order.tripWay == 1" class="mian-content-list-text">公交</view>
+							<view v-if="order.tripWay == 2" class="mian-content-list-text">出租</view>
+							<view v-if="order.tripWay == 3" class="mian-content-list-text">免费</view>
+						</view>
+						<view class="mian-content-list">
+							<span class="mian-content-list-title">全程距离</span>
+							<span class="mian-content-list-text">{{order.km}}km</span>
+						</view>
+						<view class="mian-view-list">
+							<view class="mian-view-list-title">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
+							<span class="mian-view-list-text">
+								{{order.ordersMassageList[0].userPackageDetail.mainTitle}}
+							</span>
+						</view>
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">服务项目</span>
+							<span class="mian-view-list-text">
+								{{order.entryName}}
+							</span>
+						</view>
+						<view class="mian-content-list">
+							<span class="mian-content-list-title">车费收益</span>
+							<span class="mian-content-list-text">￥ {{order.artificerTaxiMoney}}</span>
+						</view>
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">项目金额</span>
+							<span class="mian-view-list-text">￥{{order.massagePrice}}</span>
+						</view>
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">优惠券</span>
+							<span class="mian-view-list-text" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</span>
+							<span class="mian-view-list-text" v-else>-</span>
+						</view>
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">项目收益</span>
+							<span class="mian-view-list-text">￥{{order.projectBenefits}}</span>
+						</view>
+						<view class="mian-content-list">
+							<span class="mian-content-list-title">是否提前结束</span>
+							<span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
+						</view>
+						<view class="mian-content-textarea">
+							<span class="mian-content-list-title"  style="margin: 10px 0px;">提前结束原因</span>
+							<textarea class="textarea-mian" :disabled="true"  v-model="order.earlyFinishReason"  maxlength="100" name="" id=""></textarea>
+						</view>
+					</view>
+					<view class="mina-title">
+						<span class="mina-title-text">加钟信息</span>
+						<span class="mina-title-bor"></span>
+					</view>
+					<view class="mian-view">
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">是否加钟</span>
+							<span class="mian-view-list-text">{{order.addNum!=null?'是':'-'}}</span>
+						</view>
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">服务项目</span>
+							<span class="mian-view-list-text">{{order.addEntryName!=null?order.addEntryName:'-'}}</span>
+						</view>
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">项目价格</span>
+							<span class="mian-view-list-text" v-if="order.addPrice!=null">￥{{order.addPrice}}</span>
+							<span class="mian-view-list-text" v-else>-</span>
+						</view>
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">加钟数量</span>
+							<span class="mian-view-list-text">{{order.addNum!=null?order.addNum:'-'}}</span>
+						</view>
+						
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">加钟费用</span>
+							<span class="mian-view-list-text" v-if="order.addMoney!=null">￥{{order.addMoney}}</span>
+							<span class="mian-view-list-text" v-else>-</span>
+						</view>
+						<view class="yingde" style="background: #EBEBEB;">
+							<view class="yingde-title">加钟收益</view>
+							<view class="yingde-money" v-if="order.addArtificerMoney!=null">
+								<span class="fuhao-hei">￥</span>
+								<span class="num-hei">{{order.addArtificerMoney}}</span>
+							</view>
+							<span class="mian-view-list-text" v-else>-</span>
+						</view>
+					</view>
+					<view class="mina-title">
+						<span class="mina-title-text">预计收益</span>
+						<span class="mina-title-bor"></span>
+					</view>
+					<view class="mian-content" style="margin-bottom: 10px;">
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">提成比例</span>
+							<span class="mian-view-list-text">{{order.artificerRate*100}}%</span>
+						</view>
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">项目收益</span>
+							<span class="mian-view-list-text"> ￥{{order.projectBenefits}}</span>
+						</view>
+						<!-- <view class="mian-view-list">
+							<span class="mian-view-list-title">优惠券</span>
+							<span class="mian-view-list-text" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</span>
+							<span class="mian-view-list-text" v-else>-</span>
+						</view> -->
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">车费收益</span>
+							<span class="mian-view-list-text"> ￥{{order.artificerTaxiMoney}}</span>
+						</view>
+						<view class="mian-view-list">
+							<span class="mian-view-list-title">加钟收益</span>
+							<span class="mian-view-list-text"> ￥{{order.addArtificerMoney!=null?order.addArtificerMoney:0}}</span>
+						</view>
+					</view>
+					<view class="yiji">
+						<view class="yuji-title">技师收益</view>
+						<view class="yingde-money">
+							<span class="fuhao-heis">￥</span>
+							<span class="num-heis">
+								{{order.artificerMoneyTotal}}
+							</span>
+						</view>
+					</view>
+					<view class="bg padding radius margin-top" v-if="order.status!='8'&&order.startImg">
+						<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片
+						</view>
+						<view class="flex flex-wrap justify-between">
+							<view class="flex margin-bottom-sm"
+								style="width: 48%;height: 200rpx;margin-right: 5rpx;position: relative;"
+								v-for="(image,index) in order.startImg" :key="index"
+								@click="saveImg( order.startImg,index)">
+								<image :src="image" style="width: 100%;height: 100%;border-radius: 10upx;"
+									mode="aspectFill">
+								</image>
+							</view>
+						</view>
+					</view>
+					<view class="bg padding radius margin-top" v-if="order.status==8 && startImgSel != '否'">
+						<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片
+						</view>
+						<view class="flex flex-wrap">
+							<view v-if="startImgs.length">
+								<view class="flex margin-right-sm flex-wrap">
+									<view class="flex"
+										style="width: 200rpx;height: 200rpx;margin-right: 5rpx;position: relative;"
+										v-for="(image,index) in startImgs" :key="index">
+										<image :src="pictureEcho[0]" style="width: 100%;height: 100%;"></image>
+										<view style="z-index: 0;position: absolute;top: -15rpx;right: -15rpx;"
+											@click="removeImg(index,1)">
+											<u-icon name="close-circle-fill" color="#2979ff" size="50rpx"></u-icon>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="flex align-center justify-center padding-tb "
+								style="background: #f5f5f5;width: 200rpx;height: 200rpx;">
+								<view class="text-center" @click="addImage(1)">
+									<image src="../static/photo.png" style="width:60upx;height: 50upx;"></image>
+									<view class="text-sm">上传照片</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				
+				</view>
+							
 			</view>
 			
 			<view class="footers">
@@ -1520,12 +1814,18 @@
 							try {
 								if (resA.code == 0) {
 									websocketUtils.uploadAudioEnd(); //关闭音频上传
-									that.$queue.showToast(resA.msg);
+									uni.showToast({
+										title:'操作成功！'
+									})
 									uni.switchTab({
 										url:'/pages/order/index'
 									})
 								} else {
-									that.$queue.showToast(resA.msg);
+									uni.showToast({
+										icon:'error',
+										title:'操作失败！'
+									})
+									// that.$queue.showToast(resA.msg);
 								}
 							} catch (e) {
 								//TODO handle the exception
@@ -2033,7 +2333,10 @@
 							that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
 								uni.hideLoading();
 								if (res.code == 0) {
-									that.getOrder()
+									that.getOrder();
+									uni.showToast({
+										title:'操作成功！'
+									})
 								} else {
 									that.$queue.showToast(res.msg);
 								}
diff --git a/unpackage/release/apk/__UNI__B37C795__20240704232534.apk b/unpackage/release/apk/__UNI__B37C795__20240704232534.apk
deleted file mode 100644
index e1815c0..0000000
Binary files a/unpackage/release/apk/__UNI__B37C795__20240704232534.apk and /dev/null differ
diff --git a/unpackage/release/apk/__UNI__B37C795__20240705095305.apk b/unpackage/release/apk/__UNI__B37C795__20240705095305.apk
deleted file mode 100644
index 0bfde10..0000000
Binary files a/unpackage/release/apk/__UNI__B37C795__20240705095305.apk and /dev/null differ
diff --git a/unpackage/release/apk/__UNI__B37C795__20240705113159.apk b/unpackage/release/apk/__UNI__B37C795__20240705152122.apk
similarity index 97%
rename from unpackage/release/apk/__UNI__B37C795__20240705113159.apk
rename to unpackage/release/apk/__UNI__B37C795__20240705152122.apk
index ec9e76c..d6f1dec 100644
Binary files a/unpackage/release/apk/__UNI__B37C795__20240705113159.apk and b/unpackage/release/apk/__UNI__B37C795__20240705152122.apk differ