From 9283face6457e3e1495f4f2fc086330de13bd7c1 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 20 Mar 2024 16:06:27 +0800
Subject: [PATCH] fix

---
 src/libs/resize/index.js       | 10 +++++-----
 src/mixins/article/index.js    |  3 ++-
 src/pages/article/index.vue    |  4 ++--
 src/pages/column/index.vue     |  8 ++++----
 src/pages/index/list/index.vue |  8 ++++----
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/libs/resize/index.js b/src/libs/resize/index.js
index 3c98c24..974aab4 100644
--- a/src/libs/resize/index.js
+++ b/src/libs/resize/index.js
@@ -12,8 +12,8 @@ function setRem() {
 }
 
 // 初始化
-setRem();
-// 改变窗口大小时重新设置 rem
-window.onresize = function() {
-    setRem();
-};
\ No newline at end of file
+// setRem();
+// // 改变窗口大小时重新设置 rem
+// window.onresize = function() {
+//     setRem();
+// };
\ No newline at end of file
diff --git a/src/mixins/article/index.js b/src/mixins/article/index.js
index 0170a97..6e48b1d 100644
--- a/src/mixins/article/index.js
+++ b/src/mixins/article/index.js
@@ -30,7 +30,8 @@ export default {
             (this.site) :
             to.siteSelection
           if (ids[1]) { // 文章
-            href = '/article?articleId=' + ids[1]
+            const columnIds = ids[0].split(',')
+            href = `/article?articleId=${ids[1]}&id=${columnIds[columnIds.length - 1]}`
           } else { // 栏目
             const columnIds = ids[0].split(',')
             href = '/column?id=' + columnIds[columnIds.length - 1]
diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue
index f818ef5..20c95e3 100644
--- a/src/pages/article/index.vue
+++ b/src/pages/article/index.vue
@@ -152,7 +152,7 @@ export default {
               }
 
               // 浏览量+1
-              this.$post(this.api.articlePreview, Util.rsa(this.id)).then(res => { }).catch(err => { })
+              this.$post(`${this.api.articlePreview}?contentId=${this.id}`).then(res => { }).catch(err => { })
               this.loaded = true
             }
           }
@@ -203,7 +203,7 @@ export default {
     font-size: 2rem;
     font-weight: 600;
     color: #fff;
-    background: url(../../assets/images/intro-bg.png) center center no-repeat;
+    background: url(../../assets/images/intro-bg.png) center center/cover no-repeat;
     object-fit: cover;
 }
 .article {
diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue
index 5bc0ef4..e1046ac 100644
--- a/src/pages/column/index.vue
+++ b/src/pages/column/index.vue
@@ -137,7 +137,7 @@
 
             <template v-if="articles.length && !loading">
               <!-- 列表样式选的是列表详情，则直接显示最新一篇文章的详情 -->
-              <div v-if="info.listStyleId === 73"
+              <div v-if="info.listStyleId === 77"
                    class="detail">
 
                 <template v-if="article.articleTemplate != 72">
@@ -436,8 +436,8 @@
             </div>
           </div>
         </div>
-        <!-- <template v-if="info.listStyleId !== 73 && info.listStyleId !== 74"> -->
-        <template v-if="info.listStyleId !== 73 && info.listStyleId !== 74">
+        <!-- <template v-if="info.listStyleId !== 77 && info.listStyleId !== 74"> -->
+        <template v-if="info.listStyleId !== 77 && info.listStyleId !== 74">
           <!-- 选择了“列表样式”，不用显示右侧部分 -->
           <div class="right">
             <p class="l-title">{{ $t('column.hot') }}</p>
@@ -501,7 +501,7 @@ export default {
       sameStyle: 1,
       allColumnId: [],
       showNav: false,
-      showNavIds: [10, 11, 12, 16, 55, 68, 73, 74], // 显示侧导航的模板id
+      showNavIds: [10, 11, 12, 16, 55, 68, 77, 74], // 显示侧导航的模板id
       isFilter: false,
       page: 1,
       pageSize: 10,
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index c194480..a9999df 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -904,9 +904,6 @@ export default {
 @media (max-width: 1200px) {
     .wrap {
         .carousel {
-            .text-wrap {
-                left: 40px;
-            }
             .qrcode-wrap {
                 margin-right: 20px;
             }
@@ -970,7 +967,10 @@ export default {
 }
 @media (max-width: 640px) {
     .wrap {
-        .carousel {
+        /deep/.carousel {
+            .el-carousel__container {
+                height: 240px !important;
+            }
             .text-wrap {
                 left: 20px;
             }