修改bug

修改bug

.nuxt/manifest/latest.json

@@ -1 +1 @@
-{"id":"eb9f518e-21ef-47cc-8b26-59064d395d8b","timestamp":1745801133011}
+{"id":"ed4af7b7-8975-46dd-9155-24e5c4541212","timestamp":1745829918371}

.nuxt/manifest/meta/eb9f518e-21ef-47cc-8b26-59064d395d8b.json

@@ -1 +0,0 @@
-{"id":"eb9f518e-21ef-47cc-8b26-59064d395d8b","timestamp":1745801133011,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/manifest/meta/ed4af7b7-8975-46dd-9155-24e5c4541212.json

@@ -0,0 +1 @@
+{"id":"ed4af7b7-8975-46dd-9155-24e5c4541212","timestamp":1745829918371,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.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" />

.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/eb9f518e-21ef-47cc-8b26-59064d395d8b.json"
+        "./manifest/meta/ed4af7b7-8975-46dd-9155-24e5c4541212.json"
       ],
       "#components": [
         "./components"

assets/css/index.less

@@ -872,6 +872,7 @@ section {
 }
 .index_6 {
     margin: 30px auto 0px;
+    height: 553px;
 }
 .index_head_box_right_4 {
     float: right;

components/detail/HotNews.vue

@@ -97,7 +97,7 @@ getPageData();
         .hotlist_text {
             float: left;
             width: 126px;
-            height: 72px;
+            height: 75px;
             display: -webkit-box;
             -webkit-box-orient: vertical;
             -webkit-line-clamp: 3;

pages/[dir]/[dir]/[id].vue

@@ -68,6 +68,8 @@
             </div>
         </div>
     </div>
+    <!-- 列表页广告二 -->
+    <HomeTopTen :imgurl="adImg2" v-if="adImg2"></HomeTopTen>
     <!-- 页面底部 -->
     <HomeFoot1></HomeFoot1>
 </template>
@@ -182,6 +184,7 @@ getPageData();
 
 //5.广告 start ---------------------------------------->
 let adImg1 = ref([]);
+let adImg2 = ref([]);
 onMounted(async ()  => {
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
@@ -195,6 +198,18 @@ onMounted(async ()  => {
     });
     const resultAd1 = await responseAd1.json();
     adImg1.value = resultAd1.data[0];
+
+    //广告2
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nzgxw_detail_0002`
+    const responseAd2 = await fetch(url2, {
+        headers: {
+            'Content-Type': 'application/json',
+            'Userurl': $CwebUrl,
+            'Origin': $CwebUrl
+        }
+    });
+    const resultAd2 = await responseAd2.json();
+    adImg2.value = resultAd2.data[0];
 })
 //5.广告 end ---------------------------------------->
 

pages/[dir]/[id].vue

@@ -66,6 +66,9 @@
             </div>
         </div>
     </div>
+
+    <!-- 列表页广告二 -->
+    <HomeTopTen :imgurl="adImg2" v-if="adImg2"></HomeTopTen>
     <!-- 页面底部 -->
     <HomeFoot1></HomeFoot1>
 </template>
@@ -173,7 +176,7 @@ getPageData();
 
 //5.广告 start ---------------------------------------->
 let adImg1 = ref([]);
-
+let adImg2 = ref([]);
 onMounted(async ()  => {
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
@@ -187,6 +190,18 @@ onMounted(async ()  => {
     });
     const resultAd1 = await responseAd1.json();
     adImg1.value = resultAd1.data[0];
+
+    //广告2
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=nzgxw_detail_0002`
+    const responseAd2 = await fetch(url2, {
+        headers: {
+            'Content-Type': 'application/json',
+            'Userurl': $CwebUrl,
+            'Origin': $CwebUrl
+        }
+    });
+    const resultAd2 = await responseAd2.json();
+    adImg2.value = resultAd2.data[0];
 })
 //5.广告 end ---------------------------------------->
 

plugins/category.ts

@@ -1,7 +1,20 @@
 
 //master 环境
 const navMaster: number[] = [
-    
+    1787,
+    1811,
+    1646,
+    1746,
+    470,
+    1637,
+    1818,
+    1834,
+    1843,
+    1833,
+    1852,
+    1824,
+    1645,
+    1654
 ]
 
 
@@ -24,7 +37,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)
 })

plugins/globals.ts

@@ -1,16 +1,16 @@
 export default defineNuxtPlugin((nuxtApp) => {
   //Pre环境
-  nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
-  nuxtApp.provide('CwebUrl', 'http://pre.nzgx.org')
-  nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
-  nuxtApp.provide('LoginWebUrl', 'http://adminpre.bjzxtw.org.cn/adminapi')
-  nuxtApp.provide('userUrl', 'http://localhost:3006')
+//   nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
+//   nuxtApp.provide('CwebUrl', 'http://pre.nzgx.org')
+//   nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
+//   nuxtApp.provide('LoginWebUrl', 'http://adminpre.bjzxtw.org.cn/adminapi')
+//   nuxtApp.provide('userUrl', 'http://localhost:3006')
 
   //正式环境
-//   nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
-//   nuxtApp.provide('CwebUrl', 'http://nw.nzgx.org')
-//   nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
-//   nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
-//   nuxtApp.provide('userUrl', 'http://localhost:3006')
+  nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
+  nuxtApp.provide('CwebUrl', 'http://nw.nzgx.org')
+  nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
+  nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
+  nuxtApp.provide('userUrl', 'http://localhost:3006')
   
 })

plugins/request.ts

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