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

---
 my/order/payModify.vue        |  4 ++--
 pages/therapist/therapist.vue | 25 +++++++++++++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/my/order/payModify.vue b/my/order/payModify.vue
index 64e11e8..1909cf6 100644
--- a/my/order/payModify.vue
+++ b/my/order/payModify.vue
@@ -1981,7 +1981,7 @@
 
 	.pay_btn {
 	    width: 96%;
-		margin-left: 2%;
+		// margin-left: 2%;
 	    text-align: center;
 	    background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
 	    height: 40px;
@@ -1989,7 +1989,7 @@
 	    color: #ffffff;
 	    line-height: 40px;
 	    font-size: 16px;
-		position: fixed;
+		// position: fixed;
 		justify-content: center;
 	}
 
diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue
index 6acc627..66089f6 100644
--- a/pages/therapist/therapist.vue
+++ b/pages/therapist/therapist.vue
@@ -186,13 +186,13 @@
 								</view>
 								
 							</view>
-							<!--<view class="text-center make-now" v-if="getOrderByCurrentMarkerIndex().status == 1" @click.stop="goOrder(getOrderByCurrentMarkerIndex())">
+							<view class="text-center make-now" v-if="getOrderByCurrentMarkerIndex().status == 1" @click.stop="goOrder(getOrderByCurrentMarkerIndex())">
 								立即预约
 							</view>
-							<view class="text-center " @click.stop="showTips()" v-else
+							<view class="text-center" @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>
@@ -340,7 +340,8 @@ import permision from "@/components/permission.js";
 
 		onLoad(e) {
 			let that = this
-			that.massageTypeId = e.massageTypeId
+			that.massageTypeId = e.massageTypeId;
+			console.log("1231312")
 			// that.getLocation();//低精度，快就完事了
 			//    that.getLocation(true);//高精度，慢慢查询
 			if(e){
@@ -1225,13 +1226,13 @@ import permision from "@/components/permission.js";
 	/deep/.margin-bottom-sm{
 		margin-bottom: 70px;
 	}
-	/deep/.u-drawer,/deep/.u-mask-show{
-		z-index:11 !important;
-	}
-	/deep/.u-drawer-content-visible{
-		z-index:99 !important;
-		margin-bottom: 60px;
-	}
+	// /deep/.u-drawer,/deep/.u-mask-show{
+	// 	z-index:11 !important;
+	// }
+	// /deep/.u-drawer-content-visible{
+	// 	z-index:99 !important;
+	// 	margin-bottom: 60px;
+	// }
 	.item-view-jianjie{
 		font-weight: 400;
 		font-size: 24rpx;
@@ -1804,7 +1805,7 @@ import permision from "@/components/permission.js";
 	.make-now{
 		background: linear-gradient(90deg, rgb(1, 156, 136), rgb(15, 167, 139), rgb(53, 196, 149));
 		color: rgb(255, 255, 255);
-		width: 200rpx;
+		// width: 200rpx;
 		border-radius: 15px;
 		height: 30px;
 		line-height: 30px;