Browse Source

no message

xiaoxin 1 year atrás
parent
commit
688705c0c1

+ 1 - 1
pages/statistics/statistics.vue

@@ -170,7 +170,7 @@ const clickDetail = (item) => {
 	if (currentType.value === 2) {
 		// 跳转 轨迹
 		uni.navigateTo({
-			url: `/pages/track/track?id=${item.userId}`
+			url: `/pages/track/track?id=${item.userId}&time=${time.value}`
 		})
 	} else if (currentType.value === 3) {
 		// 弹窗

+ 6 - 1
pages/track/track.vue

@@ -51,7 +51,12 @@ import dayjs from 'dayjs'
 onLoad((options) => {
 	currentId.value = options.id
 
-	datetimerangeValue.value = [dayjs(Date.now() - 24 * 3600 * 1000).format('YYYY-MM-DD hh:mm:ss'), dayjs(Date.now()).format('YYYY-MM-DD hh:mm:ss')]
+	if (options.time) {
+		datetimerangeValue.value = [options.time, options.time.slice(0, 10) + ' 23:59:59']
+	} else {
+		datetimerangeValue.value = [dayjs(Date.now()).format('YYYY-MM-DD') + ' 00:00:00', dayjs(Date.now()).format('YYYY-MM-DD') + ' 23:59:59']
+	}
+
 	getData()
 })
 

+ 1 - 1
pagesWarning/home/home.vue

@@ -102,7 +102,7 @@ const listData = ref([])
 const datetimerangeValue = ref()
 
 onLoad(() => {
-	datetimerangeValue.value = [dayjs(Date.now() - 24 * 3600 * 1000).format('YYYY-MM-DD hh:mm:ss'), dayjs(Date.now()).format('YYYY-MM-DD hh:mm:ss')]
+	datetimerangeValue.value = [dayjs(Date.now()).format('YYYY-MM-DD') + ' 00:00:00', dayjs(Date.now()).format('YYYY-MM-DD') + ' 23:59:59']
 	getTypeList()
 	getData()
 })

+ 5 - 1
unpackage/dist/dev/mp-weixin/pages/track/track.js

@@ -22,7 +22,11 @@ const _sfc_main = {
   setup(__props) {
     common_vendor.onLoad((options) => {
       currentId.value = options.id;
-      datetimerangeValue.value = [common_vendor.dayjs(Date.now() - 24 * 3600 * 1e3).format("YYYY-MM-DD hh:mm:ss"), common_vendor.dayjs(Date.now()).format("YYYY-MM-DD hh:mm:ss")];
+      if (options.time) {
+        datetimerangeValue.value = [options.time, options.time.slice(0, 10) + " 23:59:59"];
+      } else {
+        datetimerangeValue.value = [common_vendor.dayjs(Date.now()).format("YYYY-MM-DD") + " 00:00:00", common_vendor.dayjs(Date.now()).format("YYYY-MM-DD") + " 23:59:59"];
+      }
       getData();
     });
     const currentId = common_vendor.ref();