fix

package-lock.json

@@ -8308,6 +8308,11 @@
       "integrity": "sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM=",
       "dev": true
     },
+    "jquery": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
+      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
+    },
     "js-base64": {
       "version": "2.6.4",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",

package.json

@@ -15,6 +15,7 @@
     "element-theme": "^2.0.1",
     "element-ui": "^2.15.6",
     "html2canvas": "^1.3.2",
+    "jquery": "^3.7.1",
     "js-cookie": "^2.2.1",
     "jspdf": "^2.4.0",
     "lru-cache": "^7.14.1",

src/components/rightColumns/index.vue

@@ -9,6 +9,19 @@
              node-key="id"
              @node-click="columnTo"></el-tree>
 
+    <template v-if="site == 2">
+      <p class="l-title">{{ $t('column.latestNews') }}</p>
+      <ul class="list">
+        <li v-for="(item, i) in site2News"
+            :key="i"
+            :title="item.title"
+            @click="toArtice(item)">
+          <p class="text">{{ item.title }}</p>
+          <span class="date">{{ item.releaseTime }}</span>
+        </li>
+      </ul>
+    </template>
+    <template v-else>
       <p class="l-title">{{$t('column.hot')}}</p>
       <ul class="list">
         <li v-for="(item, i) in hots"
@@ -30,6 +43,7 @@
           <span class="date">{{ item.releaseTime }}</span>
         </li>
       </ul>
+    </template>
   </div>
 </template>
 
@@ -47,6 +61,7 @@ export default {
         label: 'columnName'
       },
       news: [],
+      site2News: [],
       hots: []
     }
   },
@@ -71,6 +86,16 @@ export default {
         this.hots = Util.removeTag(data)
       }).catch(err => { })
 
+      if (this.site == 2) {
+        this.$post(this.api.newlyPublishedArticles, {
+          siteId: this.site,
+          columnIds: [411, 412, 413],
+          pageNum: 1,
+          pageSize: 8,
+        }).then(({ data }) => {
+          this.site2News = Util.removeTag(data.records);
+        }).catch((res) => { });
+      } else {
         this.$post(this.api.newlyPublishedArticles, {
           pageNum: 1,
           pageSize: 5,
@@ -78,6 +103,7 @@ export default {
         }).then(({ data }) => {
           this.news = Util.removeTag(data.records)
         }).catch(res => { })
+      }
     },
   }
 }

src/mixins/article/index.js

@@ -56,6 +56,7 @@ export default {
     },
     // 跳转文章页面
     toArtice(item) {
+			if (item.listStyleId === 74) return false
       if (item.articleTemplate === 24) { // 链接
         let href = item.linkAddress
         const cType = item.connectionType

src/pages/column/index.vue

@@ -321,7 +321,7 @@
                 </template>
                 <template v-else>
                   <div class="article-wrap">
-                    <ul class="articles">
+                    <ul :class="['articles', {media: info.listStyleId === 74}]">
                       <li v-for="(item, i) in articles"
                           :key="i"
                           :class="{'news-notice': info.listStyleId === 55, 'org': info.listStyleId === 68}"
@@ -335,10 +335,29 @@
                           <div class="news-title">{{ item.title }}</div>
                         </template>
                         <template v-else>
-                          <img class="pic"
+                          <img v-if="info.listStyleId !== 74"
+                               class="pic"
                                :src="item.titleImg"
                                alt=""
                                onerror="javascript:this.src='./images/1.png';" />
+
+                          <template v-else>
+                            <video v-if="Util.isVideo(item.fileList[0].fileName.substring(item.fileList[0].fileName.lastIndexOf('.') + 1))"
+                                   class="media-video"
+                                   controls
+                                   preload>
+                              <source :src="item.fileList[0].filePath"
+                                      type="video/mp4">
+                              您的浏览器不支持 video 标签。
+                            </video>
+                            <el-image v-else
+                                      class="media-pic"
+                                      :style="{backgroundImage: 'url(' + item.fileList[0].filePath + ')'}"
+                                      :src="item.fileList[0].filePath"
+                                      :preview-src-list="[item.fileList[0].filePath]">
+                            </el-image>
+                          </template>
+
                           <div class="texts">
                             <p v-if="(item.listStyleId === 10 || item.listStyleId === 15) && item.classificationName"
                                class="type">
@@ -383,13 +402,11 @@
                             <el-button v-if="item.listStyleId === 15 || item.listStyleId == 68"
                                        type="primary"
                                        class="readDetailBtn">{{ $t('column.readDetail') }}</el-button>
-
                           </div>
-
                         </template>
                       </li>
                     </ul>
-                    <div v-if="articles.length"
+                    <div v-if="articles.length > pageSize"
                          class="pagination">
                       <el-pagination background
                                      @current-change="currentChange"
@@ -410,8 +427,22 @@
             </div>
           </div>
         </div>
+        <template v-if="info.listStyleId !== 73 && info.listStyleId !== 74">
+          <div v-if="site == 2"
+               class="right">
+            <p class="l-title">{{ $t('column.latestNews') }}</p>
+            <ul class="list">
+              <li v-for="(item, i) in site2News"
+                  :key="i"
+                  :title="item.title"
+                  @click="toArtice(item)">
+                <p class="text">{{ item.title }}</p>
+                <span class="date">{{ item.releaseTime }}</span>
+              </li>
+            </ul>
+          </div>
           <!-- 选择了“列表样式”，不用显示右侧部分 -->
-        <div v-if="info.listStyleId !== 73"
+          <div v-else
                class="right">
             <p class="l-title">{{ $t('column.hot') }}</p>
             <ul class="list">
@@ -435,6 +466,7 @@
               </li>
             </ul>
           </div>
+        </template>
       </div>
     </div>
   </div>
@@ -449,6 +481,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
+      Util,
       loaded: false,
       fromColumn: this.$route.query.column,
       columnId: '',
@@ -469,7 +502,7 @@ export default {
       sameStyle: 1,
       allColumnId: [],
       showNav: false,
-      showNavIds: [10, 11, 12, 16, 55, 68, 73], // 显示侧导航的模板id
+      showNavIds: [10, 11, 12, 16, 55, 68, 73, 74], // 显示侧导航的模板id
       isFilter: false,
       page: 1,
       pageSize: 10,
@@ -479,6 +512,7 @@ export default {
         value: 'id',
         label: 'columnName'
       },
+      site2News: [],
       news: [],
       hots: [],
       deepestId: '',
@@ -677,15 +711,24 @@ export default {
     },
     // 最新资讯
     getNews () {
+      if (this.site == 2) {
+        this.$post(this.api.newlyPublishedArticles, {
+          siteId: this.site,
+          columnIds: [411, 412, 413],
+          pageNum: 1,
+          pageSize: 10,
+        }).then(({ data }) => {
+          this.site2News = Util.removeTag(data.records);
+        }).catch((res) => { });
+      } else {
         this.$post(this.api.newlyPublishedArticles, {
           pageNum: 1,
           pageSize: 5,
           siteId: this.site
-      })
+        }).then(({ data }) => {
-        .then(({ data }) => {
           this.news = Util.removeTag(data.records);
-        })
+        }).catch((res) => { });
-        .catch((res) => { });
+      }
     },
     // 会议时间筛选回调
     switchChange (item) {
@@ -1121,6 +1164,43 @@ export default {
             height: auto;
         }
     }
+    .media {
+        display: flex;
+        flex-wrap: wrap;
+        margin-left: 10px;
+        li {
+            flex-direction: column;
+            width: calc(25% - 20px);
+            margin-right: 20px;
+            background-color: transparent;
+            &:nth-child(4n) {
+                margin-right: 0;
+            }
+        }
+        .media-video {
+            width: 100%;
+            height: 200px;
+        }
+        /deep/.media-pic {
+            width: 100%;
+            height: 200px;
+            // background-size: 100% auto;
+            background-position: center center;
+            background-repeat: no-repeat;
+            img {
+                opacity: 0;
+            }
+        }
+        .texts {
+            width: 100% !important;
+            padding-left: 0;
+        }
+        h6 {
+            margin-top: 10px;
+            margin-bottom: 0;
+            text-align: center;
+        }
+    }
     .news-notice {
         .releaseTime {
             width: 88px;
@@ -1253,6 +1333,8 @@ export default {
 }
 .detail {
     flex: 1;
+    padding: 10px 15px;
+    background-color: #fff;
     h2 {
         margin-bottom: 1rem;
         font-size: 1.9rem;

src/pages/iasf/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="wrap">
     <el-carousel :class="['carousel']"
+                 id="part1"
                  :interval="6000"
                  :arrow="(modules[0] && modules[0].list.filter(e => e.isEnable).length > 1) ? 'hover' : 'never'"
                  :indicator-position="modules[0].list.filter(e => e.isEnable).length > 1 ? '' : 'none'">
@@ -19,9 +20,9 @@
         </el-carousel-item>
       </template>
     </el-carousel>
-    <div :class="['block-wrap',{active: hide}]">
+    <div :class="['block-wrap',{active: hide}]"
-      <div class="block"
+         id="part2">
-           style="padding-top: 80px">
+      <div class="block card-block">
         <div class="inner">
           <h2 class="b-title">{{ modules[1].form.title }}</h2>
           <p class="intro"
@@ -291,6 +292,7 @@ import mixins from '@/mixins/page'
 import Setting from '@/setting'
 import Util from '@/libs/util'
 import WOW from 'wow.js'
+import $ from 'jquery'
 export default {
   mixins: [mixins],
   data () {
@@ -316,7 +318,7 @@ export default {
     this.height = window.innerHeight + 'px'
     new WOW().init()
 
-    document.onscroll = this.throttle(this.scroll, 100)
+    document.onscroll = this.throttle(this.scroll, 200)
   },
   methods: {
     // 获取文章详情
@@ -415,14 +417,60 @@ export default {
     scroll () {
       let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
 
-      console.log(33, this.lastScrollTop < scrollTop)
+      if (this.lastScrollTop < scrollTop && !this.hide) {
-      if (this.lastScrollTop < scrollTop && scrollTop > 10) {
+        // this.hide = true
+        // document.querySelector(`#part2`).scrollIntoView({
+        //   behavior: 'smooth'
+        // })
         this.hide = true
-      } else if (this.lastScrollTop > scrollTop && scrollTop <= (window.innerWidth / 2.03)) {
+        setTimeout(() => {
+          $(window).scrollTop(100)
+          // window.scrollTo({
+          //   top: window.innerWidth / 2.03,
+          //   behavior: 'smooth' // 平滑滚动
+          // });
+          // this.scrollTop(window.innerWidth / 2.03, 200)
+        }, 300)
+
+      } else if (this.lastScrollTop > scrollTop && scrollTop == 0 && this.hide) {
+        // this.hide = false
+        // document.querySelector(`#part1`).scrollIntoView({
+        //   behavior: 'smooth'
+        // })
+        // window.scrollTo({
+        //   top: 0,
+        //   behavior: 'smooth' // 平滑滚动
+        // });
         this.hide = false
+        setTimeout(() => {
+          $(window).scrollTop(0)
+          // window.scrollTo({
+          //   top: 0,
+          //   behavior: 'smooth' // 平滑滚动
+          // });
+          // this.scrollTop(0, 200)
+        }, 300)
       }
       this.lastScrollTop = scrollTop
     },
+    scrollTop (number = 0, time) {
+      if (!time) {
+        document.body.scrollTop = document.documentElement.scrollTop = number;
+        return number;
+      }
+      const spacingTime = 20; // 设置循环的间隔时间  值越小消耗性能越高
+      let spacingInex = time / spacingTime; // 计算循环的次数
+      let nowTop = document.body.scrollTop + document.documentElement.scrollTop; // 获取当前滚动条位置
+      let everTop = (number - nowTop) / spacingInex; // 计算每次滑动的距离
+      let scrollTimer = setInterval(() => {
+        if (spacingInex > 0) {
+          spacingInex--;
+          this.scrollTop(nowTop += everTop);
+        } else {
+          clearInterval(scrollTimer); // 清除计时器
+        }
+      }, spacingTime);
+    },
     // 节流
     throttle (fn, time) {
       // 上一次的执行时间
@@ -497,11 +545,11 @@ $bannerHeight: calc(100vw / 2.03);
     z-index: 2;
     position: relative;
     top: $bannerHeight;
-    padding-bottom: 229px;
+    padding: 6rem 0 229px;
     background-color: #fff;
     transition: all 0.7s cubic-bezier(0.5, 0, 0.2, 1) 0s;
     &.active {
-        top: 130px;
+        top: 106px;
     }
 }
 .block {
@@ -521,6 +569,9 @@ $bannerHeight: calc(100vw / 2.03);
 .inner {
     width: 1200px;
 }
+.card-block {
+    background: url(http://10.10.11.7/images/iasf/14.jpg) 0 0/100% 100% no-repeat;
+}
 .card {
     display: flex;
     justify-content: space-between;