From 4922e75985896a7d86f6d5007d429c39f1b647c3 Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Wed, 6 Sep 2023 14:34:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageOrders/pages/orderList/orderList.vue | 50 +++++++++++++++------
 1 file changed, 37 insertions(+), 13 deletions(-)

diff --git a/packageOrders/pages/orderList/orderList.vue b/packageOrders/pages/orderList/orderList.vue
index e0b0e1a..0fb2491 100644
--- a/packageOrders/pages/orderList/orderList.vue
+++ b/packageOrders/pages/orderList/orderList.vue
@@ -47,8 +47,8 @@
 			</scroll-view>
 		</view> -->
 		<view v-if="exportShow==true">
-			<view style="padding: 20upx;"></view>
-		<view style="position: fixed;width: 750upx;z-index: 5;text-align: right;top:300upx;right: 30upx;">
+			<view style="padding: 30upx;"></view>
+		<view style="position: fixed;width: 750upx;z-index: 5;text-align: right;top:315upx;right: 30upx;">
 			<button  class="cu-btn bg-white" @click="orderExport">订单导出</button>
 		</view>
 		</view>
@@ -111,7 +111,7 @@
 					<view class="popup_card_from_item">
 						<view class="popup_card_from_item_left_text">开始时间：</view>
 						<view class="uni-list-cell-db">
-							<picker mode="date" :value="startDate" @change="startDateChange">
+							<picker mode="date" :value="startDate" @change="startDateChange" class="uni-picker">
 								<view class="uni-input">{{startDate}}</view>
 							</picker>
 						</view>
@@ -119,7 +119,7 @@
 					<view class="popup_card_from_item">
 						<view class="popup_card_from_item_left_text">结束时间：</view>
 						<view class="uni-list-cell-db">
-							<picker mode="date" :value="endDate" @change="endDateChange" :start="endStartDate" :end="endEndDate">
+							<picker mode="date" :value="endDate" @change="endDateChange" :start="endStartDate" :end="endEndDate" class="uni-picker">
 								<view class="uni-input">{{endDate}}</view>
 							</picker>
 						</view>
@@ -203,14 +203,14 @@
 				params: {
 					siteId: uni.getStorageSync('oilSitePriceId'),
 					siteName: uni.getStorageSync('oilSitePriceName'),
-					email:'13287118566@163.com',
-					startTime:curstartDate,
-					endTime:currentDate
+					email:'',
+					startTime:'',
+					endTime:''
 				},
-				startDate:curstartDate,
-				endDate:currentDate,
+				startDate:'',
+				endDate:'',
 				endStartDate:'',
-				endEndDate:currentDate,
+				endEndDate:'',
 				exportShow:false
 
 			}
@@ -228,7 +228,8 @@
 				'1689183144276463616',
 				'1689183774927818752',
 				'1689184331812888576',
-				'1689185023261741056'
+				'1689185023261741056',
+				'100'
 				]
 				var exportFields = exportList.filter((item) => {
 					return item == uni.getStorageSync('oilSitePriceId');
@@ -464,8 +465,16 @@
 				this.params.startTime = this.startDate
 			},
 			endDateChange:function(e){
-				this.endDate = e.detail.value
-				this.params.endTime = this.endDate
+				if(this.startDate ==''){
+					uni.showToast({
+						title: '请先输入开始时间',
+						icon: 'none'
+					});
+				}else{
+					this.endDate = e.detail.value
+					this.params.endTime = this.endDate
+				}
+				
 			},
 			getEndDate(val){
 				let nowDate = new Date(val)
@@ -490,6 +499,11 @@
 				 return `${year}-${month}-${day}`
 			},
 			orderExport(){
+				this.startDate = ''
+				this.endDate = ''
+				this.params.email = ''
+				this.params.startTime = ''
+				this.params.endTime = ''
 				this.$refs.popup.open('center')
 			},
 			
@@ -556,6 +570,16 @@
 		width: 750upx;
 		z-index: 3;
 	}
+	.uni-input{
+		height: 25rpx;
+	}
+	.uni-picker{
+		height: 25rpx;
+	}
+	.uni-list-cell-db{
+		width: 100%;
+		height: 30rpx;
+	}
 	
 	.popup_card_bottom {
 		display: flex;