From 2d43a1df3f5ba42710e6d21c27d1e13bdb8dfd56 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 24 三月 2025 09:23:08 +0800
Subject: [PATCH] -

---
 src/pages/delivergoods/query.vue |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/pages/delivergoods/query.vue b/src/pages/delivergoods/query.vue
index e4c1554..9ea729e 100644
--- a/src/pages/delivergoods/query.vue
+++ b/src/pages/delivergoods/query.vue
@@ -17,8 +17,7 @@
 	</up-sticky>
 	<view class="c-p-b-100">
 		<view class="c-p-l-20 c-p-r-20" v-if="orderList&&orderList.length>0">
-			<view class="listrecord c-p-t-20" v-for="(item,index) in orderList" :key="item.keyid"
-				@click='goDetail(item)'>
+			<view class="listrecord c-p-t-20" v-for="(item,index) in orderList" :key="item.keyid">
 				<view class="coreshop-ff chuany-bradius20">
 					<view class="chuany-font26">
 						<view class="chuany-flex chuany-justify-between">
@@ -26,8 +25,15 @@
 							<view class="chuany-width15">
 								{{$util.formatDate(item.deliverTime,'riqi')}}
 							</view>
-							<view class="chuany-width73">
-								<u-text size='14' :text="item.remark" lines="1">
+							<view class="chuany-width68" @click='goDetail(item)'>
+								<u-text size='14' :text="item.companyName" lines="1">
+								<!-- <u-text size='14' :text="item.remark||item.companyName" lines="1"> -->
+								</u-text>
+							</view>
+							<view class="chuany-width10 chuany-flex chuany-justify-between">
+								<u-text size='14' align="right" v-if='item.deliveredstatus=="Delivered"' type="success" text="宸查��" lines="1">
+								</u-text>
+								<u-text size='14' align="right" v-if='item.deliveredstatus=="Undeliver"' type="error" text="鏈��" lines="1">
 								</u-text>
 							</view>
 							<!-- <view class="chuany-width5" @tap.stop='editOrder(item)'>
@@ -80,7 +86,7 @@
 				</up-form-item>
 			</up-form>
 		</up-modal>
-		<fui-date-picker range :show="datePickerShow" :value="getFirstDayOfMonth()" type="3" zIndex="10000"
+		<fui-date-picker :show="datePickerShow" :value="getFirstDayOfMonth()" type="3" zIndex="10000"
 			@change="changePicker" :minDate='minDate' :maxDate='maxDate' @cancel="clickTime"></fui-date-picker>
 		<up-action-sheet :show="showActions" :actions="actions" title="璇烽�夋嫨" @close="showActions = false"
 			wrapMaxHeight='500px' @select="selectItem">
@@ -98,7 +104,7 @@
 				list: ['鍏ㄩ儴', '鏈��', '宸查��'],
 				datePickerShow: false,
 				shougHuoshow: false,
-				workTime: '',
+				workTime: this.$util.formatDate(new Date()),
 				orderList: [],
 				loadStatus: 'loadmore',
 				pageIndex: 1,
@@ -167,8 +173,8 @@
 				switchVal: false,
 				driverList: [],
 				buyerName: '',
-				timeStart: '',
-				timeEnd: '',
+				timeStart: new Date(),
+				timeEnd: new Date(),
 				sevenDaysDriver: [],
 				deliverKeyID: '',
 				deliverKeyName: ''
@@ -203,9 +209,9 @@
 			}
 		},
 		onPullDownRefresh() {
-			this.timeStart = ''
-			this.timeEnd = ''
-			this.workTime = ''
+			this.timeStart = new Date()
+			this.timeEnd = new Date()
+			this.workTime = this.$util.formatDate(new Date())
 			this.deliverKeyName = ''
 			this.init()
 			uni.stopPullDownRefresh();
@@ -239,9 +245,9 @@
 			},
 			changePicker(val) {
 				console.log(val);
-				this.workTime = val.startDate.result + '鑷�' + val.endDate.result
-				this.timeStart = new Date(val.startDate.result) //宸ヤ綔寮�濮嬫椂闂�
-				this.timeEnd = new Date(val.endDate.result)
+				this.workTime = val.result
+				this.timeStart = new Date(val.result) //宸ヤ綔寮�濮嬫椂闂�
+				this.timeEnd = new Date(val.result)
 				this.datePickerShow = !this.datePickerShow
 				this.init()
 			},

--
Gitblit v1.9.1