fix:conflict

pages/index/index.js

@@ -741,7 +741,7 @@ create.Page({
     if (maxClickCount == 0) {
       dd.alert({
         content: "版本号207"
-      });
+      })
       maxClickCount = 5;
     }
   }

pages/meetingDetail/meetingDetail.js

@@ -1073,7 +1073,6 @@ create.Page({
           this.update()
           this.resetRepeatList()
           if (this.data.recurrenceModel.model === 'weekly' && this.data.recurrenceModel.weekDayList.length === 1) {
-
             let dataRepeat4 = {
               startTime: this.$store.data.startTime.replace(/\//g, "-"),
               endTime: this.$store.data.endTime.replace(/\//g, "-"),