From 437144f41c74505d362a5214a18cec3d01b3ce4b Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 10 十月 2022 17:51:30 +0800
Subject: [PATCH] 2022.10.10
---
pages/m_service/p_schedule/p_schedule.js | 119 ++++++++++++++++++-----------------------------------------
1 files changed, 37 insertions(+), 82 deletions(-)
diff --git a/pages/m_service/p_schedule/p_schedule.js b/pages/m_service/p_schedule/p_schedule.js
index 3827671..4294756 100644
--- a/pages/m_service/p_schedule/p_schedule.js
+++ b/pages/m_service/p_schedule/p_schedule.js
@@ -1,8 +1,9 @@
// pages/m_service/p_schedule/p_schedule.js
+import b_scheduleManager from '../behaviors/b_scheduleManager'
const moment = require('../../../utils/moment.min')
Page({
-
+ behaviors: [b_scheduleManager],
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
@@ -22,90 +23,44 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- const now = moment().hour(0).minute(0).second(0).millisecond(0)
- const year = now.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++) {
- const s = {
- category: `${year}骞�${m}鏈堢幆淇濆伐浣滄棩绋媊,
- details: []
- }
- const mon = m > 9 ? m : `0${m}`
- //10,15,20
- 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}-${mon}-15`)
- let d2 = t2.diff(now, 'days')
- s.details.push({
- time: t2.format('MM鏈圖D鏃�'),
- name: '鐜繚鏃ョ▼',
- left: d2,
- })
- let t3 = moment(`${year}-${mon}-20`)
- let d3 = t3.diff(now, 'days')
- s.details.push({
- time: t3.format('MM鏈圖D鏃�'),
- name: '鐜繚鏃ョ▼',
- left: d3,
- })
- schedules.push(s)
- totals += 3
+ let totals = this.data.allSchedules.length
+
+ const map = new Map()
+ for (let i = 0; i < this.data.allSchedules.length; i++) {
+ const s = this.data.allSchedules[i];
+ s.events.forEach(e => {
+ if (!map.has(e.category)) {
+ map.set(e.category, [])
+ }
+ map.get(e.category).push({
+ time: s.time.format('MM鏈圖D鏃�'),
+ name: e.name,
+ left: s.diffDays,
+ })
+ });
}
- this.setData({schedules, totals})
+ for (let item of map) {
+ schedules.push({
+ category: item[0],
+ details: item[1]
+ })
+ }
+ this.setData({
+ schedules,
+ totals
+ })
},
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
- onReady() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
- */
- onHide() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
- */
- onUnload() {
-
- },
-
- /**
- * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
- onReachBottom() {
-
- },
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {
-
+ goto() {
+ var that = this
+ wx.navigateTo({
+ url: '/pages/m_service/p_scheduledetail/p_scheduledetail',
+ success: (res) => {
+ res.eventChannel.emit('acceptDataFromOpenerPage', that.data.thisSchedule)
+ },
+ })
}
})
\ No newline at end of file
--
Gitblit v1.9.3