From da9921bedb5d77d9f615a36e6b4ffcbbfc063f13 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 31 十月 2023 17:29:34 +0800
Subject: [PATCH] 修复偶尔打印错误,修复判断司机是否勾选默认打印样式错误,重做入场申请逻辑
---
pages/driver-page/driver-index/SelfDelivery/SelfDelivery.vue | 69 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/pages/driver-page/driver-index/SelfDelivery/SelfDelivery.vue b/pages/driver-page/driver-index/SelfDelivery/SelfDelivery.vue
index b508a7d..64ead23 100644
--- a/pages/driver-page/driver-index/SelfDelivery/SelfDelivery.vue
+++ b/pages/driver-page/driver-index/SelfDelivery/SelfDelivery.vue
@@ -42,30 +42,32 @@
</view>
</view>
</view>
- <!-- 閫夋嫨鍙戣繍鏃堕棿 -->
- <view class="send-date">
- <view class="send-date_label">
- 鍙戣繍鏃堕棿
+ <view class="bottom-block">
+ <!-- 閫夋嫨鍙戣繍鏃堕棿 -->
+ <view class="send-date">
+ <view class="send-date_label">
+ 鍙戣繍鏃堕棿
+ </view>
+ <uni-datetime-picker type="date"
+ :clear-icon="false"
+ v-model="sendDate"
+ :start="sendDateStart"
+ :end="sendDateEnd" />
</view>
- <uni-datetime-picker type="date"
- :clear-icon="false"
- v-model="sendDate"
- :start="sendDateStart"
- :end="sendDateEnd" />
- </view>
- <!-- 瀹㈡埛鍚嶇О -->
- <view class="customer-name">
- <view class="customer-name_label">
- 閫夋嫨瀹㈡埛
- </view>
- <view class="customer-name_block"
- @click="selfDeliver">
- <input class="customer-name_block-input"
- type="text"
- placeholder="璇烽�夋嫨瀹㈡埛"
- v-model="customerName"
- @focus="selfDeliver"
- ref="selectCustomer" />
+ <!-- 瀹㈡埛鍚嶇О -->
+ <view class="customer-name">
+ <view class="customer-name_label">
+ 閫夋嫨瀹㈡埛
+ </view>
+ <view class="customer-name_block"
+ @click="selfDeliver">
+ <input class="customer-name_block-input"
+ type="text"
+ placeholder="璇烽�夋嫨瀹㈡埛"
+ v-model="customerName"
+ @focus="selfDeliver"
+ ref="selectCustomer" />
+ </view>
</view>
</view>
<!-- 鎻愪氦 -->
@@ -209,7 +211,10 @@
text: v.productName
}
})
- this.productName = this.productNameList[0].value
+ this.productName = Array.isArray(this.productNameList) && this.productNameList.lenght !== 0 ?
+ this.productNameList[0].value : ''
+ }).then(() => {
+ this.getShipToList()
})
},
// 鏍规嵁閮ㄩ棬鑾峰彇鐓ゅ満鍚嶇О
@@ -235,9 +240,6 @@
},
selfDeliver() {
this.selfDeliverShow = true
- this.$nextTick(() => {
- this.$refs.selectCustomer.blur()
- })
},
selfDeliverClose() {
this.selfDeliverShow = false
@@ -309,22 +311,16 @@
align-items: center;
}
- .slot-content {
- width: 100%;
- height: vww(150);
- @include flex;
- flex-direction: column;
- }
.main {
width: 100%;
+ color: #232323;
.product-info {
width: 96%;
height: vww(250);
margin: vww(8);
margin-top: vww(20);
- background: #ffffff;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
border-radius: 20rpx;
position: relative;
@@ -361,9 +357,12 @@
}
}
+ .bottom-block {
+ height: vww(200);
+ }
+
.send-date,
.customer-name {
- height: vww(40);
margin: vww(40) vww(20);
position: relative;
--
Gitblit v1.9.1