Jing 21 ساعت پیش
والد
کامیت
e35296c03b

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

@@ -1 +1 @@
-{"id":"37ca4634-ef59-4ca2-99fb-16655c1d4a60","timestamp":1754985524372}
+{"id":"a77328e8-2d61-4f5f-98ce-f65898ad44c0","timestamp":1755062446437}

+ 0 - 1
.nuxt/manifest/meta/37ca4634-ef59-4ca2-99fb-16655c1d4a60.json

@@ -1 +0,0 @@
-{"id":"37ca4634-ef59-4ca2-99fb-16655c1d4a60","timestamp":1754985524372,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 1 - 0
.nuxt/manifest/meta/a77328e8-2d61-4f5f-98ce-f65898ad44c0.json

@@ -0,0 +1 @@
+{"id":"a77328e8-2d61-4f5f-98ce-f65898ad44c0","timestamp":1755062446437,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 1 - 1
.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/37ca4634-ef59-4ca2-99fb-16655c1d4a60.json"
+        "./manifest/meta/a77328e8-2d61-4f5f-98ce-f65898ad44c0.json"
       ],
       "#components": [
         "./components"

+ 17 - 24
pages/about/[dir]/[dir]/[id].vue

@@ -35,21 +35,14 @@
                         导航列表
                     </li>
                     <li v-for="(item, index) in bottomMenu" :key="index">
-                        <NuxtLink :to="`/about/${item.name_pinyin}/index.html`" :title="item.name"
-                            v-if="item.id == pageId && item.id != 7">
+                        <NuxtLink v-if="item.type == 0" :to="`/about/${item.name_pinyin}/index.html`" :title="item.name"
+                            :class="item.id == pageId ? 'active' : ''">
                             {{ item.name }}
                         </NuxtLink>
-                        <NuxtLink :to="`/about/${item.name_pinyin}/index.html`" :title="item.name"
-                            v-else-if="item.id != pageId && item.id != 7">
+                        <NuxtLink v-else-if="item.type == 1" :to="`/about/${item.name_pinyin}/list-1.html`"
+                            :title="item.name" :class="item.id == pageId ? 'active' : ''">
                             {{ item.name }}
                         </NuxtLink>
-                        <NuxtLink :to="`/about/${item.name_pinyin}/list-1.html`" :title="item.name"
-                            v-if="item.id == 7 && pageId == 7 && routeHref == '/specialList/7'">
-                            {{item.name }}
-                        </NuxtLink>
-                        <NuxtLink :to="`/about/${item.name_pinyin}/list-1.html`" class="active" :title="item.name" v-else-if="item.id == 7">
-                            {{ item.name}}
-                        </NuxtLink>
                     </li>
                 </ul>
             </div>
@@ -73,8 +66,8 @@ const route = useRoute();
 //获得当前的完整路径
 const fullPath = route.path;
 //拆分,取出来中间这一段,然后提取数字部分
-const segments = fullPath.split('/'); 
-const targetSegment = segments[2]; 
+const segments = fullPath.split('/');
+const targetSegment = segments[2];
 //const numberPart = targetSegment.match(/\d+$/)?.[0]; 
 
 let articleId;
@@ -86,13 +79,13 @@ const getRouteId = await requestDataPromise('/web/getWebsiteRoute', {
         'foot_pinyin': targetSegment,
     },
 });
-if(getRouteId.code == 200){
+if (getRouteId.code == 200) {
     articleId = getRouteId.data.id;
     pageId = getRouteId.data.id;
-}else{
+} else {
     console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
     console.log("错误位置:通过url路径查询导航池id")
-    console.log("后端错误反馈:",getRouteId.message)
+    console.log("后端错误反馈:", getRouteId.message)
     console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
 }
 
@@ -108,11 +101,11 @@ const newsDetail = ref({})
 const bottomMenu = ref([]);
 
 async function getPageData() {
-    const mkdata =  await requestDataPromise('/web/getWebsiteFooterCategoryInfo', {
+    const mkdata = await requestDataPromise('/web/getWebsiteFooterCategoryInfo', {
         method: 'GET',
         query: {
             'fcat_id': articleId,
-            'type':0
+            'type': 0
         },
     });
     newsDetail.value = mkdata.data;
@@ -120,7 +113,7 @@ async function getPageData() {
 getPageData();
 
 async function getPageMenu() {
-    const mkdata =  await requestDataPromise('/web/getWebsiteFooterCategory', {
+    const mkdata = await requestDataPromise('/web/getWebsiteFooterCategory', {
         method: 'GET',
         query: {},
     });
@@ -132,7 +125,7 @@ getPageMenu();
 
 //4.设置seo信息 start---------------------------------------->
 //4.1 设置seo信息
-const setData =  await requestDataPromise('/web/getWebsiteFootInfo', {
+const setData = await requestDataPromise('/web/getWebsiteFootInfo', {
     method: 'GET',
     query: {},
 });
@@ -146,13 +139,13 @@ let seoName = setData.data.website_head.website_name;
 useSeoMeta({
     title: seoTitle + "_" + seoSuffix,
     meta: [
-        { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix, tagPriority: 10  },
-        { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix , tagPriority: 10 }
+        { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix, tagPriority: 10 },
+        { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix, tagPriority: 10 }
     ]
 });
 //4.设置seo信息 end---------------------------------------->
 
-onMounted(async ()  => {
+onMounted(async () => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
@@ -166,7 +159,7 @@ onMounted(async ()  => {
     });
     const resultAd1 = await responseAd1.json();
     adImg1.value = resultAd1.data[0];
-    
+
     //广告2
     let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snscw_page_0002`
     const responseAd2 = await fetch(url2, {

+ 30 - 29
pages/about/[dir]/index.html.vue

@@ -14,12 +14,12 @@
                     <NuxtLink to="/">首页</NuxtLink>
                 </el-breadcrumb-item>
                 <el-breadcrumb-item>
-                    {{ newsDetail.con_title }}
+                    {{ newsDetail.con_title ? newsDetail.con_title : bottomMenu[num]?.name }}
                 </el-breadcrumb-item>
             </el-breadcrumb>
         </div>
     </div>
-    
+
     <!-- 资讯列表 -->
     <div class="newsDetail">
         <div class="inner">
@@ -36,21 +36,14 @@
                         导航列表
                     </li>
                     <li v-for="(item, index) in bottomMenu" :key="index">
-                        <NuxtLink :to="`/about/${item.name_pinyin}/index.html`" :title="item.name"
-                            v-if="item.id == pageId && item.id != 7" class="active">
+                        <NuxtLink v-if="item.type == 0" :to="`/about/${item.name_pinyin}/index.html`" :title="item.name"
+                            :class="item.id == pageId ? 'active' : ''">
                             {{ item.name }}
                         </NuxtLink>
-                        <NuxtLink :to="`/about/${item.name_pinyin}/index.html`" :title="item.name"
-                            v-else-if="item.id != pageId && item.id != 7">
+                        <NuxtLink v-else-if="item.type == 1" :to="`/about/${item.name_pinyin}/list-1.html`"
+                            :title="item.name" :class="item.id == pageId ? 'active' : ''">
                             {{ item.name }}
                         </NuxtLink>
-                        <NuxtLink :to="`/about/${item.name_pinyin}/list-1.html`" :title="item.name"
-                            v-if="item.id == 7 && pageId == 7 && routeHref == '/specialList/7'" class="active">
-                            {{item.name }}
-                        </NuxtLink>
-                        <NuxtLink :to="`/about/${item.name_pinyin}/list-1.html`" :title="item.name" v-else-if="item.id == 7">
-                            {{ item.name}}
-                        </NuxtLink>
                     </li>
                 </ul>
             </div>
@@ -74,10 +67,10 @@ const route = useRoute();
 //获得当前的完整路径
 const fullPath = route.path;
 //拆分,取出来中间这一段,然后提取数字部分
-const segments = fullPath.split('/'); 
-const targetSegment = segments[2]; 
+const segments = fullPath.split('/');
+const targetSegment = segments[2];
 //const numberPart = targetSegment.match(/\d+$/)?.[0]; 
-
+let num = ref(0)
 let articleId;
 let pageId;
 //通过导航路径反向查询导航id
@@ -87,13 +80,13 @@ const getRouteId = await requestDataPromise('/web/getWebsiteRoute', {
         'foot_pinyin': targetSegment,
     },
 });
-if(getRouteId.code == 200){
+if (getRouteId.code == 200) {
     articleId = getRouteId.data.id;
     pageId = getRouteId.data.id;
-}else{
+} else {
     console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
     console.log("错误位置:通过url路径查询导航池id")
-    console.log("后端错误反馈:",getRouteId.message)
+    console.log("后端错误反馈:", getRouteId.message)
     console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
 }
 
@@ -109,11 +102,11 @@ const newsDetail = ref({})
 const bottomMenu = ref([]);
 
 async function getPageData() {
-    const mkdata =  await requestDataPromise('/web/getWebsiteFooterCategoryInfo', {
+    const mkdata = await requestDataPromise('/web/getWebsiteFooterCategoryInfo', {
         method: 'GET',
         query: {
             'fcat_id': articleId,
-            'type':0
+            'type': 0
         },
     });
     newsDetail.value = mkdata.data;
@@ -121,11 +114,19 @@ async function getPageData() {
 getPageData();
 
 async function getPageMenu() {
-    const mkdata =  await requestDataPromise('/web/getWebsiteFooterCategory', {
+    const mkdata = await requestDataPromise('/web/getWebsiteFooterCategory', {
         method: 'GET',
         query: {},
     });
-    bottomMenu.value = mkdata.data;
+    if (mkdata.code == 200) {
+        bottomMenu.value = mkdata.data;
+
+        mkdata.data.forEach((item, index) => {
+            if (item.id == articleId) {
+                num.value = index;
+            }
+        });
+    }
 }
 getPageMenu();
 //2.页面数据 end ---------------------------------------->
@@ -133,7 +134,7 @@ getPageMenu();
 
 //4.设置seo信息 start---------------------------------------->
 //4.1 设置seo信息
-const setData =  await requestDataPromise('/web/getWebsiteFootInfo', {
+const setData = await requestDataPromise('/web/getWebsiteFootInfo', {
     method: 'GET',
     query: {},
 });
@@ -147,13 +148,13 @@ let seoName = setData.data.website_head.website_name;
 useSeoMeta({
     title: seoTitle + "_" + seoSuffix,
     meta: [
-        { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix, tagPriority: 10  },
-        { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix , tagPriority: 10 }
+        { name: 'description', content: seoDescription + "_" + seoName + "_" + seoSuffix, tagPriority: 10 },
+        { name: 'keywords', content: seoKeywords + "_" + seoName + "_" + seoSuffix, tagPriority: 10 }
     ]
 });
 //4.设置seo信息 end---------------------------------------->
 
-onMounted(async ()  => {
+onMounted(async () => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
@@ -167,7 +168,7 @@ onMounted(async ()  => {
     });
     const resultAd1 = await responseAd1.json();
     adImg1.value = resultAd1.data[0];
-    
+
     //广告2
     let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snscw_page_0002`
     const responseAd2 = await fetch(url2, {
@@ -183,5 +184,5 @@ onMounted(async ()  => {
 </script>
 
 <style lang="less" scoped>
-    @import '@/assets/css/about.less';
+@import '@/assets/css/about.less';
 </style>

+ 4 - 83
pages/about/[dir]/list-[id].vue

@@ -21,18 +21,9 @@
 
         <div class="newsDetail">
             <div class="inner">
-                
                 <div class="innerDetail">
                     <div class="headImg"></div>
                     <div class="innerDetail1">
-                        <!-- <div class="projectMoreBox">
-                            <div class="projectMoreTitle">社会保障在线网</div>
-                            <div class="projectMoreText">
-                                <p><b>政讯通·全国文化旅游项目</b>网络平台由<b>政讯通-全国政务信息一体化办公室</b>主管,联合30多家企事业单位组成,由北京政讯通文化传播有限公司对外牵头运营。</p>
-                                <p><b>政讯通·全国文化旅游项目</b>网络平台有政务、行业独立域名网站各<b>100</b>个和<b>4</b>个综合管理网站共<b>204</b>个网站,按照不同的行业和功能分类为用户提供大体系、广领域、全方位、全过程,有针对性的全国性文化旅游法制综合服务平台。</p>
-                                <p><b>政讯通·全国旅游资讯发布中心</b>是<b>政讯通·全国文化旅游项目</b>网络平台的4个综合管理网站之一,目前开设了栏目上千个,地市中心可全面覆盖我国334个地级市,<b>业务范围</b>涵盖旅游资讯、與情监测、法律咨询、旅游调研、法律宣传、群众监督、旅游安全等领域,日均会员访问量超过万次,累计完成文化旅游领域法制调研课题千余件,网络信息化会员遍布全国各地,实施<b>行业、区域</b>全覆盖,是我国具有广泛传播力、影响力的新型主流媒体。</p>
-                            </div>
-                        </div> -->
                         <div class="innerTitle">本网招聘</div>
                         <ul class="list">
                             <li v-for="(item, index) in newsList" :key="index">
@@ -48,21 +39,14 @@
                             导航列表
                         </li>
                         <li v-for="(item, index) in bottomMenu" :key="index">
-                            <NuxtLink :to="`/about/${item.name_pinyin}/index.html`" :title="item.name"
-                                v-if="item.id == pageId && item.id != 7" class="active">
+                            <NuxtLink v-if="item.type == 0" :to="`/about/${item.name_pinyin}/index.html`"
+                                :title="item.name" :class="item.id == pageId ? 'active' : ''">
                                 {{ item.name }}
                             </NuxtLink>
-                            <NuxtLink :to="`/about/${item.name_pinyin}/index.html`" :title="item.name"
-                                v-else-if="item.id != pageId && item.id != 7">
+                            <NuxtLink v-else-if="item.type == 1" :to="`/about/${item.name_pinyin}/list-1.html`"
+                                :title="item.name" :class="item.id == pageId ? 'active' : ''">
                                 {{ item.name }}
                             </NuxtLink>
-                            <NuxtLink :to="`/about/${item.name_pinyin}/list-1.html`" :title="item.name"
-                                v-if="item.id == 7 && pageId == 7" class="active">
-                                {{item.name }}
-                            </NuxtLink>
-                            <NuxtLink :to="`/about/${item.name_pinyin}/list-1.html`" :title="item.name" v-else-if="item.id == 7">
-                                {{ item.name}}
-                            </NuxtLink>
                         </li>
                     </ul>
                 </div>
@@ -70,50 +54,6 @@
             </div>
         </div>
         
-        <!-- 资讯列表 -->
-        <!-- <div class="newsList">
-            <div class="inner">
-                <div class="innerLeft">
-                    <div class="projectMoreBox">
-                        <div class="projectMoreTitle">社会保障在线网</div>
-                        <div class="projectMoreText">
-                            <p><b>政讯通·全国文化旅游项目</b>网络平台由<b>政讯通-全国政务信息一体化办公室</b>主管,联合30多家企事业单位组成,由北京政讯通文化传播有限公司对外牵头运营。</p>
-                            <p><b>政讯通·全国文化旅游项目</b>网络平台有政务、行业独立域名网站各<b>100</b>个和<b>4</b>个综合管理网站共<b>204</b>个网站,按照不同的行业和功能分类为用户提供大体系、广领域、全方位、全过程,有针对性的全国性文化旅游法制综合服务平台。</p>
-                            <p><b>政讯通·全国旅游资讯发布中心</b>是<b>政讯通·全国文化旅游项目</b>网络平台的4个综合管理网站之一,目前开设了栏目上千个,地市中心可全面覆盖我国334个地级市,<b>业务范围</b>涵盖旅游资讯、與情监测、法律咨询、旅游调研、法律宣传、群众监督、旅游安全等领域,日均会员访问量超过万次,累计完成文化旅游领域法制调研课题千余件,网络信息化会员遍布全国各地,实施<b>行业、区域</b>全覆盖,是我国具有广泛传播力、影响力的新型主流媒体。</p>
-                        </div>
-                    </div>
-                    <div class="innerTitle">本网招聘</div>
-                    <ul class="list">
-                        <li v-for="(item, index) in newsList" :key="index">
-                            <NuxtLink :to="{ path: `zhaopin/${item.id}.html` }" :title="item.con_title">{{item.con_title}}</NuxtLink>
-                        </li>
-                    </ul>
-                </div>
-                <div class="innerRight">
-                    <div class="rightMenuTitle">导航列表</div>
-                    <ul>
-                        <li v-for="(item, index) in bottomMenu" :key="index">
-                            <NuxtLink :to="`/about/${item.name_pinyin}/index.html`" :title="item.name"
-                                v-if="item.id == pageId && item.id != 7" class="active">
-                                {{ item.name }}
-                            </NuxtLink>
-                            <NuxtLink :to="`/about/${item.name_pinyin}/index.html`" :title="item.name"
-                                v-else-if="item.id != pageId && item.id != 7">
-                                {{ item.name }}
-                            </NuxtLink>
-                            <NuxtLink :to="`/about/${item.name_pinyin}/list-1.html`" :title="item.name"
-                                v-if="item.id == 7 && pageId == 7" class="active">
-                                {{item.name }}
-                            </NuxtLink>
-                            <NuxtLink :to="`/about/${item.name_pinyin}/list-1.html`" :title="item.name" v-else-if="item.id == 7">
-                                {{ item.name}}
-                            </NuxtLink>
-                        </li>
-                    </ul>
-                </div>
-                <div style="clear: both;"></div>
-            </div>
-        </div> -->
         <!-- 列表页广告二 -->
         <HomeTopTen :imgurl="adImg2" v-if="adImg2"></HomeTopTen>
         <!-- 页面底部 -->
@@ -161,25 +101,6 @@ if(getRouteId.code == 200){
 //广告
 let adImg1 = ref([]);
 let adImg2 = ref([]);
-// async function getAdData(){
-//     const adData = await requestDataPromise('/web/getWebsiteAdvertisement',{method:'GET',query:{'ad_tag':'PAGE'}});
-//     if(adData.code==200){
-//         for(let item of adData.data){
-//             if(item.ad_tag == 'PAGE_0001'){
-//                 adImg1.value = item;
-//             }
-//             if(item.ad_tag == 'PAGE_0002'){
-//                 adImg2.value = item;
-//             }
-//         }
-//     }else{
-//         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
-//         console.log("错误位置:获取详情页广告列表")
-//         console.log("后端错误反馈:",adData.message)
-//         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
-//     }
-// }
-// getAdData();
 onMounted(async ()  => {
     //从客户端获取行政职能部门 加快打开速度
     const { $webUrl, $CwebUrl } = useNuxtApp();

+ 2 - 2
plugins/category.ts

@@ -44,7 +44,7 @@ const navPre: number[] = [
 
 export default defineNuxtPlugin((nuxtApp) => {
     //master 环境
-    // nuxtApp.provide('pageNav', navMaster)
+    nuxtApp.provide('pageNav', navMaster)
     //pre 环境
-    nuxtApp.provide('pageNav', navPre)
+    // nuxtApp.provide('pageNav', navPre)
 })

+ 10 - 10
plugins/globals.ts

@@ -1,15 +1,15 @@
 export default defineNuxtPlugin((nuxtApp) => {
   // 三农市场网pre环境
-  nuxtApp.provide('webUrl', 'https://apipre1.bjzxtw.org.cn')
-  nuxtApp.provide('CwebUrl', 'http://pre.snscw.org.cn')
-  nuxtApp.provide('BwebUrl', 'https://adminpre.bjzxtw.org.cn')
-  nuxtApp.provide('LoginWebUrl', 'https://adminpre.bjzxtw.org.cn/adminapi')
-  nuxtApp.provide('userUrl', 'http://localhost:3000')
+  // nuxtApp.provide('webUrl', 'https://apipre1.bjzxtw.org.cn')
+  // nuxtApp.provide('CwebUrl', 'http://pre.snscw.org.cn')
+  // nuxtApp.provide('BwebUrl', 'https://adminpre.bjzxtw.org.cn')
+  // nuxtApp.provide('LoginWebUrl', 'https://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: 'https://apipre1.bjzxtw.org.cn', //pre接口地址
-        CwebUrl: 'pre.snscw.org.cn' //页面地址
+        // webUrl: 'https://apipre1.bjzxtw.org.cn', //pre接口地址
+        // CwebUrl: 'pre.snscw.org.cn' //页面地址
     }
 
     const service = axios.create({