Merge branch 'dev' into release_beta/1.0.0

pages/appDetails/appDetails.js

@@ -29,7 +29,7 @@ create.Page({
       isBind: e.userName ? true : false
     });
   },
-  onShow() {},
+  onShow() { },
   sendRequest() {
     let that = this;
     interval = setInterval(() => {
@@ -52,8 +52,6 @@ create.Page({
         ddUserId: getApp().globalData.userid
       };
       getThirdUserPlatForm(data).then(res => {
-        console.log(JSON.stringify(res));
-        console.log(res.data.msg === "当前账号已被其他账号绑定！");
         if (res.data.msg === "当前账号已被其他账号绑定！") {
           this.setData({
             isBind: false,

pages/meetingDetail/meetingDetail.js

@@ -129,7 +129,7 @@ create.Page({
     if (this.$store.data.updateInfo.isUpate) {
       switch (this.$store.data.updateInfo.updateType) {
         case 'operate_user':
-          if (this.$store.data.participatorList !== this.$store.data.originUsers) {
+          if (JSON.stringify(this.$store.data.participatorList) !== JSON.stringify(this.$store.data.originUsers)) {
             if (this.data.repeatable === 1) {
               this.setData({
                 'conSelectPopupData.selectType': 'common',
@@ -216,10 +216,10 @@ create.Page({
         let repeatListMap = new Map()
         for (let value of res.data.data.userList) {
           if (value.participator) {
-            participatorList.push(value.participator)
+            participatorList.push({ userId: value.participator.userId, username: value.participator.username, headUrl: value.participator.headUrl, platform: value.participator.platform })
             participatorUserId.push(value.participator.userId)
             originUsersId.push(value.participator.userId)
-            originUsers.push(value.participator)
+            originUsers.push({ userId: value.participator.userId, username: value.participator.username, headUrl: value.participator.headUrl, platform: value.participator.platform })
           }
         }
         for (let item of this.data.comListData.repeatList) {
@@ -871,9 +871,17 @@ create.Page({
         break
       case 'modify_location':
         this.reSetLocation()
+        this.$store.data.updateInfo = {
+          isUpate: false,
+          updateType: ''
+        }
         break
       case 'operate_user':
         this.reSetUsers()
+        this.$store.data.updateInfo = {
+          isUpate: false,
+          updateType: ''
+        }
         break
       case 'repeat':
         this.reSetRepeat()
@@ -984,7 +992,7 @@ create.Page({
         })
         break
       case 'operate_user':
-        if (this.$store.data.originUsers != this.$store.data.participatorList) {
+        if (JSON.stringify(this.$store.data.originUsers) != JSON.stringify(this.$store.data.participatorList)) {
           let addUserList = this.arrayPoor(this.$store.data.originUsers, this.$store.data.participatorList).addUserList
           let deleteUserList = this.arrayPoor(this.$store.data.originUsers, this.$store.data.participatorList).deleteUserList
           let dataUser = {

pages/participantsDetail/participantsDetail.js

@@ -174,7 +174,7 @@ create.Page({
   },
   // 编辑时候的保存
   editSave() {
-    if (this.$store.data.originUsers != this.store.data.contactPeople) {
+    if (JSON.stringify(this.$store.data.originUsers) != JSON.stringify(this.store.data.contactPeople)) {
       this.$store.data.updateInfo.isUpate = true
       this.$store.data.updateInfo.updateType = 'operate_user'
       this.$store.data.participatorList = this.store.data.contactPeople

utils/flatTree.js

@@ -8,6 +8,5 @@ export function getFlatTree(treeData) {
             flatTreeMap.set(value.id, value)
         }
     }
-    console.log(flatTreeMap)
     return flatTreeMap
 }
\ No newline at end of file