From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/driver/reservedDetail.vue | 61 ++++++++++++++++++++----------
1 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/h5/pages/driver/reservedDetail.vue b/h5/pages/driver/reservedDetail.vue
index 2303e6f..e3e47b5 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>
@@ -89,7 +91,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,8 +125,8 @@
statusMap: {
0: '寰呭鎵�',
1: '瀹℃壒涓�',
- 2: '瀹℃壒閫氳繃',
- 3: '瀹℃壒涓嶉�氳繃',
+ 2: '宸查�氳繃',
+ 3: '宸叉嫆缁�',
4: '宸插彇娑�',
},
}
@@ -134,21 +136,32 @@
},
methods: {
handleCancel(){
+ const { info } = this
uni.showModal({
title: '鎻愮ず',
- content: '杩欐槸涓�涓ā鎬佸脊绐�',
+ content: '鎮ㄧ‘璁よ鎾ゅ洖褰撳墠鐢宠鍚楋紵',
success: function (res) {
if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ driverCarRevoke({
+ id: info.id, info: ''
+ })
} 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 +213,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 +243,6 @@
bottom: 0;
}
- .separate {
- position: absolute;
- width: 4rpx;
- height: 100%;
- background-color: #eeeeee;
- left: 50%;
- transform: translate(-50%, 0);
- bottom: -80rpx;
- }
}
.content {
@@ -283,6 +295,7 @@
width: 60rpx;
height: 60rpx;
margin: 0 auto;
+ border-radius: 50%;
}
view {
font-size: 26rpx;
@@ -338,7 +351,6 @@
.status_wrap {
position: relative;
padding: 30rpx 0;
-
.name {
font-weight: 600;
font-size: 32rpx;
@@ -362,6 +374,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