From 3b5ede2a690b1c18129009f2fba3d17a12086a2a Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Thu, 7 Sep 2023 16:52:52 +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 | 56 ++++++++++-----------
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/packageOrders/pages/orderList/orderList.vue b/packageOrders/pages/orderList/orderList.vue
index d965fd0..05802d9 100644
--- a/packageOrders/pages/orderList/orderList.vue
+++ b/packageOrders/pages/orderList/orderList.vue
@@ -52,7 +52,7 @@
 			<button  class="cu-btn bg-white" @click="orderExport">订单导出</button>
 		</view>
 		</view>
-		
+
 		<view class="padding　 padding-bottom-0" style="padding-top: 200upx;">
 			<!-- 0 全部  1 待支付  2 已支付 3退款 -->
 			<view v-show="TabCur==2" class="order-list">
@@ -100,7 +100,7 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<uni-popup ref="popup">
 			<view class="popup_card">
 				<view class="popup_card_from">
@@ -149,7 +149,7 @@
 		},
 		data() {
 			return {
-				
+
 				startTime:'',
 				endTime:"",
 				activeSource: '小程序',
@@ -222,11 +222,7 @@
 				'1689183144276463616',
 				'1689183774927818752',
 				'1689184331812888576',
-				'1689185023261741056',
-				'100',
-				'1688798956131213312',
-				'1681929640815497216',
-				'1679333598941024256'
+				'1689185023261741056'
 				]
 				var exportFields = exportList.filter((item) => {
 					return item == uni.getStorageSync('oilSitePriceId');
@@ -236,7 +232,7 @@
 				}else{
 					this.exportShow = false
 				}
-				
+
 		},
 		onLoad() {
 		 uni.setStorageSync('orderType', 1)
@@ -246,7 +242,7 @@
 			this.loadMoreOrder('onReachBottom')
 		},
 		methods: {
-			getTime(){ 
+			getTime(){
 				let nowDate = new Date();
 				 let year = nowDate.getFullYear();
 				 let month = nowDate.getMonth() + 1 < 10 ? "0" + (nowDate.getMonth() + 1) : nowDate.getMonth() + 1;
@@ -360,7 +356,7 @@
 									break
 								case -2:
 									this.refundOrder = this.refundOrder.concat(res.data)
-									
+
 									if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
 										this.load.isLoadMore4 = true
 										this.load.loadStatus4 = 'nomore'
@@ -371,7 +367,7 @@
 									break
 								case 0:
 									this.payingOrder = this.payingOrder.concat(res.data)
-									
+
 									if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
 										this.load.isLoadMore2 = true
 										this.load.loadStatus2 = 'nomore'
@@ -381,7 +377,7 @@
 									}
 									break
 								case 1:
-									this.finishedOrder = this.finishedOrder.concat(res.data) 
+									this.finishedOrder = this.finishedOrder.concat(res.data)
 									if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
 										this.load.isLoadMore3 = true
 										this.load.loadStatus3 = 'nomore'
@@ -396,7 +392,7 @@
 					})
 
 				} else if (this.indexSource == 1) {
-					//	0：待支付， 1：已支付 ，-1：支付失败 ，2：已取消，3：已退款 
+					//	0：待支付， 1：已支付 ，-1：支付失败 ，2：已取消，3：已退款
 					// 小程序
 					if (data2.istate == -3) {
 						data2.istate = ''
@@ -407,7 +403,7 @@
 						if (res.code === 20000) {
 							switch (istate) {
 								case 1:
-									
+
 									this.allOrder = this.allOrder.concat(res.data)
 									if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
 										this.load.isLoadMore1 = true
@@ -417,7 +413,7 @@
 										this.load.isLoadMore1 = false
 									}
 									break
-								
+
 								case -2:
 									this.refundOrder = this.refundOrder.concat(res.data)
 									if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
@@ -439,7 +435,7 @@
 									}
 									break
 								case  -3:
-								
+
 									this.finishedOrder = this.finishedOrder.concat(res.data)
 									if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
 										this.load.isLoadMore3 = true
@@ -471,7 +467,7 @@
 					this.endDate = e.detail.value
 					this.params.endTime = this.endDate
 				}
-				
+
 			},
 			getEndDate(val){
 				let nowDate = new Date(val)
@@ -488,7 +484,7 @@
 				this.params.endTime = ''
 				this.$refs.popup.open('center')
 			},
-			
+
 			report() {
 				if (this.params.email == '') {
 					uni.showToast({
@@ -521,7 +517,7 @@
 					return false
 				}
 				uni.showModal({
-					content: '请确认邮箱'+this.params.email,
+					content: '请确认邮箱 \n'+this.params.email,
 					success:  (res)=> {
 						if (res.confirm) {
 							oliFinanceApi.getOrderInfoExport(this.params).then(res => {
@@ -570,26 +566,26 @@
 		width: 100%;
 		height: 30rpx;
 	}
-	
+
 	.popup_card_bottom {
 		display: flex;
 		justify-content: center;
 		margin-top: 68rpx;
 	}
-	
+
 	.popup_card_bottom_submit {
 		background: #FE0505;
 		color: #ffffff;
 		font-size: 25rpx;
 		width: 240rpx;
 	}
-	
+
 	.popup_card_bottom_close {
 		background: #FFFFFF;
 		font-size: 25rpx;
 		width: 240rpx;
 	}
-	
+
 	.popup_card_from_item_right_text {
 		font-size: 24rpx;
 		color: #000000;
@@ -598,21 +594,21 @@
 		text-overflow: ellipsis;
 		white-space: nowrap;
 		margin-right: 25rpx;
-	
+
 	}
-	
+
 	.popup_card_from_item_left_text {
 		width: 150rpx;
 		font-size: 24rpx;
 		color: #666666;
 	}
-	
+
 	.popup_card_from_item {
 		display: flex;
 		align-items: center;
 		margin-bottom: 40rpx;
 	}
-	
+
 	.popup_card_title {
 		text-align: center;
 		font-weight: 500;
@@ -620,9 +616,9 @@
 		font-size: 36rpx;
 		margin-bottom: 80rpx;
 	}
-	
+
 	.popup_card {
-	
+
 		width: 681rpx;
 		height: 528rpx;
 		background: #FFFFFF;