解决冲突

.nuxt/manifest/latest.json

@@ -1 +1,5 @@
-{"id":"fac450b1-8b0c-4c27-bd09-d51837baf20e","timestamp":1746781732724}
+<<<<<<< HEAD
+{"id":"fac450b1-8b0c-4c27-bd09-d51837baf20e","timestamp":1746781732724}
+=======
+{"id":"13d44bbe-63ae-49d4-9ebf-b7dcd94aa110","timestamp":1745828563145}
+>>>>>>> 6f7f78215e97bb9cd6b05dcdc651d07789b7b45f

.nuxt/manifest/meta/13d44bbe-63ae-49d4-9ebf-b7dcd94aa110.json

@@ -0,0 +1 @@
+{"id":"13d44bbe-63ae-49d4-9ebf-b7dcd94aa110","timestamp":1745828563145,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/tsconfig.json

@@ -102,7 +102,11 @@
         "./imports"
       ],
       "#app-manifest": [
+<<<<<<< HEAD
         "./manifest/meta/fac450b1-8b0c-4c27-bd09-d51837baf20e.json"
+=======
+        "./manifest/meta/13d44bbe-63ae-49d4-9ebf-b7dcd94aa110.json"
+>>>>>>> 6f7f78215e97bb9cd6b05dcdc651d07789b7b45f
       ],
       "#components": [
         "./components"

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;

assets/css/class.less

@@ -642,7 +642,7 @@ section {
 
 .channel_4 {
     margin-top: 14px;
-    height: 330px;
+    height: 430px;
 }
 
 .channel_ul_7_a {

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

@@ -20,6 +20,12 @@
                             <el-breadcrumb-item v-if="parent_name != ''">
                                 <NuxtLink :to="`/${parent_pinyin}/index.html`"> {{ parent_name }}</NuxtLink>
                             </el-breadcrumb-item>
+<<<<<<< HEAD
+=======
+                            <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>
+>>>>>>> 6f7f78215e97bb9cd6b05dcdc651d07789b7b45f
                             <el-breadcrumb-item>
                                 <NuxtLink :to="`list-1.html`"> {{ routLevelTitle }}</NuxtLink>
                             </el-breadcrumb-item>
@@ -61,6 +67,8 @@
             </div>
         </div>
     </div>
+    <!-- 列表页广告一 -->
+    <HomeTopTen :imgurl="adImg1" v-if="adImg2"></HomeTopTen>
     <!-- 页面底部 -->
     <HomeFoot1></HomeFoot1>
 </template>
@@ -175,7 +183,12 @@ getPageData();
 
 //5.广告 start ---------------------------------------->
 let adImg1 = ref([]);
+<<<<<<< HEAD
 onMounted(async () => {
+=======
+let adImg2 = ref([]);
+onMounted(async ()  => {
+>>>>>>> 6f7f78215e97bb9cd6b05dcdc651d07789b7b45f
     const { $webUrl, $CwebUrl } = useNuxtApp();
     //广告1
     let url = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snscw_detail_0001`
@@ -188,6 +201,17 @@ onMounted(async () => {
     });
     const resultAd1 = await responseAd1.json();
     adImg1.value = resultAd1.data[0];
+    //广告2
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snscw_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

@@ -180,6 +180,18 @@ onMounted(async () => {
     });
     const resultAd1 = await responseAd1.json();
     adImg1.value = resultAd1.data[0];
+
+    //广告2
+    let url2 = `${$webUrl}/web/getWebsiteAdvertisement?ad_tag=snscw_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]/index.html.vue

@@ -215,7 +215,7 @@
                             栏目简介
                         </NuxtLink>
                     </div>
-                    <div class="channel_img_ul_2 clearfix" v-if="pageData[5].data">
+                    <div class="channel_img_ul_2 clearfix" v-if="pageData[5]">
                         <div class="channel_img_ul_2_li" v-for="item in pageData[5].data">
                             <NuxtLink class="channel_img_ul_2_li" :href="getLinkPathDetail(item)" :title="item.title"
                                 :key="item.id" :target="item.islink == 1 ? '_blank' : '_self'">
@@ -226,7 +226,7 @@
                             </NuxtLink>
                         </div>
                     </div>
-                    <div class="channel_ul_6" v-if="pageData[5].data2">
+                    <div class="channel_ul_6" v-if="pageData[5]">
                         <NuxtLink class="channel_ul_6_a dot1" :href="getLinkPathDetail(item)" :title="item.title"
                             v-for="item in pageData[5].data2" :key="item.id"
                             :target="item.islink == 1 ? '_blank' : '_self'">
@@ -249,7 +249,7 @@
                             栏目简介
                         </NuxtLink>
                     </div>
-                    <div class="channel_ul_7">
+                    <div class="channel_ul_7" v-if="pageData[6]">
                         <NuxtLink class="channel_ul_7_a dot1" :href="getLinkPathDetail(item)" :title="item.title"
                             v-for="item in pageData[6].data" :key="item.id"
                             :target="item.islink == 1 ? '_blank' : '_self'">
@@ -270,7 +270,7 @@
                             栏目简介
                         </NuxtLink>
                     </div>
-                    <div class="channel_img_big_5_ul" v-if="pageData[7].data">
+                    <div class="channel_img_big_5_ul" v-if="pageData[7]">
                         <div class="channel_img_big_5_li" v-for="item in pageData[7].data">
                             <NuxtLink class="channel_img_big_5_li_a" :href="getLinkPathDetail(item)" :title="item.title"
                                 v-for="item in pageData[7].data" :key="item.id"

pages/index.vue

@@ -531,7 +531,7 @@
                             <NuxtLink class="index_name_ul_li_tag" :href="getLinkPath1(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="getLinkPathDetail1(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)

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')
 })

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({