From 4e77e01f068e8ea2ec914698aa55fcf369afc919 Mon Sep 17 00:00:00 2001 From: qingyiay <2386314947@qq.com> Date: 星期一, 15 五月 2023 11:17:25 +0800 Subject: [PATCH] 司机首页修改 --- pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 104 +++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 74 insertions(+), 30 deletions(-) diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue index 633f96d..253db2c 100644 --- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue +++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue @@ -4,30 +4,30 @@ <view class="top-information"> <view class="cutomer-name">瀹㈡埛:{{ coalDetailsData.customerName || '' }}</view> <view class="fild-name"> - <view class="">鐭垮満:{{ coalDetailsData.deptName || '' }}</view> - <view class="">鐓ゅ満:{{ coalDetailsData.filedName || '' }}</view> + <view class="">鐭垮満:{{ coalDetailsData.deptName || '鏆傛棤' }}</view> + <view class="">鐓ゅ満:{{ coalDetailsData.filedName || '鏆傛棤' }}</view> </view> </view> <view class="block-information"> <view class="block-main"> <view class="basic"> <view class="coalName">{{ coalDetailsData.coalName }}</view> - <view class="black-block"></view> - <view class="order-type">{{ coalDetailsData.orderType }}</view> + <!-- <view class="black-block"></view> + <view class="order-type">{{ coalDetailsData.orderType }}</view> --> <view class="status-button" style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/statusbutton.png') no-repeat; background-size: cover;" > - {{ coalStatus[coalDetailsData.status] }} + {{ coalStatus[coalDetailsData.status] || '' }} </view> </view> <view class="time"> <view class="time-icon"><u-icon name="clock" color="#515151" size="40"></u-icon></view> <view class="send-date">{{ coalDetailsData.sendDate }}</view> </view> - <view class="coal-code">鎻愮叅鍗曠紪鐮亄{ coalDetailsData.code || '' }}</view> - <view class="order-code">璁㈠崟缂栧彿:{{ coalDetailsData.orderCode || '' }}</view> + <view class="coal-code">鎻愮叅鍗曠紪鍙�: {{ coalDetailsData.code || '' }}</view> + <view class="order-code">璁㈠崟缂栧彿: {{ coalDetailsData.orderCode || '' }}</view> <view class="weigh-item"> <view class="item"> <view class="concrete" style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">鐨�</view> @@ -58,7 +58,7 @@ <u-button text="鍏ュ満鐢宠" type="primary" plain @click="rcsqClick" shape="circle"></u-button> </view> <view class="bottom-button"> - <u-button text="鏀剧┖" type="primary" plain @click="evacuation" throttleTime="500" shape="circle"></u-button> + <u-button text="鏀剧┖" type="primary" plain @click="evacuation" throttleTime="500" shape="circle" :disabled="!isEvacuation"></u-button> <u-button text="鍛煎彨瀹㈡湇" type="primary" plain @click="callCustomerService" shape="circle"></u-button> </view> </view> @@ -122,7 +122,7 @@ openId: null, openName: '' }, - coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�', '鏀剧┖'], // 鐘舵�� + coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠', '杩涘叆鍦洪櫌'], // 鐘舵�� weighHouseCode: '', // 鏀剧┖寮圭獥鎺у埗鍙橀噺 evacuationModalShow: false, @@ -153,6 +153,20 @@ }, openid() { return uni.getStorageSync('openid'); + }, + // 鑾峰彇浠婂ぉ鏃ユ湡 + currentDate() { + let time = new Date(); + let year = time.getFullYear(); + let month = time.getMonth() + 1; + month = month < 10 ? '0' + month : month; + let date = time.getDate(); + date = date < 10 ? '0' + date : date; + return `${year}-${month}-${date}`; + }, + // + isEvacuation() { + return this.coalDetailsData.hair == 0 || this.coalDetailsData.skin == 0; } }, methods: { @@ -210,6 +224,15 @@ this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => { if (res.code == 0) { this.dayRZ = res.data; + this.dayRZ = this.dayRZ.map(v => { + let slicedate = v.taskStatusDes.slice(0, 10); + if (slicedate == this.currentDate) { + return { + ...v, + taskStatusDes: v.taskStatusDes.slice(10) + }; + } + }); } }); }, @@ -340,7 +363,6 @@ .u-text { .u-text__value { font-size: 31rpx !important; - font-family: Microsoft YaHei; font-weight: 300; color: #303030; } @@ -373,11 +395,14 @@ top: vww(25); color: #ffffff; font-size: 31rpx; - font-family: Microsoft YaHei; font-weight: 300; .fild-name { - @include flex justify-content: space-between; + @include flex; + justify-content: space-between; width: 100%; + view { + min-width: 296rpx; + } } } .block-information { @@ -389,7 +414,6 @@ border-radius: 20rpx; position: relative; font-size: 30rpx; - font-family: Microsoft YaHei; font-weight: 300; color: #303030; overflow: hidden; @@ -407,21 +431,21 @@ text-align: center; line-height: vww(33); font-size: 28rpx; - font-family: Microsoft YaHei; font-weight: 300; position: absolute; right: vww(10); color: #fff; } .basic { - width: 40%; + width: 100%; height: vww(15); - @include flex justify-content: space-between; - .coalName { - width: 50%; + @include flex; + justify-content: flex-start; + .coalName, + .order-type { + width: 45%; height: 30rpx; font-size: 30rpx; - font-family: Microsoft YaHei; font-weight: 300; color: #515151; position: relative; @@ -430,18 +454,20 @@ width: 2rpx; height: 30rpx; background: #515151; + position: relative; + top: vww(2); } } .time { - width: 30%; + width: 35%; height: vww(12); display: flex; - justify-content: space-between; + justify-content: flex-start; .send-date { width: 148rpx; height: 24rpx; + margin-left: vww(14); font-size: 28rpx; - font-family: Microsoft YaHei; font-weight: 300; color: #515151; } @@ -451,19 +477,18 @@ width: 100%; height: 24rpx; font-size: 28rpx; - font-family: Microsoft YaHei; font-weight: 300; color: #7d7d7d; } .weigh-item { width: 100%; height: vww(36); - @include flex justify-content: space-around; + @include flex; + justify-content: space-around; .item { - width: vww(50); + min-width: vww(50); height: vww(45); font-size: 21rpx; - font-family: Microsoft YaHei; font-weight: 400; color: #ffffff; text-align: center; @@ -475,7 +500,6 @@ } .num { font-size: 40rpx; - font-family: Microsoft YaHei; font-weight: 300; color: #303030; } @@ -489,6 +513,22 @@ position: relative; top: vww(120); overflow-y: overlay; + padding: vww(20); + .u-steps { + .u-steps-item { + padding-bottom: vww(35); + .u-steps-item__wrapper { + .u-steps-item__wrapper__dot { + background: linear-gradient(-29deg, #426cff 0%, #7991ff 100%); + box-shadow: 2rpx 7rpx 10rpx 0rpx rgba(172, 172, 172, 0.64); + } + } + .u-steps-item__line { + height: vww(52) !important; + background: #e9e6ea !important; + } + } + } } .utilsBox { width: 94%; @@ -501,14 +541,15 @@ .top-button, .bottom-button { width: 100%; - height: vww(80); + height: vww(47); @include flex; .u-button { width: 40%; + height: 60rpx; font-size: 28rpx; - font-family: Microsoft YaHei; font-weight: 300; color: #497bfb; + border: 2px solid #3b56eb; } } } @@ -525,9 +566,12 @@ height: vww(89); .u-button { font-size: 28rpx; - font-family: Microsoft YaHei; font-weight: 300; color: #ffffff; + background: #497bfb; + letter-spacing: 4rpx; + border-radius: 37rpx 37rpx 37rpx 37rpx; + box-shadow: 2rpx 3rpx 13rpx 0rpx rgba(43, 98, 239, 0.5), 0rpx 0rpx 9rpx 0rpx rgba(247, 250, 253, 0.29); } } } -- Gitblit v1.9.1