Jing 1 mês atrás
pai
commit
9561cd90e7
1 arquivos alterados com 0 adições e 11 exclusões
  1. 0 11
      pages/[dir]/[dir]/[id].vue

+ 0 - 11
pages/[dir]/[dir]/[id].vue

@@ -20,12 +20,6 @@
                             <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>
@@ -183,12 +177,7 @@ 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`