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

PageComponents/scheduleList/scheduleList.acss

@@ -161,6 +161,7 @@
 .month {
     padding: 0 32rpx;
     height: 48rpx;
+    font-size: 48rpx;
     line-height: 48rpx;
     margin-bottom: 50rpx;
     font-weight: bold;

PageComponents/scheduleList/scheduleList.js

@@ -28,11 +28,6 @@ create.Component({
   props: {},
   didMount() {
     this.getDate();
-    let userMsg = {
-      headUrl: getApp().globalData.avatar || "",
-      userName: getApp().globalData.name
-    };
-    console.log(userMsg);
     this.setData({
       userMsg: {
         headUrl: getApp().globalData.avatar || "",
@@ -130,15 +125,7 @@ create.Component({
         this.data.response.templateList.map(item => {
           // TO DO 判断所获取的时间区间
           // 将会议的年，月，日拆分，时分拆分，生成rrules规则
-          let initialTime = item.initialTime.split("-"); //
-          // <<<<<<< HEAD
-          //           let initialTimeDate = new Date(parseInt(initialTime[0]), parseInt(initialTime[1]) - 1, parseInt(initialTime[2]));
-          //           initialTimeDate.setDate(initialTimeDate.getDate() - 1)
-          //           console.log(initialTimeDate.toLocaleDateString())
-          //           let initialTimeDateyear = initialTimeDate.getFullYear()
-          //           let initialTimeDatemonth = initialTimeDate.getMonth() + 1 < 10 ? '0' + (initialTimeDate.getMonth() + 1) : initialTimeDate.getMonth() + 1
-          //           let initialTimeDateday = initialTimeDate.getDate() < 10 ? '0' + initialTimeDate.getDate() : initialTimeDate.getDate()
-          // =======
+          let initialTime = item.initialTime.split("-");
           let initialTimeDate = new Date(
             parseInt(initialTime[0]),
             parseInt(initialTime[1]) - 1,
@@ -231,11 +218,15 @@ create.Component({
           } else if (
             item.scheduleTemplateId &&
             scheduleMap.get(
-              `${item.planDate.replace(/-/g, "/")}/${item.scheduleTemplateId}`
+              `${new Date(
+                item.planDate.replace(/-/g, "/")
+              ).toLocaleDateString()}/${item.scheduleTemplateId}`
             )
           ) {
             scheduleMap.set(
-              `${item.planDate.replace(/-/g, "/")}/${item.scheduleTemplateId}`,
+              `${new Date(
+                item.planDate.replace(/-/g, "/")
+              ).toLocaleDateString()}/${item.scheduleTemplateId}`,
               item
             );
           }

pages/index/index.acss

@@ -84,7 +84,7 @@
 .iconicon_days {
     position: absolute;
     left: 5rpx;
-    top: 5rpx;
+    top: 6rpx;
     font-size: 30rpx;
 }