From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007

---
 h5/pages/driver/reservedDetail.vue |   76 ++++++++++++++++++++++++++-----------
 1 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/h5/pages/driver/reservedDetail.vue b/h5/pages/driver/reservedDetail.vue
index 2303e6f..a279e90 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>
@@ -13,7 +15,7 @@
         <view class="value">{{info.inReason}}</view>
       </view>
       <view class="item">
-        <view class="label">鍚堝悓缂栧彿</view>
+        <view class="label">鍚堝悓/鍗曟嵁缂栧彿</view>
         <view class="value">{{info.contractNum}}</view>
       </view>
 			<view class="item">
@@ -21,17 +23,18 @@
 			  <view class="value" v-if="info.arriveDate">{{info.arriveDate.slice(0,16)}}</view>
 			</view>
 			<view class="item">
-			  <view class="label">鍑嗚繍璇佺収鐗�</view>
+			  <view class="label">鍑嗚繍璇�/杩愬崟鐓х墖</view>
 			  <view class="value">
 					<image
 						v-if="info.transportImg"
 					  class="avatar_wrap"
+						@click="priviewImage(info.prefixUrl + info.transportImg)"
 					  :src="info.prefixUrl + info.transportImg"
 					></image>
 				</view>
 			</view>
 			<view class="item">
-			  <view class="label">鍏ュ簱绫诲瀷</view>
+			  <view class="label">浣滀笟绫诲瀷</view>
 			  <view class="value">{{info.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'}}</view>
 			</view>
 			<view class="item">
@@ -89,7 +92,7 @@
             <view class="name_wrap">
               <text>{{item.memberName}}<text v-if="item.statusInfo" class="status">({{item.statusInfo}})</text></text>
             </view>
-    				<view v-if="item.approveType == 1" class="carbon">
+    				<view v-if="item.approveType == 1 || item.approveType == 0" class="carbon">
     				  <view class="carbon_item" v-for="child in item.approveList"
                 :key="child.id">
     				    <image :src="
@@ -123,32 +126,51 @@
 			statusMap: {
 				0: '寰呭鎵�',
 				1: '瀹℃壒涓�',
-				2: '瀹℃壒閫氳繃',
-				3: '瀹℃壒涓嶉�氳繃',
+				2: '宸查�氳繃',
+				3: '宸叉嫆缁�',
 				4: '宸插彇娑�',
 			},
     }
   },
 	onLoad(option) {
+		uni.setStorageSync('ywinfo',{})
 		this.getDetail(option.id)
 	},
   methods: {
+		priviewImage(url) {
+			uni.previewImage({
+				urls: [url]
+			})
+		},
 		handleCancel(){
+			const { info } = this
 			uni.showModal({
 				title: '鎻愮ず',
-				content: '杩欐槸涓�涓ā鎬佸脊绐�',
+				content: '鎮ㄧ‘璁よ鎾ゅ洖褰撳墠鐢宠鍚楋紵',
 				success: function (res) {
 					if (res.confirm) {
-						console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+						driverCarRevoke({
+							id: info.id, info: ''
+						}).then(() => {
+							this.getDetail(info.id)
+						})
 					} else if (res.cancel) {
 						console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
 					}
 				}
 			});
-			// driverCarRevoke
 		},
-		handleEdit(){},
-		handleAga(){},
+		handleEdit(){
+			uni.navigateTo({
+				url: '/pages/driver/reserved?id=' + this.info.id
+			})
+		},
+		handleAga(){
+			const { info } = this
+			uni.navigateTo({
+				url: `/pages/driver/reserved?id=${info.id}&type=reject`
+			})
+		},
 		getDetail(id) {
 			driverApplyDetail({id}).then(res => {
 				this.info = res.data
@@ -200,7 +222,15 @@
       .item {
         display: flex;
         margin-bottom: 48rpx;
-
+				position: relative;
+				.separate {
+				  position: absolute;
+				  width: 4rpx;
+				  height: calc( 100% - 52rpx );
+				  background-color: #eeeeee;
+				  left: 40rpx;
+				  top: 90rpx;
+				}
         .avatar_wrap {
           width: 80rpx;
           height: 80rpx;
@@ -222,15 +252,6 @@
             bottom: 0;
           }
 
-          .separate {
-            position: absolute;
-            width: 4rpx;
-            height: 100%;
-            background-color: #eeeeee;
-            left: 50%;
-            transform: translate(-50%, 0);
-            bottom: -80rpx;
-          }
         }
 
         .content {
@@ -283,6 +304,7 @@
               width: 60rpx;
               height: 60rpx;
               margin: 0 auto;
+							border-radius: 50%;
             }
             view {
               font-size: 26rpx;
@@ -338,7 +360,6 @@
   .status_wrap {
     position: relative;
     padding: 30rpx 0;
-
     .name {
       font-weight: 600;
       font-size: 32rpx;
@@ -362,6 +383,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