diff --git a/my/order/payModify.vue b/my/order/payModify.vue
index ee91a7d..149ec7a 100644
--- a/my/order/payModify.vue
+++ b/my/order/payModify.vue
@@ -1980,15 +1980,17 @@
 	}
 
 	.pay_btn {
-		width: 90%;
-		margin: 0 auto;
-		text-align: center;
-		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
-		height:80rpx;
-		border-radius: 80rpx;
-		color: #ffffff;
-		line-height: 80rpx;
-		font-size: 32rpx;
+	    width: 96%;
+		margin-left: 2%;
+	    text-align: center;
+	    background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	    height: 40px;
+	    border-radius: 40px;
+	    color: #ffffff;
+	    line-height: 40px;
+	    font-size: 16px;
+		position: fixed;
+		justify-content: center;
 	}
 
 	.serverAddress {
diff --git a/pages/my/historyMy.vue b/pages/my/historyMy.vue
index 0da9c4e..a1df4ff 100644
--- a/pages/my/historyMy.vue
+++ b/pages/my/historyMy.vue
@@ -39,7 +39,11 @@
 							<view class="item-view-bottom-qian">
 								<span>￥</span>
 								<span>{{item.price}}</span>
+<<<<<<< .mine
 								<span>/套</span>
+=======
+
+>>>>>>> .theirs
 								<span>￥</span>
 								<span>{{item.oldPrice}}</span>
 							</view>
@@ -200,7 +204,6 @@
 		 font-size: 24rpx;
 		 color: #848484;
 		 text-decoration-line: line-through;
-		 margin-left: 5px;
 	}
 	.item-view-bottom-qian span:nth-child(5){
 		 font-size: 24rpx;
@@ -220,7 +223,7 @@
 	.item-view-bottom-qian span:nth-child(3){
 		 font-weight: 400;
 		 font-size: 23rpx;
-		 color: #F95900;
+		 color: #848484;
 	}
 	.item-view-bottom{
 		width: 100%;
@@ -287,7 +290,6 @@
 		display: flex;
 		flex-direction: row;
 		align-items: center;
-		justify-content: space-between;
 	}
 	.item-view{
 		width: 55%;
diff --git a/pages/therapist/orderDetail.vue b/pages/therapist/orderDetail.vue
index 82ec0c7..ad8ea4d 100644
--- a/pages/therapist/orderDetail.vue
+++ b/pages/therapist/orderDetail.vue
@@ -1252,10 +1252,11 @@
 		display: flex;
 		flex-direction: row;
 		align-items: center;
-		background: linear-gradient(90deg, #fe912e, #ff996a, #35C495);
+		background: linear-gradient(90deg, #fee9ca, #fde4c6);
+		border: 1px #decbae solid;
 		border-radius: 30rpx 30rpx 30rpx 2rpx;
 		padding: 3rpx 15rpx;
-		color:#fff;
+		color:#8d500f;
 		font-size: 22rpx;
 		margin-left: 15rpx;
 	}
diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue
index 0738d1f..4a08296 100644
--- a/pages/therapist/therapist.vue
+++ b/pages/therapist/therapist.vue
@@ -1467,7 +1467,6 @@ import permision from "@/components/permission.js";
 		/* padding: 10px; */
 		display: flex;
 		flex-direction: column;
-		justify-content: space-between;
 		align-items: baseline;
 	}
 	.list-view{