修复bug列表

pages/createMeeting/createMeeting.axml

@@ -60,7 +60,7 @@
                     <view class="iconright iconfont icon" style="  vertical-align: middle" catchTap="goParticipantsDetail"></view>
                 </view>
                 <view class="participatorListBottom" catchTap="goParticipantsDetail">
-                    <view class="people" a:for="{{$data.participatorList.length > 10 ? [...$data.participatorList].splice(0, 11) : $data.participatorList}}">
+                    <view class="people" a:for="{{$data.showParticipatorList.length > 10 ? [...$data.showParticipatorList].splice(0, 11) : $data.showParticipatorList}}">
                         <view class="headUrl">
                             <image a:if="{{item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}" />
                             <text

pages/index/index.js

@@ -866,7 +866,7 @@ create.Page({
     maxClickCount--;
     if (maxClickCount == 0) {
       dd.alert({
-        content: "0.0.25"
+        content: "0.0.26"
       });
       maxClickCount = 5;
     }

pages/meetingDetail/meetingDetail.axml

@@ -239,17 +239,17 @@
       <view class="affair-placeholder" a:if="{{!affairList || affairList.length == 0 || (affairList.length == 1 && affairList[0].commentType === 'meeting')}}">
         <template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会，快来上传会议文件吧。'}}"/>
       </view>
-      <!--<view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view> -->
-      <popup title="{{popup.title}}" show="{{popup.show}}" mask="true" onClose="closePopup">
-        <remark a:if="{{popup.type == 'remarkModal'}}" onGetRemark="getRemark"/>
-        <comment a:if="{{popup.type == 'commentModal'}}" isEdit="{{true}}" onGetComment="getComment"/>
-        <list a:if="{{popup.type=='repeat'}}" dataComList="{{repeat.repeatList}}" comSelectListId="{{repeat.selectRepeatId}}" onComSelectList="selectRepeatListItem"></list>
-        <notes a:if="{{popup.type == 'notesModal'}}" isEdit="{{true}}" onGetNotes="getNotes"/>
-        <meeting-time-picker a:if="{{'time' === popup.type}}" startTime="{{$data.startTime}}" endTime="{{$data.endTime}}" onComplete="onComplete" isIPX="{{isIPX}}"></meeting-time-picker>
-        <list a:if="{{popup.type=='aheadTime'}}" onClose="closePopup" multiple="{{true}}" onCompelete="handleAheadTimeSave" complete="{{true}}" dataComList="{{aheadTime.aheadTimeList}}" onComSelectList="selectComList" comSelectList="{{aheadTime.aheadTimesListId}}" iconType="{{aheadTime.iconType}}"></list>
-      </popup>
     </view>
   </view>
 </block>
+<!--<view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view> -->
+<popup title="{{popup.title}}" show="{{popup.show}}" mask="true" onClose="closePopup">
+  <remark a:if="{{popup.type == 'remarkModal'}}" onGetRemark="getRemark"/>
+  <comment a:if="{{popup.type == 'commentModal'}}" isEdit="{{true}}" onGetComment="getComment"/>
+  <list a:if="{{popup.type=='repeat'}}" dataComList="{{repeat.repeatList}}" comSelectListId="{{repeat.selectRepeatId}}" onComSelectList="selectRepeatListItem"></list>
+  <notes a:if="{{popup.type == 'notesModal'}}" isEdit="{{true}}" onGetNotes="getNotes"/>
+  <meeting-time-picker a:if="{{'time' === popup.type}}" startTime="{{$data.startTime}}" endTime="{{$data.endTime}}" onComplete="onComplete" isIPX="{{isIPX}}"></meeting-time-picker>
+  <list a:if="{{popup.type=='aheadTime'}}" onClose="closePopup" multiple="{{true}}" onCompelete="handleAheadTimeSave" complete="{{true}}" dataComList="{{aheadTime.aheadTimeList}}" onComSelectList="selectComList" comSelectList="{{aheadTime.aheadTimesListId}}" iconType="{{aheadTime.iconType}}"></list>
+</popup>
 <template is="loading" a:if="{{loading.details && loading.dynamic}}">
 </template>
\ No newline at end of file

pages/meetingDetail/meetingDetail.js

@@ -64,7 +64,8 @@ create.Page({
     },
     needNotice: 0,
     placeholder: '',
-    id: ''
+    id: '',
+    saveLoading: false
   },
   onShow() {
     console.log('onshow')
@@ -1090,7 +1091,7 @@ create.Page({
     })
 
   },
-  getNotes(notes) {
+  getNotes: throttle(function (notes) {
     //编辑
     if (this.store.data.notes) {
       //是否发送通知
@@ -1150,7 +1151,7 @@ create.Page({
         this.update();
       }
     })
-  },
+  }),
   //更新笔记
   updateNotes(notes, notice, callBack) {
     updateMoment({
@@ -1365,8 +1366,8 @@ create.Page({
     this.update()
   },
   blank() {
-    debugger
-  }
+  },
+
 
 });
 

pages/meetingDetail/uploadFile.js

@@ -29,10 +29,13 @@ export async function getFileInfo() {
             file: { spaceId: permission.data.data, max: 9 },
             types: ["photo", "camera", "space", "file"],
             success: (res) => {
+                console.log(permission.data.data)
                 console.log(res)
                 resolve(res)
             },
             fail: (err) => {
+                console.log(11)
+                console.log(err)
             }
         })
     })

pages/meetingRoomList/meetingRoomList.js

@@ -1249,15 +1249,20 @@ create.Page({
       this.$store.data.locationName = this.data.meetingTime.meetingRoomName;
       this.$store.data.roomId = this.data.meetingTime.meetingRoomId;
     }
+
     if (this.$store.data.originalData && this.$store.data.locationName) {
-      if (
-        this.$store.data.locationName !=
-        this.$store.data.originalData.location.locationName ||
+      if (!this.$store.data.originalData.location) {
+        this.$store.data.updateInfo = {
+          updateType: "modify_location",
+          isUpate: true
+        };
+        this.update();
+      } else if (
+        this.$store.data.locationName != this.$store.data.originalData.location.locationName ||
         this.$store.data.roomId != this.$store.data.originalData.meetingRoomId ||
         this.$store.data.startTime != this.$store.data.originalData.startTime.replace(/-/g, "/") ||
         this.$store.data.endTime != this.$store.data.originalData.endTime.replace(/-/g, "/")
       ) {
-
         this.$store.data.updateInfo = {
           updateType: "modify_location",
           isUpate: true

pages/participantsDetail/participantsDetail.js

@@ -19,7 +19,8 @@ create.Page({
     contactPeople: {},
     showContactPeople: [],
     originUsersId: [],
-    confirmAttendance: null
+    confirmAttendance: null,
+    isUpdate: false
   },
   onLoad(event) {
     this.setData({
@@ -58,6 +59,9 @@ create.Page({
       select = selectedelRequired(Object.keys(this.data.contactPeople), require)
     }
     selectPeople(select, require).then(res => {
+      this.setData({
+        isUpdate: true
+      })
       const participatorList = {}
       // 创建的 可选 必选
       if (!this.data.scheduleItem) {
@@ -98,6 +102,10 @@ create.Page({
   },
   // 删除参会人
   delParticipants(event) {
+    this.setData({
+      isUpdate: true
+    })
+
     let userId = event.target.dataset.userId
     let participatorList = {}
     let showParticipatorList = []
@@ -136,13 +144,18 @@ create.Page({
 
   // 保存信息
   saveInfo() {
+
     this.$store.data.participatorList = this.data.contactPeople
     this.$store.data.showParticipatorList = this.data.showContactPeople
     this.update()
-    this.$store.data.updateInfo = {
-      updateType: 'operate_user',
-      isUpate: true
+
+    if (this.data.isUpdate) {
+      this.$store.data.updateInfo = {
+        updateType: 'operate_user',
+        isUpate: true
+      }
     }
+
     this.update()
     dd.navigateBack({
       delta: 1

utils/utils.js

@@ -298,7 +298,7 @@ export function selectedelRequired(select, require) {
 }
 // 文件格式化
 export function renderSize(value) {
-  if (null == value || value == '') {
+  if (null == value || value == '' || value == 0) {
     return "0 B";
   }
   var unitArr = new Array("B", "K", "M", "G", "T", "P", "E", "Z", "Y");