首页动态修改，合并Utils冲突

PageComponents/myDynamic/myDynamic.axml

@@ -10,7 +10,7 @@
             <text a:if="{{item.traceTime !== '1970-03-01 00:00:00'}}" class="iconfont iconicon_top1"></text>
           </view>
         </view>
-        <block a:for="{{item.meetingLogDataList.meetingLogDataList.slice(0,2)}}" a:for-item="dynamicItem">
+        <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>

PageComponents/myDynamic/myDynamic.js

@@ -37,14 +37,16 @@ Component({
         // 第一层日程数据处理
         if (res.data.data) {
           let dynamicList = res.data.data.records.map((item, index) => {
-            if (item.creatorInfo) {
-              item.creatorInfo = JSON.parse(item.creatorInfo);
-            }
             // 第二层日程下的动态数据处理
             let meetingLogDataList = {};
             let meetingLogDataListArr = [];
 
             for (let i = 0; i < item.meetingLogDataList.length; i++) {
+              if (item.meetingLogDataList[i].creatorInfo) {
+                item.meetingLogDataList[i].creatorInfo = JSON.parse(
+                  item.meetingLogDataList[i].creatorInfo
+                );
+              }
               let itemData = item.meetingLogDataList[i].meetingLogResource;
               if (itemData) {
                 if (itemData.taskInfos || itemData.taskInfos) {
@@ -68,12 +70,11 @@ Component({
             for (let item in meetingLogDataList) {
               meetingLogDataListArr.push(meetingLogDataList[item]);
             }
-            item.meetingLogDataList = meetingLogDataListArr;
             return {
               scheduleId: item.scheduleId,
               title: item.title,
               traceTime: item.traceTime,
-              meetingLogDataList: item
+              meetingLogDataList: meetingLogDataListArr
             };
           });
           if (current === 1) {
@@ -202,19 +203,17 @@ Component({
           that.data.dynamicList.map((item, index) => {
             if (item.scheduleId === e.scheduleId) {
               dataIndex1 = index;
-              item.meetingLogDataList.map((item2, index2) => {
-                if (item2.groupId && item2.groupId === e.groupId) {
+              item.meetingLogDataList.map((it, index2) => {
+                if (it.meetingLogResource.id == e.id) {
                   dataIndex2 = index2;
                 }
               });
             }
           });
-          let setData = `dynamicList[${dataIndex1}].meetingLogDataList[${dataIndex2}]`;
-          let setDate2 =
-            that.data.dynamicList[dataIndex1].meetingLogDataList[dataIndex2];
-          setDate2.taskStatus = e.status;
+          let setData = `dynamicList[${dataIndex1}].meetingLogDataList[${dataIndex2}].meetingLogResource.taskStatus`;
+          console.log(setData);
           that.setData({
-            [setData]: setDate2
+            [setData]: e.status
           });
           console.log(that.data.dynamicList);
         }

components/list/list.axml

@@ -11,7 +11,7 @@
         </view>
         <view a:if="{{!multiple}}" class="iconfont iconicon_ok com-list-item-selectStaus {{comSelectListId == item.id ? 'com-list-item-select' : ''}}">
         </view>
-        {{comSelectList}}  {{id}}
+        <!-- {{comSelectList}}  {{id}} -->
         <view a:if="{{multiple}}" class="iconfont iconicon_ok com-list-item-selectStaus {{comSelectList.includes(item.id) ? 'com-list-item-select' : ''}}">
         </view>
     </view>

components/meetingTimePicker/meetingTimePicker.js

+import { getInterTime } from '../../utils/utils';
 const currentDate = new Date();
 const weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
 const durationList = [{ value: 60, label: '1小时' }, { value: 120, label: '2小时' }, { value: 30, label: '30分钟' }];
@@ -179,17 +180,18 @@ Component({
   methods: {
     //设置初始值
     setInitialValue() {
-      let startDate = new Date();
+      let startDate = getInterTime(new Date());
+
       //结束日期默认+ 半小时
-      let endDate = new Date();
+      let endDate = getInterTime(new Date());
       const min = endDate.getMinutes();
       endDate.setMinutes(min + 30);
       // 赋值
       if (this.props.startTime) {
-        startDate = new Data(this.props.startTime);
+        startDate = new Date(this.props.startTime);
       }
       if (this.props.endTime) {
-        endDate = new Data(thia.props.endTime);
+        endDate = new Date(this.props.endTime);
       }
 
       this.changeStart(startDate);

components/taskList/taskList.acss

@@ -25,12 +25,14 @@
     flex: 1;
     font-size: 28rpx;
     line-height: 80rpx;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
 }
 
-.task-box>.task-title>.avater {
+.task-box>.avater {
     width: 48rpx;
     height: 48rpx;
-    position: absolute;
     right: 14rpx;
     top: 16rpx;
     line-height: 48rpx;

components/taskList/taskList.axml

@@ -4,7 +4,7 @@
   <view class="task-box" a:for='{{taskList}}'>
     <template is="checkbox" data="{{ status: item.taskStatus, id: item.id, groupId: item.groupId, scheduleId: item.scheduleId}}"></template>
     <view class="task-title" data-pop="{{title: '会议任务', type: 'updateTask'}}" onTap="showPop" data-task="{{item}}">{{item.taskInfos.taskTitle}}
-      <template is="avater" a:if="{{item.acceptorInfo}}" data="{{item: item.acceptorInfo}}"/>
     </view>
+    <template is="avater" a:if="{{item.acceptorInfo}}" data="{{item: item.acceptorInfo, split: 1}}"/>
   </view>
 </view>
\ No newline at end of file

pages/createMeeting/createMeeting.js

 import { addSchedule, getUserScheduleInTime } from '../../api/request.js'
-import { throttle } from './../../utils/utils.js'
+import { throttle, getInterTime } from './../../utils/utils.js'
 import create from 'dd-store'
 create.Page({
   data: {
@@ -348,12 +348,13 @@ create.Page({
   },
   // 获取时间参数
   getTimes(time = new Date()) {
-    let date = new Date(time)
+    let date = getInterTime(new Date(time))
     let year = date.getFullYear()
     let month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
     let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
     let hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
     let miunutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+
     return `${year}/${month}/${day} ${hour}:${miunutes}:00`
   },
   // 是否跨天

pages/meetingDetail/meetingDetail.axml

@@ -211,7 +211,7 @@
         </view>
         <file-list fileView="{{item.fileView}}" organizer="{{organizer}}" currentPeople="{{currentPeople}}" onDeleteMeetingFile="deleteMeetingFile"/>
       </view>
-      <view a:if="{{item.content}}" class='simple-column'>{{item.content}}{{item.createTime}}</view>
+      <view a:if="{{item.content}}" class='simple-column'>{{item.content}} {{item.createTime}}</view>
     </block>
     <view class="affair-placeholder" a:if="{{affairList.length <= 1}}">
       <image mode="widthFix" src="../../assests/noDynamic.png"/>
@@ -222,7 +222,7 @@
   <!--<view class="delMetting" onTap="delSheudle"><view class=" iconfont iconicon_close"></view><view>
           删除该会议</view></view> -->
   <popup title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
-    <meeting-time-picker a:if="{{'time' === comType}}" onComplete="onComplete"></meeting-time-picker>
+    <meeting-time-picker a:if="{{'time' === comType}}" onComplete="onComplete" startTime="{{$data.startTime}}" endTime="{{$data.endTime}}"></meeting-time-picker>
     <hlist a:if="{{'participator' === comType}}" dataComList="{{comHListData.contactData}}" onSelectComHList="selectComHList"></hlist>
     <list multiple="{{comListData.multiple}}" onCompelete="selectAheadtimes" comSelectList="{{comListData.aheadTimesListId}}" complete="{{comType=='aheadTime' ? true : false}}"a:if="{{comType=='repeat' || comType=='meetingWayModel' || comType=='aheadTime'}}" dataComList="{{comType=='repeat' ? comListData.repeatList : (comType=='aheadTime' ? comListData.aheadTimesList : comListData.meetingWayList)}}" onComSelectList="selectComList" comSelectListId="{{comType=='repeat' ? comListData.comSelectListId : (comType=='aheadTime'?comListData.aheadTimesListId : comListData.meetingWayModelId)}}" iconType="{{comListData.iconType}}">
     </list>

pages/meetingDetail/meetingDetail.js

@@ -545,8 +545,6 @@ create.Page({
   },
   // 选择会前提醒时间
   selectAheadtimes(event) {
-    console.log(event)
-    debugger
     this.setData({
       aheadTimes: event,
       popupShow: false,

template/avater/index.axml

@@ -2,7 +2,7 @@
 <template name="avater">
     <view class="avater">
         <image a:if="{{item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}" />
-        <text a:else>{{item.platform === "outlook" ? item.username.slice(0, 2) : item.username.slice(-2)}}
+        <text a:else>{{item.platform === "outlook" ? item.username.slice(0, split || 2) : item.username.slice(-(split || 2))}}
         </text>
     </view>
 </template>
\ No newline at end of file

utils/utils.js

@@ -141,60 +141,15 @@ export function getCurrentMonthLast(date) {
   }
   return date.getFullYear() + "-" + month + "-" + day;
 }
-// 对象数组去重
-export function uniqueObject(arr) {
-  //存放的是字符串形式的数组。
-  var tempArr = [];
-  //将数组对象转成数组字符串。
-  var newStr = arrToString(arr);
-  newStr.sort();
-  //先放置第一个
-  var temp = newStr[0];
-  tempArr.push(temp);
-  // 数组去重
-  for (var i = 1; i < newStr.length; i++) {
-    if (newStr[i] !== temp) {
-      temp = newStr[i]; //放置到集合里面。
-      tempArr.push(newStr[i]);
-    }
-  }
-  //上面，集合还是字符串形式的数组，需要转换成json对象的形式。
-  var newArr = [];
-  // 新数组字符串转成数组对象
-  for (var i = 0; i < tempArr.length; i++) {
-    newArr.push(JSON.parse(tempArr[i]));
-  }
-  return newArr;
-}
-function arrToString(arr) {
-  var newArr = [];
-  if (arr.length !== 0) {
-    for (var i = 0; i < arr.length; i++) {
-      //对每一个对象数据进行处理。
-      //将每一个对象里面的属性key 进行重新排序，变成新的对象。
-      var thisObj = sortObject(arr[i]);
-      //将json对象，转换成字符串
-      var thisStr = JSON.stringify(thisObj);
-      // 去除空格及\t空白字符
-      thisStr = thisStr.replace(/(\s|[\\t])/g, "");
-      //里面放置字符串
-      newArr.push(thisStr);
-    }
-  }
-  return newArr;
-}
-function sortObject(obj) {
-  var keyArr = [];
-  for (var item in obj) {
-    //把所有的key放置在一个数组里面。
-    keyArr.push(item);
-  }
-  keyArr.sort(); //排序，按照字符进行排序。
-  var newObj = {}; //还是json对象
-  for (var i = 0; i < keyArr.length; i++) {
-    newObj[keyArr[i]] = obj[keyArr[i]];
-  }
-  //处理成 键=值的数组形式。
-  //console.log("值是:"+JSON.stringify(newObj));
-  return newObj;
+
+//开始时间取整
+export function getInterTime(time) {
+  let date = time;
+  if (typeof time == "string") {
+    date = new Date(time);
+  }
+  const min = date.getMinutes();
+  const addMin = Math.floor(min / 5) * 5 + 5;
+  date.setMinutes(addMin);
+  return date;
 }