From 2372854774afa987c3b85e85bd03077f1ad45d25 Mon Sep 17 00:00:00 2001
From: taiyuan <yvan.ni@yolipai.com>
Date: Sat, 31 Oct 2020 18:02:57 +0800
Subject: [PATCH] 线上线下订单修改

---
 pages/user/order_list/order_list.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index c4f9f86..526aba3 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -1399,7 +1399,11 @@ Page({
 		let startDate = this.data.startDate;
 		let endDate = this.data.endDate;
 		
-		this.data.is_no_data2 = 0;
+		// this.data.is_no_data2 = 0;
+		this.setData({
+			currentPage2: 1,
+			list2: [],
+		});
 		
 	
 		if(startDate == '选择开始时间' || endDate == '选择结束时间') {
@@ -1414,7 +1418,7 @@ Page({
 				title: '不对噢！开始时间不能晚于结束时间~',
 				icon: 'none',
 			})
-			return false;
+			return;
 		};
 		
 		
--
libgit2 0.21.4