From 214e6fe7a754ddf4900e07033a2fda6200f4d7a1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十二月 2024 19:38:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/driver/taskDetail.vue | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/h5/pages/driver/taskDetail.vue b/h5/pages/driver/taskDetail.vue
index e2aab9b..b74792b 100644
--- a/h5/pages/driver/taskDetail.vue
+++ b/h5/pages/driver/taskDetail.vue
@@ -7,7 +7,9 @@
<view class="name" v-if="param.status == 3">鍏ュ洯绛夊緟</view>
<view class="name" v-if="param.status == 4">璇峰叆鍥仠闈爗{param.platformName}}浣滀笟</view>
<view class="name" v-if="param.status == 5">鏈堝彴浣滀笟涓�</view>
- <view class="name" v-if="param.status == 6">浣滀笟宸插畬鎴�</view>
+ <view class="name" v-if="param.status == 6">浣滀笟宸插畬鎴�</view>
+ <view class="name" v-if="param.status == 7">杞Щ涓�</view>
+ <view class="name red" v-if="param.status == 8">寮傚父鎸傝捣</view>
<view class="id_card">{{ param.carCodeFront }}</view>
<view class="status">{{statusMap[param.status]}}</view>
</view>
@@ -104,7 +106,6 @@
<view class="time">{{nowTime}}</view>
</view>
</view>
- <view class="space"></view>
<!-- 绛夊緟鍙彿 -->
<view v-if="param.status == 2" class="padding_wrap">
<view class="btn check" @click="handleQueue">鏌ョ湅鎺掗槦鎯呭喌</view>
@@ -152,7 +153,7 @@
</view>
<view class="line">
<view class="label">鏁伴噺锛�</view>
- <view class="value">{{ line.ioQty }}</view>
+ <view class="value">{{ line.ioQty }}涓囨敮</view>
</view>
</view>
</view>
@@ -181,10 +182,10 @@
status: '0'
},
jobId: '',
- lat: '',
- lnt: '',
- // lat: '31.783205',
- // lnt: '117.262635',
+ // lat: '',
+ // lnt: '',
+ lat: '31.783205',
+ lnt: '117.262635',
nowTime: '',
wmsInfo: {},
signDistance: uni.getStorageSync('driverGuide').signDistance,
@@ -205,7 +206,8 @@
// 'openLocation'
// ] // 蹇呭～锛岄渶瑕佷娇鐢ㄧ殑JS鎺ュ彛鍒楄〃
// })
- this.getLocation()
+ this.getLocation()
+ // this.getDetail()
} else {
this.getDetail()
}
@@ -285,7 +287,8 @@
type: 'wgs84',
success: (res) => {
this.lat = res.latitude
- this.lnt = res.longitude
+ this.lnt = res.longitude
+ console.log('---', res);
this.getDetail()
},
fail: (err) => {
--
Gitblit v1.9.3