Merge branch 'dev' into dev_Miaojiale

src/views/Home/index.vue

 <template>
   <div id="con">
-    <Notice v-show="isNotice"></Notice>
+    <Notice v-show="isNotice" :noticeName="noticeName"></Notice>
     <div v-show="!isNotice">
       <div class="flex">
         <div class="left box">
@@ -229,6 +229,7 @@ export default {
   components: { Map, PdfDialog, Notice },
   data() {
     return {
+      noticeName: "",
       isNotice: false,
       curPdf: {},
       pdfSrc: "",
@@ -262,9 +263,11 @@ export default {
           articleTitle: "申请加入国家消化道早癌防治中心联盟",
           createTime: "2022-09-20",
           isTop: 1,
+          name: "AllianceApply",
           moduleType: 99,
         },
         {
+          name: "HospitalsList",
           articleTitle: "GECA联盟理事及医院名单",
           createTime: "2022-11-20",
           isTop: 1,
@@ -361,6 +364,7 @@ export default {
   methods: {
     setPdf(item) {
       if (item.moduleType === 99) {
+        this.noticeName = item.name
         this.isNotice = true
         return
       }

src/views/Home/notice/index.vue

@@ -27,6 +27,12 @@ import AllianceApply from "./components/AllianceApply.vue"
 import HospitalsList from "./components/HospitalsList.vue"
 export default {
   name: "Notice",
+  props: {
+    noticeName: {
+      type: String,
+      default: "AllianceApply",
+    },
+  },
   components: {
     AllianceApply,
     HospitalsList,
@@ -47,12 +53,16 @@ export default {
           isTop: true,
         },
       ],
-      currentComponent: "AllianceApply",
+      currentComponent: this.$props.noticeName,
     }
   },
   methods: {},
   mounted() {},
-  watch: {},
+  watch: {
+    noticeName(val) {
+      this.currentComponent = val
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>