From 843d0abd014ec20424844546fc57a9f976f366ba Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 02 九月 2024 10:52:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/driver/index.vue | 61 ++++++++++++++++++------------
1 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/h5/pages/driver/index.vue b/h5/pages/driver/index.vue
index 43cd875..f8350f4 100644
--- a/h5/pages/driver/index.vue
+++ b/h5/pages/driver/index.vue
@@ -11,9 +11,9 @@
<image class="banner" src="../../static/driver/wuliuche_banner@2x.png" mode="widthFix"></image>
</view>
<!-- -->
- <view class="task_list">
+ <view v-if="taskList && taskList.length > 0" class="task_list">
<swiper circular class="task_swiper">
- <swiper-item v-for="item in taskList" :key="item.id">
+ <swiper-item v-for="item in taskList" :key="item.id" @click="taskClick(item)">
<view class="item">
<view class="head">
<view class="name">杩愯緭鍗晎{ item.contractNum }}</view>
@@ -41,9 +41,9 @@
</view>
<view class="sub">
<view class="time" v-if="item.arriveDate">{{ item.arriveDate.slice(5) }}</view>
- <view v-if="item.status == 0" class="sub_btn" @click="handleTask(item)">纭浠诲姟</view>
- <view v-if="item.status == 1" class="sub_btn" @click="handleSign(item)">绔嬪嵆绛惧埌</view>
- <view v-if="item.status == 2" class="sub_btn" @click="handleQueup(item)">鏌ョ湅鎺掗槦</view>
+ <view v-if="item.status == 0" class="sub_btn">纭浠诲姟</view>
+ <view v-if="item.status == 1" class="sub_btn">绔嬪嵆绛惧埌</view>
+ <view v-if="item.status == 2" class="sub_btn">鏌ョ湅鎺掗槦</view>
</view>
</view>
</view>
@@ -101,22 +101,17 @@
};
},
- created() {
+ onShow() {
this.initData();
},
methods: {
- handleSign(item) {
- uni.navigateTo({
- url: '/pages/driver/taskDetail?id=' + item.id
- });
- },
- handleQueup(item) {},
initData() {
driverHomeData().then(res => {
if (res.code == 200) {
uni.setStorageSync('driverGuide', {
bookingTips: res.data.bookingTips,
- reservationMap: res.data.reservationMap
+ reservationMap: res.data.reservationMap,
+ signDistance: res.data.signDistance
});
this.taskList = res.data.platformJobList || []
}
@@ -129,16 +124,32 @@
url: '/pages/driver/login'
});
},
- handleTask(status) {
- if (status == 1) {
- return uni.navigateTo({
- url: '/pages/driver/taskDetail'
- });
+ taskClick(item) {
+ const status = item.status
+ console.log(item);
+ if(status == 0){
+ uni.navigateTo({url: '/pages/driver/taskConfirm?id=' + item.id});
+ }else if(status == 2){
+ uni.navigateTo({url:'/pages/driver/queueUp?jobId=' + item.id})
+ }else{
+ uni.navigateTo({url: `/pages/driver/taskDetail?id=${item.id}&status=${item.status}`});
}
+ },
+ handleTask(item) {
uni.navigateTo({
- url: '/pages/driver/taskConfirm'
+ url: '/pages/driver/taskConfirm?id=' + item.id
});
- }
+ },
+ handleSign(item) {
+ uni.navigateTo({
+ url: `/pages/driver/taskDetail?id=${item.id}&status=${item.status}`
+ });
+ },
+ handleQueue(item) {
+ uni.navigateTo({
+ url:'/pages/driver/queueUp?jobId=' + item.id
+ })
+ },
}
};
</script>
@@ -175,7 +186,7 @@
position: relative;
width: 688rpx;
height: 270rpx;
- margin-bottom: 40rpx;
+ margin-bottom: 28rpx;
.h1 {
font-weight: bold;
line-height: 66rpx;
@@ -249,17 +260,17 @@
}
}
.task_list {
- margin-bottom: 48rpx;
+ margin-bottom: 0rpx;
.task_swiper {
- padding: 16rpx 10rpx;
- height: 320rpx;
+ padding: 12rpx 10rpx;
+ height: 340rpx;
width: 730rpx;
margin-left: -20rpx;
box-sizing: border-box;
}
.item {
background: #ffffff;
- box-shadow: 0rpx 0rpx 12rpx 0rpx rgba(39, 155, 170, 0.32);
+ box-shadow: 0rpx 6rpx 24rpx 0rpx rgba(39, 155, 170, 0.32);
border-radius: 16rpx;
height: 280rpx;
width: 98%;
--
Gitblit v1.9.3