Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppMeetingNotice/components/belongToMe.vue

@@ -65,10 +65,10 @@
         ]
       }
     },
-    methods: {
+    created() {
-      emitShow(){
       this.getList()
     },
+    methods: {
       emitReachBottom(){
         this.current = this.current + 1;
         this.getList()

src/apps/AppMeetingNotice/components/detail.vue

@@ -52,6 +52,7 @@
 
       <div class="footer" v-if="['1','2'].includes(detail.status) && detail.joinStatus==0">
         <div @click="updateStatus(0)">请假</div>
+        <div @click="toDo">待定</div>
         <div @click="updateStatus(1)">确认会议</div>
       </div>
 
@@ -77,7 +78,7 @@
         </div>
       </div>
     </template>
-    <AiBack visible eventName="back" @back="list=false"/>
+    <AiBack/>
   </div>
 </template>
 
@@ -107,10 +108,25 @@
           {name: this.count(0) + "人未确认"},
           {name: this.count(1) + "人已确认"},
           {name: this.count(2) + "人已请假"},
+          {name: this.count(3) + "人待定"},
         ]
       },
     },
     methods: {
+      toDo(){
+        this.$http.post("/app/appmeetinginfo/tobeConfirm", null, {
+          params: {
+            meetingId: this.id,
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.$u.toast("会议待定");
+            setTimeout(_=>{
+              uni.navigateBack();
+            },800)
+          }
+        })
+      },
       count(sta) {
         return this.detail.attendees?.filter(e => e.joinStatus == sta)?.length;
       },
@@ -448,8 +464,8 @@
         color: #333333;
       }
 
-      & > div:first-child {
+      & > div:nth-child(1), & > div:nth-child(2){
-        width: 270px;
+        width: 135px;
         height: 100%;
         display: flex;
         align-items: center;