瀏覽代碼

修改bug

Jing 1 月之前
父節點
當前提交
096a894e13

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

@@ -1 +1 @@
-{"id":"dev","timestamp":1744763021030}
+{"id":"dev","timestamp":1745203413542}

+ 1 - 1
.nuxt/manifest/meta/dev.json

@@ -1 +1 @@
-{"id":"dev","timestamp":1744763021030,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}
+{"id":"dev","timestamp":1745203413542,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 3 - 3
.nuxt/nitro.json

@@ -1,5 +1,5 @@
 {
-  "date": "2025-04-16T00:23:53.067Z",
+  "date": "2025-04-21T02:43:52.639Z",
   "preset": "nitro-dev",
   "framework": {
     "name": "nuxt",
@@ -9,9 +9,9 @@
     "nitro": "2.10.4"
   },
   "dev": {
-    "pid": 23540,
+    "pid": 14164,
     "workerAddress": {
-      "socketPath": "\\\\.\\pipe\\nitro\\worker-23540-1.sock"
+      "socketPath": "\\\\.\\pipe\\nitro\\worker-14164-1.sock"
     }
   }
 }

+ 1 - 1
.nuxt/nuxt.d.ts

@@ -1,6 +1,6 @@
 // Generated by nuxi
-/// <reference types="@nuxt/devtools" />
 /// <reference types="@nuxt/telemetry" />
+/// <reference types="@nuxt/devtools" />
 /// <reference path="types/builder-env.d.ts" />
 /// <reference types="nuxt" />
 /// <reference path="types/app-defaults.d.ts" />

+ 1 - 1
.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/dev.json"
+        "./manifest/meta/dev"
       ],
       "#components": [
         "./components"

+ 61 - 20
assets/css/public/head.less

@@ -1,3 +1,27 @@
+.userInfo11 {
+    width: 100px;
+    height: 80px;
+    background-color: #fff;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+    border-radius: 3px;
+    position: absolute;
+    top: 40px;
+    right: 35px;
+    font-size: 14px;
+    z-index: 999;
+
+    li {
+        height: 40px;
+        line-height: 40px;
+        color: #333333;
+        padding-left: 10px;
+    }
+
+    >li:hover {
+        color: #dd7d18;
+    }
+}
+
 .tips {
     padding: 20px 0;
     text-align: center;
@@ -29,11 +53,11 @@
 /* 页面头部 */
 header {
     width: 100%;
-    height: 201px;
+    height: 180px;
     font-size: 12px;
     font-family: PingFang SC-Regular;
     color: #666666;
-    background: url("../../../public/head/headtopbg.png") repeat-x;
+    background: url("http://img.bjzxtw.org.cn/master/bjzxtw/public/head/headtopbg.png") repeat-x;
 }
 
 .headerNav {
@@ -43,12 +67,13 @@ header {
 }
 
 .headerNav .left>span {
-    margin-right: 47px;
+    margin-right: 20px;
 }
 
 .headerNav .right {
     display: flex;
     margin-right: 10px;
+    position: relative;
 
     button {
         font-size: 12px;
@@ -102,6 +127,14 @@ header {
         vertical-align: -3px;
     }
 
+    .home {
+        background-image: url("http://img.bjzxtw.org.cn/master/bjzxtw/public/image/search.png");
+    }
+
+    .collection {
+        background-image: url("http://img.bjzxtw.org.cn/master/bjzxtw/public/image/search.png");
+    }
+
     .exit {
         line-height: 30px;
     }
@@ -113,28 +146,35 @@ header {
 
 /* // 头部logo */
 .headerLogo {
-    width: 100%;
-    height: 174px;
-
+    height: 145px;
+    position: relative;
+    //background: url("../../public/head/topBg.png") no-repeat center;
+    .titlead {
+        position: absolute;
+        bottom: 14px;
+        right: 26px;
+        width: 830px;
+        height: 110px;
+        overflow: hidden;
+        a {
+            display: block;
+            width: 830px;
+            height: 110px;
+            overflow: hidden;
+        }
+        img {
+            width: 100%;
+            height:110px;
+        }
+    }
     .inner {
-        display: flex;
-        justify-content: space-between;
-        width: 1200px;
-        margin: 0 auto;
         position: relative;
-        height: 174px;
-
-        .titlead {
-            position: absolute;
-            bottom: 30px;
-            right: 0px;
-        }
+        height: 145px;
     }
-
     .inner>img {
         width: 297px;
-        height: 114px;
-        margin-top: 30px;
+        height: 110px;
+        margin-top: 20px;
         cursor: pointer;
     }
 
@@ -153,6 +193,7 @@ header {
             display: inline-block;
             width: 30px;
             height: 30px;
+            background: url("http://img.bjzxtw.org.cn/master/bjzxtw/public/image/search.png") no-repeat;
             position: absolute;
             top: 5px;
             left: 15px;

+ 1 - 1
components/home/BigSwiper.vue

@@ -1,7 +1,7 @@
 <template>
     <!-- 首页大的轮播图 -->
     <div class="swiper" v-if="imagelist">
-        <el-carousel height="400px">
+        <el-carousel height="400px" v-if="imagelist">
             <el-carousel-item v-for="(item, index) in imagelist" :key="index">
                 <NuxtLink :to="`/newsDetail/${item.id}`" target="_blank">
                     <img :src="item.imgurl">

+ 49 - 36
components/home/PageMessage.vue

@@ -4,13 +4,16 @@
         <div class="inner">
             <div class="toutiao">
                 <div class="xwtt">
-                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'" v-for="(item, index) in headlinelist" :key="index">
+                    <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                        :target="item.islink == 1 ? '_blank' : '_self'" v-for="(item, index) in headlinelist"
+                        :key="index">
                         <h1 class="tttitle">{{ item.title }}</h1>
                     </NuxtLink>
                 </div>
-                <ul class="toutiao1">
+                <ul class="toutiao1" v-if="headlinelist1">
                     <li class="toutiaolist" v-for="item in headlinelist1">
-                        <NuxtLink :to="{path:`/${item.pinyin}/${item.id}.html`}" :title="item.title">{{item.title}}</NuxtLink>
+                        <NuxtLink :to="{ path: `/${item.pinyin}/${item.id}.html` }" :title="item.title">{{ item.title }}
+                        </NuxtLink>
                     </li>
                 </ul>
             </div>
@@ -18,12 +21,12 @@
                 <div class="lunbo">
                     <HomeBigSwiper></HomeBigSwiper>
                 </div>
-                <div class="messageleft_photo_text">
+                <div class="messageleft_photo_text" v-if="moveBannerList">
                     <div class="messageleft_photo" v-for="item in moveBannerList" :key="index">
                         <NuxtLink :to="`/${item.pinyin}/${item.id}.html`" :title="item.title">
                             <img :src="item.imgurl">
                             <div class="message_text">
-                                {{item.title}}
+                                {{ item.title }}
                             </div>
                         </NuxtLink>
                     </div>
@@ -33,23 +36,26 @@
                 <div class="messageRight_title">
                     要闻
                 </div>
-                <ul class="messageRight_content">  
+                <ul class="messageRight_content" v-if="hotNewsList_data1">
                     <li v-for="item in hotNewsList_data1" :key="index" class="messageRight_content_title">
-                        <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                        <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                            :target="item.islink == 1 ? '_blank' : '_self'">
                             {{ item.title }}
                         </NuxtLink>
                     </li>
                 </ul>
-                <ul class="messageRight_content">
+                <ul class="messageRight_content" v-if="hotNewsList_data2">
                     <li v-for="item in hotNewsList_data2" :key="index" class="messageRight_content_title">
-                        <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                        <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                            :target="item.islink == 1 ? '_blank' : '_self'">
                             {{ item.title }}
                         </NuxtLink>
                     </li>
                 </ul>
-                <ul class="messageRight_content">
+                <ul class="messageRight_content" v-if="hotNewsList_data3">
                     <li v-for="item in hotNewsList_data3" :key="index" class="messageRight_content_title">
-                        <NuxtLink :href="getLinkPathDetail(item)" :title="item.title" :target="item.islink == 1 ? '_blank' : '_self'">
+                        <NuxtLink :href="getLinkPathDetail(item)" :title="item.title"
+                            :target="item.islink == 1 ? '_blank' : '_self'">
                             {{ item.title }}
                         </NuxtLink>
                     </li>
@@ -82,26 +88,33 @@ const headlinelist = ref([])
 const headlinelist1 = ref([])
 
 async function getModelData1() {
-    const mkdata =  await requestDataPromise('/web/getWebsiteArticlett', {
+    const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
             'pageSize': 4,
             'level': 1,
             'placeid': 0,
-            'id':''
+            'id': ''
         },
     });
-    if(mkdata.code == 200){
+    if (mkdata.code == 200) {
+        for (let i = 0; i < mkdata.data.length; i++) {
+            if (i < 1) {
+                headlinelist.value.push(mkdata.data[i])
+            }else{
+                headlinelist1.value.push(mkdata.data[i])
+            }
+        }
         //填充大标题
-        headlinelist.value.push(mkdata.data[0])
-        //剩余的两条放到大标题下面
-        headlinelist1.value.push(mkdata.data[1])
-        headlinelist1.value.push(mkdata.data[2])
-        headlinelist1.value.push(mkdata.data[3])
-    }else{
+        // headlinelist.value.push(mkdata.data[0])
+        // //剩余的两条放到大标题下面
+        // headlinelist1.value.push(mkdata.data[1])
+        // headlinelist1.value.push(mkdata.data[2])
+        // headlinelist1.value.push(mkdata.data[3])
+    } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置:设置大标题")
-        console.log("后端错误反馈:",mkdata.message)
+        console.log("后端错误反馈:", mkdata.message)
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
     }
 }
@@ -109,21 +122,21 @@ getModelData1()
 
 const moveBannerList = ref([])
 async function getModelData2() {
-    const mkdata =  await requestDataPromise('/web/getWebsiteArticlett', {
+    const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
             'pageSize': 2,
             'level': 2,
             'placeid': 6,
-            'id':''
+            'id': ''
         },
     });
-    if(mkdata.code == 200){
+    if (mkdata.code == 200) {
         moveBannerList.value = mkdata.data;
-    }else{
+    } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置:获取首页轮播图下面的图文")
-        console.log("后端错误反馈:",mkdata.message)
+        console.log("后端错误反馈:", mkdata.message)
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
     }
 }
@@ -133,29 +146,29 @@ const hotNewsList_data1 = ref([])
 const hotNewsList_data2 = ref([])
 const hotNewsList_data3 = ref([])
 async function getModelData3() {
-    const mkdata =  await requestDataPromise('/web/getWebsiteArticlett', {
+    const mkdata = await requestDataPromise('/web/getWebsiteArticlett', {
         method: 'GET',
         query: {
             'pageSize': 8,
             'level': 6,
             'placeid': 0,
-            'id':''
+            'id': ''
         },
     });
-    if(mkdata.code == 200){
-        for(let i = 0; i < mkdata.data.length; i++){
-            if(i >= 0 && i <= 4){
+    if (mkdata.code == 200) {
+        for (let i = 0; i < mkdata.data.length; i++) {
+            if (i >= 0 && i <= 4) {
                 hotNewsList_data1.value.push(mkdata.data[i])
-            } else if(i >= 5 && i <= 9){
+            } else if (i >= 5 && i <= 9) {
                 hotNewsList_data2.value.push(mkdata.data[i])
-            } else if(i >= 10 && i <= 14){
+            } else if (i >= 10 && i <= 14) {
                 hotNewsList_data3.value.push(mkdata.data[i])
             }
         }
-    }else{
+    } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置:获取首页今日热点")
-        console.log("后端错误反馈:",mkdata.message)
+        console.log("后端错误反馈:", mkdata.message)
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
     }
 }
@@ -164,5 +177,5 @@ getModelData3()
 </script>
 
 <style lang="less" scoped>
-    @import url('@/assets/css/components/pagemessage.less');
+@import url('@/assets/css/components/pagemessage.less');
 </style>