From b44b5aa1dda1d9196416cbf84e610cfd1f5b1c82 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 25 九月 2024 15:54:01 +0800
Subject: [PATCH] lll
---
h5/pages/driver/taskDetail.vue | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/h5/pages/driver/taskDetail.vue b/h5/pages/driver/taskDetail.vue
index 84f8f11..9d23139 100644
--- a/h5/pages/driver/taskDetail.vue
+++ b/h5/pages/driver/taskDetail.vue
@@ -11,10 +11,7 @@
<view class="name" v-if="param.status == 5">鏈堝彴浣滀笟涓�</view>
<view class="name" v-if="param.status == 6">浣滀笟宸插畬鎴�</view>
<view class="id_card">{{ param.carCodeFront }}</view>
- <view class="status" v-if="param.status == 1">绛夊緟绛惧埌</view>
- <view class="status" v-if="param.status == 2">绛夊緟鍙彿</view>
- <view class="status" v-if="param.status == 5">浣滀笟涓�</view>
- <view class="status" v-if="param.status == 6">浣滀笟瀹屾垚</view>
+ <view class="status">{{statusMap[param.status]}}</view>
</view>
<!-- -->
<view class="main_content">
@@ -26,11 +23,11 @@
<view class="label">鎵嬫満鍙�</view>
<view class="value">{{param.drivierPhone}}</view>
</view>
- <template v-if="param.type == 4">
+ <template v-if="param.type != 4">
<view class="line">
<view class="label">杩愯緭鍗曞彿</view>
<view class="value" @click="showDetail = true">
- <text class="waybill_num">{{param.code}}</text>
+ <text class="waybill_num">{{param.billCode}}</text>
<text class="btn">杩愬崟璇︽儏</text>
</view>
</view>
@@ -68,11 +65,19 @@
</view>
</view>
</view>
- <view class="line" v-if="param.status == 2">
+ <view class="line" v-if="param.signDate">
<view class="label">绛惧埌鏃堕棿</view>
<view class="value">{{param.signDate}}</view>
</view>
- <view class="warnning">
+ <view class="line" v-if="param.startDate">
+ <view class="label">寮�濮嬩綔涓�</view>
+ <view class="value">{{param.startDate}}</view>
+ </view>
+ <view class="line" v-if="param.doneDate">
+ <view class="label">浣滀笟瀹屾垚</view>
+ <view class="value">{{param.doneDate}}</view>
+ </view>
+ <view v-if="param.status == 1" class="warnning">
<u-icon name="info-circle" color="#ED4545" class="mr12"></u-icon>
濡傛棤娉曡幏鍙栧畾浣嶏紝璇风敤寰俊鎵弿鍥尯澶у睆浜岀淮
</view>
@@ -173,16 +178,20 @@
<script>
import { driverTaskJobDetail, driverSignInTask } from '@/api';
+ import { statusMap } from '@/utils/config.js';
import dayjs from 'dayjs';
export default {
data() {
return {
+ statusMap,
param: {
status: '0'
},
jobId: '',
- lat: '',
- lnt: '',
+ // lat: '',
+ // lnt: '',
+ lat: '31.783205',
+ lnt: '117.262635',
nowTime: '',
signDistance: uni.getStorageSync('driverGuide').signDistance,
showDetail: false,
@@ -190,17 +199,12 @@
},
onLoad(option) {
this.jobId = option.id
- if(option.status && option.status == '1'){
- this.getLocation()
- }else{
- this.getDetail()
- }
-
- // this.getDetail({
- // jobId: option.id,
- // lat: 31.769137,
- // lnt: 117.232241,
- // })
+ // if(option.status && option.status == '1'){
+ // this.getLocation()
+ // }else{
+ // this.getDetail()
+ // }
+ this.getDetail()
setInterval(() => {
this.nowTime = dayjs().format('HH:mm:ss')
})
@@ -236,7 +240,7 @@
this.getDetail()
},
fail:(err) => {
- console.log('err', err);
+ this.showToast('鑾峰彇瀹氫綅澶辫触')
}
})
},
--
Gitblit v1.9.3