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

pages/meetingDetail/meetingDetail.js

@@ -154,10 +154,14 @@ create.Page({
                 editType: this.$store.data.updateInfo.updateType
               })
             } else {
-              this.setData({
-                editType: this.$store.data.updateInfo.updateType,
-                'centerPopup.showCenterPopup': true
-              })
+              if (this.$store.data.participatorList.length < 2) {
+                this.isChange(this.$store.data.updateInfo.updateType, 'only')
+              } else {
+                this.setData({
+                  editType: this.$store.data.updateInfo.updateType,
+                  'centerPopup.showCenterPopup': true
+                })
+              }
               // this.isChange(this.$store.data.updateInfo.updateType, 'only')
             }
           } else {
@@ -353,10 +357,15 @@ create.Page({
             editType: 'modify_location'
           })
         } else {
-          this.setData({
-            editType: 'modify_location',
-            'centerPopup.showCenterPopup': true
-          })
+          if (this.$store.data.participatorList.length < 2) {
+            this.isChange('modify_location', 'only')
+          } else {
+            this.setData({
+              editType: 'modify_location',
+              'centerPopup.showCenterPopup': true
+            })
+
+          }
         }
         break
       case 'meetingWayModel':
@@ -473,7 +482,15 @@ create.Page({
             editType: 'repeat'
           })
         } else {
-          this.isChange('repeat', 'only')
+          if (this.$store.data.participatorList.length < 2) {
+            this.isChange('repeat', 'only')
+          } else {
+            this.setData({
+              editType: 'repeat',
+              'centerPopup.showCenterPopup': true
+            })
+          }
+
         }
         break;
     }
@@ -596,10 +613,14 @@ create.Page({
         editType: 'modify_time'
       })
     } else {
-      this.setData({
-        editType: 'modify_time',
-        'centerPopup.showCenterPopup': true
-      })
+      if (this.$store.data.participatorList.length < 2) {
+        this.isChange('modify_time', 'only')
+      } else {
+        this.setData({
+          editType: 'modify_time',
+          'centerPopup.showCenterPopup': true
+        })
+      }
       // this.isChange('modify_time', 'only')
     }
   },
@@ -706,10 +727,14 @@ create.Page({
     const _that = this
     switch (this.data.conSelectPopupData.selectType) {
       case 'common':
-        if (this.data.editType === 'modify_location' || this.data.editType === 'modify_time') {
-          this.setData({
-            'centerPopup.showCenterPopup': true
-          })
+        if (this.data.editType === 'modify_location' || this.data.editType === 'modify_time' || this.data.editType === 'repeat') {
+          if (this.$store.data.participatorList.length < 2) {
+            this.isChange(this.data.editType, event.currentTarget.dataset.item.id)
+          } else {
+            this.setData({
+              'centerPopup.showCenterPopup': true
+            })
+          }
         } else {
           this.isChange(this.data.editType, event.currentTarget.dataset.item.id)
         }
@@ -1099,8 +1124,8 @@ create.Page({
           }
           // this.modifySchedule(data, needNotice)
         }).catch(err => {
-          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.startTime = this.$store.data.originalData.startTime.replace(/-/g, '/')
+          this.$store.data.endTime = this.$store.data.originalData.endTime.replace(/-/g, '/')
           this.update()
           this.setData({
             week: this.data.weekList[new Date(this.$store.data.originalData.startTime.replace(/-/g, "/")).getDay()],

yarn.lock

@@ -7,11 +7,23 @@ dd-store@^1.9.0:
   resolved "https://registry.yarnpkg.com/dd-store/-/dd-store-1.9.0.tgz#8f531e28b6991919bc60a17148fa9e1bba142397"
   integrity sha512-bhIkQMcHjNTDGG03riSeLp4UfdOBqWqg+qFfqqwAvgBiARrYbrEWU/YVE5tOV6XOqyfozp+MpZP3SaFyOtuUrw==
 
+dingtalk-jsapi@^2.10.3:
+  version "2.10.3"
+  resolved "https://registry.yarnpkg.com/dingtalk-jsapi/-/dingtalk-jsapi-2.10.3.tgz#ade5c2f858f4ac41143d294ae172b34efaeb95e2"
+  integrity sha512-ozfuwWzOKx4qgfs+ijdN2XgylB8xZ4zxetDp4ND272YDD5C9GJLo5GKhsFR6kQ/lnU0WIzBo2rYjEwZKtMrJxw==
+  dependencies:
+    promise-polyfill "^7.1.0"
+
 luxon@^1.21.3:
   version "1.22.2"
   resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.22.2.tgz#799d65cc1ed0ba85b4cb3f7dd38fc08a8d1a6750"
   integrity sha512-vq6eSaOOw1fKob+JXwfu0e3/UFUT4G4HTFRJab7dch8J1OdOGW/vXqCiJsY7rm2In+5gKNYx0EtnYT0Tc5V4Qw==
 
+promise-polyfill@^7.1.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-7.1.2.tgz#ab05301d8c28536301622d69227632269a70ca3b"
+  integrity sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ==
+
 rrule@^2.6.4:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/rrule/-/rrule-2.6.4.tgz#7f4f31fda12bc7249bb176c891109a9bc448e035"