From 754f0eea0b16985a4dc8e8448e1bde7a8aec6f26 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 二月 2025 16:22:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/driver/taskDetail.vue | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/h5/pages/driver/taskDetail.vue b/h5/pages/driver/taskDetail.vue
index 7484ad8..4dbeaae 100644
--- a/h5/pages/driver/taskDetail.vue
+++ b/h5/pages/driver/taskDetail.vue
@@ -98,11 +98,11 @@
</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>
@@ -182,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,
@@ -226,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() {
@@ -292,7 +294,8 @@
console.log('---', res);
this.getDetail()
},
- fail: (err) => {
+ fail: (err) => {
+ this.getDetail()
this.showToast('鑾峰彇瀹氫綅澶辫触', err)
}
})
--
Gitblit v1.9.3