From ab70c6eb4a181b282af0eb200275cd8a4d2ab172 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 13 十一月 2024 16:41:32 +0800
Subject: [PATCH] 2024.11.13

---
 pages/mService/pSchedule/pSchedule.js |  100 +++++++++++++++++++++++++------------------------
 1 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/pages/mService/pSchedule/pSchedule.js b/pages/mService/pSchedule/pSchedule.js
index 3f0b61a..b5732ee 100644
--- a/pages/mService/pSchedule/pSchedule.js
+++ b/pages/mService/pSchedule/pSchedule.js
@@ -1,77 +1,79 @@
-// pages/mService/pSchedule/pSchedule.js
-import bScheduleManager from '../behaviors/bScheduleManager'
-const moment = require('../../../utils/moment.min')
+import sysSchedules from '../../../data/schedules';
+import moment from "../../../utils/moment.min";
 
 Page({
-  behaviors: [bScheduleManager],
   /**
    * 椤甸潰鐨勫垵濮嬫暟鎹�
    */
   data: {
     totals: 0,
-    schedules: [{
-      category: '2022骞�9鏈堢幆淇濆伐浣滄棩绋�',
-      details: [{
-        time: '9鏈�10鏃�',
-        name: '鐜繚鏃ョ▼',
-        left: 3,
-      }]
-    }]
+    schedules: [
+      // {
+      //   category: '2022骞�9鏈堢幆淇濆伐浣滄棩绋�',
+      //   details: [
+      //     {
+      //       time: '9鏈�10鏃�',
+      //       name: '鐜繚鏃ョ▼',
+      //       left: 3,
+      //     },
+      //   ],
+      // },
+    ],
   },
 
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
   onLoad(options) {
-    // const now = moment().hour(0).minute(0).second(0).millisecond(0)
-    // const year = now.year()
-    const schedules = []
-    let totals = this.data.allSchedules.length
+    sysSchedules().then(res => this.parseAllSchedules(res));
+  },
 
-    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,
-          s: s
-        })
+  parseAllSchedules(allSchedules) {
+    const schedules = [];
+    let totals = allSchedules.length;
+
+    const map = new Map();
+    for (let i = 0; i < allSchedules.length; i++) {
+      const s = allSchedules[i];
+      const _time = moment(s.time)
+      const category = `${_time.year()}骞�${_time.month() + 1}鏈堢幆淇濆伐浣滄棩绋媊
+      if (!map.has(category)) {
+        map.set(category, []);
+      }
+      map.get(category).push({
+        time: _time.format('MM鏈圖D鏃�'),
+        name: s.title,
+        left: s.diffDays,
+        s: s,
       });
     }
     for (let item of map) {
       schedules.push({
         category: item[0],
-        details: item[1]
-      })
+        details: item[1],
+      });
     }
     this.setData({
       schedules,
-      totals
-    })
+      totals,
+    });
   },
 
   goto(e) {
-    var that = this
-    const index = e.currentTarget.dataset.index
-    const s = that.data.schedules[index[0]].details[index[1]].s
-    const _s = {
-      time: s.time.format('YYYY-MM-DD dddd'),
-      events: s.events,
-      diffDays: s.diffDays,
-      steps: s.steps,
-      category: s.category
-    }
-    console.log(that.data.schedules);
+    const index = e.currentTarget.dataset.index;
+    const s = this.data.schedules[index[0]].details[index[1]].s;
+    // const _s = {
+    //   time: s.time.format('YYYY-MM-DD dddd'),
+    //   events: s.events,
+    //   diffDays: s.diffDays,
+    //   steps: s.steps,
+    //   category: s.category,
+    // };
     wx.navigateTo({
       url: '/pages/mService/pScheduledetail/pScheduledetail',
-      success: (res) => {
-        res.eventChannel.emit('acceptDataFromOpenerPage', _s)
+      success: res => {
+        res.eventChannel.emit('acceptDataFromOpenerPage', s);
       },
-    })
-  }
-})
\ No newline at end of file
+    });
+  },
+});

--
Gitblit v1.9.3