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

src/apps/AppMeetingNotice/AppMeetingNotice.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="meeting">
-    <template v-if="isList">
     <ai-top-fixed>
       <u-grid :col="3" :border="false">
         <u-grid-item v-for="(item,index) in grid" :key="index" :custom-style="{padding:'14px 0'}"
@@ -48,8 +47,6 @@
     </div>
     <u-divider bg-color="#F5F5F5" v-if="meetingList.length">已经到底啦</u-divider>
     <ai-add @add="add"/>
-    </template>
-    <component v-else :is="comp" :params="params"></component>
   </div>
 </template>
 
@@ -131,17 +128,18 @@ export default {
       })
     },
     handleClick(index){
-      this.params = index;
-      this.isList = false;
+      let url
       if(index==0 || index==2){
-        this.comp = "meetingList";
+        url="/pages/meetingNotice/components/meetingList?index=" + index
       }else if(index==1){
-        this.comp = "belongToMe";
+        url="/pages/meetingNotice/components/belongToMe"
       }
+      uni.navigateTo({url})
     },
     add() {
-      this.isList = false;
-      this.comp = "addMeeting";
+      uni.navigateTo({
+        url: "/pages/meetingNotice/components/addMeeting"
+      })
     }
   },
 
@@ -198,6 +196,7 @@ export default {
       }
 
       & > header {
+        width: 95%;
         font-size: 32px;
         font-weight: 600;
         color: #333333;