From 5d8d536b79f7cc2e0719dd93c0069b80639e3bf1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 13 二月 2025 17:56:35 +0800
Subject: [PATCH] ll
---
h5/pages/driver/taskDetail.vue | 153 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 108 insertions(+), 45 deletions(-)
diff --git a/h5/pages/driver/taskDetail.vue b/h5/pages/driver/taskDetail.vue
index 8be07c0..4dbeaae 100644
--- a/h5/pages/driver/taskDetail.vue
+++ b/h5/pages/driver/taskDetail.vue
@@ -4,9 +4,12 @@
<image class="bg" src="../../static/driver/bg_renwu@2x.png" mode=""></image>
<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 == 3">鍏ュ洯绛夊緟</view>
+ <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>
@@ -20,7 +23,7 @@
<view class="label">鎵嬫満鍙�</view>
<view class="value">{{param.drivierPhone}}</view>
</view>
- <template v-if="param.type != 4">
+ <template v-if="param.billCode">
<view class="line">
<view class="label">杩愯緭鍗曞彿</view>
<view class="value" @click="wmsDetail">
@@ -30,9 +33,9 @@
</view>
<view class="line">
<view class="label">浣滀笟绫诲瀷</view>
- <view class="value" v-if="param.type == 0">鑷湁杞﹀嵏璐�</view>
- <view class="value" v-if="param.type == 1">鑷湁杞﹁璐�</view>
- <view class="value" v-if="param.type == 2">澶栧崗杞﹀嵏璐�</view>
+ <view class="value" v-if="param.type == 0">鑷湁杞﹀嵏璐�</view>
+ <view class="value" v-if="param.type == 1">鑷湁杞﹁璐�</view>
+ <view class="value" v-if="param.type == 2">澶栧崗杞﹀嵏璐�</view>
<view class="value" v-if="param.type == 3">澶栧崗杞﹁璐�</view>
</view>
</template>
@@ -95,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>
@@ -139,19 +141,20 @@
<view class="value">{{ wmsInfo.carrierName }}</view>
</view>
</view>
- <view class="separate"></view>
- <view class="contract_list" v-for="item in wmsInfo.wmsJobContractVOList">
- <view class="title">鍚堝悓鍙凤細{{ item.contractCode }}</view>
- <view class="address">鏀惰揣鍦帮細{{ item.address }}</view>
- <view class="list">
- <view class="item" v-for="line in item.platformWmsDetailList">
- <view class="line">
- <view class="label">鐗╂枡锛�</view>
- <view class="value">{{ line.materialName }}</view>
- </view>
- <view class="line">
- <view class="label">鏁伴噺锛�</view>
- <view class="value">{{ line.ioQty }}</view>
+ <view class="contract_wrap">
+ <view class="contract_list" v-for="item in wmsInfo.wmsJobContractVOList">
+ <view class="title">鍚堝悓鍙凤細{{ item.contractCode }}</view>
+ <view class="address">鏀惰揣鍦帮細{{ item.address }}</view>
+ <view class="list">
+ <view class="item" v-for="line in item.platformWmsDetailList">
+ <view class="line">
+ <view class="label">鐗╂枡锛�</view>
+ <view class="value">{{ line.materialName }}</view>
+ </view>
+ <view class="line">
+ <view class="label">鏁伴噺锛�</view>
+ <view class="value">{{ line.ioQty }}涓囨敮</view>
+ </view>
</view>
</view>
</view>
@@ -179,24 +182,37 @@
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,
showDetail: false,
}
},
- onLoad(option) {
+ onLoad(option) {
+ uni.setStorageSync('ywinfo',{})
this.jobId = option.id
- // if(option.status && option.status == '1'){
- // this.getLocation()
- // }else{
- // this.getDetail()
- // }
- this.getDetail()
+ if (option.status && option.status == '1') {
+ // wx.config({
+ // debug: false, // 寮�鍚皟璇曟ā寮�,璋冪敤鐨勬墍鏈塧pi鐨勮繑鍥炲�间細鍦ㄥ鎴风alert鍑烘潵锛岃嫢瑕佹煡鐪嬩紶鍏ョ殑鍙傛暟锛屽彲浠ュ湪pc绔墦寮�锛屽弬鏁颁俊鎭細閫氳繃log鎵撳嚭锛屼粎鍦╬c绔椂鎵嶄細鎵撳嵃銆�
+ // appId: 'wx173e6caf5abc718a', // 蹇呭～锛屽叕浼楀彿鐨勫敮涓�鏍囪瘑
+ // timestamp: timeStamp, // 蹇呭～锛岀敓鎴愮鍚嶇殑鏃堕棿鎴�
+ // nonceStr: nonceStr, // 蹇呭～锛岀敓鎴愮鍚嶇殑闅忔満涓�
+ // signature: Sign, // 蹇呭～锛岀鍚�
+ // jsApiList: [
+ // 'getLocation',
+ // 'openLocation'
+ // ] // 蹇呭～锛岄渶瑕佷娇鐢ㄧ殑JS鎺ュ彛鍒楄〃
+ // })
+ this.getLocation()
+ // this.getDetail()
+ } else {
+ this.getDetail()
+ }
+ // this.getDetail()
setInterval(() => {
this.nowTime = dayjs().format('HH:mm:ss')
})
@@ -210,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() {
@@ -252,15 +270,33 @@
const {
jobId
} = this
+ // wx.ready(() => {
+ // wx.getLocation({
+ // type: "gcj02", // gcj02锛堢伀鏄熷潗鏍囷級锛寃gs84锛圙PS鍧愭爣锛�
+ // success: (res) => {
+ // this.lat = res.latitude
+ // this.lnt = res.longitude
+ // this.getDetail()
+ // },
+ // fail: (err) => {
+ // console.error("鑾峰彇瀹氫綅澶辫触锛�", err);
+ // },
+ // cancel: () => {
+ // console.warn("鐢ㄦ埛鎷掔粷鎺堟潈鑾峰彇鍦扮悊浣嶇疆");
+ // },
+ // });
+ // });
uni.getLocation({
type: 'wgs84',
success: (res) => {
this.lat = res.latitude
- this.lnt = res.longitude
+ this.lnt = res.longitude
+ console.log('---', res);
this.getDetail()
},
- fail: (err) => {
- this.showToast('鑾峰彇瀹氫綅澶辫触')
+ fail: (err) => {
+ this.getDetail()
+ this.showToast('鑾峰彇瀹氫綅澶辫触', err)
}
})
},
@@ -291,7 +327,7 @@
display: flex;
.label {
- width: 150rpx;
+ width: 154rpx;
font-size: 30rpx;
color: #666666;
}
@@ -437,7 +473,10 @@
}
.detail_modal {
+ height: calc(100vh - 88rpx);
padding: 36rpx 30rpx;
+ border-radius: 12rpx;
+ box-shadow: 0 0 6rpx rgba(0, 0, 0, 0.5);
.modal_title {
font-weight: 600;
@@ -448,24 +487,48 @@
margin-bottom: 36rpx;
}
+ .contract_wrap {
+ height: calc(100% - 400rpx);
+ overflow-y: auto;
+ }
+
.contract_list {
+ border-top: 1rpx solid #E5E5E5;
+ margin-bottom: 30rpx;
+ padding-top: 30rpx;
+
+ &:nth-last-child(1) {
+ margin-bottom: 0;
+ }
+
.list {
background: #f7f7f7;
border-radius: 8rpx;
padding: 20rpx;
+ .item {
+ border-bottom: 1rpx solid #e5e5e5;
+ padding-bottom: 20rpx;
+ margin-bottom: 20rpx;
+
+ &:nth-last-child(1) {
+ border: none;
+ padding-bottom: 0;
+ margin-bottom: 0;
+ }
+ }
+
.line {
display: flex;
margin-bottom: 20rpx;
- &:nth-of-type(3n) {
- border-top: 1rpx solid #e5e5e5;
- padding-top: 20rpx;
+ &:nth-last-child(1) {
+ margin-bottom: 0rpx;
}
.label {
color: #666666;
- width: 86rpx;
+ width: 92rpx;
}
.value {
--
Gitblit v1.9.3