浏览代码

修改bug

Jing 20 小时之前
父节点
当前提交
3790e9f104

+ 1 - 1
.nuxt/manifest/latest.json

@@ -1 +1 @@
-{"id":"b7d680f5-9175-4433-95c2-fa2c369743f7","timestamp":1749091532001}
+{"id":"b024766d-37e6-4b10-ab12-92ef83c594d0","timestamp":1749796568598}

+ 1 - 0
.nuxt/manifest/meta/b024766d-37e6-4b10-ab12-92ef83c594d0.json

@@ -0,0 +1 @@
+{"id":"b024766d-37e6-4b10-ab12-92ef83c594d0","timestamp":1749796568598,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 0 - 1
.nuxt/manifest/meta/b7d680f5-9175-4433-95c2-fa2c369743f7.json

@@ -1 +0,0 @@
-{"id":"b7d680f5-9175-4433-95c2-fa2c369743f7","timestamp":1749091532001,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 1 - 1
.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/b7d680f5-9175-4433-95c2-fa2c369743f7.json"
+        "./manifest/meta/b024766d-37e6-4b10-ab12-92ef83c594d0.json"
       ],
       "#components": [
         "./components"

+ 4 - 4
assets/css/class.less

@@ -77,7 +77,7 @@ section {
     float: left;
     width: 720px;
     height: 405px;
-    margin-top: 44px;
+    margin-top: 30px;
 }
 
 .index_2_head {
@@ -120,7 +120,7 @@ section {
 .index_2_right_box {
     float: right;
     width: 450px;
-    margin-top: 33px;
+    margin-top: 18px;
 }
 
 .index_2_ul_a {
@@ -230,7 +230,7 @@ section {
 .index_5_box_3 {
     float: right;
     width: 452px;
-    margin-top: 20px;
+    // margin-top: 20px;
 }
 
 .index_5_big_img_li {
@@ -349,7 +349,7 @@ section {
 .index_9_box_1 {
     float: left;
     width: 720px;
-    margin-top: 20px;
+    // margin-top: 20px;
 }
 
 .index_9_ul_1 {

+ 7 - 8
assets/css/detail.less

@@ -1,7 +1,8 @@
 // 资讯列表
 .newsDetail {
     width: 100%;
-    margin-bottom: 70px;
+    margin-bottom: 10px;
+
 
     .inner {
         width: 1200px;
@@ -16,8 +17,7 @@
             .breadcrumb {
                 width: 100%;
                 height: 22px;
-                padding-bottom: 30px;
-                margin-top: 40px;
+                padding-bottom: 20px;
                 border-bottom: 1px solid #e6e6e6;
                 font-family: Microsoft YaHei, Microsoft YaHei;
                 font-weight: 400;
@@ -72,13 +72,12 @@
             }
 
             .LeftTop {
-                // height: 522px;
-                margin-top: 50px;
+                margin-top: 20px;
 
                 >h1 {
 
                     line-height: 40px;
-                    margin-bottom: 30px;
+                    margin-bottom: 20px;
                     font-family: Microsoft YaHei, Microsoft YaHei;
                     font-weight: bold;
                     font-size: 30px;
@@ -107,7 +106,7 @@
 
             .leftBottom {
                 width: 885px;
-                margin-top: 50px;
+                margin-top: 10px;
                 font-size: 20px;
                 line-height: 38px;
                 margin-bottom: 30px;
@@ -170,7 +169,7 @@
 
         .innerRight {
             width: 270px;
-            margin-top: 60px;
+            margin-top: 10px;
         }
     }
 }

+ 1 - 1
assets/css/index.less

@@ -797,7 +797,7 @@ section {
 }
 
 .index_9 {
-    height: 405px;
+    height: 456px;
 }
 
 .index_9_box_1 {

+ 6 - 6
assets/css/list.less

@@ -9,7 +9,7 @@
 .newsList {
     width: 100%;
     overflow: hidden;
-    margin-bottom: 70px;
+    margin-bottom: 30px;
 
     .inner {
         width: 1200px;
@@ -23,7 +23,7 @@
             .breadcrumb {
                 width: 100%;
                 height: 22px;
-                padding-bottom: 30px;
+                padding-bottom: 20px;
                 border-bottom: 1px solid #ccc;
                 font-family: Microsoft YaHei, Microsoft YaHei;
                 font-weight: 400;
@@ -33,7 +33,7 @@
                 text-align: left;
                 font-style: normal;
                 text-transform: none;
-                margin-top: 40px;
+                margin-top: 10px;
 
                 :deep(.el-breadcrumb) {
                     display: inline-block;
@@ -132,7 +132,7 @@
 
                 >li:nth-child(5n) {
                     border-bottom: 1px solid #D9D9D9;
-                    padding-bottom: 30px;
+                    padding-bottom: 20px;
                 }
 
                 >li:nth-child(5n+1) {
@@ -141,7 +141,7 @@
                     }
 
                     font-weight: bold;
-                    padding-top: 30px;
+                    padding-top: 20px;
 
                 }
             }
@@ -187,7 +187,7 @@
 
         .innerRight {
             width: 270px;
-            margin-top: 50px;
+            margin-top: 20px;
         }
     }
 }

+ 1 - 1
components/home/ListSecondaryHeading.vue

@@ -45,7 +45,7 @@ const targetRoute = segments[1];
     border-top-left-radius: 3px;
     border-top-right-radius: 3px;
     border: solid 1px #D9D9D9;
-    margin-top: 30px;
+    margin-top: 20px;
     margin-bottom: 15px;
     box-sizing: border-box;
     border-bottom: solid 2px #489D97;

+ 1 - 1
components/home/ListSecondaryHeading_zgzp.vue

@@ -40,7 +40,7 @@ const targetRoute = segments[1];
     border-top-left-radius: 3px;
     border-top-right-radius: 3px;
     border: solid 1px #D9D9D9;
-    margin-top: 40px;
+    margin-top: 20px;
     box-sizing: border-box;
     border-bottom: solid 2px #489D97;
     background: #fafafa;

+ 1 - 1
components/home/SecondaryHeading.vue

@@ -60,7 +60,7 @@ getPageData();
     border-top-left-radius: 3px;
     border-top-right-radius: 3px;
     border: solid 1px #D9D9D9;
-    margin-top: 40px;
+    margin-top: 20px;
     box-sizing: border-box;
     border-bottom: solid 2px #489D97;
     background: #fafafa;

+ 1 - 1
components/home/SecondaryHeading_shukan.vue

@@ -60,7 +60,7 @@ getPageData();
     border-top-left-radius: 3px;
     border-top-right-radius: 3px;
     border: solid 1px #D9D9D9;
-    margin-top: 40px;
+    margin-top: 20px;
     box-sizing: border-box;
     border-bottom: solid 2px #489D97;
     background: #fafafa;

+ 1 - 1
components/home/SecondaryHeading_zgzp.vue

@@ -57,7 +57,7 @@ getPageData();
     border-top-left-radius: 3px;
     border-top-right-radius: 3px;
     border: solid 1px #D9D9D9;
-    margin-top: 40px;
+    margin-top: 20px;
     box-sizing: border-box;
     border-bottom: solid 2px #489D97;
     background: #fafafa;

+ 1 - 1
pages/[dir]/[dir]/[id].vue

@@ -41,7 +41,7 @@
                     <img :src="selectedImage" alt="Preview">
                 </div>
                 <!-- 免责声明: -->
-                <div class="disclaimer" v-if="newsDetail.copyfrom == '本网'">
+                <div class="disclaimer" v-if="newsDetail.copyfrom != '本网'">
                     <p>原文链接:{{ newsDetail.fromurl }}</p>
                     <p>[免责声明]本文来源于网络转载,仅供学习交流使用,不构成商业目的。 版权归原作者所有,如涉及作品内容,版权和其他问题,请在30日与本网联系,我们将第一时间处理。</p>
                 </div>

+ 1 - 1
pages/[dir]/[dir]/list-[id].vue

@@ -7,7 +7,7 @@
         <!-- 列表页广告一 -->
         <HomeTopTen :imgurl="adImg1" v-if="adImg1"></HomeTopTen>
         <!-- 二级标题-->
-        <HomeListSecondaryHeading v-if="parent_name != ''" :name="parent_name" :nav="secondNav"></HomeListSecondaryHeading>
+        <HomeListSecondaryHeading v-if="parent_name != ''" :name="parent_name" :nav="secondNav" :pinyin="parent_pinyin"></HomeListSecondaryHeading>
         <!-- 资讯列表 -->
         <div class="newsList">
             <div class="inner">

+ 1 - 1
pages/[dir]/[id].vue

@@ -39,7 +39,7 @@
                     <img :src="selectedImage" alt="Preview">
                 </div>
                 <!-- 免责声明: -->
-                <div class="disclaimer" v-if="newsDetail.copyfrom == '本网'">
+                <div class="disclaimer" v-if="newsDetail.copyfrom != '本网'">
                     <p>原文链接:{{ newsDetail.fromurl }}</p>
                     <p>[免责声明]本文来源于网络转载,仅供学习交流使用,不构成商业目的。 版权归原作者所有,如涉及作品内容,版权和其他问题,请在30日与本网联系,我们将第一时间处理。</p>
                 </div>

+ 18 - 16
pages/index.vue

@@ -70,7 +70,7 @@
                 </div>
                 <!-- {{ job_vacancy }} -->
                 <!-- open 最新热门职位1-->
-                <div class="index_3_ul clearfix_2">
+                <div class="index_3_ul clearfix_2" v-if="job_vacancy">
                     <div class="index_3_li clearfix_2" v-for="(item, index) in job_vacancy" :key="index">
                         <NuxtLink class="index_3_li_a" :href="`/${item.pinyin}/${item.id}.html`" title="">
                             <div class="index_3_li_name_box">
@@ -156,10 +156,10 @@
                         @mouseenter="qhPicTwo(1)" :href="getLinkPath(pageData[3])" :title="pageData[3].alias">
                         {{ pageData[3].alias }}
                     </NuxtLink>
-                    <NuxtLink class="index_2_head_a" :class="{ 'index_2_head_a_only': hoverStatusTwo === 2 }"
+                    <!-- <NuxtLink class="index_2_head_a" :class="{ 'index_2_head_a_only': hoverStatusTwo === 2 }"
                         @mouseenter="qhPicTwo(2)" :href="getLinkPath(pageData[4])" :title="pageData[4].alias">
-                        {{ pageData[4].alias }}
-                    </NuxtLink>
+                        {{ pageData[4].alias }}11111
+                    </NuxtLink> -->
                 </div>
                 <div class="clearfix" v-if="hoverStatusTwo === 1">
                     <div class="index_5_box_1 clearfix">
@@ -286,7 +286,7 @@
                     <div class="index_6_head_right">
                         <div class="index_6_head_right_in" v-if="boxData6menu">
                             <NuxtLink class="index_6_head_right_in_a" v-for="item in boxData6menu"
-                                :to="{ path: `/${item.aLIas_pinyin}/list-1.html` }" :title="item.alias">
+                                :to="{ path: `/${item.pinyin}/list-1.html` }" :title="item.alias">
                                 {{ item.alias }}
                             </NuxtLink>
                         </div>
@@ -301,17 +301,17 @@
                     <div class="roll_2_box" v-if="boxData6.length > 0">
                         <div class="roll_2_img_ul">
                             <div class="roll_2_per">
-                                <NuxtLink class="roll_2_per_a" v-if="showImg == 1 && boxData6[0].length > 0"
+                                <NuxtLink class="roll_2_per_a" v-if="showImg == 1 && boxData6.length > 0"
                                     :href="getLinkPathDetail(boxData6[0])" :title="boxData6[0].title"
                                     :target="boxData6[0].islink == 1 ? '_blank' : '_self'">
                                     <img class="roll_2_per_a_img" :src="boxData6[0].imgurl" :alt="boxData6[0].title">
                                 </NuxtLink>
-                                <NuxtLink class="roll_2_per_a" v-if="showImg == 2 && boxData6[0].length > 1"
+                                <NuxtLink class="roll_2_per_a" v-if="showImg == 2 && boxData6.length > 1"
                                     :href="getLinkPathDetail(boxData6[1])" :title="boxData6[1].title"
                                     :target="boxData6[1].islink == 1 ? '_blank' : '_self'">
                                     <img class="roll_2_per_a_img" :src="boxData6[1].imgurl" :alt="boxData6[1].title">
                                 </NuxtLink>
-                                <NuxtLink class="roll_2_per_a" v-if="showImg == 3 && boxData6[0].length > 2"
+                                <NuxtLink class="roll_2_per_a" v-if="showImg == 3 && boxData6.length > 2"
                                     :href="getLinkPathDetail(boxData6[2])" :title="boxData6[2].title"
                                     :target="boxData6[2].islink == 1 ? '_blank' : '_self'">
                                     <img class="roll_2_per_a_img" :src="boxData6[2].imgurl" :alt="boxData6[2].title">
@@ -320,21 +320,21 @@
                         </div>
                     </div>
                     <div class="roll_2_btn_box" v-if="boxData6.length > 0">
-                        <div class="roll_2_btn roll_2_btn_only" v-if="boxData6[0].length > 0">
+                        <div class="roll_2_btn roll_2_btn_only" v-if="boxData6.length > 0">
                             <NuxtLink class="roll_2_btn_dot2 dot2" @mouseenter="changeImg(1)"
                                 :href="getLinkPathDetail(boxData6[0])" :title="boxData6[0].title"
                                 :target="boxData6[0].islink == 1 ? '_blank' : '_self'">
                                 {{ boxData6[0].title }}
                             </NuxtLink>
                         </div>
-                        <div class="roll_2_btn roll_2_btn_only" v-if="boxData6[0].length > 1">
+                        <div class="roll_2_btn roll_2_btn_only" v-if="boxData6.length > 1">
                             <NuxtLink class="roll_2_btn_dot2 dot2" @mouseenter="changeImg(2)"
                                 :href="getLinkPathDetail(boxData6[1])" :title="boxData6[1].title"
                                 :target="boxData6[1].islink == 1 ? '_blank' : '_self'">
                                 {{ boxData6[1].title }}
                             </NuxtLink>
                         </div>
-                        <div class="roll_2_btn roll_2_btn_only" v-if="boxData6[0].length > 2">
+                        <div class="roll_2_btn roll_2_btn_only" v-if="boxData6.length > 2">
                             <NuxtLink class="roll_2_btn_dot2 dot2" @mouseenter="changeImg(3)"
                                 :href="getLinkPathDetail(boxData6[2])" :title="boxData6[2].title"
                                 :target="boxData6[2].islink == 1 ? '_blank' : '_self'">
@@ -943,8 +943,8 @@ async function getPageAllData() {
                 //子导航内容
                 boxData6mainData.value = mkdata.data[5].child.textnum;
             }
-
-
+            console.log('boxData6',boxData6.value);
+            
         }
 
         if (mkdata.data.length > 6) {
@@ -1031,7 +1031,7 @@ if (setData.code == 200) {
 
 //6.获取页面职位 及推荐单位 start---------------------------------------->
 //6.1 获取最新热门岗位
-const job_vacancy = ref('') // 招聘岗位
+let job_vacancy = ref([]) // 招聘岗位
 const getJob = async () => {
     const getJob = await requestDataPromise('/web/getWebsiteJob', {
         method: 'GET',
@@ -1041,8 +1041,10 @@ const getJob = async () => {
         },
     });
     if (getJob.code == 200) {
-        console.log("获取到的岗位和简历:", getJob.data);
-        job_vacancy.value = getJob.data.job_recuiting; // 招聘岗位
+        // console.log("获取到的岗位和简历:", typeof (getJob.data.job_recuiting));
+        if (typeof (getJob.data.job_recuiting) != string) {
+            job_vacancy.value = getJob.data.job_recuiting; // 招聘岗位
+        }
     }
 }
 getJob()