fix: 修改会前提醒

app.js

@@ -23,9 +23,9 @@ App({
     userid: "",
     name: "",
     userInfo: "",
-    // globalUrl: "https://gateway-beta.mingwork.com", //beta地址
-    // globalUrl2: "https://third-authentication-beta.mingwork.com"
-    globalUrl: "https://gateway2.mingwork.com", // 线上地址
-    globalUrl2: "https://third-authentication.mingwork.com" //线上地址
+    globalUrl: "https://gateway-beta.mingwork.com", //beta地址
+    globalUrl2: "https://third-authentication-beta.mingwork.com"
+    // globalUrl: "https://gateway2.mingwork.com", // 线上地址
+    // globalUrl2: "https://third-authentication.mingwork.com" //线上地址
   }
 });

app.json

 {
   "pages": [
     "pages/index/index",
-    "pages/aa/aa",
     "pages/meetingRoomList/meetingRoomList",
     "pages/bindingApp/bindingApp",
     "pages/meetingDetail/meetingDetail",

pages/aa/aa.axml

-<view>
-  <web-view id="web-view-1" src="https://us04web.zoom.us/j/73435684909?pwd=jaYcRdSfyjuCD1x-Jw8DU8AD3iWiTw" onMessage="test"></web-view></view>
\ No newline at end of file

pages/aa/aa.js

-import openLink from "dingtalk-jsapi/api/biz/util/openLink";
-
-Page({
-  data: {},
-  onLoad() {
-    // openLink({
-    //   url: 'https://us04web.zoom.us/j/73435684909?pwd=jaYcRdSfyjuCD1x-Jw8DU8AD3iWiTw'
-    // });
-  },
-});

pages/aa/aa.json

-{}
\ No newline at end of file

pages/meetingDetail/meetingDetail.acss

@@ -414,13 +414,14 @@ input {
 }
 
 .remindTimeContaint {
+    height: 100%;
     display: inline-block;
-    flex-wrap: nowrap;
     max-width: 400rpx;
-    overflow: scroll;
+    min-width: 0;
     white-space: nowrap;
     margin: 0 20rpx;
     text-align: center;
+    overflow: scroll;
 }
 
 .remindTimeContaint>text {

pages/meetingDetail/meetingDetail.axml

@@ -45,7 +45,7 @@
             <view class="noPlace" a:if="{{!$data.locationName}}" onTap="nextPage" data-nextPage="location">
                 添加地点
             </view>
-            <view class="hasplace {{mrReserveStatus === 'N' ? 'lineThrough' : ''}} " onTap="nextPage" data-nextPage="location" a:else>
+            <view class="hasplace {{mrReserveStatus === 'Y' ? 'lineThrough' : ''}} " onTap="nextPage" data-nextPage="location" a:else>
                 {{$data.locationName}}
             </view>
             <view class=" icon iconfont iconicon_close close" a:if="{{!!$data.locationName&&(currentPeople == organizer)}}" data-close="location" catchTap="close">
@@ -162,9 +162,9 @@
           <view class="remind" catchTap="showPopup" data-type="aheadTime">
             <text class="iconfont iconicon_time1"></text>
             <text class="remindTimeContaint" a:if="{{aheadTimes.length}}">
-              <text class="remindTime" a:for="{{comListData.aheadTimesList}}" a:if="{{aheadTimes.includes(item.id)}}">
-                    {{item.text}}
-              </text>
+              <block class="remindTime" decode="{{true}}" a:for="{{comListData.aheadTimesList}}" a:if="{{aheadTimes.includes(item.id)}}">
+                    {{item.text}}{{' '}}
+              </block>
             </text>
             <text class="noRemind" a:if="{{!aheadTimes.length}}">不提醒</text>
             <text class="iconfont iconicon_share"></text>

pages/meetingDetail/meetingDetail.js

@@ -876,13 +876,14 @@ create.Page({
             modifyModel: modifyModel,
             modifyContent: 'title'
           }
-          this.modifySchedule(dataTitle).catch(err => {
+          this.modifySchedule(dataTitle).then(res => {
+            this.$store.data.isIndexAffairListNeedUpdate = true
+            this.$store.data.originalData.title = this.data.title
+            this.update()
+          }).catch(err => {
             this.setData({
               title: this.$store.data.originalData.title
             })
-          }).then(res => {
-            this.$store.data.originalData.title = this.data.title
-            this.update()
           })
         }
         break
@@ -893,13 +894,13 @@ create.Page({
             modifyModel: modifyModel,
             modifyContent: 'remark'
           }
-          this.modifySchedule(dataRemark).catch(err => {
+          this.modifySchedule(dataRemark).then(res => {
+            this.$store.data.originalData.remark = this.data.remark
+            this.update()
+          }).catch(err => {
             this.setData({
               remark: this.$store.data.originalData.remark
             })
-          }).then(res => {
-            this.$store.data.originalData.remark = this.data.remark
-            this.update()
           })
         }
         break
@@ -909,13 +910,13 @@ create.Page({
           modifyModel: modifyModel,
           modifyContent: 'meeting_way'
         }
-        this.modifySchedule(dataWay).catch(err => {
+        this.modifySchedule(dataWay).then(res => {
+          this.$store.data.originalData.meetingWay = !!this.data.comListData.meetingWayModelId ? this.data.comListData.meetingWayList[this.data.comListData.meetingWayModelId] : null
+          this.update()
+        }).catch(err => {
           this.setData({
             'comListData.meetingWayModelId': this.$store.data.originalData.meetingWayModel === null ? null : (this.$store.data.originalData.meetingWayModel.model === 'dingtalk' ? 2 : (this.$store.data.originalData.meetingWayModel.model === 'zoom' ? 1 : 0))
           })
-        }).then(res => {
-          this.$store.data.originalData.meetingWay = !!this.data.comListData.meetingWayModelId ? this.data.comListData.meetingWayList[this.data.comListData.meetingWayModelId] : null
-          this.update()
         })
         break
       case 'operate_user':
@@ -928,17 +929,17 @@ create.Page({
             modifyModel: modifyModel,
             modifyContent: 'operate_user'
           }
-          this.modifySchedule(dataUser, needNotice).catch(err => {
-            this.$store.data.participatorList = this.$store.data.originUsers
-            this.$store.data.participatorUserId = this.$store.data.originUsersId
+          this.modifySchedule(dataUser, needNotice).then(res => {
+            this.$store.data.originUsers = this.$store.data.participatorList
+            this.$store.data.originUsersId = this.$store.data.participatorUserId
             this.$store.data.updateInfo = {
               updateType: '',
               isUpate: false
             }
             this.update()
-          }).then(res => {
-            this.$store.data.originUsers = this.$store.data.participatorList
-            this.$store.data.originUsersId = this.$store.data.participatorUserId
+          }).catch(err => {
+            this.$store.data.participatorList = this.$store.data.originUsers
+            this.$store.data.participatorUserId = this.$store.data.originUsersId
             this.$store.data.updateInfo = {
               updateType: '',
               isUpate: false
@@ -964,17 +965,17 @@ create.Page({
             recurrenceModel: this.data.recurrenceModel,
             repeatable: this.data.repeatable
           }
-          this.modifySchedule(dataRepeat1).catch(err => {
+          this.modifySchedule(dataRepeat1).then(res => {
+            observer.notice(res.data.data)
+            this.$store.data.originalData.recurrenceModel = this.data.recurrenceModel
+            this.$store.data.originalData.repeatable = this.data.repeatable
+            this.update()
+          }).catch(err => {
             this.setData({
               'comListData.comSelectListId': this.$store.data.originalData.recurrenceModel.model === 'weekly' ? (this.$store.data.originalData.recurrenceModel.weekDayList.length > 1 ? 3 : 2) : repeatListMap.get(this.$store.data.originalData.recurrenceModel.model),
               repeatable: this.$store.data.originalData.repeatable,
               recurrenceModel: this.$store.data.originalData.repeatable ? { model: this.storer.data.originalData.recurrenceModel.model, daysOfMonth: this.$store.data.originalData.recurrenceModel.daysOfMonth, interval: 1, initialTime: this.$store.data.originalData.recurrenceModel.initialTime, terminateTime: this.$store.data.originalData.recurrenceModel.terminateTime, weekDayList: this.$store.data.originalData.recurrenceModel.weekDayList } : { model: 'no_repeat' }
             })
-          }).then(res => {
-            observer.notice(res.data.data)
-            this.$store.data.originalData.recurrenceModel = this.data.recurrenceModel
-            this.$store.data.originalData.repeatable = this.data.repeatable
-            this.update()
           })
         }
         else if (this.$store.data.originalData.repeatable === 1 && this.data.repeatable === 0) {
@@ -986,16 +987,16 @@ create.Page({
             recurrenceModel: this.data.recurrenceModel,
             repeatable: this.data.repeatable
           }
-          this.modifySchedule(dataRepeat2).catch(err => {
+          this.modifySchedule(dataRepeat2).then(res => {
+            this.$store.data.originalData.recurrenceModel = this.data.recurrenceModel
+            this.$store.data.originalData.repeatable = this.data.repeatable
+            this.update()
+          }).catch(err => {
             this.setData({
               'comListData.comSelectListId': this.$store.data.originalData.recurrenceModel.model === 'weekly' ? (this.$store.data.originalData.recurrenceModel.weekDayList.length > 1 ? 3 : 2) : repeatListMap.get(this.$store.data.originalData.recurrenceModel.model),
               repeatable: this.$store.data.originalData.repeatable,
               recurrenceModel: this.$store.data.originalData.repeatable ? { model: this.$store.data.originalData.recurrenceModel.model, daysOfMonth: this.$store.data.originalData.recurrenceModel.daysOfMonth, interval: 1, initialTime: this.$store.data.originalData.recurrenceModel.initialTime, terminateTime: this.$store.data.originalData.recurrenceModel.terminateTime, weekDayList: this.$store.data.originalData.recurrenceModel.weekDayList } : { model: 'no_repeat' }
             })
-          }).then(res => {
-            this.$store.data.originalData.recurrenceModel = this.data.recurrenceModel
-            this.$store.data.originalData.repeatable = this.data.repeatable
-            this.update()
           })
         }
         else {
@@ -1007,15 +1008,15 @@ create.Page({
             recurrenceModel: this.data.recurrenceModel,
             repeatable: this.data.repeatable
           }
-          this.modifySchedule(dataRepeat3).catch(err => {
+          this.modifySchedule(dataRepeat3).then(res => {
+            this.$store.data.originalData.recurrenceModel = this.data.recurrenceModel
+            this.$store.data.originalData.repeatable = this.data.repeatable
+            this.update()
+          }).catch(err => {
             this.setData({
               'comListData.comSelectListId': this.$store.data.originalData.recurrenceModel.model === 'weekly' ? (this.$store.data.originalData.recurrenceModel.weekDayList.length > 1 ? 3 : 2) : repeatListMap.get(this.$store.data.originalData.recurrenceModel.model),
               repeatable: this.$store.data.originalData.repeatable
             })
-          }).then(res => {
-            this.$store.data.originalData.recurrenceModel = this.data.recurrenceModel
-            this.$store.data.originalData.repeatable = this.data.repeatable
-            this.update()
           })
         }
         break
@@ -1030,11 +1031,7 @@ create.Page({
           },
           meetingRoomId: !!this.$store.data.roomId ? this.$store.data.roomId : -1
         }
-        this.modifySchedule(dataLocation, needNotice).catch(err => {
-          this.$store.data.locationName = this.$store.data.originalData.location.locationName
-          this.$store.data.roomId = this.$store.data.originalData.meetingRoomId
-          this.update()
-        }).then(res => {
+        this.modifySchedule(dataLocation, needNotice).then(res => {
           this.$store.data.originalData.location = {
             longitude: '-999',
             latitude: '-999',
@@ -1052,7 +1049,10 @@ create.Page({
             this.isChange('modify_time', modifyModel, needNotice)
 
           }
-
+        }).catch(err => {
+          this.$store.data.locationName = this.$store.data.originalData.location.locationName
+          this.$store.data.roomId = this.$store.data.originalData.meetingRoomId
+          this.update()
         })
         break
       case 'modify_time':
@@ -1062,14 +1062,7 @@ create.Page({
           endTime: this.$store.data.endTime.replace(/\//g, "-"),
           modifyContent: 'modify_time'
         }
-        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.update()
-          this.setData({
-            week: this.data.weekList[new Date(this.$store.data.originalData.startTime.replace(/-/g, "/")).getDay()],
-          })
-        }).then(res => {
+        this.modifySchedule(data, needNotice).then(res => {
           this.$store.data.originalData.startTime = this.$store.data.startTime.replace(/\//g, "-")
           this.$store.data.originalData.endTime = this.$store.data.endTime.replace(/\//g, "-")
           this.update()
@@ -1105,6 +1098,13 @@ 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.update()
+          this.setData({
+            week: this.data.weekList[new Date(this.$store.data.originalData.startTime.replace(/-/g, "/")).getDay()],
+          })
         })
         break
       case 'aheadTimes':
@@ -1113,13 +1113,13 @@ create.Page({
           aheadTimes: this.data.aheadTimes,
           modifyContent: 'aheadTimes'
         }
-        this.modifySchedule(dataAheadTimes).catch(err => {
+        this.modifySchedule(dataAheadTimes).then(res => {
+          this.$store.data.originalData.aheadTimes = (this.data.aheadTimes.length === 0 ? null : this.data.aheadTimes)
+          this.update()
+        }).catch(err => {
           this.setData({
             aheadTimes: this.$store.data.originalData.aheadTimes
           })
-        }).then(res => {
-          this.$store.data.originalData.aheadTimes = (this.data.aheadTimes.length === 0 ? null : this.data.aheadTimes)
-          this.update()
         })
         break
     }