Parcourir la source

Merge branch '2026_1_7_fzxfb_master'

CaoGQ123 il y a 4 jours
Parent
commit
f339537fe1
4 fichiers modifiés avec 367 ajouts et 270 suppressions
  1. 14 1
      components/detail/HotNews2.vue
  2. 137 73
      pages/[dir]/[id].vue
  3. 37 0
      pages/[dir]/list-[id].vue
  4. 179 196
      pages/index.vue

+ 14 - 1
components/detail/HotNews2.vue

@@ -123,6 +123,19 @@ getPageData();
     //你的样式
 }
 @media screen and (max-width: 800px) {
-    //你的样式
+    .title>h4 {
+        height: 55px;
+        line-height: 55px;
+        font-size: 20px;
+    }
+    .rightList {}
+    .rightList>li {
+        padding-left: 26px;
+    }
+    .rightList>li a {
+        height: 55px;
+        line-height: 55px;
+        font-size: 22px;
+    }
 }
 </style>

+ 137 - 73
pages/[dir]/[id].vue

@@ -620,38 +620,38 @@ const closePreview = () => {
 //@import url('@/assets/css/article/yd.less');
 //面包屑
 .breadcrumb-box {
-    width: 1400px;
+    width: 1400PX;
     margin: 0 auto;
     .inner {
         width: 100%;
-        height: 22px;
-        margin-top: 20px;
-        margin-bottom: 20px;
+        height: 22PX;
+        margin-top: 20PX;
+        margin-bottom: 20PX;
         font-family: Microsoft YaHei, Microsoft YaHei;
         font-weight: 400;
-        font-size: 20px;
+        font-size: 20PX;
         color: #666666;
-        line-height: 23px;
+        line-height: 23PX;
         text-align: left;
         font-style: normal;
         text-transform: none;
         display: flex;
         align-items: center;
-        border-bottom: 1px dashed #ccc;
-        margin-bottom: 10px;
-        padding: 20px 20px 20px 0;
+        border-bottom: 1PX dashed #ccc;
+        margin-bottom: 10PX;
+        padding: 20PX 20PX 20PX 0;
         box-sizing: border-box;
         a {
-            font-size: 16px;
+            font-size: 16PX;
             color: #000;
-            line-height: 20px;
+            line-height: 20PX;
         }
         span {
-            font-size: 16px;
+            font-size: 16PX;
             color: #000;
-            line-height: 20px;
+            line-height: 20PX;
             &.location {
-                line-height: 20px;
+                line-height: 20PX;
             }
         }
     }
@@ -659,127 +659,127 @@ const closePreview = () => {
 //资讯详情
 .newsDetail {
     width: 100%;
-    margin-bottom: 10px;
+    margin-bottom: 10PX;
     .inner {
-        width: 1400px;
+        width: 1400PX;
         overflow: hidden;
-        font-size: 16px;
+        font-size: 16PX;
         display: flex;
         align-items: flex-start;
         justify-content: space-between;
         .innerLeft {
-            width: 1030px;
+            width: 1030PX;
             .LeftTop {
-                margin-top: 20px;
-                border-bottom: 1px dashed #ccc;
-                padding-bottom: 20px;
+                margin-top: 20PX;
+                border-bottom: 1PX dashed #ccc;
+                padding-bottom: 20PX;
                 >h1 {
-                    line-height: 40px;
-                    margin-bottom: 20px;
+                    line-height: 40PX;
+                    margin-bottom: 20PX;
                     font-family: Microsoft YaHei, Microsoft YaHei;
                     font-weight: bold;
-                    font-size: 24px;
+                    font-size: 24PX;
                     color: #333333;
                     text-align: center;
                 }
                 >p {
-                    height: 18px;
-                    line-height: 18px;
+                    height: 18PX;
+                    line-height: 18PX;
                     font-family: Microsoft YaHei, Microsoft YaHei;
                     font-weight: 400;
-                    font-size: 14px;
+                    font-size: 14PX;
                     color: #999999;
                     text-align: center;
                     span {
-                        margin-right: 40px;
+                        margin-right: 40PX;
                     }
                 }
                 >img {
-                    width: 680px;
-                    height: 382px;
-                    padding: 50px 0px 60px 55px;
+                    width: 680PX;
+                    height: 382PX;
+                    padding: 50PX 0PX 60PX 55PX;
                 }
             }
             .leftBottom {
-                margin-top: 20px;
-                font-size: 20px;
-                line-height: 38px;
-                margin-bottom: 30px;
+                margin-top: 20PX;
+                font-size: 20PX;
+                line-height: 38PX;
+                margin-bottom: 30PX;
                 word-break: break-all;
                 ul>li img {
-                    width: 790px;
-                    height: 382px;
+                    width: 790PX;
+                    height: 382PX;
                 }
                 img {
-                    width: 790px;
-                    height: 382px;
+                    width: 790PX;
+                    height: 382PX;
                 }
                 p.tinymce-material {
                     img {
-                        width: 790px;
+                        width: 790PX;
                     }
                 }
                 >h3,
                 >p {
                     text-indent: 2em;
-                    width: 790px;
+                    width: 790PX;
                     font-family: Microsoft YaHei, Microsoft YaHei;
-                    font-size: 20px;
+                    font-size: 20PX;
                     color: #333333;
-                    line-height: 38px;
-                    padding-bottom: 30px;
+                    line-height: 38PX;
+                    padding-bottom: 30PX;
                     img {
-                        width: 790px;
+                        width: 790PX;
                     }
                 }
                 >h3 {
-                    font-weight: 600px;
+                    font-weight: 600PX;
                 }
                 >p {
                     font-weight: 400;
                 }
             }
             .disclaimer {
-                width: 790px;
+                width: 790PX;
                 overflow: hidden;
-                border-top: 1px solid #e6e6e6;
-                padding: 30px 0px;
+                border-top: 1PX solid #e6e6e6;
+                padding: 30PX 0PX;
                 color: #999999;
-                font-size: 17px;
+                font-size: 17PX;
                 p {
-                    width: 790px;
-                    line-height: 30px;
+                    width: 790PX;
+                    line-height: 30PX;
                 }
             }
             .recommendRead {
                 width: 100%;
-                margin: 30px 0px 20px 0;
+                margin: 30PX 0PX 20PX 0;
                 .recommendReadTitle {
-                    font-size: 18px;
+                    font-size: 18PX;
                     color: #001996;
-                    height: 42px;
-                    line-height: 35px;
-                    letter-spacing: 1px;
+                    height: 42PX;
+                    line-height: 35PX;
+                    letter-spacing: 1PX;
                     text-align: left;
                     font-style: normal;
                     text-transform: none;
-                    border-bottom: 1px solid #D9D9D9;
+                    border-bottom: 1PX solid #D9D9D9;
                     .read_title {
                         display: inline-block;
                         text-align: center;
-                        width: 94px;
-                        height: 40px;
-                        border-bottom: 2px solid #158d91;
+                        width: 94PX;
+                        height: 40PX;
+                        border-bottom: 2PX solid #158d91;
                     }
                 }
                 .recommendReadList {
-                    min-height: 155px;
-                    margin-top: 20px;
-                    padding-bottom: 10px;
-                    font-size: 16px;
-                    border-bottom: 1px solid #D9D9D9;
+                    min-height: 155PX;
+                    margin-top: 20PX;
+                    padding-bottom: 10PX;
+                    font-size: 16PX;
+                    border-bottom: 1PX solid #D9D9D9;
                     .recommendReadListTitle {
-                        margin-top: 18px;
+                        margin-top: 18PX;
                         a {
                             &:hover {
                                 color: #158d91;
@@ -789,11 +789,11 @@ const closePreview = () => {
                     }
                     .recommendReadListTitle:nth-child(1)::after {
                         content: "热";
-                        margin-left: 13px;
+                        margin-left: 13PX;
                         background: #FF8A37;
                         color: #fff;
-                        font-size: 14px;
-                        padding: 0px 2px;
+                        font-size: 14PX;
+                        padding: 0PX 2PX;
                     }
                     .recommendReadListTitle:hover a {
                         color: #158d91;
@@ -802,11 +802,11 @@ const closePreview = () => {
             }
         }
         .innerRight {
-            width: 315px;
+            width: 315PX;
             overflow: hidden;
-            border-top: 1px solid #139602;
+            border-top: 1PX solid #139602;
             .hotList1 {
-                margin-bottom: 50px;
+                margin-bottom: 50PX;
             }
         }
     }
@@ -1210,5 +1210,69 @@ const closePreview = () => {
     .newsDetail .inner .innerLeft .leftBottom {
         line-height: 33PX;
     }
+    .breadcrumb-box :deep(.el-icon) {}
+    .breadcrumb-box .inner span.location,
+    .breadcrumb-box .inner span {
+        font-size: 24px;
+    }
+    .breadcrumb-box .inner a {
+        font-size: 24px;
+        height: 55px;
+        line-height: 55px;
+    }
+    .breadcrumb-box .phone_breadcrumb_text :deep(.el-breadcrumb__inner) {
+        font-size: 24px;
+        height: 55px;
+        line-height: 55px;
+    }
+    .newsDetail .inner .innerLeft .LeftTop>h1 {
+        font-size: 24PX;
+        line-height: 33PX;
+    }
+    .newsDetail .inner .innerLeft .LeftTop>h1 {
+        font-size: 33px;
+        line-height: 44px;
+    }
+    .newsDetail .inner .innerLeft .LeftTop>p {
+        font-size: 14px;
+        line-height: 24px;
+        height: auto;
+    }
+    .newsDetail .inner .innerLeft .LeftTop>p span {
+        font-size: 14px;
+        line-height: 24px;
+        height: auto;
+    }
+    .newsDetail .inner .innerLeft .leftBottom {
+        font-size: 26px;
+        line-height: 44px;
+    }
+    .newsDetail .inner .innerLeft .recommendRead .recommendReadTitle {
+        height: auto;
+        overflow: hidden;
+    }
+    .newsDetail .inner .innerLeft .recommendRead .recommendReadTitle .read_title {
+        height: 44px;
+        line-height: 44px;
+        font-size: 28px;
+    }
+    .newsDetail .inner .innerLeft .recommendRead .recommendReadList .recommendReadListTitle {
+        line-height: 44px;
+        height: 44px;
+    }
+    .newsDetail .inner .innerLeft .recommendRead .recommendReadList .recommendReadListTitle a {
+        line-height: 44px;
+        height: 44px;
+        font-size: 24px;
+    }
+    .newsDetail .inner .innerLeft .recommendRead .recommendReadList .recommendReadListTitle:nth-child(1)::after {
+        font-size: 14PX;
+        margin-top: 1PX;
+    }
+    .prevNext a {
+        height: 44px;
+        line-height: 44px;
+        font-size: 24px;
+    }
 }
 </style>

+ 37 - 0
pages/[dir]/list-[id].vue

@@ -606,5 +606,42 @@ onMounted(async () => {
         width: 34PX !important;
         height: 34PX !important;
     }
+    .breadcrumb-box :deep(.el-icon) {}
+    .breadcrumb-box .inner span.location,
+    .breadcrumb-box .inner span {
+        font-size: 24px;
+    }
+    .breadcrumb-box .inner a {
+        font-size: 24px;
+        height: 55px;
+        line-height: 55px;
+    }
+    .breadcrumb-box .phone_breadcrumb_text :deep(.el-breadcrumb__inner) {
+        font-size: 24px;
+        height: 55px;
+        line-height: 55px;
+    }
+    .li_img_box {
+        width: 222px;
+        height: 144px;
+        margin-right: 11px;
+    }
+    .newsList .listBox .listBoxLeft .list>li {
+        margin-top: 22px;
+        padding-bottom: 22px;
+    }
+    .li_h4_dot1 {
+        height: 44px;
+        line-height: 44px;
+        font-size: 30px;
+        margin-top: 8px;
+    }
+    .li_dot3 {
+        max-height: 99px;
+        height: auto;
+        line-height: 33px;
+        font-size: 24px;
+        margin-top: 4px;
+    }
 }
 </style>

Fichier diff supprimé car celui-ci est trop grand
+ 179 - 196
pages/index.vue


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff