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

---
 my/order/payModifyDd.vue       |    2 +-
 my/order/payModifyTcMyDaiB.vue | 1874 +++++++++++++++-----------------
 pages/my/index.vue             |    6 +-
 pages/my/serviceOderDrtail.vue |    2 +-
 pages/therapist/therapist.vue  |    1 +
 5 files changed, 876 insertions(+), 1009 deletions(-)

diff --git a/my/order/payModifyDd.vue b/my/order/payModifyDd.vue
index 19d0d40..3f6a962 100644
--- a/my/order/payModifyDd.vue
+++ b/my/order/payModifyDd.vue
@@ -684,7 +684,7 @@
 						// that.showpay = true;
 						that.paySel = 1;
 						uni.navigateTo({
-							url:'/my/order/payding?ordersId='+ res.data.ordersId
+							url:'/my/order/payModifyTcMyDaiB?ordersId='+ res.data.ordersId
 						})
 					} else {
 						that.$queue.showToast(res.msg)
diff --git a/my/order/payModifyTcMyDaiB.vue b/my/order/payModifyTcMyDaiB.vue
index 14034bf..e47e902 100644
--- a/my/order/payModifyTcMyDaiB.vue
+++ b/my/order/payModifyTcMyDaiB.vue
@@ -1,134 +1,248 @@
 <template>
 	<view class="content">
+		<view v-if="order.overTimeOrders == 1" class="dingshi" style="font-size: 32upx;height: 150rpx;padding: 26rpx 29rpx 0 29rpx;">
+			<view style="color: red;font-size:26rpx">(订单已超时)</view>
+		</view>
 		<view class="padding-bottom u-skeleton">
-			<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
+			<view class="bgImg u-skeleton-fillet" v-if="order.oldOrdersMassageList && order.oldOrdersMassageList.length > 0"
+				style="padding: 0 29rpx;">
 				<view class="head-top">
-					<view class="pay-title" style="">服务项目</view>
-					<view class="flex">
+					<view class="pay-title">服务项目</view>
+					<view class="flex justify-around">
 						<view class="" style="width: 160upx;height: 160upx;">
-							<image :src="orderXm.ordersMassageList[0].userPackageDetail.massageImg"
+							<image :src="order.oldOrdersMassageList[0].massageType.massageImg"
 								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
 						</view>
-						<view class="head-bottom  margin-left-sm">
+						<view class="u-flex-1  margin-left-sm">
 							<view class="flex head-title-right">
-								<view class="margin-right-xs u-skeleton-fillet head-title">
-									{{orderXm.ordersMassageList[0].userPackageDetail.title}}
+								<view class="head-text">
+									{{order.entryName}}
+								</view>
+								<view class="zhuangtai">
+									<view v-if="order.status ==1">待付款...</view>
+									<view v-if="order.status ==2">待服务</view>
+									<view v-if="order.status ==5">已完成</view>
+									<view v-if="order.status ==6">服务中</view>
+									<view v-if="order.status ==7">技师出发</view>
+									<view v-if="order.status ==8">技师到达</view>
+									<view v-if="order.status ==3">待评价</view>
+									<view v-if="order.status ==4">已取消</view>
+									<view v-if="order.status ==9">待确认</view>
+									<view v-if="order.status ==10">待补单</view>
 								</view>
-								
 							</view>
 							<view class="flex align-center">
 								<view style="width: 100%;">
-									<view class="money-pay">
-										<view class="money-pay-zhen">
-											<span>￥</span>
-											<span>{{orderXm.ordersMassageList[0].userPackageDetail.packagePrice}}</span>
-										</view>
-										<view>
-											<uni-number-box :disabled="true" :width='27' :min="1" :value='1' @change="changeValue" />
+									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
+										<view style="justify-content: space-between;">
+											{{order.duration}}分钟
 										</view>
 									</view>
+										
+									<view class="money-pay" style="justify-content: space-between;">
+										<view class="money-pay-zhen">
+											<span>￥</span>
+											<span>{{order.massagePrice}} </span>
+											<!-- <span style="color: #666;font-size: 12px;margin-left: 3px;"> x{{order.massageNum}}</span> -->
+										</view>
+										<view>
+											<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
+										</view>
+										<!-- <view class="money-pay-jia">￥298</view> -->
+									</view>
 								</view>
+
+								<!-- <view class="jz_btn"
+									v-if="order.addNum < order.oldOrdersMassageList[0].massageType.addNum && order.status == 6"
+									@tap="saveJZ(order.oldOrdersMassageList[0].massageType.massageTypeId)">
+									加钟/补价</view> -->
 							</view>
 						</view>
 					</view>
 				</view>
-				
-			</view>
-			<view class="ske-padding margin-top-sm header-view">
-				<view v-if="!detailaddress">请选择地址</view>
-				<view class="margin-right-xs">
-					<view class="flex justify-between margin-top-lg">
-						<view class="header-view-text">联系人</view>
-						<view class="header-view-data">
-							<text>{{name}}</text>
-							<text class="xuanzhe" @click="getAddressList()">修改</text>
-						</view>
-					</view>
-					<view class="flex justify-between margin-top-lg">
-						<view class="header-view-text">手机号码</view>
-						<view class="header-view-data">
-							{{mobile}}
-						</view>
-					</view>
-					<view class="flex justify-between margin-top-lg">
-						<view class="header-view-text">详细地址</view>
-						<view class="flex adders-view">
-								<span>
-									{{province}}/{{city}}/{{district}}/{{detailaddress}}
-								</span>
-								<span class="view-more"></span>
-						</view>
-					</view>
-					
-				</view>
-			</view>
-			<view class="ske-padding margin-top-sm header-view">
-				<view class="fuwu-time" @click="liliaoshi">
-				 	<view  class="fuwu-title" >
-						<span>技师</span>
-						<!-- <span v-if="jishiName">{{jishiName.technicianTypeName}}</span> -->
-					</view>
-					<view class="liliao-bottom" style="margin-right: 6px;">
-							<span v-if="jishiName.artificerId">{{jishiName.artificerName}}</span>
-							<span v-else>请选择技师</span>
-							<span class="view-more"></span>
-					</view>
-				</view>
-				<view class="fuwu-time">
-					<view class="fuwu-title">
-						服务时间
-					</view>
-					<view class="flex align-center justify-between"
-						style="height: 100rpx;line-height: 100rpx;padding: 0rpx 10rpx;">
-						<view class="flex justify-between margin-tb-sm" @click="openData()">
-							<view v-if="startTime">{{startTime}}</view>
-							<view class="tetx-sm" v-else>请选择预约时间<span class="view-more"></span></view>
+				<view class="" style="background-color: #ffffff;border-radius: 24rpx;margin-top: 24rpx;padding: 29rpx;">
+					<view class="" v-if="order.artificer">
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">下单人</view>
+							<view class="add-con-cont">
+								{{order.userName}}
 							</view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">联系方式</view>
+							<view class="add-con-cont">
+								{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
+							</view>
+						</view>
+						<view class="serverAddress">
+							<view class="add-con-title">服务地址</view>
+							<view style="color: #666;margin-top: 8rpx;font-size: 30rpx;width: 73%; text-align: right;">{{order.address}}</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="margin-top-xl pay-ding">
+					<view class="flex align-center pay-ding-top">
+						<image :src="order.artificer.artificerImg" class="d-touxiang"></image>
+						<view class="margin-left-sm flex" style="width: 90%;justify-content: space-between;flex-direction: row;align-items: center;">
+							<view class="flex align-center" style="width: 80%;justify-content: space-between;">
+								<view class="d-title">{{order.artificer.artificerName}}</view>
+								<!-- <image
+									v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2"
+									src="../../static/img/phone.png" style="width: 10px;height: 13px;margin-left: 11px;"
+									@click="bindphone(order.artificer.phone)"></image> -->
+								<!-- <image src="../../static/img/phone.png" class="phone-pay"
+									@click="bindphone(order.artificer.phone)"></image> -->
+							</view>
+							<view class="level_button">{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</view>
+							<!-- <view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
+								<view class="margin-right">
+									<image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;">
+									</image>
+									<text
+										style="color: #F93731;margin-left: 5rpx;">{{order.artificer.ordersCount}}2</text>
+								</view>
+								<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康技师</text>
+							</view> -->
+						</view>
+					</view>
+					<view class="list-pay">
+						<view class="justify-title-nav ">
+							<view class="justify-title">订单信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view  class="add-con-title">订单编号</view>
+							<view class="flex align-center" @tap="copy(order.ordersNo)"
+								style="color: #333;font-size: 30rpx;">
+								<view class="">{{order.ordersNo}}</view>
+								<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
+							</view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view  class="add-con-title">预约时间</view>
+							<view class="add-con-cont">{{order.serveTime}}</view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">下单时间</view>
+							<view class="add-con-cont">{{order.createTime}}</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view class="justify-title-nav ">
+							<view class="justify-title">订单费用</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">项目名称</view>
+							<view class="add-con-cont">{{order.entryName}}</view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">服务时长</view>
+							<view class="add-con-cont">{{order.duration}}分钟</view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">项目价格</view>
+							<view class="add-con-cont">￥{{order.massagePrice}}</view>
+						</view> 
+						<view class="flex justify-between add-lin" >
+							<view class="add-con-title">会员折扣</view>
+							<view class="add-con-cont">{{order.vipRate}}%</view>
+						</view>
+						 <view class="flex justify-between add-lin" >
+						 	<view class="add-con-title">技师加成</view>
+						 	<view class="add-con-cont">{{order.technicianRate}}%</view>
+						 </view> 
+						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
+							<view style="color: #333;font-size: 26rpx;">小计：</view>
+							<view class="" style="color: #333;">￥<text
+									style="font-size: 35rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
+						</view>
+						
+						<view class="jusitify-line-end"></view>
+						
+						<view class="justify-title-nav ">
+							<view class="justify-title">出行费用</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.tripWay">
+							<view class="add-con-title">出行方式</view>
+							<view class="add-con-cont" v-if="order.tripWay == 1">公交</view>
+							<view class="add-con-cont" v-if="order.tripWay == 2">出租</view>
+							<view class="add-con-cont" v-if="order.tripWay == 3">免费</view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.km">
+							<view class="add-con-title">全程距离</view>
+							<view class="add-con-cont">{{order.km}}km</view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.taxiMoney">
+							<view class="add-con-title">出行交通费用</view>
+							<view class="add-con-cont">￥{{order.taxiMoney}}</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view class="justify-title-nav ">
+							<view class="justify-title">优惠券信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<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>
+						
+						<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>
+					</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>
-			<view class="margin-top-xl pay-ding">
-				<view class="d-title">备注</view>
-				<view class="list-pay">
-					<view class="textarea-pay-list">
-						<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
-					</view>
-					
-				</view>
+
+			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
+				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
+					v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">取消订单
+				</u-button>
+				<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
+					v-if="order.status == 1"
+					class="dingshi">立即支付
+				</u-button>
+				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
+					class="dingshi">联系客服</u-button>
 			</view>
-			<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view>
-		
+			
 		</view>
-		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
-		<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
-			<scroll-view scroll-y="true" style="width: 750rpx;height: 500rpx;">
-				<view class="list_item" v-for="(item,index) in orderList" :key="index">
-					<image :src="item.massageImg"></image>
-					<view class="listitem_rightview">
-						<view class="titleview">
-							<view class="item_title">{{item.title}}</view>
-							<view class="item_yishou">已售{{item.sales}}</view>
-						</view>
-						<view class="flex flex-wrap" style="margin-top: 10rpx;" v-if="item.labels.length>0">
-							<text class="margin-bottom-xs box" v-for="(items,index) in item.labels"
-								:key="index">{{items}}</text>
-						</view>
-						<view class="btnview">
-							<view class="item_money"> <text style="font-size: 24upx;">￥</text> <text
-									v-if="isVip">{{item.memberPrice}}</text><text v-if="!isVip">{{item.price}}</text>
-								/<text style="font-weight: 500;font-size: 24upx;	">{{item.duration}}分钟</text></view>
-							<view class="item_btn" @click="goOrder(item)">确认加钟</view>
-						</view>
-					</view>
-				</view>
-			</scroll-view>
-		</u-popup>
+		<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
 		<!-- 支付方式 -->
 		<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
 			<view class="popup_pay">
 				<view style="background-color: #fff;">
 					<view style="padding: 0 20upx;margin-top: 60rpx;margin-bottom: 20rpx;">
-						<view style="display: flex;height: 100upx;align-items: center;padding: 20upx 0;justify-content: center;"
+						<view
+							style="display: flex;height: 100upx;align-items: center;padding: 20upx 0;justify-content: center;"
 							v-for="(item,index) in openLists" :key='index'>
 							<image :src="item.image" style="width: 55upx;height: 55upx;border-radius: 50upx;">
 							</image>
@@ -137,29 +251,13 @@
 							</view>
 							<radio-group name="openWay" style="margin-left: 45upx;" @tap='selectWay(item)'>
 								<label class="tui-radio">
-									<radio color="#029d88" :checked="openWay === item.id ? true : false" />
+									<radio color="#019c88" :checked="openWay === item.id ? true : false" />
 								</label>
 							</radio-group>
 						</view>
 					</view>
 				</view>
-				<view class="tabber padding-top-sm padding-bottom-sm pay-zhifu" style="background: #fff !important;">
-					<span class="daizhifu">待支付:￥{{tpayMoney}}</span>
-					<u-button class="u-button-pay" @click="pay()" shape="circle" :custom-style="customStyle2" :hair-line="false">
-						立即支付
-					</u-button>
-				</view>
-			
-			</view>
-		</u-popup>
-		<!-- 预约弹窗 -->
-		<u-popup v-model="isTrue" mode="bottom">
-			<view>
-				<scroll-view scroll-y="true">
-					<its-calendar :sta_num="0" :end_num="24" :int_num="msTimeDate" :msTimeList="msTimeList" :classifyId="classifyId"
-						@getTime="TimeData">
-					</its-calendar>
-				</scroll-view>
+				<view class="pay_btn" @click="pay()">确认支付</view>
 			</view>
 		</u-popup>
 	</view>
@@ -167,23 +265,18 @@
 </template>
 
 <script>
+	// 调用手机系统权限
+	// #ifdef APP-PLUS
+	import permision from "@/components/permission.js";
+	// #endif
 	export default {
 		data() {
 			return {
-				startTime: '',
-				msTimeList: [],
-				msTimeDate: 0,
-				isTrue1: false,
-				single:'请选择时间',
-				radio1:'',
-				sex: [{
-					text: '我已同意《盛安健康服务协议》',
-					value: 0
-				}],
-				tordersId: '',
+				ordersId: '',
 				tpayMoney: '',
 				paySel: 0,
 				showorder: false,
+				showorderS: false,
 				orderList: [],
 				loading: true,
 				customStyle: {
@@ -216,6 +309,8 @@
 					user: {},
 					game: {}
 				},
+				isTrue: 0,
+
 				phone: '',
 				isVip: false,
 				birthDate: '',
@@ -225,76 +320,35 @@
 				openWay: 1,
 				closeable: true,
 				yhqxSel: '否',
-				address:[],
-				detailaddress:'',
-				name:'',
-				mobile:'',
-				cityaddress:'',
-				isDefault:'',
-				userId:'',
-				latitude:'',
-				longitude:'',
-				province:'',
-				city:'',
-				district:'',
-				addressId:'',
-				isTrue: false,
-				jishiName:'',
-				checkbox:false,
-				couponData:[],
-				couponId:'',
-				textareaData:'',
-				ordersId:'',
-				userPackageDetailId:'',
-				couponDataList:'',
-				orderXm:[],
-				detailData:[],
-				number:1,
+				btnShow:false,
+				tiqianData:'',
+				type:'center',
+				earlyFinishReason:'',
+				qurenJd:[],
+				artificerlist:[]
 			}
 		},
 		onLoad(e) {
-			if (this.$queue.getData('msTimeDate')) {
-				this.msTimeDate = parseInt(this.$queue.getData('msTimeDate'));
-			} else {
-				this.msTimeDate = 60;
+			// uni.showLoading({
+			// 	title: '加载中......',
+			// })
+			// setTimeout(() => {
+			// 	// this.loading = false;
+			// }, 2000)
+			this.isTrue = e.isTrue
+			if (this.isTrue) {
+				uni.setNavigationBarTitle({
+					title: '订单详情'
+				})
 			}
-			this.orderXm=this.$queue.getData('mainData');
-			console.log("this.orderXm",this.orderXm)
-			this.detailData=this.$queue.getData('detailData');
-			var date = new Date();
-			var year = date.getFullYear();
-			let month = (parseInt(date.getMonth()) + 1) > 9 ? (parseInt(date.getMonth()) + 1) : "0" + (parseInt(
-				date.getMonth()) + 1) // 当前月份
-			let days = (date.getDate()) > 9 ? date.getDate() : "0" + date.getDate() //当前日期
-			let fullDate = `${month}-${days}`
-			let Time = year + '-' + fullDate
-			this.yearsDate = Time;
-			var classifyId=this.$queue.getData('classifyId')
-			this.classifyId = classifyId;
-			this.jishiName=this.$queue.getData('getJishi');
-			if(this.jishiName){
-				this.getMsTime(Time);
-			}else{
-				this.jishiName=[];
-				this.jishiName.artificerId='';
-			}
-			this.couponId=this.$queue.getData('youhui');
-			if(this.couponId){
-				this.youhuiF(this.couponId)
-			}
-			
-			this.ordersId = this.orderXm.ordersId;
-			this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
-			this.youhui()
-			// this.getOrder()
+			this.ordersId = e.ordersId
+			this.getOrder()
 		},
-		
 		onShow() {
-			this.addressId = this.$queue.getData('EditAddress');
-			if (this.addressId) {
-				this.getAddressList(this.addressId);
-			} else {
-				this.addressMy()
+			this.yhqxSel = this.$queue.getData("yhqxSel");
+			this.getOrder()
+			if (uni.getStorageSync('token')) {
+				this.getIsVip()
 			}
 
 			// #ifndef MP-WEIXIN
@@ -328,238 +382,222 @@
 			// #endif
 		},
 		methods: {
-			openpay() {//验证
-				if(this.jishiName==''){
-					uni.showToast({
-						title:'请选择技师！'
-					})
-				}else if(this.startTime==''){
-					uni.showToast({
-						title:'请选择服务时间！'
-					})
-				}else{
-					this.goOrder()
-				}
-			},
-			goOrder() {//生成orderId
-				let that = this
-				// let payMoney =item.price;
-				// let payMoney = that.isVip ? item.memberPrice : item.price;
+			saveJZS(artificerId) {//升级查询技师项目
 				let data = {
-					 address:that.province+that.city+that.district+that.detailaddress,
-					 artificerId:that.jishiName.artificerId,
-					 phone:that.mobile,
-					 userName:that.name,
-					 tripWay:that.jishiName.tripWay,
-					 city:that.province,
-					 couponId: '',
-					 userId: uni.getStorageSync('userId'),
-					 longitude:that.longitude,
-					 latitude:that.latitude,
-					 serveTime:that.startTime,
-					 remark:that.textareaData,
-					 ordersMassageList:[
-					   {massageId:that.orderXm.ordersMassageList[0].userPackageDetail.id,num: 1},
-					 ],
-					 userPackageDetailId : that.orderXm.ordersMassageList[0].userPackageDetail.id,
-					 ordersId:that.ordersId
+					artificerId: artificerId,
+					status: 0
 				}
-				that.$Request.postJson("/app/artificer/updateOrders", data).then(res => {
-					that.showorder = false
-					if (res.code == 0) {
-						that.tordersId = res.data.ordersId;
-						that.ordersId = res.data.ordersId;
-						that.tpayMoney = res.data.payMoney;
-						// that.showpay = true;
-						that.paySel = 1;
-						uni.navigateTo({
-							url:'/my/order/paydingTCX?ordersId='+ res.data.ordersId
-						})
-					} else {
-						that.$queue.showToast(res.msg)
-					}
-							
-				});
-				
-			},
-			changeValue(value){
-				this.number=value
-			},
-			// 时间段数据
-			TimeData(e) {
-				var date = new Date();
-				var year = date.getFullYear();
-				// if(this.msTimeList.length > 0){
-				// 	let startTime = year + '-' + e.days + ' ' + e.hours
-				// 	for (var i = 0; i < this.msTimeList.length; i++) {
-				// 		let msTime = this.msTimeList[i].artificerDate + ' ' + this.msTimeList[i].artificerTime
-				// 		if(startTime === msTime){
-				// 			this.isTrue = false
-				// 			uni.showModal({
-				// 				title: '温馨提示',
-				// 				content: '当前时段已被预约，请更换预约时段！',
-				// 				showCancel: true,
-				// 				cancelText: '取消',
-				// 				confirmText: '确定',
-				// 				success: res => {
-				// 					if(res.confirm){
-				// 						this.isTrue = true
-				// 					}
-				// 				}
-				// 			});
-				// 			return;
-				// 		}
-				// 	}
-				// }else{
-				this.startTime = year + '-' + e.days + ' ' + e.hours
-				this.isTrue = false
-				// }
-			},
-			getMsTime(artificerDate) {
 				let that = this;
-				let artificerId = that.jishiName.artificerId;
-				this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + artificerId + '&artificerDate=' + artificerDate).then(res => {
+				this.$queue.showLoading('查询中...')
+				that.$Request.get("/app/artificer/selectArtificerMassageList", data).then(res => {
 					if (res.code == 0) {
-						this.msTimeList = res.data;
-						console.log(res.data, "获取忙时时间")
+						if (res.data && res.data.length > 0) {
+							that.artificerlist = res.data
+							// for (let i = 0; i < that.artificerlist.length; i++) {
+							// 	if (that.artificerlist[i].labels) {
+							// 		that.artificerlist[i].labels = that.artificerlist[i].labels.split(",");
+							// 	}
+							// }
+							uni.hideLoading();
+							that.showorderS = true;
+						} else {
+							uni.hideLoading();
+							that.$queue.showToast('暂无可升级项目');
+						}
+					} else {
+						uni.hideLoading();
+						that.$queue.showToast(res.msg);
+					}
+			
+				})
+			},
+			saveJZ(classifyId) {
+				let data = {
+					parentId: classifyId,
+					page: 1,
+					limit: 50,
+					status: 1
+				}
+				let that = this;
+				this.$queue.showLoading('查询中...')
+				that.$Request.get("/app/artificer/selectMassageTypePage", data).then(res => {
+					if (res.code == 0) {
+						if (res.data.list && res.data.list.length > 0) {
+							that.orderList = res.data.list
+							for (let i = 0; i < that.orderList.length; i++) {
+								if (that.orderList[i].labels) {
+									that.orderList[i].labels = that.orderList[i].labels.split(",");
+								}
+							}
+							uni.hideLoading();
+							that.showorder = true;
+						} else {
+							uni.hideLoading();
+							that.$queue.showToast('暂无可加钟项目');
+						}
+					} else {
+						uni.hideLoading();
+						that.$queue.showToast(res.msg);
+					}
+			
+				})
+			},
+			getTimeStampWithoutSeconds(date) {
+			    // 将日期转换为标准的UTC时间
+			    var utcDate = new Date(
+						   date.getUTCFullYear(), 
+						   date.getUTCMonth(), 
+						   date.getUTCDate(), 
+						   date.getUTCHours(), 
+						   date.getUTCMinutes(), 
+			                           0);
+			    // 返回不含秒的时间戳
+			    return utcDate.getTime();
+			},
+			getOrder() {
+				let data = {
+					ordersId: this.ordersId
+				}
+				this.$Request.get('/app/artificer/selectOrdersDetails', data).then(res => {
+					if (res.code == 0) {
+						this.loading = false
+						uni.hideLoading()
+						this.order = res.data;
+						var date = new Date(); // 当前日期和时间
+						var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
+						const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数
+						var twoTime=parseInt(new Date(twoHoursInMilliseconds).getTime())
+						var time=parseInt(new Date(this.order.serveTime).getTime())
+							if(time-timestamp>twoTime){
+								this.$set(this.order, 'btnShow', 'true')
+							}else{
+								this.$set(this.order, 'btnShow', 'false')
+							}
+							console.log("sadasdsa0",this.order)
+						let aliphone = this.$queue.getData('aliphone');
+						if (aliphone === '是' && this.order.artificer) {
+							this.ysPhone(this.order.phone, this.order.artificer.phone);
+						}
 					}
 				})
 			},
-			// 打开弹窗
-			openData() {
-				this.isTrue = true
+			closePopupQ(type){//提前结束    关闭弹出框
+				this.type = type
+				this.$refs.popupQ.close(type);
 			},
-			youhuijuan(){
-				uni.navigateTo({
-					url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price+'&text='+'套餐'
-				})
+			toggleQ(type,item) {//确认拒单 弹出框
+				this.qurenJd=item;
+				
+				this.type = type
+				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+				this.$refs.popupQ.open(type)
+			},
+			TuiPopup(typeTxte,type){//确认拒单 全额退款.同意按钮   关闭弹出框
+				this.type = typeTxte
+				let data = {
+					ordersId: this.qurenJd.ordersId,
+					isAuto: '0',
+					type: type
+				}
+				this.$Request.post('/app/artificer/cancelSupplementOrders', data).then(res => {
+					if (res.code == 0) {
+						uni.showToast({
+							title:'操作完成！'
+						})
+						this.getOrder()
+							this.$refs.popupQ.close(typeTxte);
+					}else{
+						this.getOrder()
+						uni.showToast({
+							icon:'error',
+							title:'操作失败！'
+						})
+					}
+				
+				}).catch(() => {
+					this.getOrder()
+					//联网失败, 结束加载
+				});
+			},
+			closePopup(type){//提前结束    关闭弹出框
+				this.type = type
+				this.$refs.popup.close(type);
+			},
+			textareaInp(e){//提前结束 输入框
+				this.earlyFinishReason=e.detail.value;
+				console.log("earlyFinishReason",this.earlyFinishReason)
+			},
+			tiqian(type){//提前结束 确认按钮
+				var that=this;
+				that.type = type;
+				if(that.earlyFinishReason){
+					uni.getLocation({
+						type: 'wgs84',
+						success: function (resa) {
+							var longitude=resa.longitude;
+							var latitude=resa.latitude;
+							console.log('当前位置的经度：' + resa.longitude);
+							console.log('当前位置的纬度：' + resa.latitude);
+							let data = {
+								ordersId: that.tiqianData.ordersId,
+								accomplishLongitude:longitude,
+								accomplishLatitude:latitude,
+								earlyFinishReason: that.earlyFinishReason,
+							}
+							that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
+								if (res.code == 0) {
+									uni.showToast({
+										title:'操作完成！'
+									})
+									that.getOrder()
+									that.$refs.popup.close(type);
+									uni.switchTab({
+										url:'/pages/order/index'
+									})
+								}else{
+									that.getOrder()
+									uni.showToast({
+										icon:'error',
+										title:'操作失败！'
+									})
+								}
+							
+							}).catch(() => {
+								//联网失败, 结束加载
+								that.getOrder()
+							});
+							
+						},
+							fail: function(e) {
+								that.getOrder()
+								// #ifdef H5
+									uni.showToast({
+										title:'获取地址失败！'
+									})
+								// #endif
+								// #ifdef APP-PLUS
+								that.checkPermission();
+								// #endif
+							}
+					});
+					
+				}else{
+					uni.showToast({
+						icon:'error',
+						title:'请输入提前结束原因！'
+					})
+				}
+			
+			},
+			toggle(type,item) {//提前结束 弹出框
+				this.tiqianData=item;
+				this.type = type;
+				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+				this.$refs.popup.open(type);
 			},
 			
-			textareaChange(e){//备注
-				this.textareaData=e.detail.value
-				console.log("adsadas0",this.textareaData)
-			},
-			checkboxChange(e){
-				this.couponId=e.detail.value.join(",")
-			},
-			youhuiF(couponId){//获取优惠卷
-				let that = this;
-				let data = {
-							  page: 1,
-							  limit: 10,
-							  id:couponId,
-							}
-				that.$Request.get("/app/coupon/selectCouponUserList", data).then(res => {
-					if (res.code == 0) {
-						var list=res.data.list;
-						that.couponDataList=list.reduce((sum, item) => sum + item.money, 0)
-						console.log("asdasdasdasd",that.couponDataList)
-					} else {
-						that.$queue.showToast(res.msg)
-					}
-							
-				});
-			},
-			youhui(){//获取优惠卷
-				let that = this
-				let data = {
-							  status: 0,
-							  page: 1,
-							  limit: 10
-							}
-				that.$Request.get("/app/coupon/selectCouponUserList", data).then(res => {
-					if (res.code == 0) {
-						that.couponData=res.data.list
-					} else {
-						that.$queue.showToast(res.msg)
-					}
-							
-				});
-			},
-			liliaoshi(){
-				uni.setStorage({
-				  key: 'taocanDd',
-				  data: '待补单',
-				  success: function () {
-				   uni.navigateTo({
-				   	url: '/pages/therapist/therapistDingdan'
-				   })
-				  }
-				});
-			},
-			getChuXing() {//判断这个城市 是不是在经营范围
-				this.$Request.getT('/app/artificer/selectTaxiMoney?artificerId=' + this.artificerId + '&latitude=' + this
-					.latitude + '&longitude=' + this.longitude).then(res => {
-					if (res.code == 0) {
-						this.cheFei = res.data.taxiMoney ? res.data.taxiMoney : 0;
-						// this.price = parseInt(this.price)+parseInt(this.cheFei).toFixed(2)
-						this.distances = res.data.distances
-						this.tripNum = res.data.tripNum
-						this.xuMoney = res.data.xuMoney
-						this.tripPrice = res.data.tripPrice
-						this.cxSel = true;
-					} else {
-						this.cxSel = false;
-						uni.showToast({
-							title: '当前城市暂未开通，请切换城市',
-							duration: 2000,
-							icon: 'none'
-						});
-					}
-				});
-			},
-			addressMy() {
-				this.$Request.getT('/app/address/selectAddressById').then(res => {
-					console.log(res)
-					if (res.code == 0) {
-						this.name = res.data.name;
-						this.mobile = res.data.phone;
-						this.cityaddress = res.data.province + res.data.city + res.data.district;
-						this.detailaddress = res.data.detailsAddress;
-						this.isDefault = res.data.isDefault;
-						this.userId = res.data.userId;
-						this.latitude = res.data.latitude;
-						this.longitude = res.data.longitude;
-						this.province = res.data.province
-						this.city = res.data.city
-						this.district = res.data.district
-						this.addressId = res.data.addressId
-						// this.getChuXing();
-						// this.$queue.setData('EditAddress', res.data.addressId);
-					}
-				});
-			},
-			// 选中地址
-			getAddressList(addressId) {
-				if (addressId) {
-					this.$Request.getT('/app/address/selectAddressByAddressId?addressId=' + this.addressId).then(res => {
-						console.log(res)
-						if (res.code == 0) {
-							this.name = res.data.name;
-							this.mobile = res.data.phone;
-							this.cityaddress = res.data.province + res.data.city + res.data.district;
-							this.detailaddress = res.data.detailsAddress;
-							this.isDefault = res.data.isDefault;
-							this.userId = res.data.userId;
-							this.latitude = res.data.latitude;
-							this.longitude = res.data.longitude;
-							this.province = res.data.province
-							this.city = res.data.city
-							this.district = res.data.district
-				
-							// this.getChuXing();
-						}
-						// uni.hideLoading();
-					});
-				} else {
-					uni.navigateTo({
-						url: '../address/address?id=' + 7
-					})
-				}
-				
-			},
-			changeLog(e){//服务时间
-				this.single=e;
+			gengBtn(){
+				this.btnShow=!this.btnShow
 			},
 			goChat() {
 				let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信 
@@ -637,20 +675,45 @@
 					}
 				});
 			},
-			
+			goOrder(item) {
+				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,
+				}
+				that.$Request.postJson("/app/artificer/updateOrders", data).then(res => {
+					that.showorder = false
+					if (res.code == 0) {
+						that.ordersId = res.data.ordersId;
+						that.tpayMoney = res.data.payMoney;
+						that.showpay = true;
+						that.paySel = 1;
+					} else {
+						that.$queue.showToast(res.msg)
+					}
+							
+				});
+			},
 			payJZ() {
 				let that = this;
 				if (that.openWay == 1) { //零钱支付
+				
 					uni.showModal({
 						title: '付款提示',
-						content: '确认支付' + that.tpayMoney + '元吗?',
+						content: '确认支付' + that.order.sumMoney + '元吗?',
 						success: function(re) {
 							if (re.confirm) {
 								that.$queue.showLoading('支付中...')
 								// console.log('用户点击确定');
 								that.$Request.post("/app/artificer/payOrders", {
-									ordersId: that.ordersId,
-									
+									ordersId: order.ordersId,
 								}).then(ret => {
 									uni.hideLoading();
 									if (ret.code == 0) {
@@ -658,7 +721,10 @@
 											title: '支付成功',
 											icon: 'none'
 										})
-										// that.getOrder()
+										uni.switchTab({
+											url:'/pages/order/index'
+										})
+										that.getOrder()
 
 									} else {
 										uni.showToast({
@@ -668,14 +734,14 @@
 									}
 								});
 							} else if (re.cancel) {
-								// that.getOrder()
+								that.getOrder()
 							}
 						}
 					})
 				} else if (that.openWay == 2) { //微信支付
 					// #ifdef MP-WEIXIN
 					let data = {
-						ordersId: that.tordersId,
+						ordersId: that.ordersId,
 						type: 3
 					}
 					that.$Request.post('/app/wxPay/payOrder', data).then(ret => {
@@ -695,12 +761,12 @@
 										title: '支付成功',
 										icon: 'none'
 									})
-									// that.getOrder()
+									that.getOrder()
 									// this.$queue.showToast('支付成功');
 
-									// uni.switchTab({
-									// 	url: '/pages/my/index'
-									// })
+									uni.switchTab({
+										url: '/pages/my/index'
+									})
 								},
 								fail: function(err) {
 									// this.$queue.showToast('支付失败');
@@ -708,7 +774,7 @@
 										title: '支付失败',
 										icon: 'nones'
 									});
-									// that.getOrder()
+									that.getOrder()
 								}
 							});
 						}
@@ -719,12 +785,15 @@
 					let ua = navigator.userAgent.toLowerCase();
 					if (ua.indexOf('micromessenger') != -1) {
 						let data = {
-							ordersId: that.tordersId,
+							ordersId: that.ordersId,
 							type: 2
 						}
 						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
 							that.showpay = false
 							if (rea.code == 0) {
+								uni.switchTab({
+									url:'/pages/order/index'
+								})
 								that.callPay(rea.data);
 							} else {
 								uni.showToast({
@@ -735,7 +804,7 @@
 						});
 					} else {
 						let data = {
-							ordersId: that.tordersId,
+							ordersId: that.ordersId,
 							type: 4
 						}
 						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
@@ -745,7 +814,10 @@
 								const hostUrl = urlArr.split("/");
 								const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
 								const url = '&redirect_url=' + callBack + 'my/order/pay';
-								window.location = rea.data.mweb_url + url
+								window.location = rea.data.mweb_url + url;
+								uni.switchTab({
+									url:'/pages/order/index'
+								})
 							} else {
 								uni.showToast({
 									title: rea.msg,
@@ -766,6 +838,9 @@
 						console.log(rea)
 						that.showpay = false
 						if (rea.code == 0) {
+							uni.switchTab({
+								url:'/pages/order/index'
+							})
 							that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
 						}
 					});
@@ -773,7 +848,7 @@
 				} else if (that.openWay == 3) { //支付宝支付
 					// #ifdef H5
 					let data = {
-						ordersId: that.tordersId,
+						ordersId: that.ordersId,
 						type: 2
 					}
 					that.$Request.post('/app/aliPay/payOrder', data).then(
@@ -783,54 +858,30 @@
 							div.innerHTML = rea.data //此处form就是后台返回接收到的数据
 							document.body.appendChild(div)
 							document.forms[0].submit()
+							uni.switchTab({
+								url:'/pages/order/index'
+							})
 						});
 					// #endif
 
 					// #ifdef APP-PLUS
 					let data = {
-						ordersId: that.tordersId,
+						ordersId: that.ordersId,
 						type: 1
 					}
 					that.$Request.post('/app/aliPay/payOrder', data).then(
 						rea => {
 							that.showpay = false
+							uni.switchTab({
+								url:'/pages/order/index'
+							})
 							that.setPayment('alipay', rea.data);
 						});
 					// #endif
 				}
 
 			},
-			saveJZ(classifyId) {
-				let data = {
-					parentId: classifyId,
-					page: 1,
-					limit: 50,
-					status: 1
-				}
-				let that = this;
-				this.$queue.showLoading('查询中...')
-				that.$Request.get("/app/artificer/selectMassageTypePage", data).then(res => {
-					if (res.code == 0) {
-						if (res.data.list && res.data.list.length > 0) {
-							that.orderList = res.data.list
-							for (let i = 0; i < that.orderList.length; i++) {
-								if (that.orderList[i].labels) {
-									that.orderList[i].labels = that.orderList[i].labels.split(",");
-								}
-							}
-							uni.hideLoading();
-							that.showorder = true;
-						} else {
-							uni.hideLoading();
-							that.$queue.showToast('暂无可加钟项目');
-						}
-					} else {
-						uni.hideLoading();
-						that.$queue.showToast(res.msg);
-					}
-
-				})
-			},
+			
 			//支付选择
 			selectWay: function(item) {
 				this.openWay = item.id;
@@ -896,27 +947,13 @@
 					}
 				});
 			},
-			goNav(e) {
+			goNav(e,item) {
+				this.$queue.setData('daibudan',item);
 				uni.navigateTo({
 					url: e
 				})
 			},
-			getOrder() {
-				let data = {
-					ordersId: this.ordersId
-				}
-				this.$Request.get('/app/artificer/selectOrdersDetails', data).then(res => {
-					if (res.code == 0) {
-						this.loading = false
-						uni.hideLoading()
-						this.order = res.data
-						let aliphone = this.$queue.getData('aliphone');
-						if (aliphone === '是' && this.order.artificer) {
-							this.ysPhone(this.order.phone, this.order.artificer.phone);
-						}
-					}
-				})
-			},
+			
 			delOrder(e) {
 				let that = this
 				uni.showModal({
@@ -953,7 +990,12 @@
 					}
 				});
 			},
-			
+			openpay(item) {
+				// uni.navigateTo({
+				// 	url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId
+				// })
+				this.showpay = true
+			},
 			// 支付订单
 			pay() {
 				let that = this
@@ -963,22 +1005,26 @@
 					return;
 				}
 				if (that.openWay == 1) { //零钱支付
+				console.log("that.order.sumMoney",that.order)
 					uni.showModal({
 						title: '付款提示',
-						content: '确认支付' + that.tpayMoney + '元吗?',
+						content: '确认支付' + that.order.sumMoney + '元吗?',
 						success: function(re) {
 							if (re.confirm) {
 								that.$queue.showLoading('支付中...')
 								console.log('用户点击确定');
 								that.$Request.post("/app/artificer/payOrders", {
-									ordersId: that.ordersId,
+									ordersId: that.order.ordersId,
 								}).then(res => {
 									uni.hideLoading();
 									if (res.code == 0) {
 										uni.showToast({
 											title: '支付成功'
 										})
-										// that.getOrder()
+										uni.switchTab({
+											url:'/pages/order/index'
+										})
+										that.getOrder()
 									} else {
 										uni.showToast({
 											title: res.msg,
@@ -1017,12 +1063,12 @@
 										title: '支付成功',
 										icon: 'none'
 									})
-									// that.getOrder()
+									that.getOrder()
 									// this.$queue.showToast('支付成功');
 
-									// uni.switchTab({
-									// 	url: '/pages/my/index'
-									// })
+									uni.switchTab({
+										url:'/pages/order/index'
+									})
 								},
 								fail: function(err) {
 									// this.$queue.showToast('支付失败');
@@ -1030,7 +1076,7 @@
 										title: '支付失败',
 										icon: 'nones'
 									});
-									// that.getOrder()
+									that.getOrder()
 								}
 							});
 						}
@@ -1048,6 +1094,9 @@
 							that.showpay = false
 							if (rea.code == 0) {
 								that.callPay(rea.data);
+								uni.switchTab({
+									url:'/pages/order/index'
+								})
 							} else {
 								uni.showToast({
 									title: rea.msg,
@@ -1074,6 +1123,9 @@
 								const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
 								const url = '&redirect_url=' + callBack + 'my/order/pay';
 								window.location = rea.data.mweb_url + url
+								uni.switchTab({
+									url:'/pages/order/index'
+								})
 							} else {
 								uni.showToast({
 									title: rea.msg,
@@ -1094,7 +1146,11 @@
 						console.log(rea)
 						that.showpay = false
 						if (rea.code == 0) {
+							
 							that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
+							uni.switchTab({
+								url:'/pages/order/index'
+							})
 						}
 					});
 					// #endif
@@ -1111,6 +1167,9 @@
 							div.innerHTML = rea.data //此处form就是后台返回接收到的数据
 							document.body.appendChild(div)
 							document.forms[0].submit()
+							uni.switchTab({
+								url:'/pages/order/index'
+							})
 						});
 					// #endif
 
@@ -1122,6 +1181,9 @@
 					that.$Request.post('/app/aliPay/payOrder', data).then(
 						rea => {
 							that.setPayment('alipay', rea.data);
+							uni.switchTab({
+								url:'/pages/order/index'
+							})
 						});
 					// #endif
 				}
@@ -1162,7 +1224,7 @@
 								title: '支付成功',
 								icon: 'none'
 							})
-							// that.getOrder()
+							that.getOrder()
 						} else {
 							uni.hideLoading();
 						}
@@ -1191,7 +1253,7 @@
 							title: '支付成功',
 							icon: 'none'
 						})
-						// that.getOrder()
+						that.getOrder()
 					},
 					fail: function(err) {
 						uni.hideLoading();
@@ -1222,7 +1284,10 @@
 							that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
 								uni.hideLoading();
 								if (res.code == 0) {
-									// that.getOrder()
+									that.getOrder()
+									uni.switchTab({
+										url:'/pages/order/index'
+									})
 								} else {
 									that.$queue.showToast(res.msg);
 								}
@@ -1248,7 +1313,9 @@
 							that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
 								uni.hideLoading();
 								if (res.code == 0) {
-									uni.navigateBack()
+									uni.switchTab({
+										url:'/pages/order/index'
+									})
 								} else {
 									that.$queue.showToast(res.msg);
 								}
@@ -1279,536 +1346,253 @@
 	}
 </script>
 
-
 <style lang="scss" scoped>
-	.textarea-pay-list{
+	.beizhu{
 		width: 100%;
-		height: 126rpx;
-		margin-top: 10px;
-	}
-	.textarea-pay{
-		background-color: #f3f3f3;
-		width: 100%;
-		height: 100%;
-		background: #F3F3F3;
-		border-radius: 14rpx;
-		padding: 7px;
-	}
-	
-	.pay-ding{
-		padding-bottom: 15px;
-	}
-	.pay-ding,.feiuong{
-		background-color: #ffffff;
-		border-radius: 24rpx;
-		margin-top: 24rpx;
-		// padding: 29rpx;
-	}
-	.view-more{
-		display:inline-block;
-		border-top:1px solid;
-		border-right:1px solid;
-		width: 15rpx;
-		height: 15rpx;
-		border-color:#999;
-		transform:rotate(45deg);
-		margin-top: 14rpx;
-		}
-	.tetx-sm{
-		font-size: 30rpx;
-		color:#888;
-	}
-	.ske-padding{
-		padding: 5rpx 30rpx 36rpx 30rpx;
-	}
-	.header-bottom-money{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: flex-end;
-	}
-	.detail-view-mina{
-		width: 68%;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-around;
-	}
-	.detail-view-img{
-		width: 76px;
-		height: 76px;
-		border-radius: 9px;
-	}
-	.detail-view{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-	}
-	.head-bottom{
-		width: 68%;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-around;
-	}
-	.money-pay-jia{
-		font-weight: 400;
-		font-size: 25rpx;
-		color: #666666;
-		text-decoration-line: line-through;
-		margin-left: 5px;
-	}
-	.money-pay-zhen span{
-		color: #FF6000;
-	}
-	.money-pay-zhen span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.money-pay-zhen span:nth-child(2){
-		font-size: 31.25rpx;
-		font-weight: bold;
-	}
-	.money-pay-zhen{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-	.money-pay{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-	}
-	.head-top{
-		background-color: #ffffff;
-		border-radius: 24rpx;
-		padding: 29rpx;
-		margin-top: 10px;
-	}
-	
-	.pay-title{
-		font-weight: bold;
-		font-size: 38rpx;
-		color: #333333;
-		margin-bottom: 5px;
-	}
-	.header-bottom-money-zhen span{
-		color: #F95900 ;
-		}
-	.header-bottom-money-zhen{
-		display: flex;
-		flex-direction: row;
-		align-items: baseline;
-		justify-content: space-between;
-		}
-	.detail-foot-nav-bor{
-		width: 64px;
-		height: 11rpx;
-		border-radius: 6rpx;
-		position: absolute;
-		bottom: 0;
-		background: linear-gradient(90deg,rgba(234, 248, 245,0.7),rgba(132, 211, 196,0.7));
-	}
-	.detail-foot-nav-text{
-		font-weight: bold;
-		font-size: 32rpx;
-		color: #000000;
-	}
-	.detail-foot-nav{
-		width: 90%;
-		display: flex;
-		flex-direction: column;
-		position: relative;
-		margin: 8px auto;
-	}
-	.detail-foot-title{
-		    width: 115px;
-		    height: 32px;
-			background-image: url(../../static/servicePackage/horn.png);
-		    background-repeat: no-repeat;
-		    background-size: 100% 100%;
-		    font-weight: 400;
-		    font-size: 13px;
-		    color: #FFFFFF;
-		    text-align: right;
-		    line-height: 32px;
-		    padding-right: 15px;
-			position: absolute;
-			    right: 0;
-			    top: 0;
-	}
-	.detail-foot-list-top{
-		width: 95%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-	.detail-foot-list{
-		width: 95%;
-		border-radius: 21rpx;
-		position: relative;
-		margin: 6px 0px 5px 0px;
-		padding: 15px;
-		display: flex;
-		flex-direction: column;
-		background-color: #fff;
-	}
-	.detail-foot{
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		padding: 15px 0px;
-	}
-	
-	.tese span:nth-child(1){
-		font-weight: bold;
-		font-size: 22rpx;
-		color: #333333;
-	}
-	.tese span:nth-child(2){
-		font-weight: 400;
-		font-size: 22rpx;
-		color: #8D9194;
-	}
-	.tese{
-		width: 100%;
-		display: -webkit-box;
+	    display: -webkit-box;
 		-webkit-box-orient: vertical;
 		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
 		overflow: hidden;
 		text-overflow: ellipsis;
 	}
-	.detail-foot-list-top span:nth-child(1){
-		font-weight: bold;
-		font-size: 31rpx;
-		color: #3F3F3F;
+	.bottom-view{
+		margin-top: 9px;
+		border-bottom: 1px solid #ccc;
+		padding-bottom: 5px;
+		margin-bottom: 5px;
 	}
-	.detail-foot-list-top span:nth-child(2){
-		width: 76rpx;
-		height: 33rpx;
-		line-height: 33rpx;
-		text-align: center;
-		border-radius: 16rpx;
-		border: 1px solid #7D7D7D;
-		font-weight: 400;
-		font-size: 20rpx;
-		color: #777777;
-		margin: 0px 25px 0px 5px;
+	/deep/.u-drawer{
+		z-index:11 !important;
 	}
-	.detail-foot-list-top span:nth-child(3){
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #029d88;
+	.xiangmu-cont-top-left{
+		font-weight: normal;
+		font-size: 21rpx;
+		color: #049E89;
+		margin-top: 1px;
 	}
-	
-	.detail-foot-mian{
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-	}
-	/deep/uni-checkbox .uni-checkbox-input{
-		width: 26px;
-		height: 26px;
-		border-radius: 50%;
-	}
-	.youhui-img{
-		width: 111.81rpx;
-		height: 111.81rpx;
-	}
-	.youhui-view-right-btn{
-		width: 158rpx;
-		height: 64rpx;
-		background: linear-gradient(-90deg, #019C88, #2DC48E);
-		border-radius: 32rpx;
-		text-align: center;
-		line-height: 64rpx;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #FFFFFF;
-		text-shadow: 0rpx 2rpx 4rpx rgba(0,119,104,0.44);
-		margin-left: 10px;
-	}
-	.youhui-view-right-time{
-		font-weight: 400;
-		font-size: 22rpx;
-		color: #999999;
-	}
-	.youhui-view-right-title{
-		width: 110px;
-		font-weight: 400;
-		font-size: 32rpx;
-		color: #333333;
-	}
-	.youhui-view-right-top{
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-	.youhui-view-right{
-		width: 502.08rpx;
-		height: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-around;
-	}
-	.youhui-view-left-bottom{
-		font-weight: 400;
-		font-size: 22rpx;
-		color: #FFFFFF;
-	}
-	.youhui-view-left-yuan{
-		display: flex;
-		flex-direction: row;
-		align-items: baseline;
-		color: #FFFFFF;
-	}
-	.youhui-view-left-num{
-		font-weight: bold;
-		font-size: 89rpx;
-	}
-	.youhui-view-left-text{
-		font-weight: bold;
-		font-size:24.31rpx;
-	}
-	.youhui-view-left{
-		width: 199rpx;
-		height: 242rpx;
-		display: flex;
-		flex-direction:column;
-		align-items: center;
-		justify-content: center;
-	}
-	.youhui-yiyong{
-		background-image: url('../../static/youhuijuan/coupons7.png');
-	}
-	.youhui-weiyong{
-		background-image: url('../../static/youhuijuan/coupons1.png');
-	}
-	.youhui-list{
-		width: 95%;
-		display: flex;
-		flex-direction: row;
-		height: 242rpx;
-		border-radius: 21rpx;
-		background-size: 100%;
-		margin: 20px auto;
-		justify-content: space-between;
-	}
-	.dingwei-image{
-		margin-right: 20rpx;
-		width: 66rpx;
-		height: 66rpx;
-		padding: 10rpx 0;
-		border-radius: 50%;
-		background: linear-gradient(90deg, #029d88, #2fc094);
-		text-align: center;
-		line-height: 66rpx;
-	}
-	/deep/.skeleton-fade{
-		display: none;
-	}
-	/deep/.u-button-pay{
-		width: 381rpx;
-		height: 76rpx;
-		line-height: 76px;
-		text-align: center;
-		color: #fff;
-		font-size: 32rpx;
-		background: linear-gradient(90deg, #029d88, #2fc094);
-		border-radius: 60rpx;
-	}
-	.daizhifu{
-		font-size: 38rpx;
-		color: #333333;
-	}
-	.pay-zhifu{
-		width: 100%;
-		background-color: #f7f7f7 !important;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between !important;
-	}
-	.liliao{
-		margin-top: 17px;
-	}
-	.fuwu-time-view{
-		text-align: right;
-	}
-	.liliao-top span:nth-child(2){
-		width: 78rpx;
-		height: 35rpx;
-		line-height: 35rpx;
-		background: linear-gradient(90deg, #FE912E, #FF9970);
-		border-radius: 17rpx;
-		text-align: center;
-		font-weight: 400;
-		font-size: 25rpx;
-		color: #FFFFFF;
-		margin-left: 5px;
-	}
-	.fuwu-time-view span:nth-child(1),.liliao-bottom span:nth-child(1){
-		font-weight: 400;
-		font-size: 29rpx;
-		color: #888;
-		margin-right: 5px;
-	}
-	.fuwu-time-view,.liliao-top{
-		width: 70%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-	.fuwu-title,.liliao-top span:nth-child(1){
-		font-size: 29rpx;
-		color: #222222;
-	}
-	.fuwu-time,.liliao{
+	.xiangmu-cont-top-time{
 		width: 100%;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
 	}
-	.adders-view image{
-		margin-top: 5px;
-	}
-	.xuanzhe{
-		margin-left: 5px;
-		border: 1px solid;
-	}
-	.header-view-data{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-	.adders-view span,.header-view-data{
-		font-size: 29rpx;
-		color: #888;
-		text-align: right;
-	}
-	.adders-view{
-		display: flex;
-		flex-direction: row;
-		position: relative;
-	}
-	.header-view-text{
-		width: 170rpx;
-		font-size: 29rpx;
-		color: #222222;
-	}
-	.header-view{
-		background-color: #fff;
-		margin-bottom: 10px;
-		border-radius: 11px;
-	}
-	.head-foot span:nth-child(1){
-		margin-right: 5px;
-	}
-	.head-foot span{
+	.xiadan{
+		width: 122rpx;
+		height: 48rpx;
+		line-height: 48rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 24rpx;
+		text-align: center;
 		font-weight: bold;
-		font-size: 28rpx;
-		color: #222222;
+		font-size: 24rpx;
+		color: #FFFFFF;
 	}
-	.head-foot{
+	.xiangmu-foot-left{
 		display: flex;
 		flex-direction: row;
-		justify-content: flex-end;
-		margin-top: 10px;
+		align-items: flex-end;
 	}
-	.head-mian{
-		margin-top: 3px;
-	}
-	.qian-right span:nth-child(1){
-		font-size: 16.67rpx;
-	}
-	.qian-right span:nth-child(2){
-		font-size:25rpx;
-	}
-	.qian-right span{
-		color: #727272;
-	}
-	.qian-left span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.qian-left span:nth-child(2){
-		font-size:29.17rpx;
-	}
-	.qian-left span{
+	.xiangmu-foot-left-shiji span{
 		color: #F95900;
 	}
-	.head-top-view-right-img,.adders-view image,.fuwu-img{
-		width: 9.38rpx;
-		height: 15.83rpx;
+	.xiangmu-foot-left-shiji span:nth-child(1){
+		font-size: 25rpx;
 	}
-	.head-top-title-bottom{
+	.xiangmu-foot-left-shiji span:nth-child(2){
+		font-weight: bold;
+		font-size:36.81rpx;
+	}
+	.xiangmu-foot-left-shiji span:nth-child(3){
+		font-size: 25rpx;
+	}
+	.xiangmu-foot-left-dazhe{
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #848484;
+		text-decoration-line: line-through;
+		margin-left:5px;
+	}
+	.xiangmu-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.xiangmu-about{
+		width: 100%;
+		text-align: left;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #848484;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		margin: 5px 0px;
+	}
+	.xiangmu-cont-top-title{
+		font-weight: bold;
+		font-size: 33rpx;
+		color: #333333;
+	}
+	
+	.xiangmu-cont-top{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.xiangmu-cont{
+		width: 55%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.xiangmu-img{
+		width: 285rpx;
+		height: 218rpx;
+		background: #9F9F9F;
+		border-radius: 14rpx;
+	}
+	.xiangmu{
+		width: 95%;
+		height: 263rpx;
+		background: #FFFFFF;
+		border-radius: 21rpx;
+		margin: 0px auto 10px auto;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		padding: 10px;
+	}
+	
+	.popup-mian-btn span:nth-child(1){
+		background: linear-gradient(90deg, #FE912E, #FF9970);
+	}
+	.popup-mian-btn span:nth-child(2){
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	}
+	.popup-mian-btn span{
+		width: 247rpx;
+		height: 77rpx;
+		line-height: 77rpx;
+		text-align: center;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #FFFEFE;
+		border-radius: 39rpx;
+	}
+	.popup-mian-btn{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
 		margin-top: 10px;
 	}
-	.head-top-title,.head-top-title-bottom,.head-mian{
+	.popup-mian-textarea{
+		width: 525.69rpx;
+		height: 211.81rpx;
+	}
+	.popup-mian{
+		width: 88%;
+		display: flex;
+		flex-direction: column;
+		margin: 5px auto 0px auto;
+	}
+	.popup-head span:nth-child(2){
+		width: 50rpx;
+		height: 50rpx;
+		line-height: 19px;
+		text-align: center;
+		font-size: 24px;
+		color: #15AB8D;
+		border-radius: 50%;
+		border: 3px solid #15AB8D;
+	}
+	.popup-head span:nth-child(1){
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.popup-head{
 		width: 100%;
+		height: 99.38rpx;
+		background-color: rgba(21, 171, 141, 0.09);
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 15px;
+	}
+	.popup-content{
+		width: 613rpx;
+		height: 479rpx;
+		background: #FFFFFF;
+		border-radius: 56rpx;
+		display: flex;
+		flex-direction: column;
+	}
+	/deep/.btns{
+		background: #019C88 !important;
+		color: #fff !important;
+	}
+	/deep/.u-size-default{
+		margin: 5px 0px 0px 0px;
+	}
+	.showBtn-mian{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		flex-wrap: wrap;
+		justify-content: flex-end;
+	}
+	.gengduo{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #7D7D7D;
+	}
+	.showBtn-view{
+		width: 100%;
+		justify-content: flex-end;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.showBtn,.hideBtn{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		
+	}
+	
+
+	.dingshi{
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	}
+	.zhuangtai{
+		color: #029D88;
+		font-weight: bold;
+	}
+	.head-title-right{
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
 	}
-	.head-top-view-right{
-		width: 83%;
-		display: flex;
-		flex-direction: column;
-	}
-	.head-top-view-img{
-		width: 98.61rpx;
-		height: 98.61rpx;
-	}
-	.head-top-view{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-	}
-	.head-top{
-		width: 100%;
-		background-color: #ffffff;
-		border-radius: 24rpx;
-		padding: 29rpx;
-	}
-	.d-title{
-		font-weight: 400;
-		font-size: 29rpx;
-		color: #222;
-		padding: 10px 15px 0px 15px;
-		width: 100%;
-	}
-	.checkbox-data{
-		padding: 0px 11px;
-		margin: 15px 0px;
-	}
-	.list-pay-text span:nth-child(2){
-		padding-left: 5px;
-	}
-	.list-pay-text{
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #999999;
-		line-height: 42rpx;
-	}
-	.list-pay{
-		width: 100%;
-		padding: 0px 29rpx;
-	}
-	.pay-ding-top{
-		width: 100%;
-		height: 80rpx;
-		padding: 0px 29rpx;
+	.head-title{
+		margin-top: -2px;display: inline-block;
+		width: 300rpx; 
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
 	}
 	.fei-view-list span,.fei-view-list-z span{
 		font-weight: bold;
@@ -1816,9 +1600,9 @@
 	}
 	.fei-view-list-z{
 		height: 65rpx;
-		background-color: rgba(247, 247, 247, 0.8);
-		border-radius: 33rpx;
-		padding: 0px 5px;
+		border-top: 1px solid #f3f3f3;
+		padding-top: 20rpx;
+		font-weight: bold;
 	}
 	.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
 		color: #666666;
@@ -1874,9 +1658,17 @@
 		border-radius: 14rpx;
 		padding: 7px;
 	}
-	
-	.pay-ding{
-		padding-bottom: 15px;
+	.list-pay{
+		width: 100%;
+		padding: 10px 29rpx;
+	}
+	.pay-ding-top{
+		width: 100%;
+		height: 50px;
+		background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff);
+		border-top-left-radius: 12px;
+		border-top-right-radius: 12px;
+		padding: 0px 14px;
 	}
 	.pay-ding,.feiuong{
 		background-color: #ffffff;
@@ -1888,7 +1680,12 @@
 		width: 49rpx;
 		height: 44rpx;
 	}
-	
+	.d-title{
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #333333;
+		font-weight: bold;
+	}
 	.d-touxiang{
 		width: 46rpx;
 		height: 46rpx;
@@ -1922,17 +1719,22 @@
 		flex-direction: row;
 		align-items: center;
 	}
-	
+	.head-top{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		padding: 29rpx;
+	}
 	.content{
-		 padding-top: 1px;
+		 padding-bottom: 140rpx;
+		 padding-top: 20px;
 		 width: 100%;
 		 background-color: #f7f7f7;
 	}
 	.pay-title{
 		font-weight: bold;
-		font-size: 28rpx;
+		font-size: 32rpx;
 		color: #333333;
-		margin-bottom: 5px;
+		margin-bottom: 8px;
 	}
 	page {
 		background: #f7f7f7;
@@ -1944,7 +1746,7 @@
 	}
 
 	.bg {
-		background: #fff;
+		background: linear-gradient(to right, #223845, #00a85b);
 	}
 
 	.list_item {
@@ -2016,7 +1818,7 @@
 			.item_btn {
 				width: 140upx;
 				height: 56upx;
-				background: linear-gradient(to right, #223845, #00a85b);
+				background-color: #019C88;
 				border-radius: 16upx;
 				text-align: center;
 				line-height: 56upx;
@@ -2086,9 +1888,9 @@
 
 	.popup_pay {
 		width: 100%;
-		height: 210px;
 		position: relative;
 		padding-bottom: 45rpx;
+		/* height: 160px; */
 		/* #ifndef MP-WEIXIN */
 		/* height: 130px; */
 		/* #endif */
@@ -2106,9 +1908,69 @@
 		line-height: 80rpx;
 		font-size: 32rpx;
 	}
+
 	.serverAddress {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 	}
+	.head-text{
+		font-size:30rpx;
+	}
+	.zhuangtai{
+		color: #029D88;
+	}
+	.level_button{
+		padding: 3rpx 13rpx;
+		background: linear-gradient(to right, #fe9131, #ff9869);
+		border-radius: 16rpx 16rpx 16rpx 1rpx ;
+		color: #fff;
+		font-size: 12px;
+	}
+	.add-lin{
+		height: 80rpx;
+		line-height: 80rpx;
+	}
+	.add-con-title{
+		color: #999;
+		font-size: 30rpx;
+	}
+	.add-con-cont{
+		color: #666;
+		font-size: 30rpx;
+		line-height: 80rpx;
+		text-align:right;
+	}
+	.level_button{
+		padding: 3rpx 13rpx;
+		background: linear-gradient(to right, #fe9131, #ff9869);
+		border-radius: 16rpx 16rpx 16rpx 1rpx ;
+		color: #fff;
+		font-size: 12px;
+	}
+	.justify-title-nav{
+		width: 90%;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+		margin: 10px 0;
+	}
+	.justify-title-nav-bor{
+		width: 64px;
+		height: 5px;
+		border-radius: 3px;
+		position: absolute;
+		bottom: 0;
+		background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7));
+	}
+	.justify-title{
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333;
+	}
+	.jusitify-line-end{
+	    height: 1px;
+	    border-bottom: 1px #f4f4f4 solid;
+	    margin: 15px 0;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/my/index.vue b/pages/my/index.vue
index bdfac93..0ccc0d5 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -100,7 +100,7 @@
 					<image src="../../static/my-liaocheng.png" mode=""></image>
 					<span class="my-serve-list-text">服务疗程</span>
 				</view>
-				<view class="my-serve-list" @click="meServe('企业预约')">
+				<view class="my-serve-list" @click="meServe('企业')">
 					<image src="../../static/my-liaocheng1.png" mode=""></image>
 					<span class="my-serve-list-text">企业预约</span>
 				</view>
@@ -563,6 +563,10 @@
 						uni.navigateTo({
 							url:'/pages/my/fuwuliaocheng'
 						})
+					}else if(item=="企业"){
+						uni.navigateTo({
+							url:'/pages/shop/index?text='+item
+						})
 					}
 				} else {
 					uni.showModal({
diff --git a/pages/my/serviceOderDrtail.vue b/pages/my/serviceOderDrtail.vue
index e9ce769..df5f598 100644
--- a/pages/my/serviceOderDrtail.vue
+++ b/pages/my/serviceOderDrtail.vue
@@ -79,7 +79,7 @@
 										￥{{item.oldPrice}}
 									</view>
 								</view>
-								<view class="service-more" @click.stop="xiangqing(item)">详情</view>
+								<view class="service-more" @click.stop="xiangqing(item)">{{item.status=='1'?'详情':'预约'}}</view>
 							</view>
 							<view style="color: #019c88;">服务时长:{{item.duration}}分钟</view>
 							<view class="tese">
diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue
index c884a07..5dc4f0f 100644
--- a/pages/therapist/therapist.vue
+++ b/pages/therapist/therapist.vue
@@ -123,6 +123,7 @@
 							<view class="zpmore_view_left" v-if="getOrderByCurrentMarkerIndex().isNewer==1" @click.stop="saveImgss(getOrderByCurrentMarkerIndex().isNewer, 0)">
 								<image src="../../static/dituzhaoren1.png" mode=""></image>
 							</view>
+							<image style="width: 30%;" class="touxiang-frame"  :src="getOrderByCurrentMarkerIndex().technicianType=='3'?'../../static/vip/grade4.png':getOrderByCurrentMarkerIndex().technicianType=='4'?'../../static/vip/grade5.png':'../../static/vip/grade6.png'"></image>
 							<!-- <view class="zpmore_view" v-if="getOrderByCurrentMarkerIndex().lifePhoto"
 								@click.stop="saveImgss(getOrderByCurrentMarkerIndex().lifePhoto, 0)">更多照片</view> -->
 						</view>