Merge pull request 'zyj' (#11) from zyj into master

Reviewed-on: #11

packageIntegral/productList/index.vue

@@ -598,4 +598,4 @@
 		}
 
 	}
-</style>
+</style>

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
 				}