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

src/apps/AppMeetingNotice/AppMeetingNotice.vue

@@ -101,7 +101,7 @@ export default {
     },
     handleDetail({id}){
       uni.navigateTo({
-        url:"/apps/meetingNotice/detail?id=" + id
+        url:"/apps/AppMeetingNotice/detail?id=" + id
       })
     },
     getData() {

src/apps/AppMeetingNotice/belongToMe.vue

@@ -101,7 +101,7 @@ export default {
     },
     handleClick({id}) {
       uni.navigateTo({
-        url: "/apps/meetingNotice/detail?id=" + id
+        url: "/apps/AppMeetingNotice/detail?id=" + id
       })
     },
     change(e) {

src/apps/AppMeetingNotice/meetingList.vue

@@ -65,9 +65,9 @@
       detail({id}) {
         let url
         if (this.index == 2) {
-          url = "/apps/meetingNotice/addMeeting?id=" + id
+          url = "/apps/AppMeetingNotice/addMeeting?id=" + id
         } else {
-          url = "/apps/meetingNotice/detail?id=" + id
+          url = "/apps/AppMeetingNotice/detail?id=" + id
         }
         uni.navigateTo({url})
       },

src/apps/AppNotification/AppNotification.vue

@@ -46,7 +46,7 @@
 
       <AiEmpty v-else/>
       <u-loadmore :status="status" v-if="dataList.length"/>
-      <AiAdd @add="add"/>
+      <AiAdd @add="handleAdd"/>
       <u-popup v-model="show" mode="bottom">
         <div class="popup-wrap">
           <u-row justify="between">
@@ -178,7 +178,7 @@ export default {
       if (item.val == 0) {
         this.show = false;
         return uni.navigateTo({
-          url: "/apps/notification/detail?id=" + this.detail.id
+          url: "/apps/AppNotification/detail?id=" + this.detail.id
         });
       }
 
@@ -189,7 +189,7 @@ export default {
       if(item.val==3){
         this.show = false;
         return uni.navigateTo({
-          url:"/apps/notification/add?id=" + this.detail.id + "&flag=" + false
+          url:"/apps/AppNotification/add?id=" + this.detail.id + "&flag=" + false
         });
       }
     },
@@ -207,13 +207,13 @@ export default {
         this.show = true;
       }else {
         uni.navigateTo({
-          url: "/apps/notification/detail?id=" + this.detail.id + "&flag=" + true
+          url: "/apps/AppNotification/detail?id=" + this.detail.id + "&flag=" + true
         })
       }
     },
-    add(){
+    handleAdd(){
       uni.navigateTo({
-        url: "/apps/notification/add"
+        url: "/apps/AppNotification/add"
       })
     },
     change(val) {