From a5d8ebf230fb35258b75770fa87c52d522716f03 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 14 八月 2024 14:25:03 +0800
Subject: [PATCH] feat:接单提示修改
---
pages/driver-page/driver-index/driver-index.vue | 99 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 76 insertions(+), 23 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 86a6c78..36a57be 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -4,7 +4,7 @@
<view class="driver-index-body">
<!-- 寰呴鍙栨彁鐓ゅ崟 -->
<view class="wait-collection"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/diverbanner.png') no-repeat;background-size:contain">
+ style="background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/diverbanner.png') no-repeat;background-size:contain">
</view>
<!-- 寮曞椤� -->
<noob-tour></noob-tour>
@@ -175,6 +175,17 @@
@confirm="cancelAppointConfirm"
@cancel="cancelAppointCancel"></u-modal>
</view>
+ <!-- 鍦哄唴鎺ュ崟寮圭獥 -->
+ <view class="">
+ <u-modal :show="insideConnectShow"
+ title="鎺ュ崟閫夋嫨"
+ showCancelButton
+ cancel-text="姝ｅ父鎺ュ崟"
+ confirm-text="鍦哄唴鎺ュ崟"
+ content="鍦哄唴鎺ュ崟鏃犻渶绉扮毊,鏄惁纭鎺ュ崟"
+ @confirm="insideConnectConfirm"
+ @cancel="insideConnectCancel"></u-modal>
+ </view>
<!-- 宸查绾︽彁鐓ゅ崟 -->
<view class="Reserved">
<combined-title title="宸查绾︽彁鐓ゅ崟"></combined-title>
@@ -244,7 +255,8 @@
<!-- <view class="order-type">{{ item.orderType }}</view> -->
</view>
</view>
- <view class="fourth-line">
+ <view class="fourth-line"
+ v-if="item.status<3">
<view class="button-img"
@click.stop="cancelAppoint(item)">
璇锋眰閫�鍗�
@@ -305,14 +317,17 @@
qiangDanTitle: '鎺ュ崟鎻愮ず',
qiangDanContent: '',
qiangDanOrderPlanId: null,
- fleetId: '',
- xsUserId: '',
- customerId: '',
isFirstLogin: true, //鏄惁鏄涓�娆＄櫥褰�
phone: "",
isFirstTime: false, //鏄惁鏄櫥褰曡繘鍏ラ椤碉紝杩樻槸鍒殑椤甸潰杩斿洖 false鏄櫥褰� true鏄埆鐨勯〉闈�
cancelAppointShow: false, //纭閫�鍗曞脊绐楁帶鍒�
- cancelAppointId: ''
+ cancelAppointId: '',
+ insideConnectShow: false,
+ orderPlanId: '',
+ fleetId: '',
+ customerId: '',
+ xsUserId: '',
+ filedId: '',
};
},
onShow() {
@@ -342,16 +357,26 @@
},
// 鎺ュ崟鎸夐挳
qiangDanBtn(value) {
- if (value.tmcCount == '0') {
- this.qiangDan(value.orderPlanId, value.fleetId, value.customerId === null ? '0' : value.customerId,
- value.xsUserId === null ? '0' : value.xsUserId);
+ //鏄惁鍙互鍦哄唴鎺ュ崟锛�1 鍙互2涓嶅彲浠�
+ if (value.isInsideConnect === 1) {
+ this.insideConnectShow = true
+ this.orderPlanId = value.orderPlanId
+ this.fleetId = value.fleetId
+ this.customerId = !value.customerId ? '0' : value.customerId
+ this.xsUserId = !value.xsUserId ? '0' : value.xsUserId
+ this.filedId = value.filedId
} else {
- this.qiangDanOrderPlanId = value.orderPlanId;
- this.fleetId = value.fleetId;
- this.customerId = value.customerId === null ? '0' : value.customerId;
- this.xsUserId = value.xsUserId === null ? '0' : value.xsUserId;
- this.qiangDanShow = true;
- this.qiangDanContent = `宸叉帴${value.tmcCount}鍗曪紝纭畾鎺ュ崟锛焋;
+ if (value.tmcCount == '0') {
+ this.qiangDan(value.orderPlanId, value.fleetId, !value.customerId ? '0' : value.customerId,
+ !value.xsUserId ? '0' : value.xsUserId);
+ } else {
+ this.qiangDanOrderPlanId = value.orderPlanId;
+ this.fleetId = value.fleetId;
+ this.customerId = !value.customerId ? '0' : value.customerId;
+ this.xsUserId = !value.xsUserId ? '0' : value.xsUserId;
+ this.qiangDanShow = true;
+ this.qiangDanContent = `宸叉帴${value.tmcCount}鍗曪紝纭畾鎺ュ崟锛焋;
+ }
}
},
// 鎺ュ崟妯℃�佹
@@ -377,7 +402,7 @@
.then(res => {
uni.hideLoading()
if (res.code == 0) {
- this.$u.toast('鎺ュ崟鎴愬姛');
+ this.$u.toast('鎺ュ崟姝ｅ湪澶勭悊涓�...');
} else {
this.$u.toast(res.msg ? res.msg : '鎺ュ崟澶辫触');
}
@@ -389,6 +414,25 @@
}).catch(e => {
uni.hideLoading()
})
+ },
+ insideConnectHandle(orderPlanId, fleetId, customerId, xsUserId, filedId) {
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ })
+ this.$reqPost('insideConnect', {
+ orderPlanId,
+ fleetId,
+ customerId,
+ xsUserId,
+ filedId
+ }, 'params').then(res => {
+ uni.hideLoading()
+ if (res.code == 0) {
+ this.$u.toast('鍦哄唴鎺ュ崟鎴愬姛');
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鍦哄唴鎺ュ崟澶辫触');
+ }
+ })
},
list3CardIconClick(value) {
uni.navigateTo({
@@ -404,7 +448,7 @@
// 璇锋眰閫�鍗�
cancelAppoint(item) {
if (item.status >= 3) {
- this.$uy.toast('褰撳墠鐘舵�佷笉鍙��鍗�')
+ this.$u.toast('褰撳墠鐘舵�佷笉鍙��鍗�')
return
}
this.cancelAppointShow = true
@@ -434,6 +478,15 @@
// 閫�鍗曞脊绐楀彇娑�
cancelAppointCancel() {
this.cancelAppointShow = false
+ },
+ insideConnectCancel() {
+ this.insideConnectShow = false
+ this.qiangDan(this.orderPlanId, this.fleetId, this.customerId, this.xsUserId)
+ },
+ // 鍦哄唴鎺ュ崟
+ insideConnectConfirm() {
+ this.insideConnectShow = false
+ this.insideConnectHandle(this.orderPlanId, this.fleetId, this.customerId, this.xsUserId, this.filedId)
},
// 鍘婚绾�
toAppointmentClick(value) {
@@ -528,7 +581,7 @@
.button-img {
width: vww(122);
height: vww(41);
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/button.png') no-repeat;
+ background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/button.png') no-repeat;
background-size: cover;
font-size: 28rpx;
font-weight: 300;
@@ -633,7 +686,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/blueblock.png') no-repeat;
+ background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/blueblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -676,7 +729,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat;
+ background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -834,7 +887,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/blueblock.png') no-repeat;
+ background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/blueblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -870,7 +923,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat;
+ background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -908,7 +961,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat;
+ background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
--
Gitblit v1.9.1