修改版本

pages/index/index.js

@@ -29,7 +29,7 @@ import create from "dd-store";
 let maxClickCount = 5;
 create.Page({
   data: {
-    sign: '',
+    sign: "",
     refresh: false,
     $data: null,
     iconDay: currentDate.getDate(),
@@ -62,7 +62,6 @@ create.Page({
   maxYear: maxYear,
   todayIndex: 0,
   onShow() {
-
     //如果是重复会议重新算
     if (this.$store.data.indexNeedUpdate) {
       dd.setNavigationBar({
@@ -88,19 +87,19 @@ create.Page({
     }
     //开启一个定时器
     this.timer = setInterval(() => {
-      this.getData()
-    }, 30000)
+      this.getData();
+    }, 30000);
   },
   onHide() {
     clearInterval(this.timer);
     this.timer = null;
   },
   refresh() {
-    this.onLoad()
+    this.onLoad();
   },
   onLoad(query) {
     console.log(query);
-    if (query && JSON.stringify(query) !== '{}') {
+    if (query && JSON.stringify(query) !== "{}") {
       this.setData({
         listLoading: false
       });
@@ -136,74 +135,76 @@ create.Page({
     getDynamicList({
       current,
       size: 10
-    }).then(res => {
-      if (!res.data.data) {
-        this.setData({
-          listLoading: false,
-          dynamicList: []
-        });
-        return;
-      }
-      const dynamicList = res.data.data.records.map((item, index) => {
-        for (let i = 0; i < item.meetingLogDataList.length; i++) {
-          if (item.meetingLogDataList[i].creatorInfo) {
-            item.meetingLogDataList[i].creatorInfo = JSON.parse(
-              item.meetingLogDataList[i].creatorInfo
-            );
-          }
-          if (item.meetingLogDataList[i].createTime) {
-            item.meetingLogDataList[i].createTime = getCreateShowTime(
-              item.meetingLogDataList[i].createTime
-            );
-          }
-          let itemData = item.meetingLogDataList[i].meetingLogResource;
-          if (itemData) {
-            itemData.groupId = item.groupId;
-            if (itemData.taskInfos || itemData.fileInfos) {
-              if (itemData.creatorInfo) {
-                itemData.creatorInfo = JSON.parse(itemData.creatorInfo);
-              }
-              if (itemData.fileInfos) {
-                itemData.fileInfos = JSON.parse(itemData.fileInfos);
-              }
-              if (itemData.taskInfos) {
-                itemData.taskInfos = JSON.parse(itemData.taskInfos);
-              }
-              if (itemData.acceptorInfo) {
-                itemData.acceptorInfo = JSON.parse(itemData.acceptorInfo);
+    })
+      .then(res => {
+        if (!res.data.data) {
+          this.setData({
+            listLoading: false,
+            dynamicList: []
+          });
+          return;
+        }
+        const dynamicList = res.data.data.records.map((item, index) => {
+          for (let i = 0; i < item.meetingLogDataList.length; i++) {
+            if (item.meetingLogDataList[i].creatorInfo) {
+              item.meetingLogDataList[i].creatorInfo = JSON.parse(
+                item.meetingLogDataList[i].creatorInfo
+              );
+            }
+            if (item.meetingLogDataList[i].createTime) {
+              item.meetingLogDataList[i].createTime = getCreateShowTime(
+                item.meetingLogDataList[i].createTime
+              );
+            }
+            let itemData = item.meetingLogDataList[i].meetingLogResource;
+            if (itemData) {
+              itemData.groupId = item.groupId;
+              if (itemData.taskInfos || itemData.fileInfos) {
+                if (itemData.creatorInfo) {
+                  itemData.creatorInfo = JSON.parse(itemData.creatorInfo);
+                }
+                if (itemData.fileInfos) {
+                  itemData.fileInfos = JSON.parse(itemData.fileInfos);
+                }
+                if (itemData.taskInfos) {
+                  itemData.taskInfos = JSON.parse(itemData.taskInfos);
+                }
+                if (itemData.acceptorInfo) {
+                  itemData.acceptorInfo = JSON.parse(itemData.acceptorInfo);
+                }
               }
             }
           }
-        }
-        return item;
-      });
-
-      //第一页数据会重新请求需要替换
-      if (current === 1) {
-        this.setData({
-          dynamicList
+          return item;
         });
-      } else {
-        const newDynamicList = this.data.dynamicList.concat(dynamicList);
+
+        //第一页数据会重新请求需要替换
+        if (current === 1) {
+          this.setData({
+            dynamicList
+          });
+        } else {
+          const newDynamicList = this.data.dynamicList.concat(dynamicList);
+          this.setData({
+            dynamicList: newDynamicList
+          });
+        }
         this.setData({
-          dynamicList: newDynamicList
+          listLoading: false,
+          current: res.data.data.current,
+          pages: res.data.data.pages
         });
-      }
-      this.setData({
-        listLoading: false,
-        current: res.data.data.current,
-        pages: res.data.data.pages
+        if (callBack) {
+          callBack();
+        }
+      })
+      .catch(err => {
+        if (err && err.refresh) {
+          this.setData({
+            refresh: true
+          });
+        }
       });
-      if (callBack) {
-        callBack();
-      }
-    }).catch(err => {
-      if (err && err.refresh) {
-        this.setData({
-          refresh: true
-        })
-      }
-    });
   },
   //动态置顶
   changeCollection(e) {
@@ -302,25 +303,27 @@ create.Page({
     getHomeUserSchedule1({
       startTime: "2020-01-01 00:00:00",
       endTime: "2025-12-30 23:59:59"
-    }).then(res => {
-      //是否刷新页面
-      if (this.data.sign && res.data.data.sign !== this.data.sign) {
-        DateMap = getDateMap(this.minYear, this.maxYear);
-      }
+    })
+      .then(res => {
+        //是否刷新页面
+        if (this.data.sign && res.data.data.sign !== this.data.sign) {
+          DateMap = getDateMap(this.minYear, this.maxYear);
+        }
 
-      if (res.data.data.sign !== this.data.sign) {
-        this.getScheduleList(res.data.data);
-      }
-      this.setData({
-        sign: res.data.data.sign
-      })
-    }).catch(err => {
-      if (err && err.refresh) {
+        if (res.data.data.sign !== this.data.sign) {
+          this.getScheduleList(res.data.data);
+        }
         this.setData({
-          refresh: true
-        })
-      }
-    });
+          sign: res.data.data.sign
+        });
+      })
+      .catch(err => {
+        if (err && err.refresh) {
+          this.setData({
+            refresh: true
+          });
+        }
+      });
   },
   //生成DateMap值
   setDateMapValue(startTime, endTime, item, type) {
@@ -460,7 +463,7 @@ create.Page({
     }
     // 取出DateMap的value值平铺到DateList
     const DateList = [];
-    DateMap.forEach(function (value, key) {
+    DateMap.forEach(function(value, key) {
       const keyDate = new Date(key);
       const year = keyDate.getFullYear();
       const month = keyDate.getMonth();
@@ -493,13 +496,13 @@ create.Page({
           value: `第${getWeekNumber(year, month, date)}周，${month +
             1}月${date}日 - ${
             rangeMonth2 == month ? "" : rangeMonth2 + 1 + "月"
-            }${rangeDay2}日`,
+          }${rangeDay2}日`,
           dateStr: `${year}/${month + 1}/${date}-week`
         });
       }
       // 有日程长度
       if (value.length !== 0) {
-        value.sort(function (a, b) {
+        value.sort(function(a, b) {
           return a.startTime.getTime() - b.startTime.getTime();
         });
         value.forEach((item, index) => {
@@ -727,7 +730,7 @@ create.Page({
   createMeeting() {
     dd.navigateTo({ url: "./../createMeeting/createMeeting" });
   },
-  nextDetail: throttle(function (e) {
+  nextDetail: throttle(function(e) {
     dd.navigateTo({
       url: `./../meetingDetail/meetingDetail?scheduleItem=${encodeURIComponent(
         JSON.stringify(e.target.dataset.item)
@@ -810,7 +813,7 @@ create.Page({
     maxClickCount--;
     if (maxClickCount == 0) {
       dd.alert({
-        content: "0.0.13"
+        content: "0.0.14"
       });
       maxClickCount = 5;
     }