From 17427143356e8a410552cb44120a02eb6eb35540 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 17 七月 2023 15:44:22 +0800
Subject: [PATCH] 增加销类型称重判断逻辑
---
pages/driver-page/driver-index/driver-index.vue | 48 +++++++++++++++++++++++++++++++-----------------
1 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index b00d209..4821623 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -2,9 +2,9 @@
<view class="">
<view class="driver-index">
<view class="driver-index-body">
- <!-- 寰呴鍙栨彁鐓ゅ崟 -->
+ <!-- 寰呴鍙栭�氱煡鍗� -->
<view class="wait-collection"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/diverbanner.png') no-repeat;background-size:contain">
+ :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/diverbanner.png)`, backgroundSize: 'contain', backgroundRepeat: 'no-repeat' }">
</view>
<view class="collection-form">
<view class="collection-form-item"
@@ -45,9 +45,6 @@
</view>
</view>
</view>
- <!-- <view class="second-line">
- <view class="coal-name">{{ item.coalName }}</view>
- </view> -->
<view class="third-line">
<view class="time-icon"><u-icon name="clock"
color="#515151"
@@ -58,7 +55,7 @@
</view>
</view>
<view class="fourth-line"
- @click="qiangDanBtn(item)"
+ @click.stop="qiangDanBtn(item)"
v-if="item.carNum - item.taskNum !== 0">
<view class="button-img">绔嬪嵆鎶㈠崟</view>
</view>
@@ -74,9 +71,9 @@
@cancel="qiangDanCancel"></u-modal>
</view>
- <!-- 寰呴绾︽彁鐓ゅ崟 -->
+ <!-- 寰呴绾﹂�氱煡鍗� -->
<view class="wait-appointment">
- <combined-title title="寰呴绾︽彁鐓ゅ崟"></combined-title>
+ <combined-title title="寰呴绾﹂�氱煡鍗�"></combined-title>
<u-empty mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png"
textSize="30"
@@ -127,6 +124,11 @@
size="40"></u-icon></view>
</view>
</view>
+ <!-- <view class="status">
+ <u-tag :text="coalStatus[item.statusWeigh] || ''"
+ plain>
+ </u-tag>
+ </view> -->
<view class="third-line">
<view class="clock">
<view class="time-icon"><u-icon name="clock"
@@ -147,9 +149,9 @@
</view>
</view>
- <!-- 宸查绾︽彁鐓ゅ崟 -->
+ <!-- 宸查绾﹂�氱煡鍗� -->
<view class="Reserved">
- <combined-title title="宸查绾︽彁鐓ゅ崟"></combined-title>
+ <combined-title title="宸查绾﹂�氱煡鍗�"></combined-title>
<u-empty mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png"
textSize="30"
@@ -203,6 +205,11 @@
size="40"></u-icon></view>
</view>
</view>
+ <view class="status">
+ <u-tag :text="coalStatus[item.statusWeigh] || ''"
+ plain>
+ </u-tag>
+ </view>
<view class="third-line">
<view class="clock havedclock">
<view class="time-icon"><u-icon name="clock"
@@ -227,7 +234,7 @@
<script>
import { customerId } from '@/utils/status';
import combinedTitle from '@/components/combined-title/combined-title.vue';
-
+ import { onlineurl } from '@/api/request.js'
export default {
components: {
combinedTitle
@@ -261,7 +268,9 @@
qiangDanOrderPlanId: null,
fleetId: '',
xsUserId: '',
- customerId: ''
+ customerId: '',
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚'],
+ onlineurl,
};
},
onShow() {
@@ -338,7 +347,7 @@
url: `/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details?orderPlanId=${value.id}&yyId=${value.yyId}`
});
},
- // 鎻愮叅鍗曡鎯�
+ // 閫氱煡鍗曡鎯�
cardBodyClick(name) {
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details?orderPlanId=${name}`
@@ -447,7 +456,7 @@
.driver-index-body {
// margin-bottom: vww(56);
- // 寰呴鍙栨彁鐓ゅ崟
+ // 寰呴鍙栭�氱煡鍗�
.wait-collection {
width: 100%;
height: 600rpx;
@@ -461,7 +470,7 @@
.collection-form-item {
width: vww(345);
- height: vww(185);
+ height: vww(195);
margin-top: vww(5);
background: #ffffff;
box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
@@ -561,8 +570,9 @@
align-items: center;
.coal-name {
+ @include flex;
min-width: vww(50);
- height: 35rpx;
+ height: 100%;
font-size: 30rpx;
font-weight: 300;
color: #515151;
@@ -681,7 +691,7 @@
.appointment-form-item {
@include formItem;
- height: vww(191);
+ height: vww(220);
justify-content: space-between;
overflow: hidden;
@@ -772,6 +782,10 @@
}
}
+ .status {
+ @include thirdLine;
+ }
+
.third-line {
@include thirdLine;
width: 94%;
--
Gitblit v1.9.1