From 04bf59bbc3fad774c57a2ee5ebf07db24b476bf2 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 17 十二月 2024 17:43:14 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 h5/pages/driver/index.vue |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/h5/pages/driver/index.vue b/h5/pages/driver/index.vue
index 56e65be..01eb818 100644
--- a/h5/pages/driver/index.vue
+++ b/h5/pages/driver/index.vue
@@ -102,7 +102,8 @@
 import {
 	logoutPost,
 	driverHomeData,
-	app_url
+	app_url,
+	getLastWaitJob
 } from '@/api'
 export default {
 	data() {
@@ -111,6 +112,26 @@
 			driverInfo: uni.getStorageSync('driverInfo'),
 
 		}
+	},
+	onLoad() {
+		const ywinfo = uni.getStorageSync('ywinfo') || {}
+		if(ywinfo.ywid && ywinfo.type == 0){
+			setTimeout(() => {
+				uni.removeStorageSync('ywinfo')
+			}, 500)
+			const yw = ywinfo.yw
+			if(yw == 7){
+				this.jump('/pages/driver/reservedDetail?id=' + ywinfo.ywid)
+			}else if(yw == 8){
+				this.jump('/pages/driver/taskDetail?id=' + ywinfo.ywid)
+			}else if(yw == 0) {
+				getLastWaitJob({ uuid: ywinfo.ywid }).then(res => {
+					if(res.data && res.data.id){
+						this.taskClick(res.data)
+					}
+				})
+			}
+		}
 	},
 	onShow() {
 		this.initData()
@@ -133,9 +154,12 @@
 			})
 		},
 		loginOut() {
-			logoutPost()
-			this.$store.commit('empty')
-			window.location.href = app_url
+			logoutPost({isH5: 1}).then(res => {
+				this.$store.commit('empty')
+				setTimeout(() => {
+					window.location.href = app_url
+				}, 300)
+			})
 		},
 		taskClick(item) {
 			const status = item.status
@@ -310,7 +334,7 @@
 		background: #ffffff;
 		box-shadow: 0rpx 6rpx 24rpx 0rpx rgba(39, 155, 170, 0.32);
 		border-radius: 16rpx;
-		height: 280rpx;
+		height: 260rpx;
 		width: 98%;
 		margin-left: 1%;
 

--
Gitblit v1.9.3