fix: 日程渲染bugs

api/http.js

@@ -11,17 +11,17 @@ export default function http(data) {
         method: data.method,
         dataType: "json",
         data: data.data,
-        success: function(res) {
+        success: function (res) {
           if (res.data.code == 0) {
             resolve(res);
           } else {
             dd.alert({
-              content: "网络异常",
+              content: res.data.msg || "网络异常",
               buttonText: "确定"
             });
           }
         },
-        fail: function(res) {
+        fail: function (res) {
           dd.alert({
             content: "网络异常",
             buttonText: "确定"
@@ -53,10 +53,10 @@ export default function http(data) {
           method: data.method,
           data: data.data,
           dataType: "json",
-          success: function(res) {
+          success: function (res) {
             resolve(res);
           },
-          fail: function(res) {
+          fail: function (res) {
             rejects(res);
           }
         });

pages/meetingDetail/meetingDetail.js

@@ -123,6 +123,7 @@ create.Page({
     }
   },
   onLoad(event) {
+    console.log(event)
     this.reset()
     dd.setNavigationBar({
       title: `会议详情`

pages/scheduleList/scheduleList.js

@@ -15,7 +15,7 @@ import {
 const currentDate = new Date();
 let minYear = 2020;
 let maxYear = currentDate.getFullYear() + 1;
-const DateMap = getDateMap(minYear, maxYear);
+let DateMap = getDateMap(minYear, maxYear);
 const weekList = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
 import create from "dd-store";
 create.Page({
@@ -43,6 +43,8 @@ create.Page({
   scheduleList: [],
   onShow() {
     if (this.$store.data.indexNeedUpdate) {
+      //优化：如果是重复会议重新算，单次会议往DateMap中添加
+      DateMap = getDateMap(minYear, maxYear);
       this.onLoad()
     }
   },
@@ -229,17 +231,23 @@ create.Page({
     });
   },
   //生成DateMap值
-  setDateMapValue(startTime, endTime, item) {
+  setDateMapValue(startTime, endTime, item, type) {
     const pushItem = {
       endTime: endTime,
       startTime: startTime,
       planDate: getFormatDate(startTime, "yyyyMMdd", "-"),
       thisDayStartTime: getFormatDate(startTime, 'HH:mm'),
       thisDayEndTime: getFormatDate(endTime, 'HH:mm'),
-      scheduleTemplateId: item.id,
       confirmAttendance: item.confirmAttendance,
       title: item.title,
+      id: item.id
     };
+    //模板会议id为空
+    if (type == 'repeat') {
+      pushItem.scheduleTemplateId = item.id;
+      pushItem.id = ''
+    }
+
     if (DateMap.has(toLocaleDateString(startTime))) {
       DateMap.get(toLocaleDateString(startTime)).push(pushItem)
     }
@@ -286,7 +294,7 @@ create.Page({
             // 剔除规则
             if (startTime.getTime() < excludeData.minFutureTime &&
               excludeData.excludeDateList.indexOf(getFormatDate(startTime, "yyyyMMdd", "-")) === -1) {
-              this.setDateMapValue(startTime, endTime, item);
+              this.setDateMapValue(startTime, endTime, item, 'repeat');
             }
           });
         }
@@ -298,7 +306,7 @@ create.Page({
             // 生成结束时间
             const endTime = new Date(startTime);
             endTime.setMinutes(endTime.getMinutes() + item.recurrenceModel.duration);
-            this.setDateMapValue(startTime, endTime, item);
+            this.setDateMapValue(startTime, endTime, item, 'repeat');
           });
         }
       });
@@ -309,15 +317,14 @@ create.Page({
         if (!item.scheduleTemplateId) {
           this.setDateMapValue(new Date(item.startTime.replace(/-/g, '/')), new Date(item.endTime.replace(/-/g, '/')), item);
         }
-        // 有scheduleTemplateId则是虚拟会议转成实体会议，需要替换rrule生成的会议记录
+        // 有scheduleTemplateId则是虚拟会议转成实体会议，需要替换rrule生成的模板会议
         else if (repeatIdList.includes(item.scheduleTemplateId)) {
           const list = DateMap.get(toLocaleDateString(new Date(item.planDate.replace(/-/g, '/')))) || [];
           list.forEach((o, index) => {
             if (o.scheduleTemplateId == item.scheduleTemplateId) {
-              list.splice(index, 1)
+              list.splice(index, 1, item)
             }
           });
-          this.setDateMapValue(new Date(item.startTime.replace(/-/g, '/')), new Date(item.endTime.replace(/-/g, '/')), item);
         }
       });
     }
@@ -411,7 +418,7 @@ create.Page({
     }
   },
   onPullDownRefresh() {
-    if (this.store.$data.tabBarIndex == '0') {
+    if (this.$store.data.tabBarIndex == '0') {
       dd.stopPullDownRefresh();
       return
     }

stores/exampleStore.js

@@ -10,8 +10,7 @@ class Store {
         originUsersId: [],
         originalData: null,
         indexNeedUpdate: false,
-        tabBarIndex: '0',
-        locationSchedule: () => { }
+        tabBarIndex: '0'
     }
 }
 export default new Store()
\ No newline at end of file