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

PageComponents/scheduleList/scheduleList.js

@@ -148,7 +148,7 @@ create.Component({
           let rule = RRule.fromString(
             `${item.recurrenceModel.recurrenceRule};DTSTART=${DTSTART}`
           );
-          rule.options.tzid = "Asia/Hong_Kong";
+          rule.options.tzid = "";
           // 判断是否需要剔除某一天
           if (item.excludePlanDates) {
             // 拿到剔除日期的list
@@ -176,7 +176,6 @@ create.Component({
                   {
                     confirmAttendance: item.confirmAttendance,
                     endTime: getFormatDate(endTime, "yyyyMMdd HH:mm:ss"),
-                    // id: item.id,
                     scheduleTemplateId: item.id,
                     startTime: startTime,
                     title: item.title,
@@ -187,12 +186,14 @@ create.Component({
             });
           } else {
             rule.all().map(item2 => {
+              let time = new Date(item2);
+              time.setHours(time.getHours() - 8);
               let startTime =
-                getFormatDate(item2, "yyyyMMdd") +
+                getFormatDate(time, "yyyyMMdd") +
                 " " +
                 item.recurrenceModel.startTime;
               let endTime = new Date(
-                getFormatDate(item2, "yyyyMMdd") +
+                getFormatDate(time, "yyyyMMdd") +
                   " " +
                   item.recurrenceModel.startTime
               );