From bd3a9d7086f5a428b385599ba2cb08299b22c0df Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 15 九月 2022 09:26:18 +0800
Subject: [PATCH] 2022.9.14
---
pages/m_service/p_schedule/p_schedule.js | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/pages/m_service/p_schedule/p_schedule.js b/pages/m_service/p_schedule/p_schedule.js
index a9c4fa4..3827671 100644
--- a/pages/m_service/p_schedule/p_schedule.js
+++ b/pages/m_service/p_schedule/p_schedule.js
@@ -22,8 +22,8 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- const now = moment()
- const year = moment().year()
+ const now = moment().hour(0).minute(0).second(0).millisecond(0)
+ const year = now.year()
const schedules = []
let totals = 0
for (let m = 1; m <= 12; m++) {
@@ -31,22 +31,23 @@
category: `${year}骞�${m}鏈堢幆淇濆伐浣滄棩绋媊,
details: []
}
+ const mon = m > 9 ? m : `0${m}`
//10,15,20
- let t1 = moment(`${year}-${m}-10`)
+ let t1 = moment(`${year}-${mon}-10`)
let d1 = t1.diff(now, 'days')
s.details.push({
time: t1.format('MM鏈圖D鏃�'),
name: '鐜繚鏃ョ▼鐜繚鏃ョ▼鐜繚鏃ョ▼鐜繚鏃ョ▼鐜繚鏃ョ▼鐜繚鏃ョ▼',
left: d1,
})
- let t2 = moment(`${year}-${m}-15`)
+ let t2 = moment(`${year}-${mon}-15`)
let d2 = t2.diff(now, 'days')
s.details.push({
time: t2.format('MM鏈圖D鏃�'),
name: '鐜繚鏃ョ▼',
left: d2,
})
- let t3 = moment(`${year}-${m}-20`)
+ let t3 = moment(`${year}-${mon}-20`)
let d3 = t3.diff(now, 'days')
s.details.push({
time: t3.format('MM鏈圖D鏃�'),
--
Gitblit v1.9.3