冲突解决

PageComponents/scheduleList/scheduleList.js

@@ -66,24 +66,10 @@ create.Component({
             }
             // 第一次加载
             const today = new Date();
-            // finalDate 是用来定位到今天的
-            const finalDate = new Date(today);
-            // finalDate.setDate(today.getDate() - today.getDay())
-            // <<<<<<< HEAD
-            //             that.setData({
-            //               scheduleList: scheduleList,
-            //               todayStr: finalDate.toLocaleDateString(),
-            //               thisYear: year,
-            //               maxYear: year,
-            //               canClick: true,
-            //               startPageOnShow: true,
-            //               isFirstLoad: false
-            //             });
-            // =======
             that.setData(
               {
                 scheduleList: scheduleList,
-                todayStr: finalDate.toLocaleDateString(),
+                todayStr: today.toLocaleDateString(),
                 thisYear: year,
                 maxYear: year
               },
@@ -91,7 +77,6 @@ create.Component({
                 console.log(new Date().getTime());
               }
             );
-            // >>>>>>> 8548e2b26ad549008cdd8c9e5e2bf83d67124e7d
           }
         );
       });
@@ -176,16 +161,7 @@ create.Component({
           let rule = RRule.fromString(
             `${item.recurrenceModel.recurrenceRule};DTSTART=${DTSTART}`
           );
-          // rule.options.tzid = "Asia/Hong_Kong";
-          // 改变时区
-          // <<<<<<< HEAD
-          // let rullAll = rule.all()
-          // rule.all().map(item => {
-          //   console.log(item.toLocaleDateString())
-          // })
-
-          // =======
-          // >>>>>>> 8548e2b26ad549008cdd8c9e5e2bf83d67124e7d
+          rule.options.tzid = "Asia/Hong_Kong";
           // 判断是否需要剔除某一天
           if (item.excludePlanDates) {
             // 拿到剔除日期的list