dangyunlong 1 өдөр өмнө
parent
commit
c4c849827a

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

@@ -1 +1 @@
-{"id":"78098e6e-641f-4928-948d-5f793b981144","timestamp":1745743814490}
+{"id":"4c72c294-f423-484e-8aa9-110df607168d","timestamp":1745826400056}

+ 1 - 0
.nuxt/manifest/meta/4c72c294-f423-484e-8aa9-110df607168d.json

@@ -0,0 +1 @@
+{"id":"4c72c294-f423-484e-8aa9-110df607168d","timestamp":1745826400056,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 0 - 1
.nuxt/manifest/meta/78098e6e-641f-4928-948d-5f793b981144.json

@@ -1 +0,0 @@
-{"id":"78098e6e-641f-4928-948d-5f793b981144","timestamp":1745743814490,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 1 - 1
.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/78098e6e-641f-4928-948d-5f793b981144.json"
+        "./manifest/meta/4c72c294-f423-484e-8aa9-110df607168d.json"
       ],
       "#components": [
         "./components"

+ 1 - 0
assets/css/about.less

@@ -89,6 +89,7 @@
 
             .innerDetail1 {
                 width: 1086px;
+                min-height: 600px;
                 margin: 0 auto;
                 padding: 30px 50px 40px;
                 box-sizing: border-box;

+ 1 - 2
components/home/ListSecondaryHeading.vue

@@ -1,6 +1,6 @@
 <template>
     <nav class="channel_nav_box">
-        <a class="channel_nav_a" href="javascript:(void)" title="name">{{ name }}</a>
+        <a class="channel_nav_head" href="javascript:(void)" title="name">{{ name }}</a>
         <div class="channel_nav_a_box clearfix">
             <NuxtLink :to="{ path: `/${targetRoute}/${item.aLIas_pinyin}/list-1.html`}" class="channel_nav_a" v-for="item in nav">{{ item.alias }}</NuxtLink>
         </div>
@@ -34,7 +34,6 @@ const targetRoute = segments[1];
     background-size:100% auto;   
     margin-top: 40px;
     .channel_nav_head {
-        width: 100px;
         height: 60px;
         line-height: 60px; 
         color: #fff;

+ 0 - 1
components/home/SecondaryHeading.vue

@@ -54,7 +54,6 @@ getPageData();
     background-size:100% auto;   
     margin-top: 40px;
     .channel_nav_head {
-        width: 100px;
         height: 60px;
         line-height: 60px; 
         color: #fff;

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

@@ -20,7 +20,7 @@
                             <el-breadcrumb-item v-if="parent_children_count > 0">
                                 <NuxtLink :to="`/${parent_pinyin}/index.html`"> {{ parent_name }}</NuxtLink>
                             </el-breadcrumb-item>
-                            <el-breadcrumb-item v-if="parent_children_count == 0">
+                            <el-breadcrumb-item v-if="parent_children_count == 0||parent_children_count==''||parent_children_count==null">
                                 <NuxtLink :to="`/${parent_pinyin}/list-1.html`"> {{ parent_name }}</NuxtLink>
                             </el-breadcrumb-item>
                             <el-breadcrumb-item>

+ 22 - 22
pages/index.vue

@@ -531,7 +531,7 @@
                             <NuxtLink class="index_name_ul_li_tag" :href="getLinkPathDetail(item)" :title="item.title"
                                 :target="item.islink == 1 ? '_blank' : '_self'">
                                 <div class="index_img_ul_7_li_dot1 dot1">
-                                    {{ item.alias }}
+                                    {{ item.category_name }}
                                 </div>
                             </NuxtLink>
                             <NuxtLink class="index_name_ul_li_dot1 dot1" :href="getLinkPathDetail(item)"
@@ -877,7 +877,7 @@ async function getPageAllData() {
         boxData13data3.value = mkdata.data[12].textnum;
         //模块14
         boxData14.value = mkdata.data[13].imgnum;
-        // boxData14data2.value = mkdata.data[13].textnum;
+        boxData14data2.value = mkdata.data[13].textnum;
 
     } else {
         ElMessage.error(mkdata.message)
@@ -885,27 +885,27 @@ async function getPageAllData() {
 }
 getPageAllData();
 //获取模块下的特殊数据
-let getJson1 = [
-    { "parent": "487,0,5" },//模块14 三农人才市场487
-]
-let jsonString1 = JSON.stringify(getJson1);
-//获取模块下的特殊数据
-async function getPageData() {
-    const mkdata = await requestDataPromise('/web/getWebsiteArticles', {
-        method: 'GET',
-        query: {
-            'id': jsonString1
-        },
-    });
-    console.log("成功获取模块数据2222!", mkdata);
-    if (mkdata.code == 200) {
-        // console.log("成功获取模块数据2222!", mkdata);
-        //模块14 三农人才市场477
-        boxData14data2.value = mkdata.data[0].textnum;
-    }
+// let getJson1 = [
+//     { "parent": "487,0,5" },//模块14 三农人才市场487
+// ]
+// let jsonString1 = JSON.stringify(getJson1);
+// //获取模块下的特殊数据
+// async function getPageData() {
+//     const mkdata = await requestDataPromise('/web/getWebsiteArticles', {
+//         method: 'GET',
+//         query: {
+//             'id': jsonString1
+//         },
+//     });
+//     console.log("成功获取模块数据2222!", mkdata);
+//     if (mkdata.code == 200) {
+//         // console.log("成功获取模块数据2222!", mkdata);
+//         //模块14 三农人才市场477
+//         boxData14data2.value = mkdata.data[0].textnum;
+//     }
 
-}
-getPageData();
+// }
+// getPageData();
 //4.页面数据 end---------------------------------------->
 
 //5.设置seo数据 start---------------------------------------->

+ 10 - 10
plugins/globals.ts

@@ -1,15 +1,15 @@
 export default defineNuxtPlugin((nuxtApp) => {
   // 三农市场网pre环境
-//   nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
-//   nuxtApp.provide('CwebUrl', 'http://pre.snscw.org.cn')
-//   nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
-//   nuxtApp.provide('LoginWebUrl', 'http://adminpre.bjzxtw.org.cn/adminapi')
-//   nuxtApp.provide('userUrl', 'http://localhost:3000')
+  nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
+  nuxtApp.provide('CwebUrl', 'http://pre.snscw.org.cn')
+  nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
+  nuxtApp.provide('LoginWebUrl', 'http://adminpre.bjzxtw.org.cn/adminapi')
+  nuxtApp.provide('userUrl', 'http://localhost:3000')
 
   //正式环境
-  nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
-  nuxtApp.provide('CwebUrl', 'http://nw.snscw.org.cn')
-  nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
-  nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
-  nuxtApp.provide('userUrl', 'http://localhost:3000')
+//   nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
+//   nuxtApp.provide('CwebUrl', 'http://nw.snscw.org.cn')
+//   nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
+//   nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
+//   nuxtApp.provide('userUrl', 'http://localhost:3000')
 })

+ 4 - 4
plugins/request.ts

@@ -6,11 +6,11 @@ export default defineNuxtPlugin(() => {
 
     let Url = {
         //正式环境
-        webUrl: 'https://flzxw.bjzxtw.org.cn', //接口地址
-        CwebUrl: 'nw.snscw.org.cn' //页面地址
+        // webUrl: 'https://flzxw.bjzxtw.org.cn', //接口地址
+        // CwebUrl: 'nw.snscw.org.cn' //页面地址
         //pre环境
-        // webUrl: 'http://apipre1.bjzxtw.org.cn:29501', //pre接口地址
-        // CwebUrl: 'pre.snscw.org.cn' //页面地址
+        webUrl: 'http://apipre1.bjzxtw.org.cn:29501', //pre接口地址
+        CwebUrl: 'pre.snscw.org.cn' //页面地址
     }
 
     const service = axios.create({