From 9b40ce3fbf6f67075c3f0be6baaef5f316df41cc Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Thu, 7 Sep 2023 15:39:13 +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 | 36 ++++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/packageOrders/pages/orderList/orderList.vue b/packageOrders/pages/orderList/orderList.vue
index e03907e..d965fd0 100644
--- a/packageOrders/pages/orderList/orderList.vue
+++ b/packageOrders/pages/orderList/orderList.vue
@@ -222,7 +222,11 @@
 				'1689183144276463616',
 				'1689183774927818752',
 				'1689184331812888576',
-				'1689185023261741056'
+				'1689185023261741056',
+				'100',
+				'1688798956131213312',
+				'1681929640815497216',
+				'1679333598941024256'
 				]
 				var exportFields = exportList.filter((item) => {
 					return item == uni.getStorageSync('oilSitePriceId');
@@ -460,7 +464,7 @@
 			endDateChange:function(e){
 				if(this.startDate ==''){
 					uni.showToast({
-						title: '请先输入开始时间',
+						title: '请先选择开始时间',
 						icon: 'none'
 					});
 				}else{
@@ -504,27 +508,35 @@
 				}
 				if(this.params.startTime==''){
 					uni.showToast({
-						title: '请输入开始时间',
+						title: '请选择开始时间',
 						icon: 'none'
 					});
 					return false
 				}
 				if(this.params.endTime==''){
 					uni.showToast({
-						title: '请输入结束时间',
+						title: '请选择结束时间',
 						icon: 'none'
 					});
 					return false
 				}
-				oliFinanceApi.getOrderInfoExport(this.params).then(res => {
-					if (res.code == 20000) {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						});
-						this.$refs.popup.close();
+				uni.showModal({
+					content: '请确认邮箱'+this.params.email,
+					success:  (res)=> {
+						if (res.confirm) {
+							oliFinanceApi.getOrderInfoExport(this.params).then(res => {
+								if (res.code == 20000) {
+									uni.showToast({
+										title: res.msg,
+										icon: 'none'
+									});
+									this.$refs.popup.close();
+								}
+							})
+						}
 					}
-				})
+				});
+
 			}
 		}
 	}