From 040acd447439dc98536281414a6d43a54b00719d Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 09 八月 2024 13:34:42 +0800
Subject: [PATCH] feat:发版
---
pages/driver-page/driver-index/driver-index.vue | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 288b3f4..816f0bd 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://wrzs.czjlchem.com:9090/appimg/image/banner/diverbanner.png') no-repeat;background-size:contain">
</view>
<!-- 寮曞椤� -->
<noob-tour></noob-tour>
@@ -157,7 +157,7 @@
</view>
<view class="fifth-line">
<view class="button-img"
- v-if="item.isDanger === 1"
+ v-if="item.isDanger === 1 && !item.idCardEscort"
@click.stop="cancelCerifCate(item)">
閬撹矾杩愯緭璇�
</view>
@@ -343,14 +343,13 @@
import { customerId } from '@/utils/status';
import combinedTitle from '@/components/combined-title/combined-title.vue';
import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue';
- import noobTour from '@/components/noobTour/noobTour.vue'
import { mapState } from 'vuex'
import { BaseUrl } from '@/api/publicInterface.js'
export default {
components: {
combinedTitle,
previewImage,
- noobTour
+
},
props: {
indexdriverBillOfLoadingData: {
@@ -430,6 +429,7 @@
.then(res => {
if (res.code == 0) {
this.$u.toast('娣诲姞鎴愬姛');
+ this.qiangDanList();
this.show=false
} else {
this.$u.toast(res.msg ? res.msg : '娣诲姞澶辫触');
@@ -540,13 +540,13 @@
},
list3CardIconClick(value) {
uni.navigateTo({
- url: `/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details?orderPlanId=${value.id}&yyId=${value.yyId}&orderType=${value.orderType}`
+ url: `/subPages/bill-of-lading-details/bill-of-lading-details?orderPlanId=${value.id}&yyId=${value.yyId}&orderType=${value.orderType}`
});
},
// 鏀跺彂鍗曡鎯�
cardBodyClick(name) {
uni.navigateTo({
- url: `/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details?orderPlanId=${name}`
+ url: `/subPages/bill-of-lading-details/bill-of-lading-details?orderPlanId=${name}`
});
},
// 璇锋眰閫�鍗�
@@ -615,14 +615,20 @@
uni.setStorageSync('isNeedOrigin', value.orderType === '澶栬喘' && value.isSpecial === 1 ? 1 : 0);
//鍒ゆ柇鏄笉鏄泦瑁呯 鏄惁闇�瑕佽緭鍏�
this.activeObj = value;
- console.log(value,'123')
+ if(value.isDanger === 1){
+ if(!value.idCardEscort){
+ this.$u.toast('璇烽�夋嫨閬撹矾杩愯緭璇佸徃鏈猴紒');
+ this.cancelCerifCate(value);
+ return
+ }
+ }
if(value.isContainerNum){
this.enterCode = true;
}else{
this.enterCode = false;
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}&isWeight=${value.isWeight}`
+ url: `/subPages/bill-of-lading-details/originInfo/originInfo?orderPlanId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}&isSpecial=${value.isSpecial}&isWeight=${value.isWeight}`
});
} else {
uni.navigateTo({
@@ -654,7 +660,7 @@
}).finally(() => {
if (this.activeObj.orderType === '澶栬喘') {
uni.navigateTo({
- url: `/pages/driver-page/driver-index/bill-of-lading-details/originInfo/originInfo?orderPlanId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}&isSpecial=${this.activeObj.isSpecial}&isWeight=${this.activeObj.isWeight}`
+ url: `/subPages/bill-of-lading-details/originInfo/originInfo?orderPlanId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}&isSpecial=${this.activeObj.isSpecial}&isWeight=${this.activeObj.isWeight}`
});
} else {
uni.navigateTo({
@@ -668,7 +674,7 @@
this.enterCodeStr = '';
if (this.activeObj.orderType === '澶栬喘') {
uni.navigateTo({
- url: `/pages/driver-page/driver-index/bill-of-lading-details/originInfo/originInfo?orderPlanId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}&isSpecial=${this.activeObj.isSpecial}&isWeight=${this.activeObj.isWeight}`
+ url: `/subPages/bill-of-lading-details/originInfo/originInfo?orderPlanId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}&isSpecial=${this.activeObj.isSpecial}&isWeight=${this.activeObj.isWeight}`
});
} else {
uni.navigateTo({
@@ -712,7 +718,7 @@
align-items: center;
.send-date {
- width: 148rpx;
+ min-width: 170rpx;
height: 24rpx;
line-height: 24rpx;
font-size: 28rpx;
@@ -721,7 +727,7 @@
}
.havedclock {
- width: 58% !important;
+ width: 70% !important;
margin-right: 0 !important;
.send-date {
@@ -749,7 +755,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://wrzs.czjlchem.com:9090/appimg/image/banner/button.png') no-repeat;
background-size: cover;
font-size: 28rpx;
font-weight: 300;
@@ -882,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://wrzs.czjlchem.com:9090/appimg/image/banner/blueblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -925,7 +931,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://wrzs.czjlchem.com:9090/appimg/image/banner/redblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -992,7 +998,7 @@
align-items: center;
.send-date {
- width: 148rpx;
+ min-width: 146rpx;
height: 24rpx;
margin-left: vww(14);
margin-right: vww(56);
@@ -1083,7 +1089,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://wrzs.czjlchem.com:9090/appimg/image/banner/blueblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -1119,7 +1125,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://wrzs.czjlchem.com:9090/appimg/image/banner/redblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -1157,7 +1163,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://wrzs.czjlchem.com:9090/appimg/image/banner/redblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -1232,7 +1238,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://wrzs.czjlchem.com:9090/appimg/image/banner/button.png') no-repeat;
background-size: cover;
font-size: 28rpx;
font-weight: 300;
--
Gitblit v1.9.1