From 2e3ba63aa0dd8abfeaa412b89b4af98c2751b956 Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Sun, 28 Apr 2024 14:55:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageIntegral/productList/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packageIntegral/productList/index.vue b/packageIntegral/productList/index.vue
index 6681a80..dc1b701 100644
--- a/packageIntegral/productList/index.vue
+++ b/packageIntegral/productList/index.vue
@@ -598,4 +598,4 @@
 		}
 
 	}
-</style>
\ No newline at end of file
+</style>

From e56aa1c24f0ae5d9db6892b6316670433daf58d7 Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Sat, 11 May 2024 11:02:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=97=B6=E9=97=B4=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageOrders/pages/orderList/orderList.vue | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/packageOrders/pages/orderList/orderList.vue b/packageOrders/pages/orderList/orderList.vue
index 6afaba5..86ca245 100644
--- a/packageOrders/pages/orderList/orderList.vue
+++ b/packageOrders/pages/orderList/orderList.vue
@@ -109,19 +109,21 @@
 						<input v-model="params.email" class="card_item_input" placeholder="请输入邮箱" />
 					</view>
 					<view class="popup_card_from_item">
-						<view class="popup_card_from_item_left_text">开始时间：</view>
+						<view class="popup_card_from_item_left_text" style="margin-top: 32rpx;">开始时间：</view>
 						<view class="uni-list-cell-db">
-							<picker mode="date" :value="startDate" @change="startDateChange" class="uni-picker">
+							<uni-datetime-picker type="datetime" :value="startDate" @change="startDateChange" />
+							<!-- <picker mode="date" :value="startDate" @change="startDateChange" class="uni-picker">
 								<view class="uni-input">{{startDate}}</view>
-							</picker>
+							</picker> -->
 						</view>
 					</view>
 					<view class="popup_card_from_item">
-						<view class="popup_card_from_item_left_text">结束时间：</view>
+						<view class="popup_card_from_item_left_text" style="margin-top: 32rpx;">结束时间：</view>
 						<view class="uni-list-cell-db">
-							<picker mode="date" :value="endDate" @change="endDateChange" :start="endStartDate" :end="endEndDate" class="uni-picker">
+							<uni-datetime-picker type="datetime" :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>
+							</picker> -->
 						</view>
 					</view>
 				</view>
@@ -452,10 +454,10 @@
 				}
 			},
 			startDateChange:function(e){
-				this.startDate = e.detail.value
+				this.startDate = e
 				let data=this.startDate
 				this.endStartDate = data
-				this.endEndDate = this.getEndDate(Date.parse(data)+ 3600 * 1000 * 24 * 30)
+				this.endEndDate = this.getEndDate(Date.parse(data)+ 3600 * 1000 * 24 * 31)
 				this.params.startTime = this.startDate
 			},
 			endDateChange:function(e){
@@ -465,7 +467,7 @@
 						icon: 'none'
 					});
 				}else{
-					this.endDate = e.detail.value
+					this.endDate = e
 					this.params.endTime = this.endDate
 				}