详情滚动加载

pages/traplamp/detail/detail.vue

@@ -51,6 +51,7 @@
 				},
 				// 图片列表
 				lampList: [],
+				timeVal: timeFormat(timeFrame('start')).slice(-8), // 存当前时分秒
 				searchTime: [timeFrameText('start'), timeFrameText('end')],
 				total: 0, // 设备总数
 				img_url:'',
@@ -76,10 +77,10 @@
 					val = [timeFormat(timeFrame('start')), timeFormat(timeFrame('end'))];
 					this.searchTime = val
 				}
-				this.params.start_time = val[0];
-				this.params.end_time = val[1];
+				this.params.start_time = val[0] + ' ' + this.timeVal;
+				this.params.end_time = val[1] + ' ' + this.timeVal;
 				this.lampList = [];
-				this.page = 1;
+				this.params.page = 1;
 				this.getlampList()
 			},
 			// 获取图片列表

pages/weatherother/detail.vue

@@ -7,7 +7,7 @@
 			<!-- 选择时间范围 -->
 			<view class="mb">
 				<uni-datetime-picker v-model="searchTime" type="daterange" rangeSeparator="-"
-					@change="changeSearchTime" />
+					@change="changeSearchTime" :clear-icon="false"/>
 			</view>
 			<!-- 历史数据表格 -->
 			<uni-table class="table-style" ref="table" :loading="pageLoading" emptyText="暂无更多数据">
@@ -19,7 +19,7 @@
 				<uni-tr v-for="(item, index) in historyList" :key="index">
 					<block v-for="(header) in historyHeader" :key="header.key">
 						<uni-td align="center" v-if="header.key == 'wind_o'">{{fengObj[item[header.key]]}}</uni-td>
-						<uni-td align="center" v-else-if="header.key == 'updateTime'">{{new Date(item.updateTime).getTime()/1000 | timeFrom}}</uni-td>
+						<uni-td align="center" v-else-if="header.key == 'updateTime'">{{((new Date(item.updateTime).getTime())/1000).toFixed(0) | timeFrom}}</uni-td>
 						<uni-td align="center" v-else>{{item[header.key]}}</uni-td>
 					</block>
 				</uni-tr>
@@ -39,6 +39,7 @@
 	import {
 		timeFormat,
 		timeFrame,
+		dateToUnix,
 		timeFrameText
 	} from '@/utils/utils.js'
 	export default {
@@ -56,6 +57,7 @@
 					page: 1,
 					page_size: 10,
 				},
+				timeVal: timeFormat(timeFrame('start')).slice(-8), // 存当前时分秒
 				searchTime: [timeFormat(timeFrameText('start')), timeFormat(timeFrameText('end'))],
 				fengObj:{
 				    "N": "北",
@@ -142,13 +144,15 @@
 		},
 		methods: {
 			// 选择时间
-			changeSearchTime(time) {
-				this.params.start_time = time[0] ? dateToUnix(time[0]) : timeFrame('start');
-				this.params.end_time = time[0] ? dateToUnix(time[1]) : timeFrame('end');
-				this.searchTime = time;
+			changeSearchTime(val) {
+				if(val.length == 0) {
+					val = [timeFormat(timeFrame('start')), timeFormat(timeFrame('end'))];
+					this.searchTime = val
+				}
+				this.params.start_time = val[0] + ' ' + this.timeVal;
+				this.params.end_time = val[1] + ' ' + this.timeVal;
 				this.params.page = 1;
 				this.getHistoryList();
-				this.getWeatherChart();
 			},
 			// 切换页码
 			changePagination(e) {