delete code

PageComponents/myDynamic/myDynamic.axml

@@ -15,8 +15,8 @@
           <block a:for="{{item.meetingLogDataList.slice(0,2)}}" a:for-item="dynamicItem">
             <view class="userDynamic">
               <view class="dynamicTime">
-                <text>{{dynamicItem.creatorInfo.username}}更新了{{dynamicItem.category == 2 ? '文件' : '任务'}}</text>
-                <text>{{createTime}}</text>
+                <text>{{dynamicItem.content}}</text>
+                <text>{{dynamicItem.createTime}}</text>
               </view>
               <file-list a:if="{{dynamicItem.category === '2'}}" fileView="{{dynamicItem.meetingLogResource}}" isCanEdit="{{false}}"/>
               <view class="dynamicFile" a:if="{{dynamicItem.category === '3'}}">

PageComponents/myDynamic/myDynamic.js

@@ -3,7 +3,7 @@ import {
   meetingCollection,
   updateMeetingTask
 } from "../../api/request";
-import { dealFileTime, uniqueObject } from "../../utils/utils";
+import { getCreateShowTime, uniqueObject } from "../../utils/utils";
 import create from 'dd-store';
 
 create.Component({
@@ -59,6 +59,11 @@ create.Component({
                   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) {
                 if (itemData.taskInfos || itemData.fileInfos) {
@@ -107,48 +112,6 @@ create.Component({
         }
       });
     },
-    // touchstart(e) {
-    //   this.setData({
-    //     startX: e.changedTouches[0].clientX,
-    //     startY: e.changedTouches[0].clientY,
-    //     isTouchMove: this.data.isTouchMove
-    //       ? !this.data.isTouchMove
-    //       : this.data.isTouchMove
-    //   });
-    // },
-    // touchmove(e) {
-    //   var that = this,
-    //     startX = that.data.startX, //开始X坐标
-    //     startY = that.data.startY, //开始Y坐标
-    //     touchMoveX = e.changedTouches[0].clientX, //滑动变化坐标
-    //     touchMoveY = e.changedTouches[0].clientY, //滑动变化坐标
-    //     //获取滑动角度
-    //     angle = that.angle(
-    //       { X: startX, Y: startY },
-    //       { X: touchMoveX, Y: touchMoveY }
-    //     );
-    //   var isTouchMove;
-    //   //滑动超过30度角 return
-    //   if (Math.abs(angle) > 30) return;
-    //   if (touchMoveX > startX) {
-    //     //右滑
-    //     isTouchMove = false;
-    //   } else {
-    //     //左滑
-    //     isTouchMove = true;
-    //   }
-    //   //更新数据
-    //   that.setData({
-    //     isTouchMove: isTouchMove,
-    //     touchMoveId: e.currentTarget.dataset.id
-    //   });
-    // },
-    // angle(start, end) {
-    //   var _X = end.X - start.X,
-    //     _Y = end.Y - start.Y;
-    //   //返回角度 /Math.atan()返回数字的反正切值
-    //   return (360 * Math.atan(_Y / _X)) / (2 * Math.PI);
-    // },
     changeCollection(e) {
       let that = this;
       let index = e.target.dataset.index;

PageComponents/scheduleList/scheduleList.js

@@ -41,6 +41,9 @@ create.Component({
       this.update();
       this.getDate();
     }
+    if (!this.props.update && this.$store.data.isLocation) {
+      this.changeLocation();
+    }
   },
   didUnmount() {},
   methods: {
@@ -370,8 +373,9 @@ create.Component({
       });
       let thisDay = new Date().toLocaleDateString();
       DateMap.forEach(function(value, key, map) {
+        const keyDate = new Date(key);
         if (
-          new Date(key).getDay() === 0 &&
+          keyDate.getDay() === 0 &&
           that.count(
             key,
             new Date(year, 0, isLeapYear ? 366 : 365).toLocaleDateString()
@@ -379,15 +383,15 @@ create.Component({
         ) {
           listWeek = listWeek + 1;
           // 有此月份
-          if (new Date(key).getMonth() !== listMonth) {
-            listMonth = new Date(key).getMonth();
+          if (keyDate.getMonth() !== listMonth) {
+            listMonth = keyDate.getMonth();
             DateList.push({
               type: "month",
-              value: new Date(key).getMonth() + 1
+              value: keyDate.getMonth() + 1
             });
-            let rangeYear1 = new Date(key).getFullYear();
-            let rangeMonth1 = new Date(key).getMonth();
-            let rangeDay1 = new Date(key).getDate();
+            let rangeYear1 = keyDate.getFullYear();
+            let rangeMonth1 = keyDate.getMonth();
+            let rangeDay1 = keyDate.getDate();
             let rangeDate = new Date(rangeYear1, rangeMonth1, rangeDay1 + 6);
             let rangeMonth2 = new Date(rangeDate).getMonth();
             let rangeDay2 = new Date(rangeDate).getDate();
@@ -401,9 +405,9 @@ create.Component({
           }
           // 没有此月份
           else {
-            let rangeYear1 = new Date(key).getFullYear();
-            let rangeMonth1 = new Date(key).getMonth();
-            let rangeDay1 = new Date(key).getDate();
+            let rangeYear1 = keyDate.getFullYear();
+            let rangeMonth1 = keyDate.getMonth();
+            let rangeDay1 = keyDate.getDate();
             let rangeDate = new Date(rangeYear1, rangeMonth1, rangeDay1 + 6);
             let rangeMonth2 = new Date(rangeDate).getMonth();
             let rangeDay2 = new Date(rangeDate).getDate();
@@ -416,15 +420,12 @@ create.Component({
             });
           }
         } else if (
-          new Date(key).getDay() === 0 &&
-          that.count(
-            new Date(key),
-            new Date(year, 0, isLeapYear ? 366 : 365) < 7
-          )
+          keyDate.getDay() === 0 &&
+          that.count(keyDate, new Date(year, 0, isLeapYear ? 366 : 365) < 7)
         ) {
-          let rangeYear1 = new Date(key).getFullYear();
-          let rangeMonth1 = new Date(key).getMonth();
-          let rangeDay1 = new Date(key).getDate();
+          let rangeYear1 = keyDate.getFullYear();
+          let rangeMonth1 = keyDate.getMonth();
+          let rangeDay1 = keyDate.getDate();
           let rangeDate = new Date(rangeYear1, rangeMonth1, rangeDay1 + 6);
           let rangeMonth2 = new Date(rangeDate).getMonth();
           let rangeDay2 = new Date(rangeDate).getDate();
@@ -445,10 +446,10 @@ create.Component({
             value: {
               value: value.scheduleList,
               day:
-                new Date(key).getDate() < 10
-                  ? "0" + new Date(key).getDate()
-                  : new Date(key).getDate(),
-              week: weekList[new Date(key).getDay()]
+                keyDate.getDate() < 10
+                  ? "0" + keyDate.getDate()
+                  : keyDate.getDate(),
+              week: weekList[keyDate.getDay()]
             }
           });
         }
@@ -459,10 +460,10 @@ create.Component({
             value: {
               value: value.scheduleList,
               day:
-                new Date(key).getDate() < 10
-                  ? "0" + new Date(key).getDate()
-                  : new Date(key).getDate(),
-              week: weekList[new Date(key).getDay()],
+                keyDate.getDate() < 10
+                  ? "0" + keyDate.getDate()
+                  : keyDate.getDate(),
+              week: weekList[keyDate.getDay()],
               dateStr: key
             }
           });
@@ -473,10 +474,10 @@ create.Component({
             value: {
               value: value.scheduleList,
               day:
-                new Date(key).getDate() < 10
-                  ? "0" + new Date(key).getDate()
-                  : new Date(key).getDate(),
-              week: weekList[new Date(key).getDay()],
+                keyDate.getDate() < 10
+                  ? "0" + keyDate.getDate()
+                  : keyDate.getDate(),
+              week: weekList[keyDate.getDay()],
               dateStr: key
             }
           });
@@ -505,6 +506,21 @@ create.Component({
     },
     nextPage() {
       dd.navigateTo({ url: "./../createMeeting/createMeeting" });
+    },
+    changeLocation() {
+      this.setData(
+        {
+          todayStr: ""
+        },
+        () => {
+          this.setData({
+            todayStr: new Date().toLocaleDateString()
+          });
+          this.$store.data.isLocation = false;
+          this.update();
+          console.log("更新完毕");
+        }
+      );
     }
   }
 });

app.json

@@ -7,13 +7,7 @@
     "pages/outLookContact/outLookContact",
     "pages/place/place",
     "pages/meetingRoomList/meetingRoomList",
-    "pages/addRemark/addRemark",
     "pages/uploadFile/uploadFile",
-    "pages/repetitionTime/repetitionTime",
-    "pages/repeatMechanism/repeatMechanism",
-    "pages/attendingSituation/attendingSituation",
-    "pages/remind/remind",
-    "pages/scheduleDetail/scheduleDetail",
     "pages/participantsDetail/participantsDetail",
     "pages/applicationDetails/applicationDetails",
     "pages/attendeeList/attendeeList"

pages/index/index.acss

@@ -28,7 +28,7 @@
 .createMeeting {
     position: absolute;
     left: 50%;
-    top: 4rpx;
+    top: 8rpx;
     font-size: 32rpx;
     border-radius: 50%;
     height: 84rpx;
@@ -50,10 +50,19 @@
 
 .tabBarView {
     display: flex;
-    align-items: center;
-    justify-content: center;
     flex-direction: column;
     height: 116rpx;
+    justify-content: center;
+}
+
+.tabBarView1 {
+    padding-left: 140rpx;
+    align-items: flex-start;
+}
+
+.tabBarView2 {
+    padding-right: 140rpx;
+    align-items: flex-end;
 }
 
 .tabBarView>view {
@@ -84,7 +93,7 @@
 .iconicon_days {
     position: absolute;
     left: 5rpx;
-    top: 6rpx;
+    top: 8rpx;
     font-size: 30rpx;
 }
 

pages/index/index.axml

@@ -6,18 +6,18 @@
     </my-dynamic>
 </view>
 <view a:if="{{tabBarIndex === '1'}}">
-    <my-schedule update="{{$data.indexNeedUpdate}}">
+    <my-schedule isLocation="{{isLocation}}" update="{{$data.indexNeedUpdate}}">
     </my-schedule>
 </view>
 <view class="tabBar">
     <view onTap="changeTabBar" data-tabbar='0'>
-        <view class="tabBarView {{tabBarIndex === '0' ? 'ischooseTabBar' : ''}}">
+        <view class="tabBarView tabBarView1 {{tabBarIndex === '0' ? 'ischooseTabBar' : ''}}">
             <view class="iconfont iconicon_dynamic"></view>
             <view>动态</view>
         </view>
     </view>
     <view onTap="changeTabBar" data-tabbar='1'>
-        <view class="tabBarView {{tabBarIndex === '1' ? 'ischooseTabBar' : ''}}">
+        <view class="tabBarView tabBarView2 {{tabBarIndex === '1' ? 'ischooseTabBar' : ''}}">
             <view class="iconfont iconicon_Calendarbox1">
                 <text class="iconfont iconicon_days iconicon_days{{iconDay}}">
                 </text>

pages/index/index.js

@@ -4,7 +4,8 @@ create.Page({
   data: {
     tabBarIndex: "0",
     $data: null,
-    iconDay: ""
+    iconDay: "",
+    isLocation: false
   },
   onLoad() {
     let iconDay = new Date().getDate();
@@ -19,12 +20,19 @@ create.Page({
   },
   // 修改tabBar
   changeTabBar(e) {
+    let nowtabBarIndex = this.data.tabBarIndex;
     this.setData({
       tabBarIndex: e.currentTarget.dataset.tabbar
     });
+    if (
+      nowtabBarIndex === e.currentTarget.dataset.tabbar &&
+      e.currentTarget.dataset.tabbar === "1"
+    ) {
+      this.$store.data.isLocation = true;
+      this.update();
+    }
   },
   createMeeting() {
-    // isClicked(this)
     dd.navigateTo({ url: "./../createMeeting/createMeeting" });
   }
 });

pages/meetingDetail/meetingDetail.js

@@ -3,7 +3,7 @@ import create from 'dd-store';
 import pageStore from './store';
 import { getMeetingRoomAffairs, createMeetingTask, deleteMeetingTask, updateMeetingTask, uploadPermissions } from '../../api/request';
 import { isParticipate, deleteSchedule, getScheduleDetail, getUserScheduleInTime, modifySchedule } from '../../api/request.js'
-import { throttle } from './../../utils/utils.js'
+import { throttle, getCreateShowTime } from './../../utils/utils.js'
 import { observer } from '/utils/observer.js'
 import { resolve } from 'path';
 create.Page({
@@ -1413,49 +1413,3 @@ create.Page({
   }
 });
 
-
-// 判断是刚刚 60分钟以内 23小时以内 正常时间年月日
-function getCreateShowTime(createdTime) {
-  let timeResule = ''
-  const creatTime = createdTime.replace(/\-/g, "/")
-  const year = new Date().getFullYear()
-  const month = new Date().getMonth() + 1
-  const day = new Date().getDate()
-  const creatYear = new Date(creatTime).getFullYear()
-  const creatMonth = new Date(creatTime).getMonth() + 1
-  const creatDay = new Date(creatTime).getDate()
-  if (year == creatYear) {
-    if (month == creatMonth) {
-      if (day == creatDay) {
-        const letMin = (new Date().getTime() - new Date(creatTime).getTime()) / 1000 / 60;
-        if (letMin < 2) {
-          timeResule = '刚刚'
-
-        } else if (letMin < 60) {
-          timeResule = letMin.toFixed(0) + '分钟前'
-        } else {
-          timeResule = (letMin / 60).toFixed(0) + '小时前'
-        }
-      } else {
-        timeResule = day - creatDay + '天前'
-      }
-    } else {
-      const leftDay = (new Date().getTime() - new Date(creatTime).getTime()) / 1000 / 60 / 60 / 24;
-
-      if (leftDay < 28) {
-        if (leftDay < 1) {
-          timeResule = (leftDay * 24).toFixed(0) + '小时前'
-        } else {
-          timeResule = letDay.toFixed(0) + '天前'
-        }
-      } else {
-        timeResule = `${creatTime.substring(5, 7)}月${creatTime.substring(8, 10)}日 ${creatTime.substring(11, 16)}`
-      }
-    }
-
-  } else {
-    timeResule = `${creatTime.substring(0, 4)}年${creatTime.substring(5, 7)}月${creatTime.substring(8, 10)}日 ${creatTime.substring(11, 16)}`
-  }
-
-  return timeResule
-}

stores/exampleStore.js

@@ -8,7 +8,8 @@ class Store {
         originUsers: [],
         originUsersId: [],
         originalData: null,
-        indexNeedUpdate: false
+        indexNeedUpdate: false,
+        isLocation: false
     }
 }
 export default new Store()
\ No newline at end of file

utils/utils.js

@@ -4,7 +4,7 @@ export function throttle(fn, gapTime) {
     gapTime = 1500;
   }
   let _lastTime = null;
-  return function() {
+  return function () {
     let _nowTime = new Date();
     if (_nowTime - _lastTime > gapTime || !_lastTime) {
       fn.apply(this, arguments); //将this和参数传给原函数
@@ -15,7 +15,7 @@ export function throttle(fn, gapTime) {
 
 export function debounce(fn, delay) {
   let timeout = null;
-  return function() {
+  return function () {
     clearTimeout(timeout);
     timeout = setTimeout(() => {
       fn.apply(this, arguments);
@@ -23,64 +23,6 @@ export function debounce(fn, delay) {
   };
 }
 
-// 判断时间 刚刚 五分钟以内 十分钟以内 正常时间年月日
-export function dealFileTime(time) {
-  let result = "";
-  let argumentsTime = new Date(time.replace(/\-/g, "/")).getTime();
-  let nowTime = new Date().getTime();
-  let diffValue = nowTime - argumentsTime;
-  let minute = 1000 * 60; //把分，时，天，周，半个月，一个月用毫秒表示
-  let hour = minute * 60;
-  let day = hour * 24;
-  let week = day * 7;
-  let halfamonth = day * 15;
-  let month = day * 30;
-  if (diffValue < 0) {
-    return;
-  }
-  let minC = diffValue / minute; //计算时间差的分，时，天，周，月
-  let hourC = diffValue / hour;
-  let dayC = diffValue / day;
-  let weekC = diffValue / week;
-  let monthC = diffValue / month;
-  if (monthC >= 1 && monthC <= 3) {
-    result = " " + parseInt(monthC) + "月前";
-  } else if (weekC >= 1 && weekC <= 3) {
-    result = " " + parseInt(weekC) + "周前";
-  } else if (dayC >= 1 && dayC <= 6) {
-    result = " " + parseInt(dayC) + "天前";
-  } else if (hourC >= 1 && hourC <= 23) {
-    result = " " + parseInt(hourC) + "小时前";
-  } else if (minC >= 1 && minC <= 59) {
-    result = " " + parseInt(minC) + "分钟前";
-  } else if (diffValue >= 0 && diffValue <= minute) {
-    result = "刚刚";
-  } else {
-    let datetime = new Date();
-    datetime.setTime(time);
-    let Nyear = datetime.getFullYear();
-    let Nmonth =
-      datetime.getMonth() + 1 < 10
-        ? "0" + (datetime.getMonth() + 1)
-        : datetime.getMonth() + 1;
-    let Ndate =
-      datetime.getDate() < 10 ? "0" + datetime.getDate() : datetime.getDate();
-    let Nhour =
-      datetime.getHours() < 10
-        ? "0" + datetime.getHours()
-        : datetime.getHours();
-    let Nminute =
-      datetime.getMinutes() < 10
-        ? "0" + datetime.getMinutes()
-        : datetime.getMinutes();
-    let Nsecond =
-      datetime.getSeconds() < 10
-        ? "0" + datetime.getSeconds()
-        : datetime.getSeconds();
-    result = Nyear + "-" + Nmonth + "-" + Ndate;
-  }
-  return result;
-}
 /*  
   返回时间补0
   time 时间
@@ -142,7 +84,7 @@ export function getCurrentMonthLast(date) {
   return date.getFullYear() + "-" + month + "-" + day;
 }
 
-//开始时间取整
+//开始时间取整, 取5的倍数
 export function getInterTime(time) {
   let date = time;
   if (typeof time == "string") {
@@ -153,3 +95,50 @@ export function getInterTime(time) {
   date.setMinutes(addMin);
   return date;
 }
+
+
+// 判断是刚刚 60分钟以内 23小时以内 正常时间年月日
+export function getCreateShowTime(createdTime) {
+  let timeResule = ''
+  const creatTime = createdTime.replace(/\-/g, "/")
+  const year = new Date().getFullYear()
+  const month = new Date().getMonth() + 1
+  const day = new Date().getDate()
+  const creatYear = new Date(creatTime).getFullYear()
+  const creatMonth = new Date(creatTime).getMonth() + 1
+  const creatDay = new Date(creatTime).getDate()
+  if (year == creatYear) {
+    if (month == creatMonth) {
+      if (day == creatDay) {
+        const letMin = (new Date().getTime() - new Date(creatTime).getTime()) / 1000 / 60;
+        if (letMin < 2) {
+          timeResule = '刚刚'
+
+        } else if (letMin < 60) {
+          timeResule = letMin.toFixed(0) + '分钟前'
+        } else {
+          timeResule = (letMin / 60).toFixed(0) + '小时前'
+        }
+      } else {
+        timeResule = day - creatDay + '天前'
+      }
+    } else {
+      const leftDay = (new Date().getTime() - new Date(creatTime).getTime()) / 1000 / 60 / 60 / 24;
+
+      if (leftDay < 28) {
+        if (leftDay < 1) {
+          timeResule = (leftDay * 24).toFixed(0) + '小时前'
+        } else {
+          timeResule = letDay.toFixed(0) + '天前'
+        }
+      } else {
+        timeResule = `${creatTime.substring(5, 7)}月${creatTime.substring(8, 10)}日 ${creatTime.substring(11, 16)}`
+      }
+    }
+
+  } else {
+    timeResule = `${creatTime.substring(0, 4)}年${creatTime.substring(5, 7)}月${creatTime.substring(8, 10)}日 ${creatTime.substring(11, 16)}`
+  }
+
+  return timeResule
+}