diff --git a/my/order/pay.vue b/my/order/pay.vue
index b7d87c4..016dc18 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -49,10 +49,10 @@
 									</view>
 								</view>
 
-								<view class="jz_btn"
+								<!-- <view class="jz_btn"
 									v-if="order.addNum < order.ordersMassageList[0].massageType.addNum && order.status == 6"
 									@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)">
-									加钟/补价</view>
+									加钟/补价</view> -->
 							</view>
 						</view>
 					</view>
@@ -256,7 +256,7 @@
 					class="dingshi">
 					去投诉
 				</u-button>
-				<u-button v-if="order.status == 9&&order.refusalContent!=''&&order.refusalContent!=null" :custom-style="customStyle2"
+				<u-button v-if="order.status == 9&&order.refusalContent!=null" :custom-style="customStyle2"
 					shape="circle" :plain="true"
 					@click="toggleQ('center',order)"
 					class="dingshi">
@@ -268,7 +268,7 @@
 					class="dingshi">
 					立即预约
 				</u-button>
-				<u-button v-if="order.status != 4&&order.status != 1&&order.status != 10&&order.status != 3&&order.status == 9&&order.status != 5" :custom-style="customStyle2"
+				<u-button v-if="order.btnShow == 'true'&&order.status==2||order.status==6||order.status==7||order.status==8||order.status == 9&&order.refusalContent==null" :custom-style="customStyle2"
 					shape="circle" :plain="true"
 					@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order)"
 					class="dingshi">
@@ -303,22 +303,25 @@
 					</view>
 					<view class="showBtn-view" v-show="btnShow">
 						<u-button
+							v-if="order.status == 6"
 							shape="circle" :plain="true"
 							@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
 							class="btns">
 							充值
 						</u-button>
 						<u-button
+							v-if="order.addNum < order.ordersMassageList[0].massageType.addNum && order.status == 6"
 							shape="circle" :plain="true"
-							@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
+							@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
 							class="btns">
 							加钟
 						</u-button>
 						<u-button
+							v-if="order.status == 6"
 							shape="circle" :plain="true"
-							@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
+							@tap="saveJZS(order.artificerId)"
 							class="btns">
-							改价
+							升级项目
 						</u-button>
 					</view>
 				</view>
@@ -326,8 +329,9 @@
 			</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;">
+			<scroll-view scroll-y="true" style="width: 750rpx;height: 600rpx;">
 				<view class="list_item" v-for="(item,index) in orderList" :key="index">
 					<image :src="item.massageImg"></image>
 					<view class="listitem_rightview">
@@ -349,6 +353,41 @@
 				</view>
 			</scroll-view>
 		</u-popup>
+		<!-- 升级 -->
+		<u-popup v-model="showorderS" mode="bottom" :closeable="closeable">
+			<scroll-view scroll-y="true" style="width: 750rpx;height: 600rpx;">
+				<view class="xiangmu" v-for="(item,index) in artificerlist" :key="index">
+					<image class="xiangmu-img" :src="item.massageImg" mode=""></image>
+					<view class="xiangmu-cont">
+						<view class="xiangmu-cont-top">
+							<view class="xiangmu-cont-top-title">
+								{{item.title}}
+							</view>
+							<view class="xiangmu-cont-top-time">
+								<view class="xiangmu-cont-top-left">服务时长：{{item.duration}}分钟</view>
+								<view class="xiangmu-cont-top-left">已售：{{item.sales}}</view>
+							</view>
+						</view>
+						<view class="xiangmu-about">
+							{{item.jianjie}}
+						</view>
+						<view class="xiangmu-foot">
+							<view class="xiangmu-foot-left">
+								<view class="xiangmu-foot-left-shiji">
+									<span>￥</span>
+									<span>{{item.price}}</span>
+									<span>/元套</span>
+								</view>
+								<view class="xiangmu-foot-left-dazhe">{{item.oldPrice}}</view>
+							</view>
+							<view class="xiadan" @click="goOrder(item)">
+								确认升级
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</u-popup>
 		<!-- 支付方式 -->
 		<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
 			<view class="popup_pay">
@@ -433,10 +472,11 @@
 	export default {
 		data() {
 			return {
-				tordersId: '',
+				ordersId: '',
 				tpayMoney: '',
 				paySel: 0,
 				showorder: false,
+				showorderS: false,
 				orderList: [],
 				loading: true,
 				customStyle: {
@@ -484,7 +524,8 @@
 				tiqianData:'',
 				type:'center',
 				earlyFinishReason:'',
-				qurenJd:[]
+				qurenJd:[],
+				artificerlist:[]
 			}
 		},
 		onLoad(e) {
@@ -542,6 +583,78 @@
 			// #endif
 		},
 		methods: {
+			saveJZS(artificerId) {//升级查询技师项目
+				let data = {
+					artificerId: artificerId,
+					status: 0
+				}
+				let that = this;
+				this.$queue.showLoading('查询中...')
+				that.$Request.get("/app/artificer/selectArtificerMassageList", data).then(res => {
+					if (res.code == 0) {
+						if (res.data && res.data.length > 0) {
+							that.artificerlist = res.data
+							// for (let i = 0; i < that.artificerlist.length; i++) {
+							// 	if (that.artificerlist[i].labels) {
+							// 		that.artificerlist[i].labels = that.artificerlist[i].labels.split(",");
+							// 	}
+							// }
+							uni.hideLoading();
+							that.showorderS = true;
+						} else {
+							uni.hideLoading();
+							that.$queue.showToast('暂无可升级项目');
+						}
+					} else {
+						uni.hideLoading();
+						that.$queue.showToast(res.msg);
+					}
+			
+				})
+			},
+			saveJZ(classifyId) {
+				let data = {
+					parentId: classifyId,
+					page: 1,
+					limit: 50,
+					status: 1
+				}
+				let that = this;
+				this.$queue.showLoading('查询中...')
+				that.$Request.get("/app/artificer/selectMassageTypePage", data).then(res => {
+					if (res.code == 0) {
+						if (res.data.list && res.data.list.length > 0) {
+							that.orderList = res.data.list
+							for (let i = 0; i < that.orderList.length; i++) {
+								if (that.orderList[i].labels) {
+									that.orderList[i].labels = that.orderList[i].labels.split(",");
+								}
+							}
+							uni.hideLoading();
+							that.showorder = true;
+						} else {
+							uni.hideLoading();
+							that.$queue.showToast('暂无可加钟项目');
+						}
+					} else {
+						uni.hideLoading();
+						that.$queue.showToast(res.msg);
+					}
+			
+				})
+			},
+			getTimeStampWithoutSeconds(date) {
+			    // 将日期转换为标准的UTC时间
+			    var utcDate = new Date(
+						   date.getUTCFullYear(), 
+						   date.getUTCMonth(), 
+						   date.getUTCDate(), 
+						   date.getUTCHours(), 
+						   date.getUTCMinutes(), 
+			                           0);
+			    // 返回不含秒的时间戳
+			    return utcDate.getTime();
+			},
 			getOrder() {
 				let data = {
 					ordersId: this.ordersId
@@ -550,7 +663,18 @@
 					if (res.code == 0) {
 						this.loading = false
 						uni.hideLoading()
-						this.order = res.data
+						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);
@@ -738,31 +862,29 @@
 				});
 			},
 			goOrder(item) {
+				console.log("item=====>",item)
+				console.log("order=====>",this.order)
 				let that = this
-				let payMoney = that.isVip ? item.memberPrice : item.price;
 				let data = {
-					parentId: that.order.ordersId,
-					artificerId: that.order.artificerId,
-					ordersMassageList: [{
-						massageId: item.massageTypeId,
-						num: 1,
-					}],
-					price: payMoney,
-					couponId: '',
-					payMoney: payMoney,
-					userId: uni.getStorageSync('userId'),
+				  classifyId:item.classifyId,
+				  ordersId:that.order.ordersId,
+				  ordersMassageList:[
+				    {massageId: item.massageTypeId,num: 1},
+				  ],
+				  massageTypeId:item.massageTypeId,
+				  userPackageDetailId:item.userPackageDetailId,
 				}
-				that.$Request.postJson("/app/artificer/insertOrders", data).then(res => {
+				that.$Request.postJson("/app/artificer/updateOrders", data).then(res => {
 					that.showorder = false
 					if (res.code == 0) {
-						that.tordersId = res.data.ordersId;
-						that.tpayMoney = payMoney;
+						that.ordersId = res.data.ordersId;
+						that.tpayMoney = res.data.payMoney;
 						that.showpay = true;
 						that.paySel = 1;
 					} else {
 						that.$queue.showToast(res.msg)
 					}
-
+							
 				});
 			},
 			payJZ() {
@@ -776,7 +898,7 @@
 								that.$queue.showLoading('支付中...')
 								// console.log('用户点击确定');
 								that.$Request.post("/app/artificer/payOrders", {
-									ordersId: that.tordersId,
+									ordersId: that.ordersId,
 								}).then(ret => {
 									uni.hideLoading();
 									if (ret.code == 0) {
@@ -801,7 +923,7 @@
 				} 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 => {
@@ -845,7 +967,7 @@
 					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 => {
@@ -861,7 +983,7 @@
 						});
 					} else {
 						let data = {
-							ordersId: that.tordersId,
+							ordersId: that.ordersId,
 							type: 4
 						}
 						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
@@ -899,7 +1021,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(
@@ -914,7 +1036,7 @@
 
 					// #ifdef APP-PLUS
 					let data = {
-						ordersId: that.tordersId,
+						ordersId: that.ordersId,
 						type: 1
 					}
 					that.$Request.post('/app/aliPay/payOrder', data).then(
@@ -926,37 +1048,7 @@
 				}
 
 			},
-			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;
@@ -1397,6 +1489,114 @@
 </script>
 
 <style lang="scss" scoped>
+	/deep/.u-drawer{
+		z-index:11 !important;
+	}
+	.xiangmu-cont-top-left{
+		font-weight: normal;
+		font-size: 21rpx;
+		color: #049E89;
+		margin-top: 1px;
+	}
+	.xiangmu-cont-top-time{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.xiadan{
+		width: 122rpx;
+		height: 48rpx;
+		line-height: 48rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 24rpx;
+		text-align: center;
+		font-weight: bold;
+		font-size: 24rpx;
+		color: #FFFFFF;
+	}
+	.xiangmu-foot-left{
+		display: flex;
+		flex-direction: row;
+		align-items: flex-end;
+	}
+	.xiangmu-foot-left-shiji span{
+		color: #F95900;
+	}
+	.xiangmu-foot-left-shiji span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.xiangmu-foot-left-shiji span:nth-child(2){
+		font-weight: bold;
+		font-size:36.81rpx;
+	}
+	.xiangmu-foot-left-shiji span:nth-child(3){
+		font-size: 25rpx;
+	}
+	.xiangmu-foot-left-dazhe{
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #848484;
+		text-decoration-line: line-through;
+		margin-left:5px;
+	}
+	.xiangmu-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.xiangmu-about{
+		width: 100%;
+		text-align: left;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #848484;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		margin: 5px 0px;
+	}
+	.xiangmu-cont-top-title{
+		font-weight: bold;
+		font-size: 33rpx;
+		color: #333333;
+	}
+	
+	.xiangmu-cont-top{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.xiangmu-cont{
+		width: 55%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.xiangmu-img{
+		width: 285rpx;
+		height: 218rpx;
+		background: #9F9F9F;
+		border-radius: 14rpx;
+	}
+	.xiangmu{
+		width: 95%;
+		height: 263rpx;
+		background: #FFFFFF;
+		border-radius: 21rpx;
+		margin: 0px auto 10px auto;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		padding: 10px;
+	}
+	
 	.popup-mian-btn span:nth-child(1){
 		background: linear-gradient(90deg, #FE912E, #FF9970);
 	}
@@ -1745,7 +1945,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;
diff --git a/my/order/payModify.vue b/my/order/payModify.vue
index a553685..b42321a 100644
--- a/my/order/payModify.vue
+++ b/my/order/payModify.vue
@@ -392,8 +392,8 @@
 				  key: 'taocanDd',
 				  data: '支付',
 				  success: function () {
-				   uni.switchTab({
-				   	url: '/pages/therapist/therapist'
+				   uni.navigateTo({
+				   	url: '/pages/therapist/therapistDingdan'
 				   })
 				  }
 				});
diff --git a/my/order/payModifyDzhifu.vue b/my/order/payModifyDzhifu.vue
index ac3de6f..114372d 100644
--- a/my/order/payModifyDzhifu.vue
+++ b/my/order/payModifyDzhifu.vue
@@ -42,7 +42,7 @@
 							服务时间
 						</view>
 						<view class="fuwu-time-view" @change="changeLog">
-							<uni-datetime-picker :hide-second='true' v-model="single" type="datetime">{{single==''?order.serveTime:single}}</uni-datetime-picker>
+							<uni-datetime-picker :start-date="startDate" :hide-second='true' v-model="single" type="datetime">{{single==''?order.serveTime:single}}</uni-datetime-picker>
 							<!-- <span>{{order.serveTime}}</span> -->
 							<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
 						</view>
@@ -249,7 +249,9 @@
 				ordersId:'',
 				userPackageDetailId:'',
 				dingdanData:'',
-				huixian:[]
+				huixian:[],
+				// 设置今天之后的日期为可选的开始日期
+				startDate: this.getTomorrowDate()
 			}
 		},
 		onLoad(e) {
@@ -312,6 +314,23 @@
 			// #endif
 		},
 		methods: {
+			// 获取明天的日期字符串
+			  getTomorrowDate() {
+				const now = new Date();
+				const tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1);
+				return this.formatDate(tomorrow);
+			  },
+			  // 将日期对象格式化为YYYY-MM-DD字符串
+			  formatDate(date) {
+				const year = date.getFullYear();
+				const month = this.padStart(date.getMonth() + 1);
+				const day = this.padStart(date.getDate());
+				return `${year}-${month}-${day}`;
+			  },
+			  // 补齐日期字符串，确保月份和日期为两位数
+			  padStart(num) {
+				return num < 10 ? '0' + num : num;
+			  },
 			openpay() {//验证
 				if(this.single=='2024-06-19'){
 					uni.showToast({
@@ -383,8 +402,8 @@
 				  key: 'taocanDd',
 				  data: '待支付',
 				  success: function () {
-				    uni.switchTab({
-				    	url: '/pages/therapist/therapist'
+				    uni.navigateTo({
+				    	url: '/pages/therapist/therapistDingdan'
 				    })
 				  }
 				});
diff --git a/my/wallet/index.vue b/my/wallet/index.vue
index 6b5ed57..a55e1a4 100644
--- a/my/wallet/index.vue
+++ b/my/wallet/index.vue
@@ -25,7 +25,7 @@
 			<view class="padding-lr padding-bottom">
 				<view class="chongzhi">
 					<span class="yu-e">余额充值</span>
-					<span @click="toggle('center')">为TA充值</span>
+					<span v-if="artificerId.artificerId=='my'" @click="goNavtherapist('/pages/therapist/therapistDingdan')">为TA充值</span>
 				</view>
 				<view class="flex justify-between flex-wrap" v-if="wallet.length > 0">
 					<view v-for="(item,index) in wallet" :key='index' class="padding-sm radius"
@@ -52,6 +52,7 @@
 							<view style="font-size: 30upx;margin-left: 20upx;">{{item.text}}
 							</view>
 						</view>
+						
 						<radio-group name="openWay" style="margin-left: 20upx;" @tap='selectWay(item)'>
 							<label class="tui-radio">
 								<radio color="#096f4b" :checked="openWay === item.id ? true : false" />
@@ -89,11 +90,10 @@
 				<view @click="goNav('/pages/therapist/therapistList?index=2')">为TA充值</view>
 				<view @click="goNav('/pages/therapist/therapistList?index=3')">我的理疗师</view>
 			</view> -->
-			<view
-				style="position: fixed;bottom: 0rpx;left: 0;right: 0;background: #FFFFFF;height: 110rpx;line-height: 110rpx;z-index: 999;">
-				<view class="btn" @click="pay"
-					style="background: linear-gradient(to right, #00a85b, #00a85b);color: #FFFFFF;margin: 16rpx 30upx;position: fixed;bottom: 0upx;width: 90%;border-radius: 50rpx;height: 78rpx;line-height: 78rpx;font-size: 32rpx;">
-					确定充值</view>
+			<view style="position: fixed;bottom: 0rpx;left: 0;right: 0;background: #FFFFFF;height: 110rpx;line-height: 110rpx;z-index: 999;">
+				<view class="btn" @click="pay" style="background: linear-gradient(to right, #00a85b, #00a85b);color: #FFFFFF;margin: 16rpx 30upx;position: fixed;bottom: 0upx;width: 90%;border-radius: 50rpx;height: 78rpx;line-height: 78rpx;font-size: 32rpx;">
+					确定充值
+				</view>
 			</view>
 		</view>
 		<view v-if="title_color==2 && isAgency == 1">
@@ -215,7 +215,7 @@
 			<uni-popup ref="popup" background-color="#fff" @change="change">
 				<view class="popup-content">
 					<view class="popup-head">
-						<span>改价单</span>
+						<span>为TA充值</span>
 						<span @click="closePopup(type)">x</span>
 					</view>
 					<view class="popup-mian">
@@ -234,72 +234,32 @@
 							</view>
 						</view> -->
 						<view class="chong">
-							<view class="chong-list">
-								<view class="chong-list-left">
-									<radio value=""  class="chong-list-radio"/>
-									<image src="../../static/jinggao.png" mode=""></image>
-								</view>
-								<view class="chong-list-right">
-									<view class="chong-title">
-										<span>王丽楠</span>
-										<image src="../../static/xinren.png" mode=""></image>
+							<checkbox-group @change="checkboxChange">
+								<view class="chong-list">
+									<view class="chong-list-left">
+										<label class="tui-radio">
+											<checkbox :checked="checkbox" activeBackgroundColor="#096f4b" color="#096f4b" :value="1"/>
+										</label>
+										<image src="../../static/jinggao.png" mode=""></image>
 									</view>
-									<view class="chong-bottom">
-										<view class="chong-bottom-ding">
-											<image src="../../static/orderDetail/dingwei.png" mode=""></image>
-											<span>0.8km</span>
+									<view class="chong-list-right">
+										<view class="chong-title">
+											<span>王丽楠</span>
+											<image src="../../static/xinren.png" mode=""></image>
 										</view>
-										<view class="chong-bottom-cheng">
-											<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
-											<span>春城有约</span>
+										<view class="chong-bottom">
+											<view class="chong-bottom-ding">
+												<image src="../../static/orderDetail/dingwei.png" mode=""></image>
+												<span>0.8km</span>
+											</view>
+											<view class="chong-bottom-cheng">
+												<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
+												<span>春城有约</span>
+											</view>
 										</view>
 									</view>
 								</view>
-							</view>
-							<view class="chong-list">
-								<view class="chong-list-left">
-									<radio value=""  class="chong-list-radio"/>
-									<image src="../../static/jinggao.png" mode=""></image>
-								</view>
-								<view class="chong-list-right">
-									<view class="chong-title">
-										<span>王丽楠</span>
-										<image src="../../static/xinren.png" mode=""></image>
-									</view>
-									<view class="chong-bottom">
-										<view class="chong-bottom-ding">
-											<image src="../../static/orderDetail/dingwei.png" mode=""></image>
-											<span>0.8km</span>
-										</view>
-										<view class="chong-bottom-cheng">
-											<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
-											<span>春城有约</span>
-										</view>
-									</view>
-								</view>
-							</view>
-							<view class="chong-list">
-								<view class="chong-list-left">
-									<radio value=""  class="chong-list-radio"/>
-									<image src="../../static/jinggao.png" mode=""></image>
-								</view>
-								<view class="chong-list-right">
-									<view class="chong-title">
-										<span>王丽楠</span>
-										<image src="../../static/xinren.png" mode=""></image>
-									</view>
-									<view class="chong-bottom">
-										<view class="chong-bottom-ding">
-											<image src="../../static/orderDetail/dingwei.png" mode=""></image>
-											<span>0.8km</span>
-										</view>
-										<view class="chong-bottom-cheng">
-											<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
-											<span>春城有约</span>
-										</view>
-									</view>
-								</view>
-							</view>
+							</checkbox-group>
 						</view>
 						<view class="popup-mian-btn">
 							<span @click="closePopup(type)">
@@ -321,6 +281,7 @@
 	export default {
 		data() {
 			return {
+				checkbox:false,
 				type:'center',
 				jsczSel: '否',
 				tgCheck: '否',
@@ -374,10 +335,16 @@
 				renzheng: 0,
 				sp: 0,
 				txMsg: '',
-				nameTxt:''
+				nameTxt:'',
+				couponId:'',
+				artificerId:''
 			}
 		},
 		onLoad(d) {
+			this.artificerId=d;
+			if(this.artificerId.artificerId==undefined){
+				this.artificerId=this.$queue.getData('getJishi')
+			}
 			if (d.tabIndex) {
 				this.tabIndex = d.tabIndex;
 				this.title_color = 2;
@@ -427,6 +394,10 @@
 
 		},
 		methods: {
+			checkboxChange(e){//选择优惠卷
+				this.couponId=e.detail.value.join(",");
+				
+			},
 			getMoneyList() {
 				this.$Request.get("/app/payClassify/selectPayClassifyList").then(res => {
 					if (res.code == 0) {
@@ -572,7 +543,19 @@
 			cut(e) {
 				this.title_color = e
 			},
+			goNavtherapist(url){
+				uni.setStorage({
+				  key: 'taocanDd',
+				  data: '充值',
+				  success: function () {
+				   uni.navigateTo({
+						url: url
+				   })
+				  }
+				});
+			},
 			goNav(url) {
+				
 				uni.navigateTo({
 					url
 				})
@@ -698,18 +681,23 @@
 					let data = {
 						payClassifyId: this.thisSelect.payClassifyId,
 						type: 2,
-						userId: uni.getStorageSync('userId')
+						userId: uni.getStorageSync('userId'),
+						artificerId:this.artificerId.artificerId
 					}
 					this.$Request.post('/app/aliPay/payOrderMoney', data).then(
 						res => {
-							if (res.code === 0) {
+							if (res.code == 0) {
+								uni.showToast({
+									title: '支付成功!'
+								});
 								const div = document.createElement('div')
 								div.innerHTML = res.data //此处form就是后台返回接收到的数据
 								document.body.appendChild(div)
 								document.forms[0].submit()
-								setTimeout(d => {
-									uni.navigateBack(1)
-								}, 1000);
+								
+								// setTimeout(d => {
+								// 	uni.navigateBack(1)
+								// }, 1000);
 							} else {
 								uni.showToast({
 									icon: 'none',
@@ -897,6 +885,15 @@
 </script>
 
 <style scoped>
+	/deep/uni-checkbox .uni-checkbox-input{
+		width: 26px;
+		height: 26px;
+		border-radius: 50%;
+	}
+	.checkbox-data{
+		padding: 0px 11px;
+		margin: 15px 0px;
+	}
 	.chong-list:last-child{
 		border: 0px !important;
 	}
@@ -958,11 +955,11 @@
 		height: 76rpx;
 	}
 	/deep/uni-radio .uni-radio-input{
-		width: 29.86rpx;
+		/* width: 29.86rpx;
 		height: 29.86rpx;
 		margin: -3px 0px 0px -20px;
 		background-color: rgba(4, 159, 137, 1) !important;
-		border-color: rgba(4, 159, 137, 1) !important;
+		border-color: rgba(4, 159, 137, 1) !important; */
 	}
 	.chong-list-radio{
 		margin-right: 5px;
diff --git a/my/wallet/index1.vue b/my/wallet/index1.vue
index 60bbb62..1a82373 100644
--- a/my/wallet/index1.vue
+++ b/my/wallet/index1.vue
@@ -279,7 +279,7 @@
 				ylTxSel: '否',
 				tabIndex: 0,
 				bankCard: '',
-				openWay: 2,
+				openWay: 1,
 				wallet: [],
 				moneyNum: null,
 				thisSelect: {},
@@ -324,9 +324,9 @@
 			this.openLists = [{
 				image: '../../static/share/icon_weixin.png',
 				text: '微信',
-				id: 2
+				id: 1
 			}];
-			this.openWay = 2;
+			this.openWay = 1;
 			// #endif
 
 		},
diff --git a/pages.json b/pages.json
index 12e4f09..b7cb449 100644
--- a/pages.json
+++ b/pages.json
@@ -173,6 +173,15 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/therapist/therapistDingdan",
+			"style": {
+				"navigationBarTitleText": "技师列表",
+				"navigationBarBackgroundColor": "#096f4b",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/my/historyMy",
 			"style": {
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 3de9c1c..c67682c 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -437,7 +437,7 @@
 			chonghi(link){//我的钱包
 				if(link=='充值'){
 					uni.navigateTo({
-						url:'/my/wallet/index'
+						url:'/my/wallet/index?artificerId='+'my'
 					})
 				}else{
 					uni.navigateTo({
diff --git a/pages/order/index.vue b/pages/order/index.vue
index fcc1b84..ebc1345 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -59,8 +59,8 @@
 			<view class="flex u-p-t-20 justify-between align-center" style="justify-content: flex-end;">
 				<view class="flex text-right" style="flex-direction: column;width: 100%;">
 					
-					<view class="showBtn" :style="{'justify-content':item.status != 6?'flex-end':'space-between'}">
-						<view class="gengduo" @click.stop="gengBtn(index)" v-show="item.status ==6">更多</view>
+					<view class="showBtn" :style="{'justify-content':item.status != 6||item.status==1?'flex-end':'space-between'}">
+						<view class="gengduo" @click.stop="gengBtn(index)" v-show="item.status ==6||item.status ==1">更多</view>
 						<view class="showBtn-view">
 							<u-button v-if="item.status == 10" :custom-style="customStyle1" shape="circle" :plain="true"
 								@click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item)" class="btns">
@@ -70,7 +70,7 @@
 								@click="goNav('/my/order/feedback?artificerId='+item.artificerId+ '&ordersId='+item.ordersId)">
 								待评价
 							</u-button>		
-							<u-button v-if="item.status == 9&&item.refusalContent" :custom-style="customStyle1" shape="circle" :plain="true"
+							<u-button v-if="item.status == 9&&item.refusalContent==null" :custom-style="customStyle1" shape="circle" :plain="true"
 								@click="toggleQ('center',item)"  class="btns">
 								拒单确认
 							</u-button>
@@ -78,43 +78,45 @@
 								@click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item)" class="btns">
 								去支付
 							</u-button>
-							<u-button
-								v-if="(item.status == 1 || item.status == 2 || item.status == 7 || item.status == 8) && yhqxSel != '否'"
-								:custom-style="customStyle" shape="circle" :plain="true"
-								 class="btns"
-								@click="cancelOrder(item)">
-								取消订单
-							</u-button>
-							<u-button v-if="item.status != 4&&item.status != 1&&item.status != 10&&item.status != 3&&item.status != 9&&item.status != 5" :custom-style="customStyle1" shape="circle" :plain="true"
-								@click="goNav('/my/order/payModify?ordersId='+item.ordersId,item)" class="btns">
+							
+							<u-button v-if="item.btnShow == 'true'&&item.status==2||item.status==6||item.status==7||item.status==8||item.status == 9&&item.refusalContent==null" :custom-style="customStyle1" shape="circle" :plain="true"
+								@click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item)" class="btns">
 								修改订单
 							</u-button>
-							<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
-									@click="cancel(item)">
-								充值
+							<u-button v-if="item.status == 5" :custom-style="customStyle1" shape="circle"  class="btns" :plain="true" @click="goNav('/my/order/complain?id='+item.ordersId)" >
+								去投诉
 							</u-button>
 							<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
-									@click="cancel(item)">
-								加钟
+									@click="goNav('/my/order/pay?ordersId='+item.ordersId)">
+								升级项目
+							</u-button>
+							<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
+								@click="toggle('center',item)">
+								提前结束
 							</u-button>
 							<u-button :custom-style="customStyle1" shape="circle" :plain="true"
 								@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH">
 								联系客服
 							</u-button>
-							<u-button v-if="item.status == 5" :custom-style="customStyle1" shape="circle"  class="btns" :plain="true" @click="goNav('/my/order/complain?id='+item.ordersId)" >
-								去投诉
-							</u-button>
 						</view>
 					</view>
 					<view class="hideBtn" v-show="btnShow==index" style="justify-content: end;">
-						<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
-								@click="cancel(item)">
-							改价
+						<u-button
+							v-if="(item.status == 1 || item.status == 2 || item.status == 7 || item.status == 8) && yhqxSel != '否'"
+							:custom-style="customStyle" shape="circle" :plain="true"
+							 class="btns"
+							@click="cancelOrder(item)">
+							取消订单
 						</u-button>
 						<u-button v-if="item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
-							@click="toggle('center',item)">
-							提前结束
+								@click="goNav('/my/wallet/index?ordersId='+item.ordersId+'&artificerId='+item.artificerId)">
+							充值
 						</u-button>
+						<u-button v-if="item.addNum < item.ordersMassageList[0].massageType.addNum && item.status == 6" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
+								@click="goNav('/my/order/pay?ordersId='+item.ordersId)">
+							加钟
+						</u-button>
+						
 					</view>
 				</view>
 			</view>
@@ -280,7 +282,8 @@
 				// 	height: '54rpx',
 				// 	margin: "0 0 0 20rpx"
 				// }
-				earlyFinishReason:''
+				earlyFinishReason:'',
+				
 			}
 		},
 		onLoad() {
@@ -448,6 +451,18 @@
 				}
 				return status;
 			},
+			getTimeStampWithoutSeconds(date) {
+			    // 将日期转换为标准的UTC时间
+			    var utcDate = new Date(
+						   date.getUTCFullYear(), 
+						   date.getUTCMonth(), 
+						   date.getUTCDate(), 
+						   date.getUTCHours(), 
+						   date.getUTCMinutes(), 
+			                           0);
+			    // 返回不含秒的时间戳
+			    return utcDate.getTime();
+			},
 			//获取列表数据
 			getOrderList() {
 				let curTab = this.tabs[this.tabIndex].status
@@ -460,28 +475,20 @@
 				this.$Request.get('/app/artificer/selectOrdersList', data).then(res => {
 					if (res.code == 0) {
 						uni.hideLoading();
-						console.log(res)
 						if (this.page == 1) this.goods = []; //如果是第一页需手动制空列表
 						this.goods = [...this.goods, ...res.data.list]; //追加新数据
-						// this.goods.forEach(ret => {
-						// 	switch (ret.status) {
-						// 		case '1':
-						// 			ret.statusName = '待付款'
-						// 			break;
-						// 		case '2':
-						// 			ret.statusName = '进行中'
-						// 			break;
-						// 		case '3':
-						// 			ret.statusName = '已评价'
-						// 			break;
-						// 		case '4':
-						// 			ret.statusName = '已取消'
-						// 			break;
-						// 		case '5':
-						// 			ret.statusName = '已完成'
-						// 			break;
-						// 	}
-						// })
+						var date = new Date(); // 当前日期和时间
+						var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
+						const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数
+						var twoTime=parseInt(new Date(twoHoursInMilliseconds).getTime())
+						for(var i=0;i<this.goods.length;i++){
+							var time=parseInt(new Date(this.goods[i].serveTime).getTime())
+							if(time-timestamp>twoTime){
+								this.$set(this.goods[i], 'btnShow', 'true')
+							}else{
+								this.$set(this.goods[i], 'btnShow', 'false')
+							}
+						}
 					}
 
 				}).catch(() => {
diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue
index ad5b8d6..df6686d 100644
--- a/pages/therapist/therapist.vue
+++ b/pages/therapist/therapist.vue
@@ -351,7 +351,6 @@ import permision from "@/components/permission.js";
 			that.massageTypeId = e.massageTypeId
 			// that.getLocation();//低精度，快就完事了
 			//    that.getLocation(true);//高精度，慢慢查询
-			
 			that.getTypeList();
 			uni.getLocation({
 				type: 'wgs84',
@@ -410,12 +409,7 @@ import permision from "@/components/permission.js";
 			that.city = uni.getStorageSync('city') ? uni.getStorageSync('city') : '请选择城市'
 			that.getTpCount();
 			that.getTpMy();
-			uni.getStorage({
-			      key: 'taocanDd',
-			      success: (res) => {
-			        that.dataIndex = res.data;
-			      }
-			    });
+			
 			that.token = uni.getStorageSync('token')
 			// if (uni.getStorageSync('token')) {
 			if (that.latitude && that.longitude) {
@@ -463,7 +457,6 @@ import permision from "@/components/permission.js";
 		methods: {
 			// 跳转订单
 			goOrder(e) {
-				if(this.dataIndex!='支付'&&this.dataIndex!='待支付'){
 					console.log('授权', uni.getStorageSync('sendMsg'))
 					if (uni.getStorageSync('sendMsg')) {
 						console.log('授权+1')
@@ -491,22 +484,6 @@ import permision from "@/components/permission.js";
 							url: '/pages/public/login'
 						});
 					}
-				}else{
-					if(this.dataIndex=='待支付'){
-						this.$queue.setData('getJishi',e);
-						uni.reLaunch({
-							url:'/my/order/payModifyDzhifu'
-						})
-					
-					}else{
-						this.$queue.setData('getJishi',e);
-						uni.reLaunch({
-							url:'/my/order/payModify'
-						})
-					}
-				}
-				
-			
 			},
 			switch1Change: function (e) {//地图和列表切换
 				var num= Number(e)
diff --git a/pages/therapist/therapistDingdan.vue b/pages/therapist/therapistDingdan.vue
new file mode 100644
index 0000000..4b7cd59
--- /dev/null
+++ b/pages/therapist/therapistDingdan.vue
@@ -0,0 +1,1813 @@
+<template>
+	<view class="content">
+		<view class="content-head">
+			<view class="padding-top-sm flex align-center" style="padding-bottom: 9px;">
+				<view v-if="XCXIsSelect != '否'" class="flex align-center justify-between margin-right-sm"
+					@tap="showCityList" style="line-height: 68rpx;">
+					<image src="../../static/liliao-1.png" class="dingwei-img"></image>
+					<view class="localName">{{ city }}</view>
+				</view>
+				<u-search class="flex-sub" placeholder="请输入理疗师名字" :focus="false" shape="square" v-model="artificerName"
+					:show-action="true" :animation="true" bg-color="#fff" color="#1A1A1A" @search="onSearch()"
+					action-text="搜索" @custom="onSearch()"></u-search>
+				<view class="flex align-center justify-between">
+					<selectSwitchDitu @change="switch1Change" />
+				</view>
+			</view>
+		</view>
+		<view class="liebiao" v-show="current === 0">
+			<view v-if="orderList.length" class="flex text-center flex-wrap list-view">
+				<view class="margin-bottom-sm radius touxiang-left">
+					<view class="flex align-center touxiang-left-view" v-for="(item, index) in orderList" :key='index'
+					@click="goOrder(item)">
+						<view class="touxiang-left-content">
+							<image class="touxiang-left-content-img" :src="item.artificerImg ? item.artificerImg : '../../static/logo.png'"
+								@click.stop="saveImgs(item.artificerImg)" mode="aspectFill"></image>
+							<image class="touxiang-left-content-img" v-if="item.isHot == 1"
+								src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png"
+								style="width: 30rpx;height: 36rpx;position: absolute;z-index: 99;top: 40rpx;left: 110rpx;">
+							</image>
+							<!-- <view class="zpmore_view_left" v-if="item.technicianType==1" @click.stop="saveImgss(item.technicianType, 0)">
+								<image src="../../static/dituzhaoren1.png" mode=""></image>
+							</view> -->
+							<span class="img-span">{{item.technicianType=='3'?'新手':item.technicianType=='4'?'专家':'资深'}}</span>
+						</view>
+						<view class="list-right">
+							<view class="flex align-center" style="justify-content: start;">
+								<view class="flex align-center list-right-top">
+									<view class="list-right-top-view">
+										<view class="list-right-top-name">
+											{{ item.artificerName }}
+										</view>
+										<view class="keyuyue">
+											<view class="keyuyue-btn keyuyue-jinri">
+												 {{item.state == 1?"可服务":item.state == 2?"今日可约":"休息中"}}
+											</view>
+											<view class="keyuyue-btn keyuyue-time" v-if="item.status == 1 && item.time">{{ item.time
+										}}</view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="item-view-jianjie">
+								{{item.technicianTypeName}}
+							</view>
+							<view class="therapist-mian">
+								<view class="therapist-mian-top">
+									<view class="therapist-mian-view">
+										<image src="../../static/dituzhaoren3.png" mode="">
+										</image>
+										<span>评论</span>
+										<view class="therapist-mian-view-text">
+											{{ item.commentCount ? item.commentCount : 0 }}
+										</view>
+									</view>
+									<view class="therapist-mian-view" style="margin-left: 10px;">
+										<image src="../../static/dituzhaoren4.png" mode="">
+										</image>
+										<span>收藏</span>
+										<view class="therapist-mian-view-text">
+											{{ item.collectCount ? item.collectCount : 0 }}
+										</view>
+									</view>
+								</view>
+								<view class="therapist-mian-bottom">
+									<view class="flex flex-wrap align-center"  v-if="item.consortiaName">
+										<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
+										</image>
+										<view class="therapist-mian-bottom-text">{{item.consortiaName}}</view>
+									</view>
+									<view class="flex align-center" v-if="item.tripWay != 3" >
+										<image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image>
+										<view class="therapist-bottom-dingwei-text">
+											{{ item.distance }}
+										</view>
+									</view>
+								</view>
+								<view class="text-center text-sm" v-if="item.status == 1"
+									style="background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 10rpx;"
+									@click.stop="goOrder(item)">
+									立即预约
+								</view>
+								<view class="text-center text-sm" @click.stop="showTips()" v-else
+									style="background: #d9d9d9;color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 10rpx;">
+									立即预约
+								</view>
+							</view>
+							
+							
+						</view>
+					</view>
+				</view>
+			</view>
+			<empty v-if="orderList.length == 0"></empty>
+		</view>
+		<view v-show="current === 1">
+			<view class="flex text-center flex-wrap"
+				style="margin-top: 135px; padding: 0px 16px; justify-content: space-between;">
+				<div id="txMapContainer" style="width: 100%;height: calc(100vh - 188px);">&nbsp;</div>
+				<!-- 地图地图 -->
+			</view>
+			<u-popup v-model="showPopup" mode="bottom" height="" closeable :mask-close-able="false">
+				<view id="popView">
+					<view class="flex align-center list-view" style="padding: 0px;">
+						<view class="touxiang-left-view" style="margin-bottom: 0px;padding-bottom: 0px;width: auto;">
+							<image
+								class="touxiang-left-content-img"
+								:src="getOrderByCurrentMarkerIndex().artificerImg ? getOrderByCurrentMarkerIndex().artificerImg : '../../static/logo.png'"
+								@click.stop="saveImgs(getOrderByCurrentMarkerIndex().artificerImg)"
+								 mode="aspectFill"></image>
+							<image v-if="getOrderByCurrentMarkerIndex().isHot == 1"
+								class="touxiang-left-content-img"
+								src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png"
+								style="width: 30rpx;height: 36rpx;position: absolute;z-index: 99;top: 40rpx;left: 110rpx;">
+							</image>
+							<view class="zpmore_view_left" v-if="getOrderByCurrentMarkerIndex().isNewer==1" @click.stop="saveImgss(getOrderByCurrentMarkerIndex().isNewer, 0)">
+								<image src="../../static/dituzhaoren1.png" mode=""></image>
+							</view>
+							<!-- <view class="zpmore_view" v-if="getOrderByCurrentMarkerIndex().lifePhoto"
+								@click.stop="saveImgss(getOrderByCurrentMarkerIndex().lifePhoto, 0)">更多照片</view> -->
+						</view>
+						<view class="margin-left flex flex-direction dituList">
+							<view class="flex align-center" style="justify-content: start;">
+								<!-- <view class="flex align-center" style="width: 120rpx;">
+									<view class="text-bold text-30 margin-right-xs"
+										style="width: 100rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;text-align: left;">
+										{{ getOrderByCurrentMarkerIndex().artificerName }}
+									</view>
+								</view> -->
+								<view class="flex align-center list-right-top">
+									<view class="list-right-top-view">
+										<view class="list-right-top-name">
+											{{ getOrderByCurrentMarkerIndex().artificerName }}
+										</view>
+										<view class="keyuyue">
+											<view class="keyuyue-btn keyuyue-jinri">
+												 {{getOrderByCurrentMarkerIndex().state == 1?"可服务":getOrderByCurrentMarkerIndex().state == 2?"今日可约":"休息中"}}
+											</view>
+											<view class="keyuyue-btn keyuyue-time" v-if="getOrderByCurrentMarkerIndex().status == 1 && getOrderByCurrentMarkerIndex().time">{{ getOrderByCurrentMarkerIndex().time}}</view>
+										</view>
+									</view>
+									<!-- <view class="list-right-top-bottom">
+										{{item.technicianTypeName}}
+									</view> -->
+								</view>
+								
+
+								
+							</view>
+							<view class="therapist-mian-top">
+								<!-- <view v-if="getOrderByCurrentMarkerIndex().ordersScore">
+									<image src="../../static/images/start.png" style="width: 24upx;height: 22upx;">
+									</image>
+									<text class="margin-left-xs" style="color: #fe831e;">{{
+									getOrderByCurrentMarkerIndex().ordersScore }}.0</text>
+								
+								</view> -->
+								<view class="therapist-mian-view">
+									<image src="../../static/dituzhaoren3.png" mode="">
+									</image>
+									<span>评论</span>
+									<view class="therapist-mian-view-text">
+										{{ getOrderByCurrentMarkerIndex().commentCount ? getOrderByCurrentMarkerIndex().commentCount : 0 }}
+									</view>
+								</view>
+								<view class="therapist-mian-view" style="margin-left: 10px;">
+									<image src="../../static/dituzhaoren4.png" mode="">
+									</image>
+									<span>收藏</span>
+									<view class="therapist-mian-view-text">
+										{{ getOrderByCurrentMarkerIndex().collectCount ? getOrderByCurrentMarkerIndex().collectCount : 0 }}
+									</view>
+								</view>
+							</view>
+							<view class="therapist-mian-bottom">
+								<view class="flex flex-wrap align-center"  v-if="getOrderByCurrentMarkerIndex().consortiaName">
+									<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
+									</image>
+									<view class="therapist-mian-bottom-text">{{getOrderByCurrentMarkerIndex().consortiaName}}</view>
+								</view>
+								<view class="flex align-center" v-if="getOrderByCurrentMarkerIndex().tripWay != 3" >
+									<image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image>
+									<view class="therapist-bottom-dingwei-text">
+										{{ getOrderByCurrentMarkerIndex().distance }}
+									</view>
+								</view>
+							</view>
+							<view class="text-center text-sm" v-if="getOrderByCurrentMarkerIndex().status == 1"
+								style="background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 10rpx;"
+								@click.stop="goOrder(getOrderByCurrentMarkerIndex())">
+								立即预约
+							</view>
+							<view class="text-center text-sm" @click.stop="showTips()" v-else
+								style="background: #d9d9d9;color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 10rpx;">
+								立即预约
+							</view>
+							
+							
+						</view>
+					</view>
+				</view>
+			</u-popup>
+		</view>
+		<view style="display:none;position: fixed;z-index: 999;bottom: 160rpx;" v-if="showTP">
+			<image src="https://admin.sjajk.com/file/uploadPath/2023/02/16/15ade225e9fa8a1d82b325c06dc2b653.png"
+				style="width: 690rpx;margin: 30rpx;height: 600rpx;"></image>
+			<view
+				style="position: absolute;bottom: 100rpx;width: 100%;text-align: center;display: flex;justify-content: center;">
+				<view>
+					<view style="color: #333333;font-size: 28rpx;"><text style="font-size: 44rpx;color:#ee6c54">{{
+					tpCount }}</text>人已投票</view>
+					<view class="tp_view" v-if="tpSel == 2" @tap="saveTP">投票</view>
+					<view class="ytp_view" v-if="tpSel == 1">已投票</view>
+				</view>
+			</view>
+		</view>
+		<!-- 经验筛选 -->
+		<u-select v-model="Cityshow" :list="cityList" @confirm="getCity"></u-select>
+	</view>
+</template>
+<script>
+	import selectSwitchDitu from "@/components/xuan-switch/xuan-switch-ditu.vue";
+	import meTabs from "@/components/mescroll-uni/me-tabs/me-tabs.vue";
+	import empty from '@/components/empty.vue'
+
+	import RenDropdownFilter from '@/components/ren-dropdown-filter/ren-dropdown-filter.vue'
+	import commonConfig from 'common/config.js';
+
+	import * as webMap from 'utils/webMap.js';
+import permision from "@/components/permission.js";
+	// 调用手机系统权限
+	// #ifdef APP-PLUS
+	// import permision from "@/components/permission.js";
+	// #endif
+	export default {
+		components: {
+			meTabs,
+			empty,
+			RenDropdownFilter,
+			selectSwitchDitu
+		},
+		data() {
+			return {
+				artificerName: '',
+				tpSel: 0,
+				tpCount: 0,
+				showTP: false,
+				Cityshow: false,
+				loading: true, // 是否显示骨架屏组件
+				defaultSelected: [],
+				value1: '',
+				value2: '',
+				value3: '',
+				game: [],
+				defaultIndex: [0, 0, 0],
+				filterData: [
+					[{
+						label: '推荐',
+						value: '',
+					}],
+					[{
+							label: '服务热度',
+							value: '0',
+						},
+
+						{
+							label: '从高到低',
+							value: '1',
+						},
+						{
+							label: '从低到高',
+							value: '2',
+						}
+					],
+					[{
+							label: '距离',
+							value: '0',
+						},
+						{
+							label: '从远到近',
+							value: '2',
+						},
+						{
+							label: '从近到远',
+							value: '1',
+						}
+					],
+				],
+				list: [{
+					name: '综合',
+					id: 1
+				}, {
+					name: '距离',
+					id: 2
+				}, {
+					name: '销量',
+					id: 3
+				}, {
+					name: '好评',
+					id: 4
+				}],
+				listIndex: 0,
+				city: '请选择城市',
+				orderList: [],
+				page: 1,
+				limit: 10,
+				token: '',
+				XCXIsSelect: '否',
+				isVip: false,
+				showModal: true,
+				arr: [],
+				tab: '',
+				cityList: [],
+				tablist: [],
+				tabIndex: 0,
+				orderIndex: 0,
+				current: 0,
+
+				myId: uni.getStorageSync('userId') ? uni.getStorageSync('userId') : '',
+				//地图相关
+				latitude: '43.86487',
+				longitude: '',
+				address: '',
+				mapScale: 16, // 地图默认放大倍数
+				markers: [], // 地图上markers列表
+				cmap: null, //当前的map对象
+				amap: null,
+				infoWindow: null,
+				marker: null,
+				socketConnect: null,
+				pointMap: {}, //点map
+				pointThread: null,
+				massageTypeId: null,
+				currentMarkerIndex: -1,
+				showPopup: false,
+				dataIndex:''
+			}
+		},
+
+		onLoad(e) {
+			let that = this
+			that.massageTypeId = e.massageTypeId
+			// that.getLocation();//低精度，快就完事了
+			//    that.getLocation(true);//高精度，慢慢查询
+			uni.getStorage({
+			      key: 'taocanDd',
+			      success: (res) => {
+			        that.dataIndex = res.data;
+			      }
+			    });
+			that.getTypeList();
+			uni.getLocation({
+				type: 'wgs84',
+				geocode: true, //设置该参数为true可直接获取经纬度及城市信息
+				highAccuracyExpireTime: 500,
+				success: function(res) {
+					console.log(res, '地理位置-----------------------》')
+					that.latitude = res.latitude
+					that.longitude = res.longitude
+
+					uni.setStorageSync('latitude', res.latitude)
+					uni.setStorageSync('longitude', res.longitude)
+					if (that.amap) {
+						that.amap.setCenter(new AMap.LngLat(res.latitude, res.longitude));
+					}
+					if (that.infoWindow) {
+						that.infoWindow.setPosition(new TMap.LatLng(res.latitude, res.longitude));
+					}
+					that.page = 1
+					that.getTypeList();
+				},
+				fail: function(e) {
+					console.log('获取地址失败1', e)
+					// #ifdef APP-PLUS
+					that.checkPermission();
+					// #endif
+				}
+			})
+
+			// 获取邀请码保存到本地
+			if (e.invitation) {
+				that.$queue.setData('inviterCode', e.invitation);
+			}
+
+			if (this.myId) {
+				that.$Request.getT('/app/common/type/235').then(res => { //报名成功通知
+					if (res.code == 0) {
+						if (res.data && res.data.value) {
+							that.arr.push(res.data.value)
+						}
+					}
+				})
+				that.$Request.getT('/app/common/type/236').then(res => { //活动即将开始提醒
+					if (res.code == 0) {
+						if (res.data && res.data.value) {
+							that.arr.push(res.data.value)
+						}
+					}
+				})
+			}
+		},
+		onShow() {
+			let that = this
+			that.getKTCityList();
+			that.XCXIsSelect = this.$queue.getData("XCXIsSelect");
+			that.city = uni.getStorageSync('city') ? uni.getStorageSync('city') : '请选择城市'
+			that.getTpCount();
+			that.getTpMy();
+			
+			that.token = uni.getStorageSync('token')
+			// if (uni.getStorageSync('token')) {
+			if (that.latitude && that.longitude) {
+				that.page = 1
+				that.getlist()
+			} else {
+				uni.getLocation({
+					type: 'gcj02',
+					highAccuracyExpireTime: 500,
+					geocode: true, //设置该参数为true可直接获取经纬度及城市信息
+					success: function(res) {
+						console.log(res, '地理位置')
+						that.latitude = res.latitude
+						that.longitude = res.longitude
+						that.page = 1
+						that.getTypeList();
+						// that.getlist()
+					},
+					fail: function() {
+						console.log('获取地址失败2')
+					}
+				})
+			}
+			// }
+			that.myId = uni.getStorageSync('userId')
+			// console.log(that.showModal, '------', that.myId)
+			// #ifdef MP-WEIXIN
+			//订阅
+			if (that.myId) {
+				that.getIsVip()
+				if (this.showModal) {
+					// this.openMsg()
+				}
+			}
+			// #endif
+		},
+		onReady() {
+			console.log('this ->', this, uni);
+			this.initMap();
+			//this.initMapPointThread();
+		},
+		onUnload() {
+			//this.closeSocket();
+		},
+		methods: {
+			// 跳转订单
+			goOrder(e) {
+					console.log('授权', uni.getStorageSync('sendMsg'))
+					if (uni.getStorageSync('sendMsg')) {
+						console.log('授权+1')
+						wx.requestSubscribeMessage({
+							tmplIds: this.arr,
+							success(re) {
+								console.log(JSON.stringify(re), 111111111111)
+								var datas = JSON.stringify(re);
+								if (datas.indexOf("accept") != -1) {
+									console.log(re)
+								}
+							},
+							fail: (res) => {
+								console.log(res)
+							}
+						})
+					}else if (!this.token) {
+						uni.navigateTo({
+							url: '/pages/public/login'
+						});
+					} else if(this.dataIndex=='待支付'){
+						this.$queue.setData('getJishi',e);
+						uni.reLaunch({
+							url:'/my/order/payModifyDzhifu'
+						})
+					
+					}else if(this.dataIndex=='支付'){
+						this.$queue.setData('getJishi',e);
+						uni.reLaunch({
+							url:'/my/order/payModify'
+						})
+					}else if(this.dataIndex=='充值'){
+						this.$queue.setData('getJishi',e);
+						uni.reLaunch({
+							url:'/my/wallet/index'
+						})
+					}
+			},
+			switch1Change: function (e) {//地图和列表切换
+				var num= Number(e)
+				if(e==false){
+					this.current = 1;
+				}else{
+					this.current = 0;
+				}
+				console.log('switch1 发生 change 事件，携带值为', Number(e),e)
+			},
+			showTips() {
+				uni.showToast({
+					title: '理疗师已下线',
+					icon: 'none'
+				})
+			},
+			onClickItem(e) {
+				if (this.current != e) {
+					this.current = e;
+				}
+			},
+			showCityList() {
+				// #ifdef APP-PLUS
+				if (this.latitude === '' || this.longitude === '') {
+					this.checkPermission();
+					return;
+				}
+				// #endif
+				this.Cityshow = true;
+			},
+			async checkPermission() {
+				let status = permision.isIOS ? await permision.requestIOS('location') : await permision.requestAndroid(
+					'android.permission.ACCESS_FINE_LOCATION');
+				if (status === null || status === 1) {
+					status = 1;
+				} else if (status === 2) {
+					uni.showModal({
+						content: "系统定位已关闭",
+						confirmText: "确定",
+						showCancel: false,
+						success: function(res) {}
+					})
+				} else if (status.code) {
+					uni.showModal({
+						content: status.message
+					})
+				} else {
+					uni.showModal({
+						title: '定位服务已关闭',
+						content: "您需要打开定位权限，否则我们将无法获得到您附近的项目服务，导致我们无法为您提供服务，请到>设置>隐私>定位服务>中开启【盛安到家】定位权限",
+						confirmText: "设置",
+						success: function(res) {
+							if (res.confirm) {
+								permision.gotoAppSetting();
+							}
+						}
+					})
+				}
+				return status;
+			},
+			saveImgss(imgs, index) {
+				console.log(imgs, index)
+				// let that = this
+				let imgArr = imgs
+				// this.imgArr.push(imgs);
+				// console.log(this.imgArr)
+				// //预览图片
+				uni.previewImage({
+					urls: imgArr,
+					current: imgArr[index]
+				});
+			},
+			saveImgs(imgs) {
+				let imgArr = [];
+				imgArr.push(imgs);
+				// //预览图片
+				uni.previewImage({
+					urls: imgArr,
+					current: 0
+				});
+			},
+			saveTP() {
+				if (!this.token) {
+					uni.navigateTo({
+						url: '/pages/public/login'
+					});
+					return;
+				}
+				let userId = this.$queue.getData('userId');
+				let userName = this.$queue.getData('userName');
+				this.$queue.showLoading('投票中...');
+				this.$Request.postJson('/app/message/insertMessage', {
+						state: 11,
+						content: this.city,
+						userName: userName,
+						userId: userId
+					})
+					.then(res => {
+						if (res.code === 0) {
+							uni.showToast({
+								title: '投票成功！'
+							});
+							this.getTpCount();
+							this.getTpMy();
+						} else {
+							uni.hideLoading();
+							uni.showModal({
+								showCancel: false,
+								title: '投票失败',
+								content: res.msg
+							});
+						}
+					});
+			},
+			getTpMy() {
+				var data={
+					page:'',
+					limit:'',
+					state:''
+				}
+				this.$Request.getT('/app/message/selectMessageByUserId',data).then(res => {
+					if (res.code == 0) {
+						if (res.data && res.data.list && res.data.list.length > 0) {
+							this.tpSel = 1;
+						} else {
+							this.tpSel = 2;
+						}
+					}
+				});
+			},
+			getTpCount() {
+				this.$Request.getT('/app/message/selectCityCount?city=' + this.city).then(res => {
+					if (res.code == 0) {
+						this.tpCount = res.data ? res.data : 0;
+					}
+				});
+			},
+			getCity(e) {
+				console.log("得到的城市-------------》",e[0].label);
+				this.city = e[0].label;
+				uni.setStorageSync('city', this.city)
+				this.getKTCityList();
+				this.page = 1
+				this.getlist()
+			},
+			getKTCityList() {
+				let cityName;
+				// let cityName = uni.getStorageSync('city') ? uni.getStorageSync('city') : '请选择城市'
+				// if (cityName === '请选择城市') {
+				// 	return;
+				// }
+				this.$Request.getT('/app/trip/selectTripList').then(res => {
+					if (res.code == 0) {
+						this.cityList = [];
+						let isOpen = false
+						res.data.forEach((d, index) => {
+							if (cityName === d.city) {
+								isOpen = true;
+							}
+							let data = {}
+							data.label = d.city
+							data.value = index
+							this.cityList.push(data);
+						});
+						console.log("请求-----------------请求>",this.cityList)
+						if (!isOpen) {
+							// debugger;
+							this.orderList = []
+							this.showTP = true;
+							// uni.showToast({
+							// 	title: '当前城市暂未开通，请切换城市',
+							// 	duration: 2000,
+							// 	icon: 'none'
+							// });
+						} else {
+							this.showTP = false;
+						}
+					}
+				});
+			},
+			getTypeList() {
+				this.$Request.get("/app/dict/list", {
+					type: '服务类型'
+				}).then(res => {
+					if (res.code == 0) {
+						if (res.data) {
+							this.tablist = res.data
+							this.tabIndex = res.data[0].id;
+							this.page = 1;
+							this.getlist()
+							//开启地图线程
+							this.initMapPointThread();
+						}
+					}
+				});
+			},
+			// selectCity(longitude, latitude) {
+			// 	this.$Request.get('/app/Login/selectCity?lat=' + latitude + '&lng=' + longitude).then(res => {
+			// 		if (res.code == 0) {
+			// 			// this.city = res.data.city ? res.data.city : '未知'
+			// 			// uni.setStorageSync('city', res.data.city)
+			// 			let data = {
+			// 				num: 1,
+			// 				size: 10
+			// 			}
+			// 			this.getData(data)
+			// 		}
+			// 	});
+			// },
+			tanChange(index, item) {
+				this.orderIndex = index
+				this.tabIndex = item.id
+				this.page = 1
+				this.getlist()
+			},
+			// 开启订阅消息
+			openMsg() {
+				console.log('订阅消息')
+				var that = this
+				uni.getSetting({
+					withSubscriptions: true, //是否获取用户订阅消息的订阅状态，默认false不返回
+					success(ret) {
+						if (ret.subscriptionsSetting.itemSettings) {
+							uni.setStorageSync('sendMsg', true)
+							uni.openSetting({ // 打开设置页 
+								success(rea) {
+									console.log(rea.authSetting)
+								}
+							});
+						} else { // 用户没有点击“总是保持以上，不再询问”则每次都会调起订阅消息
+							console.log(99999)
+							uni.setStorageSync('sendMsg', false)
+							uni.showModal({
+								title: '提示',
+								content: '为了更好的体验,请绑定消息推送',
+								confirmText: '确定',
+								cancelText: '取消',
+								success: function(res) {
+									if (res.confirm) {
+										wx.requestSubscribeMessage({
+											tmplIds: that.arr,
+											success(re) {
+												var datas = JSON.stringify(re);
+												if (datas.indexOf("accept") != -1) {
+													console.log(re)
+													// uni.setStorageSync('sendMsg', true)
+												}
+											},
+											fail: (res) => {
+												console.log(res)
+											}
+										})
+										// uni.setStorageSync('sendMsg', true)
+										console.log('确认')
+										that.showModal = false
+									} else if (res.cancel) {
+										console.log('取消')
+										// uni.setStorageSync('sendMsg', false)
+										that.showModal = true
+									}
+								}
+							})
+						}
+					}
+				})
+			},
+			getIsVip() {
+				this.$Request.get("/app/UserVip/isUserVip").then(res => {
+					if (res.code == 0) {
+						this.isVip = res.data
+						uni.setStorageSync('isVIP', res.data)
+					}
+				});
+			},
+			onSearch(e) {
+				// this.artificerName = e;
+				this.page = 1;
+				this.getlist()
+			},
+			getlist() {
+				// if (this.city === '请选择城市') {
+				// 	return;
+				// }
+				// if (this.tabIndex == 0) {
+				// 	return;
+				// }
+				// let index = this.list[this.listIndex].id
+				let index = 2
+				let data = {
+					// id: curTab,
+					artificerName: this.artificerName,
+					classifyId: this.tabIndex,
+					page: this.page,
+					limit: this.limit,
+					// massageTypeId: this.massageTypeId,
+					// condition: this.value1, //智能优选
+					// authentication: this.value2, //不限男女
+					by: index, //价格
+					latitude: this.latitude,
+					longitude: this.longitude,
+					city: this.city
+				}
+				// console.log(data)
+				this.$Request.get("/app/artificer/selectArtificerList", data).then(res => {
+					this.loading = false;
+					if (res.code == 0) {
+						for (var i = 0; i < res.data.list.length; i++) {
+							if (res.data.list[i].lifePhoto) {
+								res.data.list[i].lifePhoto = res.data.list[i].lifePhoto.split(',')
+							}
+							if (res.data.list[i].distance > 1000) {
+								res.data.list[i].distance = (res.data.list[i].distance / 1000).toFixed(1) +
+									'km'
+							} else {
+								res.data.list[i].distance = (res.data.list[i].distance).toFixed(1) + 'm'
+							}
+
+						}
+						if (this.page == 1) {
+							this.orderList = res.data.list
+						} else {
+							this.orderList = [...this.orderList, ...res.data.list]
+						}
+						//加载到地图里
+						if (this.amap) {
+							// debugger;
+							console.log(this.orderList)
+							if (this.orderList.length > 0) {
+								let rmap = {};
+								let onLineArtificerList = this.orderList.filter((item) => item.status == 1);
+								onLineArtificerList.forEach(x => {
+									rmap[x.userId] = x.latitude + ',' + x.longitude; //没有给个签到坐标
+								});
+								console.log('在orderList初始化：', JSON.parse(JSON.stringify(rmap)));
+								this.pointMap = rmap;
+								this.creatMarker(rmap);
+							}
+						}
+
+					}
+					uni.stopPullDownRefresh();
+				})
+			},
+			// 切换菜单
+			tabChange() {
+				if (uni.getStorageSync('sendMsg')) {
+					console.log('授权+1')
+					wx.requestSubscribeMessage({
+						tmplIds: this.arr,
+						success(re) {
+							console.log(JSON.stringify(re), 111111111111)
+							var datas = JSON.stringify(re);
+							if (datas.indexOf("accept") != -1) {
+								// console.log(re)
+							}
+						},
+						fail: (res) => {
+							// console.log(res)
+						}
+					})
+				}
+				this.defaultIndex = [0, 0, 0]
+				// this.$refs.uDropdown.close();
+				this.page = 1
+				this.getlist()
+			},
+
+			// 筛选
+			change(index) {
+
+				// this.value1 = e[0][0].value
+				// this.value2 = e[1][0].value
+				// this.value3 = e[2][0].value
+				this.listIndex = index
+				this.page = 1
+				this.getlist()
+			},
+			// 选择城市
+			goSelectCity() {
+				// uni.navigateTo({
+				// 	url: '/pages/index/citys/citys'
+				// });
+				let that = this
+				uni.chooseLocation({
+					success: function(res) {
+						console.log('位置名称：' + res.name);
+						console.log('详细地址：' + res.address);
+						console.log('纬度：' + res.latitude);
+						console.log('经度：' + res.longitude);
+						that.latitude = res.latitude
+						that.longitude = res.longitude
+						uni.setStorageSync('latitude', res.latitude)
+						uni.setStorageSync('longitude', res.longitude)
+						that.selectCity(that.longitude, that.latitude);
+					}
+				});
+			},
+			selectCity(longitude, latitude) {
+				this.$Request.get('/app/Login/selectCity?lat=' + latitude + '&lng=' + longitude).then(res => {
+					if (res.code == 0) {
+						this.city = res.data.city ? res.data.city : '未知'
+						uni.setStorageSync('city', res.data.city)
+						this.page = 1
+						this.getlist()
+					}
+				});
+			},
+			// 乐享低价
+			goLowTaking() {
+				uni.navigateTo({
+					url: '/pages/index/order/lowTaking'
+				});
+			},
+			// 跳转游戏列表
+			goNav(url) {
+				if (uni.getStorageSync('sendMsg')) {
+					console.log('授权+1')
+					wx.requestSubscribeMessage({
+						tmplIds: this.arr,
+						success(re) {
+							console.log(JSON.stringify(re), 111111111111)
+							var datas = JSON.stringify(re);
+							if (datas.indexOf("accept") != -1) {
+								console.log(re)
+							}
+						},
+						fail: (res) => {
+							console.log(res)
+						}
+					})
+				}
+				if (url.indexOf('/pages/') !== -1) {
+					uni.navigateTo({
+						url
+					});
+				} else {
+					//#ifndef H5
+					uni.navigateTo({
+						url: '/pages/index/webView?url=' + url
+					});
+					//#endif
+					//#ifdef H5
+					window.location.href = url;
+					//#endif
+				}
+			},
+			// 跳转搜索
+			goSearch(index) {
+				if (uni.getStorageSync('sendMsg')) {
+					console.log('授权+1')
+					wx.requestSubscribeMessage({
+						tmplIds: this.arr,
+						success(re) {
+							// console.log(JSON.stringify(re), 111111111111)
+							var datas = JSON.stringify(re);
+							if (datas.indexOf("accept") != -1) {
+								console.log(re)
+							}
+						},
+						fail: (res) => {
+							console.log(res)
+						}
+					})
+				}
+				uni.navigateTo({
+					url: '/pages/index/search/index?index=' + index
+				});
+			},
+			
+			//地图初始化，
+			getLocation(isHighAccuracy = false) {
+				console.log('获取地理位置，精度：', isHighAccuracy);
+				let that = this;
+				//获取地理坐标
+				uni.getLocation({
+					// type: 'wgs84',
+					type: 'gcj02',
+					highAccuracyExpireTime: isHighAccuracy ? 5000 : 500,
+					isHighAccuracy,
+					success: function(res) {
+						let longitude = res.longitude;
+						let latitude = res.latitude;
+						console.log('当前位置的经度：' + longitude);
+						console.log('当前位置的纬度：' + latitude);
+						getApp().globalData['longitude'] = longitude;
+						getApp().globalData['latitude'] = latitude;
+						console.log('定位成功', latitude, longitude);
+						if (that.amap) {
+							uni.amap.setCenter([longitude, latitude])
+						}
+					},
+					fail(res) {
+						console.log('定位失败！', res);
+					}
+				});
+				//读取缓存里面的经纬度
+				let longitude = getApp().globalData['longitude'] || 0;
+				let latitude = getApp().globalData['latitude'] || 0;
+				return {
+					latitude,
+					longitude
+				};
+			},
+			initMap() {
+				let amap = webMap.creatAMap('txMapContainer');
+				uni.amap = amap;
+				this.amap = amap;
+				let that = this;
+				setTimeout(() => {
+					uni.hideLoading();
+					this.current = 0;
+					uni.getLocation({
+						// type: 'wgs84',
+						type: 'gcj02',
+						highAccuracyExpireTime: 3000,
+						isHighAccuracy: true,
+						success: function(res) {
+							let longitude = res.longitude;
+							let latitude = res.latitude;
+							console.log('当前位置的经度：' + longitude);
+							console.log('当前位置的纬度：' + latitude);
+							console.log('定位成功', latitude, longitude);
+							if (amap) {
+								uni.amap.setCenter([longitude, latitude])
+							}
+						},
+						fail(res) {
+							console.log('定位失败！', res);
+						}
+					});
+					if (that.orderList.length > 0) {
+						let rmap = {};
+						let onLineArtificerList = this.orderList.filter((item) => item.status == 1);
+						onLineArtificerList.forEach(x => {
+							rmap[x.userId] = x.latitude + ',' + x.longitude; //没有给个签到坐标
+						});
+						console.log('在initMap初始化：', JSON.parse(JSON.stringify(rmap)));
+						this.pointMap = rmap;
+						that.creatMarker(rmap);
+					}
+				}, 500);
+			},
+			creatMarker(map) {
+				let that = this;
+				webMap.addMarker(uni.amap, map, this.orderList, (e, udata) => {
+					that.currentMarkerIndex = udata.userId;
+					that.showPopup = true;
+				});
+			},
+			updateMarker(map) {
+				this.creatMarker(map);
+			},
+			getUserId() {
+				return this.myId;
+			},
+			getBusinessId() {
+				// return '12345678900987654321';
+				//return this.massageTypeId;
+				return this.tabIndex;
+				// return '98';
+			},
+			getOrderByCurrentMarkerIndex(key = this.currentMarkerIndex) {
+				return ((this.orderList || []).find(x => x.userId == key) || {});
+			},
+			creatSocket() {
+				let deviceId = this.getBusinessId();
+				let socketConnect = uni.connectSocket({
+					url: commonConfig.WS_UPLOAD_MAP_PATH + deviceId,
+					data() {
+						return {
+							msg: ''
+						}
+					},
+					header: {
+						'content-type': 'application/json',
+						// 'token': token
+					},
+					method: 'GET',
+					success(res) {
+						// 这里是接口调用成功的回调，不是连接成功的回调，请注意
+						// uni.showLoading({
+						//   title: '连接成功！'
+						// });
+					},
+					fail(err) {
+						// 这里是接口调用失败的回调，不是连接失败的回调，请注意
+						// uni.showLoading({
+						//   title: '连接失败！'
+						// });
+					}
+				});
+				uni.onSocketOpen((res) => {
+					// uni.hideLoading()
+					// uni.showToast({
+					// 	icon: 'none',
+					// 	title: '连接成功'
+					// })
+					console.log('onOpen', res);
+				});
+				uni.onSocketError((err) => {
+					// this.connecting = false
+					// this.connected = false
+					// uni.hideLoading()
+					// uni.showModal({
+					// 	content: '网络较差，请稍后再试',
+					// 	showCancel: false
+					// })
+					console.log('onError', err);
+				});
+				uni.onSocketMessage((res) => {
+					let that = this;
+					console.log('onMessage', res)
+					let datas = JSON.parse(res.data)
+					// let data = {
+					// 	chat: {
+					// 		userHead: '../../static/logo.png'
+					// 	},
+					// 	content: datas.content,
+					// 	type: datas.type,
+					// 	sendType: datas.sendType
+					// }
+					// that.ListItem.push(data);
+					//解析点
+					this.pointMap = {};
+					switch (datas.type) {
+						case 'getCoordinate': {
+							console.log('坐标包：', JSON.parse(JSON.stringify(datas.data)));
+							let map = {};
+							let rmap = {};
+							let onLineArtificerList = this.orderList.filter((item) => item.status == 1);
+							onLineArtificerList.forEach(x => {
+								map[x.userId] = x;
+								let zb = datas.data[x.userId];
+								if (!zb) {
+									//datas.data[x.userId] = x.latitude + ',' + x.longitude; //没有给个签到坐标
+									rmap[x.userId] = x.latitude + ',' + x.longitude; //没有给个签到坐标
+								} else {
+									rmap[x.userId] = zb;
+								}
+							});
+							// let data = datas.data;
+							// let rdata = {};
+
+							// data.forEach(x => rdata[x.userId]);
+
+							//rmap = datas.data; //debug
+							console.log('坐标最终结果：', JSON.parse(JSON.stringify(rmap)));
+							this.pointMap = rmap;
+							that.creatMarker(rmap);
+							break;
+						}
+						default: {
+
+						}
+					}
+
+				});
+				uni.onSocketClose((res) => {
+					console.log('onClose', res)
+					console.log('2 - 关闭触发', uni.pointThread)
+					//this.closeSocket();
+					this.socketConnect = null;
+					this.pointThread = null;
+					uni.pointThread = null;
+					uni.userSocketConnect = null;
+				});
+
+				this.socketConnect = socketConnect;
+				uni.userSocketConnect = socketConnect;
+			},
+			sendMsg(msg) {
+				uni.sendSocketMessage({
+					data: JSON.stringify(msg),
+					success: (...e) => {
+						console.log('发送成功！', ...e);
+					},
+					fail: (...e) => {
+						console.log('发送失败！', ...e);
+					},
+				});
+			},
+			closeSocket() {
+				console.log('2-关闭 - closeSocket')
+				uni.closeSocket();
+				//temp1.pointThread
+				clearInterval(uni.pointThread);
+			},
+			initMapPointThread() {
+				let that = this;
+				//创建连接
+				if (!that.socketConnect) {
+					this.closeSocket();
+					//that.socketConnect = uni.userSocketConnect;
+				}
+				if (uni.userSocketConnect) {
+					this.closeSocket()
+					//that.socketConnect = uni.userSocketConnect;
+				}
+				setTimeout(x => {
+					console.log('重新开始');
+					that.creatSocket();
+					//开始循环
+					setTimeout(x => {
+						that.forSendMsg();
+					}, 500);
+				}, 500)
+			},
+			forSendMsg() {
+				let that = this;
+				if (!that.mapPointThreadIsRun) {
+					that.sendMsgFn();
+					let pointThread = setInterval(() => {
+						that.sendMsgFn();
+					}, 3 * 60 * 1000); //3 * 60 * 1000
+					this.pointThread = pointThread;
+					uni.pointThread = pointThread;
+				}
+			},
+			sendMsgFn() {
+				let that = this;
+				let userId = that.getUserId();
+				let businessId = that.getBusinessId();
+				let msg = {
+					sendType: "getCoordinate",
+					userId,
+					businessId,
+					rkey: `map:location:${businessId}:*`
+				}
+				that.sendMsg(msg);
+			},
+		},
+		onReachBottom: function() {
+			this.page = this.page + 1;
+			this.getlist()
+		},
+		onPullDownRefresh: function() {
+			this.page = 1;
+			this.getlist()
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.item-view-jianjie{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #848484;
+		margin:5px 0px;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		text-align: left;
+	}
+	.dituList{
+		width: 85%;
+		height: 173px;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+	}
+	.liebiao{
+		height: 100vh;
+		margin-top: 55px;
+		display: flex;
+		flex-direction: column;
+	}
+	.content-head{
+		position: fixed;
+		top: 0rpx;
+		z-index: 999;
+		width: 100%;
+		background-image: url('../../static/topimg.png');
+		// background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), #f7f7f7), url('../../static/background-img.png');
+		// background-position: center center;
+		// background-repeat: no-repeat;
+		background-size: cover;
+		// overflow: auto;
+	}
+	.therapist-bottom-dingwei-text{
+		font-weight: bold;
+		font-size: 23rpx;
+		color: #848485;
+	}
+	.therapist-bottom-dingwei{
+		width: 17.36rpx;
+		height: 20.14rpx;
+		margin-right:3px;
+	}
+	.therapist-bottom-img{
+		width: 22.22rpx;
+		height: 22.22rpx;
+		margin-right:3px;
+	}
+	.therapist-mian-bottom-text{
+		font-weight: bold;
+		font-size: 23rpx;
+		color: #222222;
+	}
+	.therapist-mian-bottom{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		margin: 5px 0px 3px 0px;
+	}
+	.therapist-mian-view-text span{
+		font-weight: 500;
+		font-size: 23rpx;
+		color: #222222;
+	}
+	.therapist-mian-view span{
+		font-weight: 400;
+		font-size: 23rpx;
+		color: #7C8187;
+		margin-right: 5px;
+	}
+	.therapist-mian-view image{
+		width: 24rpx;
+		height: 24rpx;
+		margin-right: 1px;
+	}
+	.therapist-mian-view{
+		display: flex;
+		flex-direction:row;
+		align-items: center;
+	}
+	.therapist-mian-top{
+		width: 100%;
+		display: flex;
+		flex-direction:row;
+	}
+	.therapist-mian{
+		width: 100%;
+		display: flex;
+		flex-direction:column;
+	}
+	.list-right-top-bottom{
+		width: 100%;
+		text-align: left;
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #333333;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.list-right-top-name{
+		width: 60px;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		text-align: left;
+		font-weight: bold;
+		font-size: 35rpx;
+		color: #13141A;
+	}
+	.keyuyue{
+		width: 115px;
+		height: 18px;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.keyuyue .keyuyue-btn{
+		width: 50%;
+		height: 100%;
+		font-weight: 400;
+		font-size: 17rpx;
+		text-align: center;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+	}
+	.keyuyue-jinri{
+		border-top-left-radius: 7rpx;
+		border-bottom-left-radius: 7rpx;
+		border-radius: 7rpx;
+		color: #fff;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	}
+	.keyuyue-time{
+		border-top-right-radius: 7rpx;
+		border-bottom-right-radius: 7rpx;
+		color: #039E89;
+		background: #EBEBEB;
+	}
+	.list-right-top-view image{
+		width: 168.75rpx;
+		height: 40.97rpx;
+	}
+	.list-right-top-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.list-right-top{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.list-right{
+		width: 67%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		padding: 10px 5px 0px 5px;
+	}
+	.zpmore_view {
+		position: absolute;
+		bottom: -20rpx;
+		left: 14rpx;
+		color: #f9f3d3;
+		background: linear-gradient(to right, #0a0c16, #4d4d53);
+		width: 130upx;
+		text-align: center;
+		border-radius: 30rpx;
+		height: 42rpx;
+		line-height: 42rpx;
+		font-size: 24rpx;
+		margin-left: 10rpx;
+	}
+	.zpmore_view_left{
+		width: 68.75rpx;
+		height: 29.86rpx;
+	}
+	.img-span{
+		padding: 1px 5px;
+		font-weight: 400;
+		font-size: 8px;
+		color: #FFFFFF;
+		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
+		border-radius: 7px 0px 7px 0px;
+		position: absolute;
+		bottom: 0px;
+		right: 0;
+		margin-bottom: 5px;
+		margin-right: 5px;
+	}
+	// .zpmore_view_left image{
+	// 	position: absolute;
+	// 	bottom: 0px;
+	// 	right: 0px;
+	// 	margin: 0px 5px -16px 0px;
+	// 	width: 68.75rpx;
+	// 	height: 29.86rpx;
+	// }
+	.touxiang{
+		width: 202.08rpx;
+		height: 306.94rpx;
+	}
+	.touxiang-left-content{
+		width: 202.08rpx;
+		height: auto;
+		border-radius: 10rpx;
+		position: relative;
+	}
+	.touxiang-left-content-img{
+		width: 202.08rpx;
+		height: 173px;
+	}
+	.touxiang-left-view{
+		width: 100%;
+		height: 173px;
+		border-radius: 14rpx;
+		align-items: flex-start;
+		justify-content: space-between;
+		background: #fff;
+		margin-bottom: 20px;
+		padding-bottom: 10px;
+	}
+	.touxiang-left{
+		width: 100%;
+		/* padding: 10px; */
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		align-items: baseline;
+	}
+	.list-view{
+		// margin-top: 52px;
+		padding: 0 20rpx;
+		height: 100%;
+		justify-content: space-between;
+	}
+	
+	/deep/.justify-between{
+		// width: 100px;
+		// height: 32px;
+		line-height: 32px;
+		border-radius: 4px;
+		margin-left: 10px;
+	}
+	.padding-top-sm{
+		width: 95%;
+		margin: 0 auto;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	/deep/.page-box{
+		background: none !important;
+	}
+	/deep/.u-action{
+		display: none;
+	}
+	.content{
+		width: 100%;
+		height: 100vh;
+		background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), #f7f7f7), url('../../static/background-img.png');
+		background-position: center center;
+		background-repeat: no-repeat;
+		background-size: cover;
+		overflow: auto;
+	}
+	/deep/.u-content{
+		border-radius: 30px !important;
+	}
+	.flex-sub{
+		width: 353rpx;
+		height: 63rpx !important;
+	}
+	.localName{
+		margin-left: 4rpx;
+		font-weight: bold;
+		font-size: 33rpx;
+		color: #333333;
+	}
+	.dingwei-img{
+		width:33.33rpx;
+		height:37.5rpx;
+	}
+	page {
+		background-color: #F7F7F7;
+	}
+
+	.jishi_name {
+		max-width: 80rpx;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		overflow: hidden;
+	}
+
+	.zz_view {
+		color: #333333;
+		font-size: 24rpx;
+		padding: 6rpx 10rpx;
+		border-radius: 10rpx;
+	}
+
+	.zpmore_view {
+		position: absolute;
+		bottom: -20rpx;
+		left: 14rpx;
+		color: #f9f3d3;
+		background: linear-gradient(to right, #0a0c16, #4d4d53);
+		width: 130upx;
+		text-align: center;
+		border-radius: 30rpx;
+		height: 42rpx;
+		line-height: 42rpx;
+		font-size: 24rpx;
+		margin-left: 10rpx;
+	}
+
+	.byy_view {
+		background: #ebebeb;
+		width: 100upx;
+		text-align: center;
+		border-radius: 50rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		font-size: 24rpx;
+		color: #000000;
+		// border: 3upx solid #999999;
+		margin-top: 6rpx;
+		margin-left: 40rpx;
+	}
+
+	.kfw_view {
+		background: #ffaa00;
+		width: 100upx;
+		text-align: center;
+		border-radius: 50rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		font-size: 24rpx;
+		color: #FFFFFF;
+		margin-top: 6rpx;
+		margin-left: 40rpx;
+	}
+
+	.kyy_view {
+		background: #096f4b;
+		width: 100upx;
+		text-align: center;
+		border-radius: 50rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		font-size: 24rpx;
+		color: #FFFFFF;
+		margin-top: 6rpx;
+		margin-left: 40rpx;
+	}
+
+	.bg {
+		background: #FFFFFF;
+	}
+
+	.ytp_view {
+		background: #e3e3e3;
+		width: 400rpx;
+		border-radius: 10rpx;
+		font-size: 28rpx;
+		text-align: center;
+		height: 80rpx;
+		line-height: 80rpx;
+		color: #848484;
+		margin-top: 40rpx;
+	}
+
+	.tp_view {
+		background: #ee6c54;
+		width: 400rpx;
+		border-radius: 10rpx;
+		font-size: 28rpx;
+		text-align: center;
+		height: 80rpx;
+		line-height: 80rpx;
+		color: #FFFFFF;
+		margin-top: 40rpx;
+	}
+
+	.sticky-tabs {
+		z-index: 990;
+		position: sticky;
+		top: var(--window-top);
+		// background-color: #fff;
+	}
+
+	/* // 使用mescroll-uni,则top为0 */
+	.mescroll-uni,
+	/deep/.mescroll-uni {
+		.sticky-tabs {
+			top: 0;
+		}
+	}
+
+	.demo-tip {
+		padding: 18upx;
+		font-size: 24upx;
+		text-align: center;
+	}
+
+	.line_s {
+		display: inline-flex;
+		width: 10rpx;
+		height: 10rpx;
+		background: #1AD566;
+		border-radius: 50%;
+		margin-right: 10rpx;
+	}
+
+	.line_x {
+		display: inline-flex;
+		width: 10rpx;
+		height: 10rpx;
+		background: #000000;
+		border-radius: 50%;
+		margin-right: 10rpx;
+	}
+
+	.box {
+		// border: 3rpx solid #005dff;
+		background: #E8FAE1;
+		color: #096f4b;
+		padding: 5rpx 15rpx;
+		font-size: 26rpx;
+		letter-spacing: 2rpx;
+		border-radius: 8rpx;
+		// margin-top: 10rpx;
+		margin-right: 8upx;
+	}
+
+	.actve {
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: 800;
+		color: #20C675;
+	}
+
+	.tabview1 {
+		// width: 686upx;
+		// height: 100upx;
+		background: #FFFFFF;
+		// z-index: 99;
+		// display: flex;
+		// line-height: 100upx;
+
+		.tabview {
+			// width: 686upx;
+			// // height: 100upx;
+			border-radius: 24rpx 24rpx 0 0;
+			// margin-top: -50upx;
+			// z-index: 99;
+			display: flex;
+			line-height: 100upx;
+
+			.tabItem_sel {
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: 800;
+				color: #ffffff;
+				background: linear-gradient(to right, #223845, #00a85b);
+				flex: 1;
+				text-align: center;
+			}
+
+			.tabItem {
+				font-size: 32upx;
+				font-family: PingFang SC;
+				color: #333333;
+				flex: 1;
+				text-align: center;
+			}
+		}
+
+		.tabsx {
+			width: 686upx;
+			border-radius: 24rpx;
+			padding-bottom: 10rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 20rpx 30rpx;
+			font-size: 26rpx;
+
+			.active {
+				color: #20C675;
+				font-size: 30rpx;
+				font-weight: bold;
+			}
+		}
+	}
+
+	.aa {
+		background: linear-gradient(to right, #223845, #00a85b);
+		width: 46px;
+		text-align: center;
+		height: 24px;
+		line-height: 24px;
+		margin-left: 4px;
+		color: #ffffff;
+		box-shadow: 0 0 3px #dddddd;
+		border-radius: 4px;
+	}
+
+	.bb {
+		width: 46px;
+		text-align: center;
+		height: 24px;
+		line-height: 24px;
+		margin-left: 4px;
+		color: #666666;
+		border-radius: 4px;
+		background-color: #f7f7f7;
+	}
+
+	//地图标点样式
+	/deep/.custom-content-marker {
+		width: 70px;
+		height: 70px;
+
+
+		.marker_border {
+			//border: black solid;
+			width: 20px;
+			height: 20px;
+			padding: 5px;
+			background: white;
+			box-shadow: 0px 5px 10px #888888;
+			border-radius: 50%;
+		}
+
+		.marker_foot {
+			// height: 50px;
+			// width: 50px;
+			// background: black;
+			// transform: rotate(45deg);
+			// position: absolute;
+			// top: 50px;
+			// overflow: hidden;
+		}
+	}
+
+	/deep/.custom-content-marker img {
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+	}
+</style>
\ No newline at end of file