Merge branch 'master' of ssh://101.201.226.163:50022/binbin0314/datang-ui

src/components/Footer/Footer.vue

@@ -60,18 +60,18 @@ import { getLink } from 'config/api';
 export default {
   data() {
     return {
-      isTrue: true,
+      isTrue: false,
       str: '',
       otherLink: {},
     };
   },
   watch: {
     '$route.path'(value) {
-      if (value === '/') {
+      // if (value === '/') {
-        this.isTrue = true;
+      //   this.isTrue = true;
-      } else {
+      // } else {
-        this.isTrue = false;
+      //   this.isTrue = false;
-      }
+      // }
     },
   },
   created() {

src/components/RichText/RichText.vue

@@ -8,6 +8,9 @@
         <div v-if="richObj.publishTime">发表日期: {{ $moment(richObj.publishTime).format('YYYY-MM-DD') }}</div>
       </div>
     </template>
+    <div style="text-align:center;" class="mt-4" v-if="richObj && richObj.titleUrl && code === '0207'">
+      <video style="width: 100%;height: 400px" controls :src="richObj.titleUrl" />
+    </div>
     <div class="mt-4 content-size" v-if="richObj.content" v-dompurify-html="richObj.content"></div>
     <a-empty v-else />
     <template v-if="richObj && richObj.title">
@@ -24,7 +27,7 @@ export default {
     },
   },
   data() {
-    return {};
+    return { code: '' };
   },
   watch: {
     richObj(val) {
@@ -34,6 +37,9 @@ export default {
       }
     },
   },
+  mounted() {
+    this.code = this.$route.query.code;
+  },
   created() {
     if (this.richObj.jumpUrl) {
       window.open(this.richObj.jumpUrl);

src/views/OtherPages/NoticeNotice.vue

@@ -100,7 +100,7 @@ export default {
         const param = {
           showPage: this.code,
           year: this.year,
-          showType: '1',
+          showType: '0',
           pageNum: this.pageNum,
           pageSize: 10,
         };

src/views/OtherPages/PartyBuilding.vue

@@ -104,7 +104,7 @@ export default {
         const param = {
           showPage: this.code,
           year: this.year,
-          showType: '1',
+          showType: '0',
           pageNum: this.pageNum,
           pageSize: 10,
         };

src/views/OtherPages/SafeProduction.vue

@@ -103,7 +103,7 @@ export default {
         const param = {
           showPage: this.code,
           year: this.year,
-          showType: '1',
+          showType: '0',
           pageNum: this.pageNum,
           pageSize: 10,
         };