From 8ab31157536e116dba27e942a05a20e3caaa4812 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 28 八月 2024 09:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
h5/pages/driver/taskDetail.vue | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/h5/pages/driver/taskDetail.vue b/h5/pages/driver/taskDetail.vue
index 7d8e014..0365e8f 100644
--- a/h5/pages/driver/taskDetail.vue
+++ b/h5/pages/driver/taskDetail.vue
@@ -6,34 +6,40 @@
src="../../static/driver/bg_renwu@2x.png"
mode=""
></image>
- <view class="name">浣滀笟宸插畬鎴�</view>
- <view class="id_card">鐨朅D1212</view>
- <view class="status">浣滀笟瀹屾垚</view>
+ <view class="name" v-if="param.status == 1">璇蜂笌{{ param.arriveDate.slice(0,11) }}鐜板満绛惧埌</view>
+ <view class="name" v-if="param.status == 2">鍓嶆柟鎺掗槦锛歿{param.lineUpNum}}杈�</view>
+ <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>
<!-- -->
<view class="main_content">
<view class="line">
<view class="label">鍙告満濮撳悕</view>
- <view class="value">鍒樻煇</view>
+ <view class="value">{{param.lineUpNum}}</view>
</view>
<view class="line">
<view class="label">鎵嬫満鍙�</view>
- <view class="value">188</view>
+ <view class="value">{{param.lineUpNum}}</view>
</view>
<view class="line">
<view class="label">杩愯緭鍗曞彿</view>
<view class="value" @click="showDetail = true">
- <text class="waybill_num">Y111</text>
+ <text class="waybill_num">{{param.lineUpNum}}</text>
<text class="btn">杩愬崟璇︽儏</text>
</view>
</view>
<view class="line">
<view class="label">浣滀笟绫诲瀷</view>
- <view class="value">鍏ュ洯瑁呰揣</view>
+ <view class="value">{{param.lineUpNum}}</view>
</view>
<view class="line">
<view class="label">杞︾墝鐓�</view>
- <view class="value">鍓嶏細鐨朅21</view>
+ <view class="value">{{param.lineUpNum}}</view>
</view>
<!-- -->
<view class="line">
@@ -41,11 +47,7 @@
<view class="value">
<view class="">0 鍏噷</view>
<view class="btn" @click="getLocation">
- <u-icon
- name="map"
- :color="$store.state.primaryColor"
- class="mr6"
- ></u-icon>
+ <image class="icon mr6" src="../../static/driver/position.png"></image>
閲嶆柊瀹氫綅
</view>
</view>
@@ -151,6 +153,7 @@
</template>
<script>
+ import { driverTaskJobDetail } from '@/api'
export default {
data() {
return {
@@ -160,15 +163,27 @@
showDetail: false,
}
},
+ onLoad(option) {
+ this.getLocation(option.id)
+ },
methods: {
handleSignIn() {
const { param } = this
this.param.status = param.status == '0' ? '1' : '0'
},
- getLocation() {
+ getLocation(jobId) {
uni.getLocation({
type: 'wgs84',
+
success: function (res) {
+ driverTaskJobDetail({
+ jobId,
+ lat: res.latitude,
+ lnt: res.longitude,
+ }).then(ress => {
+ this.param = { ...ress.data }
+ })
+ console.log(res);
console.log('褰撳墠浣嶇疆鐨勭粡搴︼細' + res.longitude)
console.log('褰撳墠浣嶇疆鐨勭含搴︼細' + res.latitude)
}
@@ -209,6 +224,11 @@
font-size: 28rpx;
color: $uni-color-primary;
display: flex;
+ align-items: center;
+ .icon{
+ width: 30rpx;
+ height: 30rpx;
+ }
}
}
}
--
Gitblit v1.9.3