From 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 三月 2025 16:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/driver/reservedDetail.vue | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/h5/pages/driver/reservedDetail.vue b/h5/pages/driver/reservedDetail.vue
index bf1c851..f918538 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>
@@ -26,6 +28,7 @@
<image
v-if="info.transportImg"
class="avatar_wrap"
+ @click="priviewImage(info.prefixUrl + info.transportImg)"
:src="info.prefixUrl + info.transportImg"
></image>
</view>
@@ -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,16 +126,22 @@
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({
@@ -142,6 +151,8 @@
if (res.confirm) {
driverCarRevoke({
id: info.id, info: ''
+ }).then(() => {
+ this.getDetail(info.id)
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -293,6 +304,7 @@
width: 60rpx;
height: 60rpx;
margin: 0 auto;
+ border-radius: 50%;
}
view {
font-size: 26rpx;
@@ -348,7 +360,6 @@
.status_wrap {
position: relative;
padding: 30rpx 0;
-
.name {
font-weight: 600;
font-size: 32rpx;
@@ -372,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