fix: await promise resolve to navback

api/xFetch.js

@@ -28,7 +28,6 @@ export default function xFetch({ url, method, data, type }) {
                 }
             },
             fail: function (err) {
-                console.log('err', JSON.stringify(err))
                 if (err && err.status == 401) {
                     login();
                 }

pages/createMeeting/createMeeting.js

@@ -320,7 +320,7 @@ create.Page({
     this.conflictPeople()
     this.resetRepeatList()
   },
-  addSchedule: throttle(function () {
+  addSchedule: throttle(async function () {
     let data = {
       title: this.data.title || `${getApp().globalData.name}创建的会议`,
       location: {
@@ -339,40 +339,27 @@ create.Page({
       meetingRoomId: this.$store.data.roomId,
       meetingWayModel: this.data.meetingWayModel
     }
-    addSchedule(data).then(res => {
-      if (res.data.code === 0) {
-        this.$store.data.tabBarIndex = '1'
-        if (this.data.repeatable === 0) {
-          // this.$store.data.onceMeetingContent = {
-          //   startTime: new Date(this.$store.data.startTime),
-          //   endTime: new Date(this.$store.data.endTime),
-          //   confirmAttendance: res.data.data.confirmAttendance,
-          //   title: res.data.data.title,
-          //   id: res.data.data.id
-          // }
-          if (this.$store.addOnceMeeting) {
-            this.$store.addOnceMeeting({
-              startTime: new Date(this.$store.data.startTime),
-              endTime: new Date(this.$store.data.endTime),
-              confirmAttendance: res.data.data.confirmAttendance,
-              title: res.data.data.title,
-              id: res.data.data.id
-            })
-          }
-
-        } else {
-          if (this.$store.modifyErpeatMeeting) {
-            this.$store.modifyErpeatMeeting()
-          }
-          // this.$store.data.indexNeedUpdate = true
+    const res = await addSchedule(data);
+    if (res.data.code === 0) {
+      this.$store.data.tabBarIndex = '1'
+      if (this.data.repeatable === 0) {
+        if (this.$store.addOnceMeeting) {
+          await this.$store.addOnceMeeting({
+            startTime: new Date(this.$store.data.startTime),
+            endTime: new Date(this.$store.data.endTime),
+            confirmAttendance: res.data.data.confirmAttendance,
+            title: res.data.data.title,
+            id: res.data.data.id
+          })
         }
 
-        this.update()
-        dd.navigateBack({
-          delta: 1
-        })
+      } else {
+        if (this.$store.modifyErpeatMeeting) {
+          await this.$store.modifyErpeatMeeting()
+        }
       }
-    })
+      dd.navigateBack()
+    }
 
   }),
   // 获取时间参数

pages/index/index.js

@@ -97,20 +97,20 @@ create.Page({
     //获取日程列表
     this.getData();
 
-    this.$store.modifyOnceMeetingContent = (content) => {
-      this.modifyOnceMeetingContent(content);
+    this.$store.modifyOnceMeetingContent = async (content) => {
+      await this.modifyOnceMeetingContent(content);
     }
-    this.$store.modifyErpeatMeeting = () => {
-      this.modifyErpeatMeeting()
+    this.$store.modifyErpeatMeeting = async () => {
+      await this.modifyErpeatMeeting()
     }
-    this.$store.addOnceMeeting = (content) => {
-      this.addOnceMeeting(content)
+    this.$store.addOnceMeeting = async (content) => {
+      await this.addOnceMeeting(content)
     }
     this.update();
   },
   //添加单次会议
-  addOnceMeeting(content) {
-    this.getData(true);
+  async addOnceMeeting(content) {
+    await this.getData(true);
     dd.setNavigationBar({
       title: "日程"
     });
@@ -124,12 +124,12 @@ create.Page({
     });
   },
   //修改重复会议
-  modifyErpeatMeeting() {
-    this.getData();
+  async modifyErpeatMeeting() {
+    await this.getData();
   },
   //修改会议，除单次会议修改成重复会议
-  modifyOnceMeetingContent(content) {
-    this.getData(true);
+  async modifyOnceMeetingContent(content) {
+    await this.getData(true);
     const scheduleListIndex = `scheduleList[${this.data.scheduleListIndex}].value`;
     const item = this.data.scheduleList[this.data.scheduleListIndex].value
     this.setData({
@@ -148,8 +148,8 @@ create.Page({
       }
     }
   },
-  getData(onlyChangeSign) {
-    getHomeUserSchedule1({
+  async getData(onlyChangeSign) {
+    await getHomeUserSchedule1({
       startTime: "2020-01-01 00:00:00",
       endTime: "2025-12-30 23:59:59"
     }).then(res => {
@@ -213,6 +213,8 @@ create.Page({
     this.timer = null;
   },
   refresh() {
+    this.isFirstLoad = true;
+    this.isLoaded = false;
     this.onLoad();
   },
   //动态列表侧滑的时候禁止页面上下滑动

pages/meetingDetail/meetingDetail.js

@@ -651,8 +651,6 @@ create.Page({
     return new Promise((resolve, rejects) => {
       modifySchedule(Object.assign(data, obj)).then(res => {
         if (res.data.code === 0) {
-          // that.$store.data.indexNeedUpdate = true
-          // that.update()
           if (data.modifyContent !== 'title') {
             if (this.$store.modifyErpeatMeeting) {
               this.$store.modifyErpeatMeeting()
@@ -754,8 +752,6 @@ create.Page({
         }
         isParticipate(data1).then(res => {
           if (res.data.code === 0) {
-            // this.$store.data.indexNeedUpdate = true
-            // this.update()
             this.setData({
               confirmAttendance: 0
             })
@@ -782,8 +778,6 @@ create.Page({
         }
         isParticipate(data).then(res => {
           if (res.data.code === 0) {
-            // this.$store.data.indexNeedUpdate = true
-            // this.update()
             this.setData({
               aheadTimes: [15],
               'comListData.aheadTimesListId': [15],
@@ -817,11 +811,10 @@ create.Page({
                 templateId: this.data.scheduleItem.scheduleTemplateId,
                 planDate: this.data.scheduleItem.planDate
               }
-              deleteSchedule(data).then(res => {
+              deleteSchedule(data).then(async () => {
                 if (this.$store.modifyErpeatMeeting) {
-                  this.$store.modifyErpeatMeeting()
+                  await this.$store.modifyErpeatMeeting()
                 }
-                // _that.$store.data.indexNeedUpdate = true;
                 _that.$store.data.isIndexAffairListNeedUpdate = true;
                 _that.update()
                 dd.navigateBack({
@@ -1253,11 +1246,10 @@ create.Page({
               identify: this.data.organizer === getApp().globalData.userid ? 'major' : 'identify',
               deleteModel: 'only'
             }
-            deleteSchedule(data).then(res => {
+            deleteSchedule(data).then(async () => {
 
-              // _that.$store.data.indexNeedUpdate = true;
               if (this.$store.modifyErpeatMeeting) {
-                this.$store.modifyErpeatMeeting()
+                await this.$store.modifyErpeatMeeting()
               }
               _that.$store.data.isIndexAffairListNeedUpdate = true;
               _that.update()
@@ -1285,11 +1277,6 @@ create.Page({
     } else {
       isParticipate(data).then(res => {
         if (res.data.code === 0) {
-          // this.$store.data.indexNeedUpdate = true
-
-          // this.update()       
-
-
           this.setData({
             aheadTimes: [15],
             'comListData.aheadTimesListId': [15],
@@ -1318,8 +1305,6 @@ create.Page({
     } else {
       isParticipate(data).then(res => {
         if (res.data.code === 0) {
-          // this.$store.data.indexNeedUpdate = true
-          // this.update()
           this.setData({
             confirmAttendance: 0
           })
@@ -1347,8 +1332,6 @@ create.Page({
     }
     isParticipate(data).then(res => {
       if (res.data.code === 0) {
-        // this.$store.data.indexNeedUpdate = true
-        // this.update()
         this.setData({
           confirmAttendance: -9
         })