更新字段

bb81785e · liang ce · f5f88d00 · bb81785e · bb81785e · bb81785e
Commit bb81785e authored Mar 31, 2020 by liang ce
5 changed files
--- a/PageComponents/scheduleList/scheduleList.js
+++ b/PageComponents/scheduleList/scheduleList.js
@@ -27,100 +27,55 @@ Component({
  },
  props: {},
  didMount() {
-    // let that = this;
-    // let now = new Date();
-    // let year = now.getFullYear();
-    // let month = now.getMonth() + 1;
-    // let day = now.getDate();
-    // let parmsStartDate = this.returnMonthActionAndEndDate(year, month - 2, day)
-    //   .startDay;
-    // let parmsEndDate = this.returnMonthActionAndEndDate(year, month + 2, day)
-    //   .endDay;
-    // let startTime = getFormatDate(
-    //   new Date(year, month - 12, parmsStartDate),
-    //   "yyyyMMdd",
-    //   "-"
-    // );
-    // let endTime = getFormatDate(
-    //   new Date(year, month + 12, parmsEndDate),
-    //   "yyyyMMdd",
-    //   "-"
-    // );
-    // let data = {
-    //   startTime: `${startTime} 00:00:00`,
-    //   endTime: `${endTime} 23:59:59`
-    // };
-    // getHomeUserSchedule1(data).then(res => {
-    //   this.setData(
-    //     {
-    //       response: res.data.data
-    //     },
-    //     () => {
-    //       let scheduleList = [];
-    //       for (let i = -12; i <= 12; i++) {
-    //         let forDate = new Date(2024, month + i, 1);
-    //         scheduleList.push(
-    //           that.returnScheduleList(forDate.toLocaleDateString())
-    //         );
-    //       }
-    //       this.setData({
-    //         scheduleList: scheduleList,
-    //         pageStartTime: new Date(year, month - 13, 1).toLocaleDateString(),
-    //         pageEndTime: new Date(year, month + 12, 1).toLocaleDateString()
-    //       });
-    //     }
-    //   );
-    // });
-    // 页面显示
-    let data = {
-      startTime: "2020-01-01 00:00:00",
-      endTime: "2025-12-30 23:59:59"
-    };
-    let that = this;
-    getHomeUserSchedule1(data).then(res => {
-      that.setData(
-        {
-          response: res.data.data
-        },
-        () => {
-          let now = new Date();
-          let year = now.getFullYear();
-          let scheduleList = [];
-          for (let i = 0; i <= year - 2019; i++) {
-            scheduleList.push(that.returnScheduleList(2019 + i));
-          }
-          // 第一次加载
-          if (this.data.isFirstLoad) {
-            const today = new Date();
-            // finalDate 是用来定位到今天的
-            const finalDate = new Date(today);
-            // finalDate.setDate(today.getDate() - today.getDay())
-            that.setData({
-              scheduleList: scheduleList,
-              todayStr: finalDate.toLocaleDateString(),
-              thisYear: year,
-              maxYear: year,
-              canClick: true,
-              startPageOnShow: true,
-              isFirstLoad: false
-            });
-          } else {
-            that.setData({
-              scheduleList: scheduleList,
-              thisYear: year,
-              maxYear: year,
-              canClick: true,
-              startPageOnShow: true
-            });
-          }
-        }
-      );
-    });
+    this.getDate();
+  },
+  didUpdate() {
+    if (this.props.update) {
+      this.getDate();
+    }
  },
-  didUpdate() { },
-  didUnmount() { },
+  didUnmount() {},
  methods: {
-    nextDetail: throttle(function (e) {
+    getDate() {
+      // 页面显示
+      let data = {
+        startTime: "2020-01-01 00:00:00",
+        endTime: "2025-12-30 23:59:59"
+      };
+      let that = this;
+      getHomeUserSchedule1(data).then(res => {
+        that.setData(
+          {
+            response: res.data.data
+          },
+          () => {
+            let now = new Date();
+            let year = now.getFullYear();
+            let scheduleList = [];
+            for (let i = 0; i <= year - 2019; i++) {
+              scheduleList.push(that.returnScheduleList(2019 + i));
+            }
+            // 第一次加载
+            if (this.data.isFirstLoad) {
+              const today = new Date();
+              // finalDate 是用来定位到今天的
+              const finalDate = new Date(today);
+              // finalDate.setDate(today.getDate() - today.getDay())
+              that.setData({
+                scheduleList: scheduleList,
+                todayStr: finalDate.toLocaleDateString(),
+                thisYear: year,
+                maxYear: year,
+                canClick: true,
+                startPageOnShow: true,
+                isFirstLoad: false
+              });
+            }
+          }
+        );
+      });
+    },
+    nextDetail: throttle(function(e) {
      let item = e.target.dataset.item;
      dd.navigateTo({
        url: `./../editMeeting/editMeeting?scheduleItem=${JSON.stringify(item)}`
@@ -185,9 +140,16 @@ Component({
            );
            rule.all().map(item2 => {
              let excludeDate = getFormatDate(item2, "yyyyMMdd");
-              let hasExclude = excludeDateList.scheduleList.indexOf(excludeDate) === -1;
-              if (new Date(item2).getTime() < excludeDateList.templateList && hasExclude) {
-                let startTime = getFormatDate(item2, "yyyyMMdd") + " " + item.recurrenceModel.startTime;
+              let hasExclude =
+                excludeDateList.scheduleList.indexOf(excludeDate) === -1;
+              if (
+                new Date(item2).getTime() < excludeDateList.templateList &&
+                hasExclude
+              ) {
+                let startTime =
+                  getFormatDate(item2, "yyyyMMdd") +
+                  " " +
+                  item.recurrenceModel.startTime;
                let endTime = new Date(startTime);
                endTime.setMinutes(
                  endTime.getMinutes() + item.recurrenceModel.duration
@@ -201,7 +163,7 @@ Component({
                    scheduleTemplateId: item.id,
                    startTime: startTime,
                    title: item.title,
-                    planDate: getFormatDate(item2, "yyyyMMdd", '-')
+                    planDate: getFormatDate(item2, "yyyyMMdd", "-")
                  }
                );
              }
@@ -214,8 +176,8 @@ Component({
                item.recurrenceModel.startTime;
              let endTime = new Date(
                getFormatDate(item2, "yyyyMMdd") +
-                " " +
-                item.recurrenceModel.startTime
+                  " " +
+                  item.recurrenceModel.startTime
              );
              endTime.setMinutes(
                endTime.getMinutes() + item.recurrenceModel.duration
@@ -228,7 +190,7 @@ Component({
                  scheduleTemplateId: item.id,
                  startTime: startTime,
                  title: item.title,
-                  planDate: getFormatDate(item2, "yyyyMMdd", '-')
+                  planDate: getFormatDate(item2, "yyyyMMdd", "-")
                }
              );
            });
@@ -250,7 +212,7 @@ Component({
            );
          }
        });
-        scheduleMap.forEach(function (value, key, map) {
+        scheduleMap.forEach(function(value, key, map) {
          scheduleList.push(value);
        });
        return scheduleList;
@@ -332,9 +294,9 @@ Component({
              thisDayEndTime: AllScheduleList[y].endTime.slice(11, 16),
              isBeOverdue:
                new Date().getTime() >
-                  new Date(
-                    AllScheduleList[y].endTime.replace(/-/g, "/")
-                  ).getTime()
+                new Date(
+                  AllScheduleList[y].endTime.replace(/-/g, "/")
+                ).getTime()
                  ? true
                  : false
            });
@@ -369,9 +331,9 @@ Component({
                duration: count + 1,
                isBeOverdue:
                  new Date().getTime() >
-                    new Date(
-                      AllScheduleList[y].endTime.replace(/-/g, "/")
-                    ).getTime()
+                  new Date(
+                    AllScheduleList[y].endTime.replace(/-/g, "/")
+                  ).getTime()
                    ? true
                    : false
              });
@@ -388,7 +350,7 @@ Component({
        value: year
      });
      let thisDay = new Date().toLocaleDateString();
-      DateMap.forEach(function (value, key, map) {
+      DateMap.forEach(function(value, key, map) {
        if (
          new Date(key).getDay() === 0 &&
          that.count(
@@ -414,7 +376,7 @@ Component({
              type: "week",
              value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${
                rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月"
-                }${rangeDay2}日`,
+              }${rangeDay2}日`,
              dayStr: key
            });
          }
@@ -430,7 +392,7 @@ Component({
              type: "week",
              value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${
                rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月"
-                }${rangeDay2}日`,
+              }${rangeDay2}日`,
              dayStr: key
            });
          }
@@ -452,7 +414,7 @@ Component({
            type: "week",
            value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${
              rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月"
-              }${rangeDay2}日`,
+            }${rangeDay2}日`,
            dayStr: key
          });
        }

--- a/pages/index/index.axml
+++ b/pages/index/index.axml
 <view a:if="{{tabBarIndex === '0'}}">
-  <my-dynamic>
-  </my-dynamic>
+    <my-dynamic>
+    </my-dynamic>
 </view>
 <view a:if="{{tabBarIndex === '1'}}">
-  <my-schedule>
-  </my-schedule>
+    <my-schedule update="{{indexNeedUpdate}}">
+    </my-schedule>
 </view>
 <view class="tabBar">
-  <view onTap="changeTabBar" data-tabbar='0'>
-    <view class="tabBarView {{tabBarIndex === '0' ? 'ischooseTabBar' : ''}}">
-      <text class="iconfont iconicon_dynamic"></text>
-      <text>动态</text>
+    <view onTap="changeTabBar" data-tabbar='0'>
+        <view class="tabBarView {{tabBarIndex === '0' ? 'ischooseTabBar' : ''}}">
+            <text class="iconfont iconicon_dynamic"></text>
+            <text>动态</text>
+        </view>
    </view>
-  </view>
-  <view onTap="changeTabBar" data-tabbar='1'>
-    <view class="tabBarView {{tabBarIndex === '1' ? 'ischooseTabBar' : ''}}">
-      <text class="iconfont iconicon_Calendarbox1"></text>
-      <text>日程</text>
+    <view onTap="changeTabBar" data-tabbar='1'>
+        <view class="tabBarView {{tabBarIndex === '1' ? 'ischooseTabBar' : ''}}">
+            <text class="iconfont iconicon_Calendarbox1"></text>
+            <text>日程</text>
+        </view>
+    </view>
+    <view class="createMeeting" onTap="createMeeting">
+        <text class="iconfont iconicon_add1"></text>
    </view>
-  </view>
-  <view class="createMeeting" onTap="createMeeting">
-    <text class="iconfont iconicon_add1"></text>
-  </view>
 </view>
\ No newline at end of file
--- a/pages/index/index.js
+++ b/pages/index/index.js
 import { getFormatDate } from '../../utils/utils'
-Page({
+import create from 'dd-store'
+import exampleStore from '/stores/exampleStore'
+create.Page({
+  store: exampleStore,
+  useAll: true,
  data: {
-    tabBarIndex: '1'
+    tabBarIndex: '1',
  },
  onLoad() {


--- a/pages/meetingRoomList/meetingRoomList.js
+++ b/pages/meetingRoomList/meetingRoomList.js
 import { getMeetingRoom, getLabelTree, myMeetingPage, getReserveRoomList, getAllScheduleWithMeetingRoomByTime } from '../../api/request'
 import { EEXIST } from 'constants'
-import { resolve } from 'url'
 import create from 'dd-store'
 import exampleStore from '/stores/exampleStore'
 create.Page({

--- a/stores/exampleStore.js
+++ b/stores/exampleStore.js
@@ -28,6 +28,7 @@ class Store {
        originUsers: [],
        originUsersId: [],
        originalData: null,
+        indexNeedUpdate: false,
    }
 }
 export default new Store()
\ No newline at end of file