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

src/apps/AppMeetingNotice/AppMeetingNotice.vue

@@ -100,10 +100,10 @@ export default {
         "3": "common/toDo.png",
       }[status]
     },
-    detail({id}) {
-      this.comp = "detail";
-      this.params = id;
-      this.isList = false;
+    detail({id}){
+      uni.navigateTo({
+        url:"/apps/meetingNotice/detail?id=" + id
+      })
     },
     getData() {
       this.$http.post("/app/appmeetinginfo/list", null, {
@@ -135,12 +135,6 @@ export default {
   },
 
   onShow() {
-    const {id} = this.$route.query
-    if (id) {
-      this.comp = "detail";
-      this.params = id;
-      this.isList = false;
-    }
     this.getData();
   },
 

src/apps/AppMeetingNotice/meetingList.vue

@@ -36,33 +36,30 @@
 </template>
 
 <script>
-  import AiBack from "../../components/AiBack";
-  import AiEmpty from "../../components/AiEmpty";
-  import AiOpenData from "../../components/AiOpenData";
 
   export default {
     name: "meetingList",
-    components: {AiOpenData,AiBack, AiEmpty},
     props: {
       params: {
-        type: [String,Number,Object],
+        type: [String, Number, Object],
       }
     },
     data() {
       return {
         list: [],
         current: 1,
+        index: null,
         status: "加载更多",
       }
     },
 
-   created(){
-     document.title = "会议列表";
-     uni.setNavigationBarTitle({
-       title: this.params == 0 ? "历史会议" : "草稿箱"
-     });
-     this.getData();
-   },
+    onLoad(opt) {
+      this.index = opt.index
+      uni.setNavigationBarTitle({
+        title: opt.index == 0 ? "历史会议" : "草稿箱"
+      });
+      this.getData();
+    },
 
     methods: {
       detail({id}) {
@@ -85,8 +82,8 @@
       getData() {
         this.$http.post("/app/appmeetinginfo/list", null, {
           params: {
-            listType: this.params == 0 ? "2" : '0',
-            meetingStatus: this.params == 0 ? "4" : "0",
+            listType: this.index == 0 ? "2" : '0',
+            meetingStatus: this.index == 0 ? "4" : "0",
             size: 10,
             current: this.current,
           }
@@ -101,8 +98,6 @@
       },
     },
 
-
-
     filters: {
       format(date) {
         return date.split(" ")[1].substr(0, 5)