From 3eaf9655d591907e14e0d0c3ee82cba06210ca97 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 12 十一月 2024 14:16:52 +0800
Subject: [PATCH] feat:scoket 地址修改
---
pages/driver-page/driver-index/driver-index.vue | 120 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 95 insertions(+), 25 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index a3870bf..fc58c4e 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -4,17 +4,17 @@
<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>
<!-- 鑷富閰嶉�佺晫闈� -->
<view class="self-deliver">
<view class="self-deliver_text">
- 鏌ョ湅鑷富閰嶉�侀〉闈�
+ 鍒涘缓鑷富閰嶉�佸崟
</view>
<view class="self-deliver_btn">
- <u-button text="鏌ョ湅"
+ <u-button text="鍘诲垱寤�"
type="primary"
shape="cirle"
@click="selfDeliver"></u-button>
@@ -157,6 +157,7 @@
</view>
<view class="fourth-line">
<view class="button-img"
+ v-if="!(item.orderType === '鍐呰喘' ||item.orderType === '杞叆')"
@click.stop="cancelAppoint(item)">
璇锋眰閫�鍗�
</view>
@@ -174,6 +175,17 @@
content="鏄惁纭閫�鍗�"
@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">
@@ -244,6 +256,13 @@
<!-- <view class="order-type">{{ item.orderType }}</view> -->
</view>
</view>
+ <view class="fourth-line"
+ v-if="item.status<3 && !(item.orderType === '鍐呰喘' ||item.orderType === '杞叆')">
+ <view class="button-img"
+ @click.stop="cancelAppoint(item)">
+ 璇锋眰閫�鍗�
+ </view>
+ </view>
</view>
</view>
<view class="white-block"></view>
@@ -299,14 +318,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() {
@@ -336,16 +358,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}鍗曪紝纭畾鎺ュ崟锛焋;
+ }
}
},
// 鎺ュ崟妯℃�佹
@@ -371,7 +403,7 @@
.then(res => {
uni.hideLoading()
if (res.code == 0) {
- this.$u.toast('鎺ュ崟鎴愬姛');
+ this.$u.toast('鎺ュ崟姝ｅ湪澶勭悊涓�...');
} else {
this.$u.toast(res.msg ? res.msg : '鎺ュ崟澶辫触');
}
@@ -383,6 +415,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({
@@ -397,6 +448,10 @@
},
// 璇锋眰閫�鍗�
cancelAppoint(item) {
+ if (item.status >= 3) {
+ this.$u.toast('褰撳墠鐘舵�佷笉鍙��鍗�')
+ return
+ }
this.cancelAppointShow = true
this.cancelAppointId = item.id
},
@@ -425,17 +480,26 @@
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) {
// 鐢变簬鑷富閰嶉�佸崟 鏄璐崟 浣嗘槸涓嶉渶瑕佸～鍐欏師鍙戜负1涓嶉渶瑕佸～鍐欏師鍙�
uni.setStorageSync('isNeedOrigin', value.orderType === '澶栬喘' && value.isSpecial === 1 ? 1 : 0)
if (value.orderType === '澶栬喘') {
uni.navigateTo({
- url: `/pages/driver-page/driver-index/bill-of-lading-details/originInfo/originInfo?orderPlanId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}&isSpecial=${value.isSpecial}`
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/originInfo/originInfo?orderPlanId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}&isSpecial=${value.isSpecial}&coalName=${value.coalName}`
});
} else {
uni.navigateTo({
- url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}`
+ url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}&coalName=${value.coalName}`
});
}
},
@@ -518,7 +582,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;
@@ -623,7 +687,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;
@@ -666,7 +730,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;
@@ -824,7 +888,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;
@@ -860,7 +924,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;
@@ -898,7 +962,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;
@@ -970,6 +1034,12 @@
}
.Reserved {
+ .fourth-line {
+ justify-content: flex-end;
+ letter-spacing: vww(2);
+ left: 223rpx !important;
+ }
+
.white-block {
width: 100%;
height: vww(50);
--
Gitblit v1.9.1