Merge branch 'dev' of http://gitlab.roboming.com/fengzhaoyu/schedule into dev

pages/index/index.js

@@ -361,7 +361,6 @@ create.Page({
         }
       }
     }
-
     if (DateMap.has(toLocaleDateString(startTime))) {
       DateMap.get(toLocaleDateString(startTime)).push(pushItem);
     }
@@ -394,10 +393,12 @@ create.Page({
         const initialTimeList = item.initialTime.split("-");
         const startTimeList = item.startTime.split(":");
         const DTSTART = `${initialTimeList[0]}${initialTimeList[1]}${initialTimeList[2]}T${startTimeList[0]}${startTimeList[1]}00Z`;
-        const rule = RRule.fromString(
-          `${item.recurrenceModel.recurrenceRule};DTSTART=${DTSTART}`
-        );
-
+        let rule = { all: () => [] };
+        if (item.recurrenceModel.recurrenceRule) {
+          rule = RRule.fromString(
+            `${item.recurrenceModel.recurrenceRule};DTSTART=${DTSTART}`
+          );
+        }
         const setDateMapValueAll = (startTime, endTime, item) => {
           //如果有日程会议则用日程会议替换
           let replaceItem = [];
@@ -418,6 +419,7 @@ create.Page({
         };
         // 需要剔除某一天
         if (item.excludePlanDates) {
+
           const excludeData = getExcludeDate(item.excludePlanDates.split(","));
           rule.all().forEach(startTime => {
             //修正时间（时间有8小时时差）