日程页面修改dataStr

pages/scheduleList/scheduleList.axml

@@ -10,16 +10,16 @@
     </view>
   </view>
   <scroll-view class="indexScrollView" scroll-y="{{true}}" style="background: #FFFFFF" lower-threshold="1000" onScrollToLower="lower" scroll-into-view="{{todayStr}}">
-    <block a:for="{{scheduleList}}">
+    <block a:for="{{scheduleList}}" key="{{item.dateStr}}">
       <!-- 年 -->
       <block a:if="{{item.type == 'year'}}">
-        <view class="year">
+        <view class="year" id="{{item.dateStr}}">
           {{item.value}}年
         </view>
       </block>
       <!-- 月 -->
       <block a:elif="{{item.type == 'month'}}">
-        <view class="month">
+        <view class="month" id="{{item.dateStr}}">
           {{item.value}}月
         </view>
       </block>
@@ -31,8 +31,8 @@
       </block>
       <!-- 天 -->
       <block a:elif="{{item.type == 'day' || item.type == 'today'}}">
-        <view class="date">
-          <view class="hasDateTitle {{item.type == 'today' ? 'today' : ''}} {{item.value.isBeOverdue ? 'overdueLabel':''}}">
+        <view class="date" id="{{item.dateStr}}">
+          <view class="hasDateTitle {{item.type == 'today' && item.hasDateLabel ? 'today' : ''}} {{item.value.isBeOverdue ? 'overdueLabel':''}}">
             <view>
                 {{item.week}}
             </view>
@@ -53,7 +53,7 @@
       </block>
       <!-- 今天有无会议 -->
       <block a:elif="{{item.type == 'thisDay'}}">
-        <view class="date" id="{{item.value.dateStr}}">
+        <view class="date" id="{{item.dateStr}}">
           <view class="hasDateTitle today">
             <view>
                 {{item.week}}

pages/scheduleList/scheduleList.js

@@ -59,6 +59,7 @@ create.Page({
             );
           }
           // 第一次加载
+          console.log(scheduleList);
           const finalDate = new Date();
           that.setData({
             scheduleList: scheduleList,
@@ -314,15 +315,14 @@ create.Page({
         DateList.push({
           type: "year",
           value: keyDate.getFullYear(),
-          dateStr: keyDate.getFullYear()
+          dateStr: `${keyDate.getFullYear()}`
         });
       }
       if (keyDate.getDate() === 1) {
         DateList.push({
           type: "month",
           value: keyDate.getMonth() + 1,
-          dateStr: `${keyDate.getFullYear()}/${keyDate.getMonth() +
-            1}/${keyDate.getDate()}`
+          dateStr: `${keyDate.getFullYear()}/${keyDate.getMonth() + 1}`
         });
       }
       if (keyDate.getDay() === 0) {
@@ -337,7 +337,8 @@ create.Page({
           value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${
             rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月"
           }${rangeDay2}日`,
-          dayStr: `${keyDate.getFullYear()}第${listWeek}周`
+          dayStr: `${keyDate.getFullYear()}/${rangeMonth1 +
+            1}/${rangeDay1}-week`
         });
         listWeek += 1;
       }
@@ -353,13 +354,13 @@ create.Page({
                   ? "0" + keyDate.getDate()
                   : keyDate.getDate(),
               value: item,
-              dateStr: `${key}/${item.id}`
+              dateStr: `${key}`
             });
           } else {
             DateList.push({
               type: "day",
               value: item,
-              dateStr: `${key}/${item.id}`
+              dateStr: `${key}/${item.id || item.scheduleTemplateId}`
             });
           }
         });
@@ -376,13 +377,13 @@ create.Page({
                   ? "0" + keyDate.getDate()
                   : keyDate.getDate(),
               value: item,
-              dateStr: `${key}/${item.id}`
+              dateStr: `${key}`
             });
           } else {
             DateList.push({
               type: "today",
               value: item,
-              dateStr: `${key}/${item.id}`
+              dateStr: `${key}/${item.id || item.scheduleTemplateId}`
             });
           }
         });