From 843d0abd014ec20424844546fc57a9f976f366ba Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 02 九月 2024 10:52:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5/pages/driver/reservedDetail.vue |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/h5/pages/driver/reservedDetail.vue b/h5/pages/driver/reservedDetail.vue
index bf1c851..2b90caa 100644
--- a/h5/pages/driver/reservedDetail.vue
+++ b/h5/pages/driver/reservedDetail.vue
@@ -3,7 +3,9 @@
     <view class="status_wrap">
       <view class="name">{{info.driverName}}鐨勫叆鍥绾�</view>
       <view class="desc">{{info.carCodeFront}}</view>
-      <view class="status">{{ statusMap[info.status] }}</view>
+      <view class="status" v-if="info.status != 2 && info.status != 3">{{ statusMap[info.status] }}</view>
+			<image v-if="info.status == 2" class="icon" src="../../static/ic_passed@2x.png" mode=""></image>
+			<image v-if="info.status == 3" class="icon" src="../../static/ic_refused@2x.png" mode=""></image>
     </view>
     <!--  -->
     <view class="emyty"></view>
@@ -123,8 +125,8 @@
 			statusMap: {
 				0: '寰呭鎵�',
 				1: '瀹℃壒涓�',
-				2: '瀹℃壒閫氳繃',
-				3: '瀹℃壒涓嶉�氳繃',
+				2: '宸查�氳繃',
+				3: '宸叉嫆缁�',
 				4: '宸插彇娑�',
 			},
     }
@@ -348,7 +350,6 @@
   .status_wrap {
     position: relative;
     padding: 30rpx 0;
-
     .name {
       font-weight: 600;
       font-size: 32rpx;
@@ -372,6 +373,15 @@
       background-color: #e9edff;
       color: $uni-color-primary;
     }
+		.icon{
+			width: 120rpx;
+			height: 120rpx;
+			border-radius: 50%;
+			position: absolute;
+			right: 0rpx;
+			top: 20rpx;
+			
+		}
   }
 
   .main_footer {

--
Gitblit v1.9.3