From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007

---
 h5/pages/driver/taskDetail.vue |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/h5/pages/driver/taskDetail.vue b/h5/pages/driver/taskDetail.vue
index e2aab9b..1fec4d2 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>
@@ -39,11 +41,11 @@
 			</template>
 			<template v-else>
 				<view class="line">
-					<view class="label">鍚堝悓缂栧彿</view>
+					<view class="label">鍚堝悓/鍗曟嵁缂栧彿</view>
 					<view class="value">{{param.contractNum}}</view>
 				</view>
 				<view class="line">
-					<view class="label">鍏ュ簱绫诲瀷</view>
+					<view class="label">浣滀笟绫诲瀷</view>
 					<view class="value">{{param.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'}}</view>
 				</view>
 				<view class="line">
@@ -96,15 +98,14 @@
 			</view> -->
 			<view v-if="param.status == 1" class="signIn_wrap" @click="handleSignIn">
 				<image :src="
-            param.getDistance < signDistance
+            (param.getDistance || param.getDistance == 0) && param.getDistance < signDistance
               ? require('@/static/driver/btn_qiandao@2x.png')
               : require('@/static/driver/btn_qiandao_fail@2x.png')
           " class="img" mode="widthFix"></image>
-				<view class="handle">{{ param.getDistance > signDistance ? '鏃犳硶绛惧埌' : '绛惧埌' }}</view>
+				<view class="handle">{{ !param.getDistance || param.getDistance > signDistance ? '鏃犳硶绛惧埌' : '绛惧埌' }}</view>
 				<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>
@@ -191,7 +192,8 @@
 				showDetail: false,
 			}
 		},
-		onLoad(option) {
+		onLoad(option) {
+			uni.setStorageSync('ywinfo',{})
 			this.jobId = option.id
 			if (option.status && option.status == '1') {
 				// wx.config({
@@ -205,7 +207,8 @@
 				// 		'openLocation'
 				// 	] // 蹇呭~锛岄渶瑕佷娇鐢ㄧ殑JS鎺ュ彛鍒楄〃
 				// })
-				this.getLocation()
+				this.getLocation()
+				// this.getDetail()
 			} else {
 				this.getDetail()
 			}
@@ -223,15 +226,17 @@
 					lnt,
 					jobId
 				} = this
-				if (param.getDistance > signDistance) return
+				if (!param.getDistance || param.getDistance > signDistance) return
 				driverSignInTask({
 					jobId,
 					lat,
 					lnt,
 					signType: 0
-				}).then(res => {
-					this.showToast('绛惧埌鎴愬姛')
-					this.getDetail()
+				}).then(res => {
+					if (res && res.code == 200) {
+						this.showToast('绛惧埌鎴愬姛')
+						this.getDetail()
+					}
 				})
 			},
 			getDetail() {
@@ -285,10 +290,12 @@
 					type: 'wgs84',
 					success: (res) => {
 						this.lat = res.latitude
-						this.lnt = res.longitude
+						this.lnt = res.longitude
+						console.log('---', res);
 						this.getDetail()
 					},
-					fail: (err) => {
+					fail: (err) => {
+						this.getDetail()
 						this.showToast('鑾峰彇瀹氫綅澶辫触', err)
 					}
 				})
@@ -320,7 +327,7 @@
 				display: flex;
 
 				.label {
-					width: 150rpx;
+					width: 154rpx;
 					font-size: 30rpx;
 					color: #666666;
 				}

--
Gitblit v1.9.3