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

pages/createOrEditSchedule/createOrEditSchedule.js

@@ -44,9 +44,9 @@ create.Page({
     this.store.data.conflictPeople = []
     this.store.data.participatorList = []
     this.store.data.locationName = ''
-// <<<<<<< HEAD
-//     this.store.data.participatorUserId = []
-//       this.update()
+    // <<<<<<< HEAD
+    //     this.store.data.participatorUserId = []
+    //       this.update()
 
     this.store.data.participatorUserId = [getApp().globalData.userid]
     this.update()
@@ -348,6 +348,9 @@ create.Page({
         meetingRoomId: this.store.data.roomId,
         remark: this.store.data.remark
       }
+      console.log(111111)
+      console.log(JSON.stringify(this.store.data.roomId))
+      console.log(22222)
       this.resetStore()
       modifySchedule(data).then(res => {
         dd.navigateBack({

pages/participantsDetail/participantsDetail.js

@@ -64,6 +64,8 @@ create.Page({
       requiredUsers: require,            //必选用户（不可取消选中状态）
       responseUserOnly: true,        //返回人，或者返回人和部门
       success: function (res) {
+        _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)
         if (!_that.data.scheduleItem || _that.data.organizer === getApp().globalData.userid) {
           _that.store.data.participatorList = []
           _that.store.data.participatorUserId = []
@@ -71,19 +73,17 @@ create.Page({
             _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.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)
           })
+          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 = _that.setArrary(_that.store.data.participatorList)
         _that.store.data.participatorUserId = [...new Set(_that.store.data.participatorUserId)]