Merge branch 'dev' of http://gitlab.roboming.com/fengzhaoyu/schedule into dev

PageComponents/scheduleList/scheduleList.js

@@ -163,12 +163,13 @@ create.Component({
           let rule = RRule.fromString(
             `${item.recurrenceModel.recurrenceRule};DTSTART=${DTSTART}`
           );
-          // rule.options.tzid = "Asia/Hong_Kong";
+          // console.log(rule, 'rule')
+          rule.options.tzid = "Asia/Hong_Kong";
           // 改变时区
-          // let rullAll = rule.all()
-          // rule.all().map(item => {
-          //   console.log(item.toLocaleDateString())
-          // })
+          let rullAll = rule.all()
+          rule.all().map(item => {
+            console.log(item.toLocaleDateString())
+          })
 
           // 判断是否需要剔除某一天
           if (item.excludePlanDates) {

app.json

@@ -16,6 +16,7 @@
     "pages/scheduleDetail/scheduleDetail",
     "pages/participantsDetail/participantsDetail",
     "pages/applicationDetails/applicationDetails",
-    "pages/attendeeList/attendeeList"
+    "pages/attendeeList/attendeeList",
+    "pages/aaaa/aaaa"
   ]
-}
+}
\ No newline at end of file

components/list/list.js

@@ -47,9 +47,9 @@ Component({
 
       } else if (this.props.multiple && event.currentTarget.dataset.item.id == -1) {
         this.setData({
-          comSelectList: []
+          comSelectList: [-1]
         })
-        this.props.onCompelete([])
+        this.props.onCompelete([-1])
       }
       else if (!this.props.multiple) {
         this.setData({

components/meetingTimePicker/meetingTimePicker.js

@@ -193,6 +193,7 @@ Component({
       if (this.props.endTime) {
         endDate = new Date(this.props.endTime);
       }
+      console.log(this.props)
 
       this.changeStart(startDate);
       this.changeEnd(endDate);

pages/aaaa/aaaa.axml

+<view>
+  New Page
+</view>
\ No newline at end of file

pages/aaaa/aaaa.js

+// import { RRule, RRuleSet, rrulestr } from 'rrule'
+// Page({
+//   data: {},
+//   onLoad() {
+//     const rule = new RRule({
+//       freq: RRule.WEEKLY,
+//       interval: 5,
+//       byweekday: [RRule.MO, RRule.FR],
+//       dtstart: new Date(Date.UTC(2012, 1, 1, 10, 30)),
+//       until: new Date(Date.UTC(2012, 12, 31))
+//     })
+
+//     rule.all()
+//     ['2012-02-03T10:30:00.000Z',
+//     '2012-03-05T10:30:00.000Z',
+//     '2012-03-09T10:30:00.000Z',
+//     '2012-04-09T10:30:00.000Z',
+//     '2012-04-13T10:30:00.000Z',
+//     '2012-05-14T10:30:00.000Z',
+//     '2012-05-18T10:30:00.000Z',
+//     ]
+
+//       rule.between(new Date(Date.UTC(2012, 7, 1)), new Date(Date.UTC(2012, 8, 1)))
+//       ['2012-08-27T10:30:00.000Z',
+//       '2012-08-31T10:30:00.000Z']
+
+//     // rule.toString()
+//     // "DTSTART:20120201T093000Z\nRRULE:FREQ=WEEKLY;INTERVAL=5;UNTIL=20130130T230000Z;BYDAY=MO,FR"
+
+//     // rule.toText()
+//     // "every 5 weeks on Monday, Friday until January 31, 2013"
+//   },
+// });

pages/aaaa/aaaa.json

+{}
\ No newline at end of file

pages/createMeeting/createMeeting.js

@@ -43,7 +43,7 @@ create.Page({
     weekList: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
     week: '',
     isAcrossDay: false,
-    conflictPeople: []
+    conflictPeople: [],
   },
 
   showPop(event) {
@@ -55,6 +55,7 @@ create.Page({
     this.setData({
       show: false
     })
+
   },
   Complete(data) {
     this.closePop();
@@ -109,7 +110,7 @@ create.Page({
     this.$store.data.originUsersId = []
     this.$store.data.locationName = ''
     this.$store.data.startTime = this.getTimes()
-    this.$store.data.endTime = this.getTimes(new Date(this.getTimes()).setMinutes(new Date(this.$store.data.startTime).getMinutes() + 30))
+    this.$store.data.endTime = this.getTimes(new Date().setMinutes(new Date().getMinutes() + 30))
     this.update()
     this.resetRepeatList()
     this.acrossDay(this.$store.data.startTime, this.$store.data.endTime)
@@ -172,6 +173,7 @@ create.Page({
       comType: event.currentTarget.dataset.type,
       'comListData.iconType': iconType
     })
+
   },
   resetRepeatList() {
     let index = 0

pages/meetingDetail/meetingDetail.acss

@@ -541,4 +541,9 @@ input {
     text-align: center;
     background: rgb(234, 12, 40);
     display: inline-block;
+}
+
+.metingDetail {
+    overflow: hidden;
+    height: 100vh;
 }
\ No newline at end of file

pages/meetingDetail/meetingDetail.js

@@ -105,7 +105,8 @@ create.Page({
     editType: '',
     confirmAttendance: null,
     isExpand: false,
-    c: false
+    forbiddenScroll: false
+
   },
   onShow() {
     console.log(this)
@@ -172,7 +173,7 @@ create.Page({
         this.setData({
           confirmAttendance: res.data.data.confirmAttendance,
           organizer: res.data.data.organizer,
-          // 'comListData.meetingWayModelId': res.data.data.meetingWayModel.model === null ? null : (res.data.data.meetingWayModel.model === 'dingtalk' ? 2 : (res.data.data.meetingWayModel.model === 'zoom' ? 1 : 0)),
+          'comListData.meetingWayModelId': res.data.data.meetingWayModel.model === null ? null : (res.data.data.meetingWayModel.model === 'dingtalk' ? 2 : (res.data.data.meetingWayModel.model === 'zoom' ? 1 : 0)),
           'scheduleItem.id': res.data.data.id,
           'scheduleItem.groupId': res.data.data.groupId,
           repeatable: res.data.data.repeatable,
@@ -193,8 +194,8 @@ create.Page({
         this.$store.data.originUsers = participatorList
         this.$store.data.locationName = res.data.data.location.locationName
         this.$store.data.roomId = res.data.data.meetingRoomId < 0 ? '' : res.data.data.meetingRoomId
-        this.$store.data.startTime = res.data.data.startTime.replace(/'-'/g, "\/")
-        this.$store.data.endTime = res.data.data.endTime.replace(/'-'/g, "\/")
+        this.$store.data.startTime = res.data.data.startTime.replace(/-/g, "/")
+        this.$store.data.endTime = res.data.data.endTime.replace(/-/g, "/")
         this.$store.data.participatorList = participatorList
         this.$store.data.participatorUserId = participatorUserId
         this.$store.data.originUsersId = participatorUserId
@@ -293,6 +294,7 @@ create.Page({
         this.update()
         if (this.data.repeatable) {
           this.setData({
+            'conSelectPopupData.selectType': 'common',
             'conSelectPopupData.showSelectPopup': true,
             editType: 'modify_location'
           })
@@ -314,11 +316,15 @@ create.Page({
           this.isChange('meeting_way', 'only')
         }
     }
+    this.setData({
+      forbiddenScroll: false
+    })
   },
   // 关闭popup 点击mark
   closePopup() {
     this.setData({
-      popupShow: false
+      popupShow: false,
+      forbiddenScroll: false
     })
   },
   // 选择循环机制 选择会议方式  选择时间  会前提醒 出现popup弹窗
@@ -327,6 +333,7 @@ create.Page({
     let complete = false
     let multiple = false
     let popupTitle = ''
+    let forbiddenScroll = false
     switch (event.currentTarget.dataset.type) {
       case 'meetingWayModel':
         iconType = 'image',
@@ -345,6 +352,7 @@ create.Page({
         break
       case 'time':
         popupTitle = '选择会议时间'
+        forbiddenScroll = true
         break
       case 'aheadTime':
         popupTitle = '选择会前提醒'
@@ -354,6 +362,7 @@ create.Page({
         break
     }
     this.setData({
+      forbiddenScroll: forbiddenScroll,
       popupShow: true,
       popupTitle: popupTitle,
       comType: event.currentTarget.dataset.type,
@@ -504,6 +513,7 @@ create.Page({
         _that.conflictPeople()
         if (_that.data.repeatable) {
           _that.setData({
+
             'conSelectPopupData.showSelectPopup': true,
             editType: 'operate_user'
           })
@@ -531,7 +541,8 @@ create.Page({
     this.acrossDay(this.$store.data.startTime, this.$store.data.endTime)
     this.setData({
       popupShow: false,
-      editType: ''
+      editType: '',
+      forbiddenScroll: false
     })
     this.conflictPeople()
     if (this.data.repeatable) {
@@ -548,7 +559,7 @@ create.Page({
     this.setData({
       aheadTimes: event,
       popupShow: false,
-      'comListData.aheadTimesListId': event.length == 0 ? [-1] : event
+      'comListData.aheadTimesListId': event
     })
     if (this.data.repeatable) {
       this.setData({
@@ -666,7 +677,6 @@ create.Page({
         }
         isParticipate(data1).then(res => {
           if (res.data.code === 0) {
-            observer.notice(res.data.data)
             this.setData({
               confirmAttendance: 0,
               'conToastData.showToast': true,
@@ -684,7 +694,6 @@ create.Page({
         }
         isParticipate(data).then(res => {
           if (res.data.code === 0) {
-            observer.notice(res.data.data)
             this.setData({
               confirmAttendance: 1,
               'conToastData.showToast': true,
@@ -1202,7 +1211,6 @@ create.Page({
     });
 
     if (this.data.pop.type == 'updateTask') {
-
       const { currentTask } = this.store.data;
       const { oldTask } = this.data;