diff --git a/my/order/pay.vue b/my/order/pay.vue
index aa48427..09ebdbf 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -69,7 +69,7 @@
 						</view>
 						<view class="serverAddress add-lin">
 							<view class="add-con-title">服务地址</view>
-							<view class="add-con-cont" style="width: 73%;">{{order.address}}</view>
+							<view class="add-con-cont" style="width: 73%; line-height: 34rpx;">{{order.address}}</view>
 						</view>
 					</view>
 				</view>
@@ -1638,7 +1638,7 @@
 
 <style lang="scss" scoped>
 	/deep/.padding-bottom{
-		padding-bottom: 50px;
+		padding-bottom: 20rpx;
 	}
 	
 	/deep/.u-drawer{
@@ -1854,6 +1854,7 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: center;
+		margin-top: 20rpx;
 	}
 	.hideBtn{
 		width: 100%;
@@ -2017,6 +2018,11 @@
 		padding: 29rpx;
 	}
 	.content{
+<<<<<<< .mine
+
+=======
+		// padding-bottom: 140rpx;
+>>>>>>> .theirs
 		 padding-top: 20px;
 		 width: 100%;
 		 background-color: #f7f7f7;
diff --git a/my/order/paydingTCX.vue b/my/order/paydingTCX.vue
index 7730289..5e420de 100644
--- a/my/order/paydingTCX.vue
+++ b/my/order/paydingTCX.vue
@@ -15,7 +15,7 @@
 						</view>
 						<view class="u-flex-1  margin-left-sm">
 							<view class="flex head-title-right">
-								<view class="margin-right-xs text-df u-skeleton-fillet head-title">
+								<view class="head-text">
 									{{order.entryName}}
 								</view>
 								<view class="zhuangtai">
@@ -62,21 +62,21 @@
 				</view>
 				<view class="" style="background-color: #ffffff;border-radius: 24rpx;margin-top: 24rpx;padding: 29rpx;">
 					<view class="" v-if="order.artificer">
-						<view class="flex align-center justify-between">
-							<view class="" style="color: #999;font-size: 26rpx;">下单人</view>
-							<view style="color: #333;font-size: 26rpx;">
+						<view class="flex align-center justify-between add-lin">
+							<view class="add-con-title">下单人</view>
+							<view class="add-con-cont">
 								{{order.userName}}
 							</view>
 						</view>
-						<view class="flex align-center justify-between" style="margin-top: 19rpx;">
-							<view class="" style="color: #999;font-size: 26rpx;">联系方式</view>
-							<view style="color: #333;font-size: 26rpx;">
+						<view class="flex align-center justify-between add-lin">
+							<view class="add-con-title">联系方式</view>
+							<view class="add-con-cont">
 								{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
 							</view>
 						</view>
-						<view class="serverAddress">
-							<view style="color: #999;font-size: 26rpx;margin-top: 19rpx;">服务地址</view>
-							<view style="text-align: right;color: #333333;margin-top: 8rpx;font-size: 26rpx;width: 73%;">{{order.address}}</view>
+						<view class="serverAddress add-lin">
+							<view class="add-con-title">服务地址</view>
+							<view class="add-con-cont" style="width: 73%; line-height: 34rpx;">{{order.address}}</view>
 						</view>
 					</view>
 				</view>
@@ -1666,13 +1666,13 @@
 	}
 	.zhuangtai{
 		color: #029D88;
+		font-weight: bold;
 	}
 	.head-title-right{
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
-		font-weight: bold;
 	}
 	.head-title{
 		margin-top: -2px;display: inline-block;
@@ -1751,11 +1751,11 @@
 	}
 	.pay-ding-top{
 		width: 100%;
-		height: 80rpx;
-		background-image: linear-gradient(to bottom, rgba(8, 162, 138, 0.5), #fff);
-		border-top-left-radius: 24rpx;
-		border-top-right-radius: 24rpx;
-		padding: 0px 29rpx;
+		height: 50px;
+		background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff);
+		border-top-left-radius: 12px;
+		border-top-right-radius: 12px;
+		padding: 0px 14px;
 	}
 	.pay-ding,.feiuong{
 		background-color: #ffffff;
@@ -1769,8 +1769,9 @@
 	}
 	.d-title{
 		font-weight: 400;
-		font-size: 25rpx;
+		font-size: 32rpx;
 		color: #333333;
+		font-weight: bold;
 	}
 	.d-touxiang{
 		width: 46rpx;
@@ -1818,9 +1819,9 @@
 	}
 	.pay-title{
 		font-weight: bold;
-		font-size: 28rpx;
+		font-size: 32rpx;
 		color: #333333;
-		margin-bottom: 5px;
+		margin-bottom: 8px;
 	}
 	page {
 		background: #f7f7f7;
@@ -1999,4 +2000,21 @@
 		justify-content: space-between;
 		align-items: center;
 	}
+	.head-text{
+		font-size:30rpx;
+	}
+	.add-lin{
+		height: 80rpx;
+		line-height: 80rpx;
+	}
+	.add-con-title{
+		color: #999;
+		font-size: 30rpx;
+	}
+	.add-con-cont{
+		color: #666;
+		font-size: 30rpx;
+		line-height: 80rpx;
+		text-align:right;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/my/cureOderDrtail.vue b/pages/my/cureOderDrtail.vue
index 20c735c..5e9b9db 100644
--- a/pages/my/cureOderDrtail.vue
+++ b/pages/my/cureOderDrtail.vue
@@ -116,7 +116,7 @@
 			</view>
 		</view>
 		<view class="detail-btn" v-if="dataList.name=='my'" @click="goumai(getList)">
-			立即购买
+			立即预约
 		</view>
 	</view>
 </template>
@@ -235,28 +235,28 @@
 	}
 	.header-bottom-title-liao{
 		display: inline-block;
-		padding: 3px 7px;
+		padding: 2px 7px;
 		height: 16px;
 		line-height: 16px;
 		text-align: center;
 		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
 		border-radius: 7px;
 		margin-left: 5px;		
-		font-size: 11px;
+		font-size: 10px;
 		border-top-left-radius: 20px;
 		border-bottom-right-radius: 20px;
 		color: #fff;
 		}
 	.detail-btn{
 		width:95%;
-		height: 92rpx;
-		line-height: 92rpx;
+		height: 80rpx;
+		line-height: 80rpx;
 		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
 		border-radius: 46rpx;
 		margin: 0 auto;
 		text-align: center;
 		font-weight: 400;
-		font-size: 38rpx;
+		font-size: 36rpx;
 		color: #FFFFFF;
 		position: fixed;
 		bottom: 0px;
@@ -412,7 +412,7 @@
 		background-color: #fff;
 		border-radius: 21rpx;
 		padding: 15px;
-		margin-bottom: 50px;
+		margin-bottom: 20rpx;
 	}
 	.jianjie{
 		font-weight: 400;
@@ -572,7 +572,6 @@
 		display: flex;
 		flex-direction: row;
 		align-items: center;
-		justify-content: space-between;
 		margin-top: 15rpx;
 		}
 	.header-bottom-title-num span{
diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue
index 17b0de7..6768b9e 100644
--- a/pages/therapist/therapist.vue
+++ b/pages/therapist/therapist.vue
@@ -1383,6 +1383,7 @@ import permision from "@/components/permission.js";
 		display: flex;
 		flex-direction: row;
 		align-items: center;
+		justify-content: space-between;
 	}
 	.list-right-top{
 		width: 100%;
diff --git a/pages/therapist/therapistDingdan.vue b/pages/therapist/therapistDingdan.vue
index 12f291b..30fad0c 100644
--- a/pages/therapist/therapistDingdan.vue
+++ b/pages/therapist/therapistDingdan.vue
@@ -49,6 +49,7 @@
 									</view>
 								</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">