From 662a3ff7013126dc84da223af500a7f18a1d86a0 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 19 Jul 2024 16:18:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/order/pay.vue      | 45 ++++++++++++++++++++++++++++++++-----------
 pages/order/index.vue | 40 +++++++++++++++++++++++---------------
 2 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/my/order/pay.vue b/my/order/pay.vue
index 129b4ae..d1177c0 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="content">
-		<view v-if="order.overTimeOrders == 1" class="dingshi" style="font-size: 32upx;height: 150rpx;padding: 26rpx 29rpx 0 29rpx;">
-			<view style="color: red;font-size:26rpx">(订单已超时)</view>
+		<view v-if="order.overTimeOrders == 1" class="prompt">
+			<image class="promptimg" src="../../static/reminder.png"></image>
+			<view style="color: #ff8542;font-size:26rpx">订单已超时</view>
 		</view>
 		<view class="padding-bottom u-skeleton">
 			<view class="bgImg u-skeleton-fillet" v-if="order.ordersMassageList && order.ordersMassageList.length > 0"
@@ -425,7 +426,7 @@
 						 v-if="order.addNum ==null&&order.ordersMassageList[0].massageType"
 						shape="circle" :plain="true"
 						@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
-						class="btns">
+						class="btns-state">
 						加钟
 					</u-button>
 					<u-button
@@ -2340,7 +2341,24 @@
 </script>
 
 <style lang="scss" scoped>
-	
+	.prompt{
+		background: #ffefe2;
+		height: 100rpx;
+		color: #ff7a03;
+		margin:0 26rpx 26rpx 26rpx;
+		border-radius: 20rpx;
+		text-align: center;
+		display: flex;
+		line-height: 100rpx;
+		justify-content: center;
+		align-items: center; 
+		border: 1px #ff7a03 dashed;
+	}
+	.promptimg{
+		width: 40rpx;
+		height: 40rpx;
+		margin-right: 10rpx;
+	}
 	/deep/.u-size-default{
 		width: 85px !important;
 		height:34rpx;
@@ -2523,9 +2541,14 @@
 		color: #019C88 !important;
 		margin-left: 10rpx !important;
 	}
+	.btns-state{
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		margin-left: 10rpx;
+		color: #ffffff;
+	}
 	.eject-btns{
-		height:60rpx;
-		line-height: 60rpx;
+		height:70rpx;
+		line-height: 70rpx;
 		border-bottom: 1px solid #f7f7f7;
 		padding: 0 20rpx;
 		color: #666666;
@@ -2940,8 +2963,8 @@
 		margin-top: 24rpx;
 	}
 	.add-lin{
-		height: 74rpx;
-		line-height: 74rpx;
+		height: 70rpx;
+		line-height: 70rpx;
 	}
 	.add-con-title{
 		color: #999;
@@ -2955,11 +2978,11 @@
 	}
 	.level_button{
 		padding: 4rpx 20rpx;
-		background: linear-gradient(to right, #ffc1a9,#fedec9, #fdbb9f);
+		background: linear-gradient(to right, #ffddb3,#ffefdb, #ffe1be);
 		border-radius: 16rpx 16rpx 16rpx 1rpx ;
-		color: #e95c3b;
+		color: #805c18;
 		font-size: 12px;
-		border: 1px solid #fd967c;
+		border: 1px solid #f2cd9f;
 	}
 	.justify-title-nav{
 		width: 90%;
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 8f1dac0..74bcc0d 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -849,17 +849,12 @@
 		align-items: center;
 	}
 	.gengduoBtn{
-		background: #fff;
-		color: #019C88;
-		width: 69px;
-		height: 30px;
-		line-height: 30px;
-		border-radius: 40px;
-		font-size: 12px;
-		overflow: visible;
+		height:70rpx;
+		line-height: 70rpx;
+		border-bottom: 1px solid #f7f7f7;
+		padding: 0 20rpx;
+		color: #666666;
 		text-align: center;
-		border: 1px solid;
-		margin-top: 5px;
 	}
 	.content{
 		padding-bottom: 100px;
@@ -890,13 +885,26 @@
 		flex-direction: column;
 		align-items: center;
 		position: absolute;
-		bottom: 0;
-		background-color: #fff;
+		background-color: #ffffff;
 		padding: 10px;
-		margin-bottom: 48px;
-		margin-left: 7px;
-		box-shadow: 1px 1px 3px 1px #f5f5f5;
-		border-radius:20rpx 20rpx  20rpx 1rpx;
+		bottom:90rpx;
+		left:50rpx;
+		box-shadow: 0px 0px 3px 0px #b5b5b5;
+		border-radius: 10rpx;
+	}
+	.showBtn-view:before {
+		position: absolute;
+		left: 20rpx;
+		bottom:-12rpx;
+		width: 20rpx;
+		height: 20rpx;
+		background: #ffffff;
+		margin-top: -2px;
+		border-right: 1px solid #e5e5e5;
+		border-bottom: 1px solid #e5e5e5;
+		transform: rotate(45deg);
+		-webkit-transform: rotate(45deg);
+		content: '';
 	}
 	.showBtn{
 		margin: 35rpx 0;