会议

pages/createOrEditSchedule/createOrEditSchedule.js

@@ -41,13 +41,11 @@ create.Page({
     this.store.data.repeatable = 0
     this.store.data.locationName = ''
     this.store.data.conflictPeople = []
-    this.store.data.participatorList = [{ userId: getApp().globalData.userid, username: getApp().globalData.name, headUrl: getApp().globalData.avatar }]
+    this.store.data.participatorList = []
     this.store.data.locationName = ''
-    this.store.data.participatorUserId = [getApp().globalData.userid]
-    this.update()
-    dd.setNavigationBar({
-      title: '创建会议'
-    })
+    this.store.data.participatorUserId =
+      this.update()
+
     var date = new Date();
     var y = date.getFullYear();
     var m = (date.getMonth() + 1) < 10 ? "0" + (date.getMonth() + 1) : (date.getMonth() + 1);//获取当前月份的日期，不足10补0
@@ -78,6 +76,9 @@ create.Page({
       this.getScheduleInfo()
       this.update()
     } else {
+      dd.setNavigationBar({
+        title: '创建会议'
+      })
       this.store.data.startTime = this.data.time1
       this.store.data.endTime = this.data.time2
       this.store.data.week1 = this.data.week1
@@ -190,11 +191,13 @@ create.Page({
     if (!this.data.scheduleItem || this.data.organizer === getApp().globalData.userid) {
       select = this.store.data.participatorUserId
       require = [getApp().globalData.userid]
-      select.forEach((item, index) => {
-        if (item.userId == getApp().globalData.userid) {
-          select.splice(index, 1)
-        }
-      })
+      if (!!select.length) {
+        select.forEach((item, index) => {
+          if (item.userId == getApp().globalData.userid) {
+            select.splice(index, 1)
+          }
+        })
+      }
     } else {
       select = [...this.store.data.participatorUserId]
       require = [...this.data.requireUsers]
@@ -210,23 +213,23 @@ create.Page({
         if (!_that.data.scheduleItem || _that.data.organizer === getApp().globalData.userid) {
           _that.store.data.participatorList = []
           _that.store.data.participatorUserId = []
+          _that.store.data.participatorList.push({ userId: getApp().globalData.userid, username: getApp().globalData.name, headUrl: getApp().globalData.avatar })
+          _that.store.data.participatorUserId.push(getApp().globalData.userid)
           res.users.forEach((item, index) => {
             _that.store.data.participatorList.push({ userId: item.userId, username: item.name, headUrl: item.avatar })
             _that.store.data.participatorUserId.push(item.userId)
           })
-          _that.store.data.participatorList.push({ userId: getApp().globalData.userid, username: getApp().globalData.name, headUrl: getApp().globalData.avatar })
-          _that.store.data.participatorUserId.push(getApp().globalData.userid)
         } else {
+          _that.data.requireUsersInfo.forEach((item, index) => {
+            _that.store.data.participatorList.push({ userId: item.userId, username: item.username, headUrl: item.headUrl })
+            _that.store.data.participatorUserId.push(item.userId)
+          })
           _that.store.data.participatorList = []
           _that.store.data.participatorUserId = []
           res.users.forEach((item, index) => {
             _that.store.data.participatorList.push({ userId: item.userId, username: item.name, headUrl: item.avatar })
             _that.store.data.participatorUserId.push(item.userId)
           })
-          _that.data.requireUsersInfo.forEach((item, index) => {
-            _that.store.data.participatorList.push({ userId: item.userId, username: item.username, headUrl: item.headUrl })
-            _that.store.data.participatorUserId.push(item.userId)
-          })
         }
         _that.store.data.participatorList = _that.setArrary(_that.store.data.participatorList)
         _that.store.data.participatorUserId = [...new Set(_that.store.data.participatorUserId)]
@@ -329,7 +332,7 @@ create.Page({
         endTime: `${this.data.time2.replace(/\//g, '-')}`,
         scheduleType: this.store.data.roomId ? 'meeting' : 'common',
         noticeType: 'dd_notice',
-        participatorList: this.store.data.participatorList,
+        participatorList: !!this.store.data.participatorList.length ? this.store.data.participatorList : [{ userId: getApp().globalData.userid, username: getApp().globalData.name, headUrl: getApp().globalData.avatar }],
         repeatable: this.store.data.repeatable,
         aheadTimes: this.store.data.aheadTimes,
         recurrenceModel: this.store.data.recurrenceModel,
@@ -355,7 +358,7 @@ create.Page({
         endTime: `${this.data.time2.replace(/\//g, '-')}`,
         scheduleType: this.store.data.roomId ? 'meeting' : 'common',
         noticeType: 'dd_notice',
-        participatorList: this.store.data.participatorList,
+        participatorList: !!this.store.data.participatorList.length ? this.store.data.participatorList : [{ userId: getApp().globalData.userid, username: getApp().globalData.name, headUrl: getApp().globalData.avatar }],
         repeatable: this.store.data.repeatable,
         aheadTimes: this.store.data.aheadTimes,
         recurrenceModel: this.store.data.recurrenceModel,

pages/index/index.axml

 <!-- <mw-select></mw-select> -->
-
-版本号：106版
+版本号：108版
 <scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" style="height: 100vh;" scroll-into-view="{{todayStr}}">
     <block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
         <block a:for="{{scheduleYearList}}">

pages/repeatMechanism/repeatMechanism.js

@@ -9,7 +9,7 @@ create.Page({
     repeatList: [
       { model: 'no_repeat', text: '不重复', weekDayList: [] },
       { model: 'every_day', text: '每天重复', weekDayList: [] },
-      { model: 'day_in_week', text: '', weekDayList: [] },
+      { model: 'day_in_week', text: '每周重复', weekDayList: [] },
       { model: 'day_in_week', text: '每周的工作日重复', weekDayList: ['MO', 'TU', 'WE', 'TH', 'FR'] }
     ]
   },
@@ -19,7 +19,6 @@ create.Page({
     })
     let week = new Date().getDay()
     this.data.repeatList[2].weekDayList = [this.data.week1[week -1]]
-    this.data.repeatList[2].text = this.data.week2[week -1]
     this.setData({
       repeatList: this.data.repeatList
     })

pages/scheduleDetail/scheduleDetail.axml

@@ -37,7 +37,7 @@
         </text>
         <view class="repeatTip" a:if="{{!!isRepeatable}}">
           {{recModel.model=='day_in_week'?(recModel.weekDayList.length==5?'每周的工作日重复':'每'+week+'重复'):'每天重复'}},
-          {{recModel.forever=='0'? '永不截止':'截止到'+recModel.terminateTime}}
+          {{recModel.forever=='1'? '永不截止':'截止到'+recModel.terminateTime}}
         </view>
       </view>
     </view>
@@ -103,7 +103,7 @@
               {{item2.fileName}}
             </view>
           </view>
-          <view class="modFile" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}" >
+          <view class="modFile" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}">
             <view class="ediFile" data-nextPage="editFile" catchTap="nextPage" data-file="{{item.scheduleAccessory}}">
               编辑
             </view>