From 1382a7990e9b13f60c6416ada5477673a934dd16 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 29 八月 2024 09:02:57 +0800
Subject: [PATCH] ll
---
h5/pages/driver/taskConfirm.vue | 156 ++++++++++++++++++++++++++++++---------------------
1 files changed, 91 insertions(+), 65 deletions(-)
diff --git a/h5/pages/driver/taskConfirm.vue b/h5/pages/driver/taskConfirm.vue
index 1cf5578..7de5284 100644
--- a/h5/pages/driver/taskConfirm.vue
+++ b/h5/pages/driver/taskConfirm.vue
@@ -2,60 +2,61 @@
<view class="main_app">
<view class="status_wrap">
<image class="bg" 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">璇风‘璁や换鍔�</view>
+ <view class="id_card">{{ param.carCodeFront }}</view>
+ <view class="status">浠诲姟寰呯‘璁�</view>
</view>
<!-- -->
<view class="main_content">
<view class="line">
<view class="label">鍙告満濮撳悕</view>
- <view class="value">鍒樻煇</view>
+ <view class="value">{{ param.driverName }}</view>
</view>
<view class="line">
<view class="label">鎵嬫満鍙�</view>
- <view class="value">188</view>
+ <view class="value">{{ param.drivierPhone }}</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.contractNum }}</text>
<text class="btn">杩愬崟璇︽儏</text>
</view>
</view>
<view class="line">
<view class="label">浣滀笟绫诲瀷</view>
- <view class="value">鍏ュ洯瑁呰揣</view>
+ <view class="value">{{ param.inType == 0 ? '鏁存墭鐩�' : '浠剁儫' }}</view>
</view>
<view class="empty"></view>
<!-- -->
<view class="line">
- <view class="label">杞﹀墠鐗岀収鍙�</view>
- <view class="value" @click="openInput(1)">
- <text :style="{ color: param.carNos ? '#000000' : '#999999' }">{{ param.carNos ? param.carNos : '璇疯緭鍏ヨ溅鍓嶇墝鐓у彿'
- }}</text>
+ <view class="label">鍒板満鏃ユ湡<text class="red ml6">*</text></view>
+ <view class="value" @click="showDate = true">
+ <view :class="param.date ? '' : 'placeholder9'">{{ param.date ? param.date : '璇烽�夋嫨' }}</view>
+ <u-icon color="#999999" name="arrow-right"></u-icon>
</view>
</view>
<view class="line">
- <view class="label">杞﹀悗鐗岀収鍙�</view>
+ <view class="label">杞﹀墠鐗岀収鍙�</view>
+ <view class="value" @click="openInput(1)">
+ <text :style="{ color: param.carCodeFront ? '#000000' : '#999999' }">{{ param.carCodeFront ? param.carCodeFront : '璇疯緭鍏ヨ溅鍓嶇墝鐓у彿' }}</text>
+ </view>
+ </view>
+ <view class="line">
+ <view class="label">杞﹀悗鐗岀収鍙�<text class="red ml6">*</text></view>
<view class="value">
- <text @click="openInput(1)" :style="{ color: param.carNos ? '#000000' : '#999999' }">{{ param.carNos ?
- param.carNos : '璇疯緭鍏ヨ溅鍚庣墝鐓у彿' }}</text>
- <text class="copy">澶嶅埗杞﹀墠鐗岀収鍙�</text>
+ <text @click="openInput(2)" :style="{ color: param.carCodeBack ? '#000000' : '#999999' }">{{ param.carCodeBack ? param.carCodeBack : '璇疯緭鍏ヨ溅鍚庣墝鐓у彿' }}</text>
+ <text class="copy" @click="copy">澶嶅埗杞﹀墠鐗岀収鍙�</text>
</view>
</view>
<!-- -->
-
</view>
<view class="space"></view>
<!-- 绛夊緟鍙彿 -->
- <view class="sub_wrap">
- <view class="btn check">纭浠诲姟</view>
- </view>
+ <view class="sub_wrap"><view class="btn check" @click="onSubmit">纭浠诲姟</view></view>
<!-- modal -->
- <u-popup :show="showDetail" :round="10" :safeAreaInsetBottom="true" closeOnClickOverlay :closeable="true"
- mode="bottom" @close="showDetail = false">
+ <u-popup :show="showDetail" :round="10" :safeAreaInsetBottom="true" closeOnClickOverlay :closeable="true" mode="bottom" @close="showDetail = false">
<view class="detail_modal">
<view class="modal_title">杩愬崟璇︽儏</view>
<view class="id_card">
@@ -106,59 +107,85 @@
</view>
</view>
</u-popup>
+ <u-datetime-picker :show="showDate" v-model="param.date" :minDate="minDate" @confirm="dateEnter" @cancel="showDate = false" mode="datetime"></u-datetime-picker>
<keyboardInput ref="keyboard" @export="setPlate" @close="closeInput" />
</view>
<!-- -->
</template>
<script>
-import keyboardInput from '@/components/keyboard-input/keyboard-input.vue'
+import keyboardInput from '@/components/keyboard-input/keyboard-input.vue';
+import { driverTaskJobDetail, driverConfirmTask } from '@/api';
+import dayjs from 'dayjs'
export default {
components: {
keyboardInput
},
data() {
return {
- param: {
- status: '0'
- },
+ param: {},
+ showDate: false,
showDetail: false,
+ minDate: '',
inputType: ''
- }
+ };
+ },
+ onLoad(option) {
+ this.getDetail(option.id);
+ this.minDate = new Date().getTime()
},
methods: {
- handleSignIn() {
+ onSubmit(){
const { param } = this
- this.param.status = param.status == '0' ? '1' : '0'
- },
- getLocation() {
- uni.getLocation({
- type: 'wgs84',
- success: function (res) {
- console.log('褰撳墠浣嶇疆鐨勭粡搴︼細' + res.longitude)
- console.log('褰撳墠浣嶇疆鐨勭含搴︼細' + res.latitude)
- }
+ if(!param.date) return this.showToast('璇烽�夋嫨鍒板満鏃ユ湡')
+ if(!param.carCodeBack) return this.showToast('璇疯緭鍏ヨ溅鍚庣墝鐓у彿')
+ driverConfirmTask({
+ id: param.id,
+ carCodeBack: param.carCodeBack,
+ arriveDate: param.date + ':59'
+ }).then(res =>{
+ this.showToast('纭鎴愬姛')
+ uni.navigateBack()
})
},
+ getDetail(jobId) {
+ driverTaskJobDetail({
+ jobId
+ }).then(ress => {
+ this.param = { ...ress.data, carCodeBack: '' };
+ });
+ },
+ dateEnter(e) {
+ setTimeout(() => {
+ this.$set(this.param, 'date', dayjs(e.value).format('YYYY-MM-DD HH:mm'))
+ })
+ this.showDate = false
+ },
openInput(type) {
- this.inputType = type
- this.$refs.keyboard.open()
+ this.inputType = type;
+ this.$refs.keyboard.open();
+ },
+ copy() {
+ if (this.param.carCodeFront) {
+ this.$set(this.param, 'carCodeBack', this.param.carCodeFront);
+ this.showToast('澶嶅埗鎴愬姛');
+ }
},
setPlate(e) {
if (this.inputType === 1) {
- this.param.carNos = e
+ this.$set(this.param, 'carCodeFront', e);
} else if (this.inputType === 2) {
- this.param.carNos = e
+ this.$set(this.param, 'carCodeBack', e);
}
- this.$forceUpdate()
- this.closeInput()
+ this.$forceUpdate();
+ this.closeInput();
},
closeInput() {
- this.$refs.keyboard.close()
+ this.$refs.keyboard.close();
}
}
-}
+};
</script>
<style lang="scss">
@@ -170,15 +197,15 @@
padding: 0;
.main_content {
- background: #FFFFFF;
+ background: #ffffff;
border-radius: 20rpx 20rpx 0rpx 0rpx;
padding: 16rpx 30rpx;
position: relative;
bottom: 32rpx;
-
+ z-index: 999;
.line {
padding: 24rpx 0 28rpx;
- border-bottom: 1rpx solid #E5E5E5;
+ border-bottom: 1rpx solid #e5e5e5;
.label {
font-size: 26rpx;
@@ -208,15 +235,15 @@
}
}
}
- .empty{
+ .empty {
width: 750rpx;
- height: 20rpx;
- background-color: #f7f7f7;
- margin: 0 -30rpx;
+ height: 20rpx;
+ background-color: #f7f7f7;
+ margin: 0 -30rpx;
}
.warnning {
display: flex;
- color: #ED4545;
+ color: #ed4545;
align-items: center;
margin: 40rpx 0;
}
@@ -234,7 +261,7 @@
align-items: center;
.handle {
- font-weight: 500;
+ font-weight: 600;
font-size: 40rpx;
line-height: 56rpx;
}
@@ -270,7 +297,7 @@
}
.name {
- font-weight: 500;
+ font-weight: 600;
font-size: 40rpx;
line-height: 56rpx;
margin-bottom: 12rpx;
@@ -285,12 +312,11 @@
top: 30rpx;
height: 68rpx;
line-height: 68rpx;
- background: #FFFFFF;
+ background: #ffffff;
padding: 0 24rpx;
border-radius: 34rpx 0rpx 0rpx 34rpx;
font-size: 26rpx;
color: $uni-color-primary;
-
}
}
@@ -316,7 +342,7 @@
width: 690rpx;
font-size: 36rpx;
color: #333333;
- background: #FFFFFF;
+ background: #ffffff;
border-radius: 48rpx;
border: 1rpx solid #999999;
}
@@ -333,7 +359,7 @@
padding: 36rpx 30rpx;
.modal_title {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #222222;
line-height: 44rpx;
@@ -343,7 +369,7 @@
.contract_list {
.list {
- background: #F7F7F7;
+ background: #f7f7f7;
border-radius: 8rpx;
padding: 20rpx;
@@ -352,7 +378,7 @@
margin-bottom: 20rpx;
&:nth-of-type(3n) {
- border-top: 1rpx solid #E5E5E5;
+ border-top: 1rpx solid #e5e5e5;
padding-top: 20rpx;
}
@@ -369,7 +395,7 @@
}
.title {
- font-weight: 500;
+ font-weight: 600;
font-size: 30rpx;
color: $uni-color-primary;
margin-bottom: 12rpx;
@@ -405,7 +431,7 @@
width: 750rpx;
height: 2rpx;
margin: 30rpx -30rpx;
- border: 1rpx solid #E5E5E5;
+ border: 1rpx solid #e5e5e5;
}
.id_card {
@@ -420,15 +446,15 @@
margin-bottom: 30rpx;
.last {
- background: #E9F5F6;
+ background: #e9f5f6;
width: 60rpx;
border-radius: 8rpx 0rpx 0rpx 8rpx;
- border: 1rpx solid #DFDEDE;
+ border: 1rpx solid #dfdede;
}
.name {
width: 186rpx;
- border: 1rpx solid #DFDEDE;
+ border: 1rpx solid #dfdede;
}
}
}
--
Gitblit v1.9.3