diff --git a/my/order/pay.vue b/my/order/pay.vue
index 2132ef6..18a5c1b 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -1330,13 +1330,13 @@ export default {
           uni.hideLoading()
           this.order = res.data;
           if(res.data["technicianType"] == 3){
-            this.order["technicianTypeName"] = "新手"
+            this.order["technicianTypeName"] = "资深"
           }
           if(res.data["technicianType"] == 4){
-            this.order["technicianTypeName"] = "专家"
+            this.order["technicianTypeName"] = "金牌"
           }
           if(res.data["technicianType"] == 5){
-            this.order["technicianTypeName"] = "资深"
+            this.order["technicianTypeName"] = "专家"
           }
           var date = new Date(); // 当前日期和时间
           // var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue
index 29a2ec2..cbf6d10 100644
--- a/my/order/payJaZ.vue
+++ b/my/order/payJaZ.vue
@@ -1125,13 +1125,13 @@ export default {
           uni.hideLoading()
           this.order = res.data;
 		  if(res.data["technicianType"] == 3){
-		  	this.order["technicianTypeName"] = "新手"
+		  	this.order["technicianTypeName"] = "资深"
 		  }
 		  if(res.data["technicianType"] == 4){
-		  	this.order["technicianTypeName"] = "专家"
+		  	this.order["technicianTypeName"] = "金牌"
 		  }
 		  if(res.data["technicianType"] == 5){
-		  	this.order["technicianTypeName"] = "资深"
+		  	this.order["technicianTypeName"] = "专家"
 		  }
           var date = new Date(); // 当前日期和时间
           var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
diff --git a/my/order/payModify.vue b/my/order/payModify.vue
index 864cad4..1fbda3c 100644
--- a/my/order/payModify.vue
+++ b/my/order/payModify.vue
@@ -309,7 +309,7 @@
 				selectedString:'',
 				fuwuBtn: [
 					{'title':'请速回电'},
-					{'title':'切勿大声敲门'},
+					{'title':'勿大声敲门'},
 					{'title':'尽快上门服务'},
 					{'title':'直接来即可'},
 				],
@@ -694,6 +694,12 @@
 			},
 			goOrder() {//生成orderId
 				let that = this
+				if(that.detailaddress==''){
+					uni.showToast({
+						title:'请选择服务地址！'
+					})
+					return;
+				}
 				let data = {
 				  address:that.province+that.city+that.district+that.detailaddress,
 				  artificerId:that.jishiName.artificerId,
diff --git a/my/order/payModifyDzhifu.vue b/my/order/payModifyDzhifu.vue
index fa692a7..226b7b9 100644
--- a/my/order/payModifyDzhifu.vue
+++ b/my/order/payModifyDzhifu.vue
@@ -275,8 +275,8 @@
 			return {
 				fuwuBtn: [
 					{'title':'请速回电'},
-					{'title':'切勿大声敲门'},
 					{'title':'尽快上门服务'},
+					{'title':'勿大声敲门'},
 					{'title':'直接来即可'},
 				],
 				selected:[],
diff --git a/my/order/payModifyJsDetail.vue b/my/order/payModifyJsDetail.vue
index 2ed44c5..3e17a8f 100644
--- a/my/order/payModifyJsDetail.vue
+++ b/my/order/payModifyJsDetail.vue
@@ -311,7 +311,7 @@
 				selectedString:'',
 				fuwuBtn: [
 					{'title':'请速回电'},
-					{'title':'切勿大声敲门'},
+					{'title':'勿大声敲门'},
 					{'title':'尽快上门服务'},
 					{'title':'直接来即可'},
 				],
diff --git a/my/order/payModifyTcMy.vue b/my/order/payModifyTcMy.vue
index 84d4141..0adc4f3 100644
--- a/my/order/payModifyTcMy.vue
+++ b/my/order/payModifyTcMy.vue
@@ -290,7 +290,7 @@
 				selectedString:'',
 				fuwuBtn: [
 					{'title':'请速回电'},
-					{'title':'切勿大声敲门'},
+					{'title':'勿大声敲门'},
 					{'title':'尽快上门服务'},
 					{'title':'直接来即可'},
 				],
@@ -304,13 +304,13 @@
 			}
 			this.orderXm=this.$queue.getData('mainData');
 			if(this.orderXm.level == 3){
-				this.orderXm.levelName = "新手"
+				this.orderXm.levelName = "资深"
 			}
 			if(this.orderXm.level == 4){
-				this.orderXm.levelName = "专家"
+				this.orderXm.levelName = "金牌"
 			}
 			if(this.orderXm.level == 5){
-				this.orderXm.levelName = "资深"
+				this.orderXm.levelName = "专家"
 			}
 			console.log("this.orderXm",this.orderXm)
 			this.detailData=this.$queue.getData('detailData');
@@ -417,6 +417,12 @@
 			},
 			goOrder() {//生成orderId
 				let that = this
+				if(that.detailaddress==''){
+					uni.showToast({
+						title:'请选择服务地址！'
+					})
+					return;
+				}
 				// let payMoney =item.price;
 				// let payMoney = that.isVip ? item.memberPrice : item.price;
 				let data = {
@@ -1408,21 +1414,47 @@
 	}
 	.huiBtn {
 		color:#333;
+<<<<<<< .mine
 		background: #f3f3f3;
+
+=======
+		background: #f3f3f3;
+		// color: #333333;
+>>>>>>> .theirs
 	}
 	.lanBtn {
 		color:#fff;
 		background: #049F89;
 	}
 	.guke-btn {
+<<<<<<< .mine
 		width: 24%;
 		line-height: 34px;
+
+
+=======
+		width:24%;
+		// height: 40px;
+		line-height:34px;
+		// margin-left: 5px;
+>>>>>>> .theirs
 		text-align: center;
 		font-weight: bold;
+<<<<<<< .mine
 		font-size: 11px;
+=======
+		font-size:11px;
+>>>>>>> .theirs
 		border-radius: 6px;
+<<<<<<< .mine
 		margin-top: 5px;
 		margin-right: 2px;
+
+=======
+		margin-top:5px;
+		margin-right:2px;
+		// border-bottom: 1px solid #ccc;
+>>>>>>> .theirs
 	}
 	.guke-list {
 		width: 100%;
diff --git a/my/order/payModifyTcMyDaiB.vue b/my/order/payModifyTcMyDaiB.vue
index f2fc018..f1d4a52 100644
--- a/my/order/payModifyTcMyDaiB.vue
+++ b/my/order/payModifyTcMyDaiB.vue
@@ -533,13 +533,13 @@
 						uni.hideLoading()
 						this.order = res.data;
 						if (res.data["technicianType"] == 3) {
-							this.order["technicianTypeName"] = "新手"
+							this.order["technicianTypeName"] = "资深"
 						}
 						if (res.data["technicianType"] == 4) {
-							this.order["technicianTypeName"] = "专家"
+							this.order["technicianTypeName"] = "金牌"
 						}
 						if (res.data["technicianType"] == 5) {
-							this.order["technicianTypeName"] = "资深"
+							this.order["technicianTypeName"] = "专家"
 						}
 						var date = new Date(); // 当前日期和时间
 						// var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue
index 90289f6..318336b 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -1443,13 +1443,13 @@
 						uni.hideLoading()
 						this.order = res.data;
 						if(res.data["technicianType"] == 3){
-							this.order["technicianTypeName"] = "新手"
+							this.order["technicianTypeName"] = "资深"
 						}
 						if(res.data["technicianType"] == 4){
-							this.order["technicianTypeName"] = "专家"
+							this.order["technicianTypeName"] = "金牌"
 						}
 						if(res.data["technicianType"] == 5){
-							this.order["technicianTypeName"] = "资深"
+							this.order["technicianTypeName"] = "专家"
 						}
 						var date = new Date(); // 当前日期和时间
 						var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
diff --git a/my/order/payding.vue b/my/order/payding.vue
index 4f9df35..ee92983 100644
--- a/my/order/payding.vue
+++ b/my/order/payding.vue
@@ -114,7 +114,7 @@
 										<image style="width: 120rpx; height: 45rpx;" :src="order.technicianType=='3'?'../../static/vip/grade1.gif':order.technicianType=='4'?'../../static/vip/grade2.gif':'../../static/vip/grade3.gif'" mode=""></image>
 									</view>
 							</view>
-							<!-- <view class="level_button">{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</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">
@@ -495,13 +495,13 @@
 						uni.hideLoading()
 						this.order = res.data;
 						if(res.data["technicianType"] == 3){
-							this.order["technicianTypeName"] = "新手"
+							this.order["technicianTypeName"] = "资深"
 						}
 						if(res.data["technicianType"] == 4){
-							this.order["technicianTypeName"] = "专家"
+							this.order["technicianTypeName"] = "金牌"
 						}
 						if(res.data["technicianType"] == 5){
-							this.order["technicianTypeName"] = "资深"
+							this.order["technicianTypeName"] = "专家"
 						}
 						var date = new Date(); // 当前日期和时间
 						// var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
diff --git a/my/order/paydingDd.vue b/my/order/paydingDd.vue
index 7e9b48d..7b4bd46 100644
--- a/my/order/paydingDd.vue
+++ b/my/order/paydingDd.vue
@@ -207,7 +207,7 @@
 						</view>
 						<view class="fei-view-list">
 							<span>技师等级</span>
-							<span>{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</span>
+							<span>{{order.technicianType=='3'?'资深':order.technicianType=='4'?'金牌':'专家'}}</span>
 						</view>
 						<view class="fei-view-list">
 							<span>技师服务佣金上浮比例</span>
diff --git a/my/order/paydingTCX.vue b/my/order/paydingTCX.vue
index e4c11aa..bee7fc9 100644
--- a/my/order/paydingTCX.vue
+++ b/my/order/paydingTCX.vue
@@ -570,13 +570,13 @@
 						uni.hideLoading()
 						this.order = res.data;
 						if(res.data["technicianType"] == 3){
-							this.order["technicianTypeName"] = "新手"
+							this.order["technicianTypeName"] = "资深"
 						}
 						if(res.data["technicianType"] == 4){
-							this.order["technicianTypeName"] = "专家"
+							this.order["technicianTypeName"] = "金牌"
 						}
 						if(res.data["technicianType"] == 5){
-							this.order["technicianTypeName"] = "资深"
+							this.order["technicianTypeName"] = "专家"
 						}
 						var date = new Date(); // 当前日期和时间
 						// var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
diff --git a/my/order/paydingXiuGai.vue b/my/order/paydingXiuGai.vue
index c71cda6..e13cf55 100644
--- a/my/order/paydingXiuGai.vue
+++ b/my/order/paydingXiuGai.vue
@@ -94,7 +94,7 @@
 								<!-- <image src="../../static/img/phone.png" class="phone-pay"
 									@click="bindphone(order.artificer.phone)"></image> -->
 							</view>
-							<view>{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</view>
+							<view>{{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;">
diff --git a/pages/my/cikarDrtail.vue b/pages/my/cikarDrtail.vue
index 58e1971..93f7f95 100644
--- a/pages/my/cikarDrtail.vue
+++ b/pages/my/cikarDrtail.vue
@@ -649,13 +649,13 @@
 					that.$Request.get('/app/massage/packageDetail/findAppPage', data).then(res => {
 						if (res.code == 0) {
 							if(res.mainData.level == 3){
-								res.mainData.levelName = "新手"
+								res.mainData.levelName = "资深"
 							}
 							if(res.mainData.level == 4){
-								res.mainData.levelName = "专家"
+								res.mainData.levelName = "金牌"
 							}
 							if(res.mainData.level == 5){
-								res.mainData.levelName = "资深"
+								res.mainData.levelName = "专家"
 							}
 							that.mainData=res.mainData;
 							that.contentImg=that.mainData.contentImg.split(",");
@@ -674,13 +674,13 @@
 					that.$Request.get('/app/user/package/detail/findMyPackageDetailList', data).then(res => {
 						if (res.code == 0) {
 							if(res.data.mainData.level == 3){
-								res.data.mainData.levelName = "新手"
+								res.data.mainData.levelName = "资深"
 							}
 							if(res.data.mainData.level == 4){
-								res.data.mainData.levelName = "专家"
+								res.data.mainData.levelName = "金牌"
 							}
 							if(res.data.mainData.level == 5){
-								res.data.mainData.levelName = "资深"
+								res.data.mainData.levelName = "专家"
 							}
 							that.mainData=res.data.mainData;
 							that.contentImg=that.mainData.contentImg.split(",");
diff --git a/pages/my/fuwuliaochengDetail.vue b/pages/my/fuwuliaochengDetail.vue
index dd7d88b..becf140 100644
--- a/pages/my/fuwuliaochengDetail.vue
+++ b/pages/my/fuwuliaochengDetail.vue
@@ -659,13 +659,13 @@
 					that.$Request.get('/app/massage/packageDetail/findAppPage', data).then(res => {
 						if (res.code == 0) {
 							if(res.mainData.level == 3){
-								res.mainData.levelName = "新手"
+								res.mainData.levelName = "资深"
 							}
 							if(res.mainData.level == 4){
-								res.mainData.levelName = "专家"
+								res.mainData.levelName = "金牌"
 							}
 							if(res.mainData.level == 5){
-								res.mainData.levelName = "资深"
+								res.mainData.levelName = "专家"
 							}
 							that.mainData=res.mainData;	
 							that.detailData=res.detailData.list;
@@ -685,13 +685,13 @@
 					that.$Request.get('/app/user/package/detail/findMyPackageDetailList', data).then(res => {
 						if (res.code == 0) {						
 							if(res.data.mainData.level == 3){
-								res.data.mainData.levelName = "新手"
+								res.data.mainData.levelName = "资深"
 							}
 							if(res.data.mainData.level == 4){
-								res.data.mainData.levelName = "专家"
+								res.data.mainData.levelName = "金牌"
 							}
 							if(res.data.mainData.level == 5){
-								res.data.mainData.levelName = "资深"
+								res.data.mainData.levelName = "专家"
 							}
 							that.mainData=res.data.mainData;
 							that.detailData=res.data.detailData;
diff --git a/pages/my/miaoShaOderDrtail.vue b/pages/my/miaoShaOderDrtail.vue
index 8817ef2..be7c5bc 100644
--- a/pages/my/miaoShaOderDrtail.vue
+++ b/pages/my/miaoShaOderDrtail.vue
@@ -220,13 +220,13 @@
 					that.$Request.get('/app/user/package/detail/findMyPackageDetailList',data).then(res => {
 						if (res.code == 0) {
 							if(res.data.mainData.level == 3){
-								res.data.mainData.levelName = "新手"
+								res.data.mainData.levelName = "资深"
 							}
 							if(res.data.mainData.level == 4){
-								res.data.mainData.levelName = "专家"
+								res.data.mainData.levelName = "金牌"
 							}
 							if(res.data.mainData.level == 5){
-								res.data.mainData.levelName = "资深"
+								res.data.mainData.levelName = "专家"
 							}
 							that.mainData=res.data.mainData;
 							that.detailData=res.data.detailData;
diff --git a/pages/my/myMsOderDrtail.vue b/pages/my/myMsOderDrtail.vue
index bace83d..c270e36 100644
--- a/pages/my/myMsOderDrtail.vue
+++ b/pages/my/myMsOderDrtail.vue
@@ -171,13 +171,13 @@
 				that.$Request.get('/app/user/package/detail/getMyPackageDetail', data).then(res => {
 					if (res.code == 0) {
 						if(res.data.level == 3){
-							res.data.levelName = "新手"
+							res.data.levelName = "资深"
 						}
 						if(res.data.level == 4){
-							res.data.levelName = "专家"
+							res.data.levelName = "金牌"
 						}
 						if(res.data.level == 5){
-							res.data.levelName = "资深"
+							res.data.levelName = "专家"
 						}
 						that.getList=res.data;
 						that.backgroundImageUrl=that.getList.massageImg
diff --git a/pages/my/newTeamlDetail.vue b/pages/my/newTeamlDetail.vue
index 8fe0bea..4034e21 100644
--- a/pages/my/newTeamlDetail.vue
+++ b/pages/my/newTeamlDetail.vue
@@ -236,13 +236,13 @@
 					that.$Request.get('/app/massage/package/getAppGroupDetail', data).then(res => {
 						if (res.code == 0) {
 							if(res.groupData.level == 3){
-								res.groupData.levelName = "新手"
+								res.groupData.levelName = "资深"
 							}
 							if(res.groupData.level == 4){
-								res.groupData.levelName = "专家"
+								res.groupData.levelName = "金牌"
 							}
 							if(res.groupData.level == 5){
-								res.groupData.levelName = "资深"
+								res.groupData.levelName = "专家"
 							}
 							that.mainData=res.groupData;
 							that.ordersData=res.ordersData;
@@ -283,13 +283,13 @@
 					that.$Request.get('/app/user/package/detail/findMyPackageDetailList', data).then(res => {
 						if (res.code == 0) {
 							if(res.data.mainData.level == 3){
-								res.data.mainData.levelName = "新手"
+								res.data.mainData.levelName = "资深"
 							}
 							if(res.data.mainData.level == 4){
-								res.data.mainData.levelName = "专家"
+								res.data.mainData.levelName = "金牌"
 							}
 							if(res.data.mainData.level == 5){
-								res.data.mainData.levelName = "资深"
+								res.data.mainData.levelName = "专家"
 							}
 							that.mainData=res.data.mainData;
 							that.detailData=res.data.detailData;
diff --git a/pages/my/newseckilldetails.vue b/pages/my/newseckilldetails.vue
index a393e28..c1ee43e 100644
--- a/pages/my/newseckilldetails.vue
+++ b/pages/my/newseckilldetails.vue
@@ -656,13 +656,13 @@
 								that.isEnd = false;
 							}
 							if(res.data.level == 3){
-								res.data.levelName = "新手"
+								res.data.levelName = "资深"
 							}
 							if(res.data.level == 4){
-								res.data.levelName = "专家"
+								res.data.levelName = "金牌"
 							}
 							if(res.data.level == 5){
-								res.data.levelName = "资深"
+								res.data.levelName = "专家"
 							}
 							that.mainData=res.data;
 							that.backgroundImageUrl=res.data.packageImg
@@ -683,13 +683,13 @@
 								this.$set(res.data, 'btnShow', false)
 							}
 							if(res.data.level == 3){
-								res.data.levelName = "新手"
+								res.data.levelName = "资深"
 							}
 							if(res.data.level == 4){
-								res.data.levelName = "专家"
+								res.data.levelName = "金牌"
 							}
 							if(res.data.level == 5){
-								res.data.levelName = "资深"
+								res.data.levelName = "专家"
 							}
 							that.mainData=res.data;
 							that.backgroundImageUrl=res.data.packageImg
diff --git a/pages/my/pTuanOderDrtail.vue b/pages/my/pTuanOderDrtail.vue
index 1e79dc4..cd1a4dd 100644
--- a/pages/my/pTuanOderDrtail.vue
+++ b/pages/my/pTuanOderDrtail.vue
@@ -153,13 +153,13 @@
 				that.$Request.get('/app/user/package/detail/getMyPackageDetail', data).then(res => {
 					if (res.code == 0) {
 						if(res.data.level == 3){
-							res.data.levelName = "新手"
+							res.data.levelName = "资深"
 						}
 						if(res.data.level == 4){
-							res.data.levelName = "专家"
+							res.data.levelName = "金牌"
 						}
 						if(res.data.level == 5){
-							res.data.levelName = "资深"
+							res.data.levelName = "专家"
 						}
 						that.getList=res.data;
 						that.backgroundImageUrl=that.getList.massageImg
diff --git a/pages/my/pinTuanOderDrtail.vue b/pages/my/pinTuanOderDrtail.vue
index e17f85b..de9ca6f 100644
--- a/pages/my/pinTuanOderDrtail.vue
+++ b/pages/my/pinTuanOderDrtail.vue
@@ -219,13 +219,13 @@
 					that.$Request.get('/app/user/package/detail/findMyPackageDetailList',data).then(res => {
 						if (res.code == 0) {
 							if(res.data.mainData.level == 3){
-								res.data.mainData.levelName = "新手"
+								res.data.mainData.levelName = "资深"
 							}
 							if(res.data.mainData.level == 4){
-								res.data.mainData.levelName = "专家"
+								res.data.mainData.levelName = "金牌"
 							}
 							if(res.data.mainData.level == 5){
-								res.data.mainData.levelName = "资深"
+								res.data.mainData.levelName = "专家"
 							}
 							that.mainData=res.data.mainData;
 							that.detailData=res.data.detailData;
diff --git a/pages/my/serviceOderDrtail.vue b/pages/my/serviceOderDrtail.vue
index 97f75b6..03a81fd 100644
--- a/pages/my/serviceOderDrtail.vue
+++ b/pages/my/serviceOderDrtail.vue
@@ -691,13 +691,13 @@
 					that.$Request.get('/app/user/package/detail/findMyPackageDetailList',data).then(res => {
 						if (res.code == 0) {
 							if(res.data.mainData.level == 3){
-								res.data.mainData.levelName = "新手"
+								res.data.mainData.levelName = "资深"
 							}
 							if(res.data.mainData.level == 4){
-								res.data.mainData.levelName = "专家"
+								res.data.mainData.levelName = "金牌"
 							}
 							if(res.data.mainData.level == 5){
-								res.data.mainData.levelName = "资深"
+								res.data.mainData.levelName = "专家"
 							}
 							that.mainData=res.data.mainData;
 							that.detailData=res.data.detailData;
@@ -714,13 +714,13 @@
 					that.$Request.get('/app/massage/packageDetail/findAppPage',data).then(res => {
 						if (res.code == 0) {
 							if(res.mainData.level == 3){
-								res.mainData.levelName = "新手"
+								res.mainData.levelName = "资深"
 							}
 							if(res.mainData.level == 4){
-								res.mainData.levelName = "专家"
+								res.mainData.levelName = "金牌"
 							}
 							if(res.mainData.level == 5){
-								res.mainData.levelName = "资深"
+								res.mainData.levelName = "专家"
 							}
 							that.mainData=res.mainData;
 							that.detailData=res.detailData.list;
diff --git a/pages/shop/qiyeDatail.vue b/pages/shop/qiyeDatail.vue
index 76bfb2c..aa57ebb 100644
--- a/pages/shop/qiyeDatail.vue
+++ b/pages/shop/qiyeDatail.vue
@@ -192,13 +192,13 @@
 					that.$Request.get('/app/massage/packageDetail/findAppPage', data).then(res => {
 						if (res.code == 0) {
 							if(res.mainData.level == 3){
-								res.mainData.levelName = "新手"
+								res.mainData.levelName = "资深"
 							}
 							if(res.mainData.level == 4){
-								res.mainData.levelName = "专家"
+								res.mainData.levelName = "金牌"
 							}
 							if(res.mainData.level == 5){
-								res.mainData.levelName = "资深"
+								res.mainData.levelName = "专家"
 							}
 							that.mainData=res.mainData;
 							that.contentImg=that.mainData.contentImg.split(",");
@@ -218,13 +218,13 @@
 					that.$Request.get('/app/user/package/detail/findMyPackageDetailList', data).then(res => {
 						if (res.code == 0) {
 							if(res.data.mainData.level == 3){
-								res.data.mainData.levelName = "新手"
+								res.data.mainData.levelName = "资深"
 							}
 							if(res.data.mainData.level == 4){
-								res.data.mainData.levelName = "专家"
+								res.data.mainData.levelName = "金牌"
 							}
 							if(res.data.mainData.level == 5){
-								res.data.mainData.levelName = "资深"
+								res.data.mainData.levelName = "专家"
 							}
 							that.mainData=res.data.mainData;
 							that.contentImg=that.mainData.contentImg.split(",");
diff --git a/pages/therapist/orderDetail.vue b/pages/therapist/orderDetail.vue
index 0a21586..da02a34 100644
--- a/pages/therapist/orderDetail.vue
+++ b/pages/therapist/orderDetail.vue
@@ -35,7 +35,7 @@
 						<view class="jian-view-name">{{order.artificerName}}</view>
 						<!--<view class="headset-line">
 							<image class="headset-img" src="../../static/vip/headset1.png" mode=""></image>
-							<span class="headset-text">新手</span>
+							<span class="headset-text">资深</span>
 						</view>
 						<view class="headset-line">
 							<image class="headset-img" src="../../static/vip/headset2.png" mode=""></image>
diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue
index a4f2e28..6bf0b65 100644
--- a/pages/therapist/therapist.vue
+++ b/pages/therapist/therapist.vue
@@ -72,17 +72,16 @@
 								</view>
 							</view>
 							<view class="flex  thera-lin thera-bottom">
+								<view class="flex" v-if="item.consortiaName">
+									<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png"></image>
+									<view  v-if="item.consortiaName" class="therapist-mian-bottom-text">{{item.consortiaName}}</view>
+								</view>
 								<view class="flex align-center" v-if="item.distance">
 									<image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image>
 									<view class="therapist-bottom-dingwei-text">
 										{{ item.distance }}
 									</view>
 								</view>
-								<view class="flex" v-if="item.consortiaName">
-									<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png"></image>
-									<view  v-if="item.consortiaName" class="therapist-mian-bottom-text">{{item.consortiaName}}</view>
-								</view>
-								
 							</view>
 						</view>
 					</view>
@@ -169,17 +168,16 @@
 								</view>
 							</view>
 							<view class="flex  thera-lin thera-bottom">
+								<view class="flex" v-if="getOrderByCurrentMarkerIndex().consortiaName">
+									<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png"></image>
+									<view  v-if="getOrderByCurrentMarkerIndex().consortiaName" class="therapist-mian-bottom-text">{{getOrderByCurrentMarkerIndex().consortiaName}}</view>
+								</view>
 								<view class="flex align-center" v-if="getOrderByCurrentMarkerIndex().distance">
 									<image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image>
 									<view class="therapist-bottom-dingwei-text">
 										{{ getOrderByCurrentMarkerIndex().distance }}
 									</view>
 								</view>
-								<view class="flex" v-if="getOrderByCurrentMarkerIndex().consortiaName">
-									<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png"></image>
-									<view  v-if="getOrderByCurrentMarkerIndex().consortiaName" class="therapist-mian-bottom-text">{{getOrderByCurrentMarkerIndex().consortiaName}}</view>
-								</view>
-								
 							</view>
 							<!-- <view class="therapist-mian-bottom">
 								<view class="flex flex-wrap align-center"  v-if="getOrderByCurrentMarkerIndex().consortiaName">
@@ -217,7 +215,7 @@
 			</view>
 		</view>
 		<!-- 经验筛选 -->
-		<!-- <u-select v-model="Cityshow" :list="cityList" @confirm="getCity"></u-select> -->
+		<u-select v-model="Cityshow" :list="cityList" @confirm="getCity"></u-select>
 	</view>
 </template>
 <script>
@@ -246,17 +244,17 @@ import permision from "@/components/permission.js";
 					{
 						id: 3,
 						name: "",
-						value: "新手",
+						value: "资深",
 					},
 					{
 						id: 4,
 						name: "",
-						value: "专家",
+						value: "金牌",
 					},
 					{
 						id: 5,
 						name: "",
-						value: "资深",
+						value: "专家",
 					},
 				],
 				technicianType:3,
@@ -331,9 +329,6 @@ import permision from "@/components/permission.js";
 
 		onLoad(e) {
 			let that = this
-			uni.showLoading({
-				title: '加载中...'
-			})
 			that.massageTypeId = e.massageTypeId;
 			// that.getLocation();//低精度，快就完事了
 			//    that.getLocation(true);//高精度，慢慢查询
@@ -360,7 +355,6 @@ import permision from "@/components/permission.js";
 					that.selectCity(that.longitude,that.latitude)
 				},
 				fail: function(e) {
-					 that.getlist()
 					console.log('获取地址失败1', e)
 					// #ifdef APP-PLUS
 					that.checkPermission();
@@ -392,9 +386,6 @@ import permision from "@/components/permission.js";
 		},
 		onShow() {
 			let that = this
-			uni.showLoading({
-				title: '加载中...'
-			})
 			that.XCXIsSelect = this.$queue.getData("XCXIsSelect");
 			var add=uni.getStorageSync('cityTherapist');
 			if(add!=''){
@@ -405,9 +396,9 @@ import permision from "@/components/permission.js";
 			  that.latitude = location[1]
 			  that.componentKey++
 			  that.initMap();
-			  console.log("location========>location",add)
+			  console.log("location========>",add)
 			}
-			// that.getKTCityList();
+			that.getKTCityList();
 			that.getTpCount();
 			that.getTpMy();
 			that.userId = uni.getStorageSync('userId')
@@ -429,15 +420,13 @@ import permision from "@/components/permission.js";
 						geocode: true, //设置该参数为true可直接获取经纬度及城市信息
 						success: function(res) {
 							console.log(res, '地理位置onShow')
-							that.latitude = res.latitude;
-							that.longitude = res.longitude;
-							that.page = 1;
-							that.selectCity(that.longitude,that.latitude)
-							// that.getTypeList();
+							that.latitude = res.latitude
+							that.longitude = res.longitude
+							that.page = 1
+							that.getTypeList();
 							// that.getlist()
 						},
 						fail: function() {
-							 that.getlist()
 							console.log('获取地址失败2')
 						}
 					})
@@ -463,46 +452,6 @@ import permision from "@/components/permission.js";
 			//this.closeSocket();
 		},
 		methods: {
-			selectCity(longitude, latitude) {
-				var that=this;
-				var longitude = that.longitude;
-				var latitude = that.latitude;
-				let amapKey = that.Key2; // 替换为你的高德地图API Key
-				let url = `https://restapi.amap.com/v3/geocode/regeo?key=${amapKey}&location=${longitude},${latitude}&radius=1000`;
-				uni.request({
-				  url: url,
-				  success: (response) => {
-				    if(response.data && response.data.regeocode) {
-				      let address = response.data.regeocode.formatted_address;
-					  let province = response.data.regeocode.addressComponent.province;
-					  let city = response.data.regeocode.addressComponent.city;
-				      let district = response.data.regeocode.addressComponent.district;
-				      let township = response.data.regeocode.addressComponent.township;
-					  let streetNumber = response.data.regeocode.addressComponent.streetNumber.street;
-					  let number = response.data.regeocode.addressComponent.streetNumber.number;
-					  that.cityname = address.replace(province,'').replace(city,'').replace(district,'').replace(streetNumber,'').replace(number,'').replace(township,'')
-					  that.city=city
-					  var add=uni.getStorageSync('cityTherapist');
-					   console.log('getStorageSync===========', add);
-					   if(add!=''){
-					     that.cityname=add.name;
-					     that.city=add.cityname;
-					     var location=add.location.split(",")
-					     that.longitude = location[0]
-					     that.latitude = location[1]
-					   }
-					   that.page = 1
-					   that.getlist()
-				    } else {
-				      console.log('逆地理编码失败', response.data);
-				    }
-				  },
-				  fail: (error) => {
-					    uni.hideLoading();
-				    console.log('网络请求失败', error);
-				  }
-				});
-			},
 			changeClick(index,item){
 				this.artificerName='';
 				this.technicianType=item.id;
@@ -527,8 +476,7 @@ import permision from "@/components/permission.js";
 				console.log("that.current=======",that.current)
 				console.log("that.page=======",that.page)
 				that.$Request.get("/app/artificer/selectArtificerList", data).then(res => {
-					// that.loading = false;
-					  uni.hideLoading();
+					that.loading = false;
 					if (res.code == 0) {
 						for (var i = 0; i < res.data.list.length; i++) {
 							if (res.data.list[i].lifePhoto) {
@@ -703,7 +651,7 @@ import permision from "@/components/permission.js";
 							this.getTpCount();
 							this.getTpMy();
 						} else {
-							// uni.hideLoading();
+							uni.hideLoading();
 							uni.showModal({
 								showCancel: false,
 								title: '投票失败',
@@ -731,12 +679,12 @@ import permision from "@/components/permission.js";
 				});
 			},
 			getCity(e) {
-				// console.log("得到的城市-------------》",e[0].label);
-				// this.city = e[0].label;
-				// uni.setStorageSync('city', this.city)
-				// this.getKTCityList();
-				// this.page = 1
-				// this.getlist()
+				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;
@@ -760,7 +708,7 @@ import permision from "@/components/permission.js";
 						console.log("请求-----------------请求>",this.cityList)
 						if (!isOpen) {
 							// debugger;
-							// this.orderList = []
+							this.orderList = []
 							this.showTP = true;
 							// uni.showToast({
 							// 	title: '当前城市暂未开通，请切换城市',
@@ -789,7 +737,37 @@ import permision from "@/components/permission.js";
 					}
 				});
 			},
-			
+			selectCity(longitude, latitude) {
+				var that=this;
+				var longitude = that.longitude;
+				var latitude = that.latitude;
+				let amapKey = that.Key2; // 替换为你的高德地图API Key
+				let url = `https://restapi.amap.com/v3/geocode/regeo?key=${amapKey}&location=${longitude},${latitude}&radius=1000`;
+				uni.request({
+				  url: url,
+				  success: (response) => {
+				    if(response.data && response.data.regeocode) {
+				      let address = response.data.regeocode.formatted_address;
+					  let province = response.data.regeocode.addressComponent.province;
+					  let city = response.data.regeocode.addressComponent.city;
+				      let district = response.data.regeocode.addressComponent.district;
+				      let township = response.data.regeocode.addressComponent.township;
+					  let streetNumber = response.data.regeocode.addressComponent.streetNumber.street;
+					  let number = response.data.regeocode.addressComponent.streetNumber.number;
+					  that.cityname = address.replace(province,'').replace(city,'').replace(district,'').replace(streetNumber,'').replace(number,'').replace(township,'')
+					  that.city=city
+				      that.page = 1
+					  that.getlist()
+				      that.getKTCityList();
+				    } else {
+				      console.log('逆地理编码失败', response.data);
+				    }
+				  },
+				  fail: (error) => {
+				    console.log('网络请求失败', error);
+				  }
+				});
+			},
 			tanChange(index, item) {
 				this.orderIndex = index
 				this.tabIndex = item.id
@@ -879,19 +857,6 @@ import permision from "@/components/permission.js";
 						}
 					})
 				}
-				uni.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
@@ -972,6 +937,7 @@ import permision from "@/components/permission.js";
 			
 			//地图初始化，
 			getLocation(isHighAccuracy = false) {
+				console.log('获取地理位置，精度：', isHighAccuracy);
 				let that = this;
 				//获取地理坐标
 				uni.getLocation({
@@ -982,8 +948,11 @@ import permision from "@/components/permission.js";
 					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])
 						}
@@ -1006,6 +975,7 @@ import permision from "@/components/permission.js";
 				this.amap = amap;
 				let that = this;
 				setTimeout(() => {
+					uni.hideLoading();
 					this.current = 0;
 					uni.getLocation({
 						// type: 'wgs84',
@@ -1013,7 +983,6 @@ import permision from "@/components/permission.js";
 						highAccuracyExpireTime: 3000,
 						isHighAccuracy: true,
 						success: function(res) {
-							// uni.hideLoading();
 							let longitude = res.longitude;
 							let latitude = res.latitude;
 							console.log('当前位置的经度=========1：' + longitude);
@@ -1026,11 +995,12 @@ import permision from "@/components/permission.js";
 								  that.latitude = location[1]
 								  console.log("locationlocationlocationlocation>",location)
 								  uni.amap.setCenter([location[0],location[1]])
+								  
+								 
 								}
 							}
 						},
 						fail(res) {
-							// uni.hideLoading();
 							console.log('定位失败！', res);
 						}
 					});
@@ -1048,6 +1018,8 @@ import permision from "@/components/permission.js";
 			},
 			creatMarker(map) {
 				let that = this;
+				console.log("uni.amap=============>",uni.amap)
+				console.log("map=============>",map)
 				webMap.addMarker(uni.amap, map, this.orderList, (e, udata) => {
 					that.currentMarkerIndex = udata.userId;
 					that.showPopup = true;
diff --git a/pages/therapist/therapist1.vue b/pages/therapist/therapist1.vue
index 308e2b4..66ca418 100644
--- a/pages/therapist/therapist1.vue
+++ b/pages/therapist/therapist1.vue
@@ -258,17 +258,17 @@ import permision from "@/components/permission.js";
 					{
 						id: 3,
 						name: "",
-						value: "新手",
+						value: "资深",
 					},
 					{
 						id: 4,
 						name: "",
-						value: "专家",
+						value: "金牌",
 					},
 					{
 						id: 5,
 						name: "",
-						value: "资深",
+						value: "专家",
 					},
 				],
 				technicianType:3,
diff --git a/pages/therapist/therapistList.vue b/pages/therapist/therapistList.vue
index ac79d9c..165f4ee 100644
--- a/pages/therapist/therapistList.vue
+++ b/pages/therapist/therapistList.vue
@@ -226,17 +226,17 @@ import permision from "@/components/permission.js";
 					{
 						id: 3,
 						name: "",
-						value: "新手",
+						value: "资深",
 					},
 					{
 						id: 4,
 						name: "",
-						value: "专家",
+						value: "金牌",
 					},
 					{
 						id: 5,
 						name: "",
-						value: "资深",
+						value: "专家",
 					},
 				],
 				technicianType:3,
diff --git a/pages/therapist/therapistList1.vue b/pages/therapist/therapistList1.vue
index 7d55714..15cd3dc 100644
--- a/pages/therapist/therapistList1.vue
+++ b/pages/therapist/therapistList1.vue
@@ -356,8 +356,8 @@
 		data() {
 			return {
 				tabList:[
-					{value:'新手'},
 					{value:'资深'},
+					{value:'金牌'},
 					{value:'专家'}
 				],
 				Cityshow: false,
diff --git a/pages/videoCircle/gDvideo.vue b/pages/videoCircle/gDvideo.vue
index 881825c..4d192ae 100644
--- a/pages/videoCircle/gDvideo.vue
+++ b/pages/videoCircle/gDvideo.vue
@@ -3,7 +3,7 @@
 	<view class="content">
 		<scroll-view v-if="getVideoData.length>0" scroll-y="true" class="scroll-Y" @scrolltolower="loadMore">
 		<view class="top-view">
-			<image class="info-cover" style="width: 100%;" src="../../static/suggest-banner4.png" mode="scaleToFill"></image>
+			<image class="info-cover" style="width: 100%;" src="../../static/suggest-banner4.png"></image>
 			<!-- 用户头像关注 -->
 			<view class="u-flex-wrap"
 				style="padding-top: 18rpx;padding-bottom: 18rpx;position: relative;align-items: center;display: flex;flex-direction: row;justify-content: flex-end;">
@@ -490,6 +490,7 @@
 		background-color: #fff;
 	}
 	.top-view {
+		width:100%;
 		background-color: #fff;
 		border-bottom: 6px solid #f7f7f7;
 	}