|
@@ -43,6 +43,18 @@
|
|
<div class="content">
|
|
<div class="content">
|
|
<SimplePageContentLoader :loader="introdLoader">
|
|
<SimplePageContentLoader :loader="introdLoader">
|
|
<div class="d-flex justify-content-center">
|
|
<div class="d-flex justify-content-center">
|
|
|
|
+ <h2>{{ introdLoader.content.value?.introd1?.title }}</h2>
|
|
|
|
+ </div>
|
|
|
|
+ <LeftRightBox
|
|
|
|
+ class="mt-4"
|
|
|
|
+ :title="introdLoader.content.value?.introd1?.title"
|
|
|
|
+ :desc="introdLoader.content.value?.introd1?.content"
|
|
|
|
+ :image="introdLoader.content.value?.introd1?.image"
|
|
|
|
+ :rightItems="introdLoader.content.value?.list"
|
|
|
|
+ @rightItemDefaultClick="(item) => navTo('/news/detail', { id: item.id })"
|
|
|
|
+ @moreClick="navTo('/introduction/about')"
|
|
|
|
+ />
|
|
|
|
+ <div class="d-flex justify-content-center mt-5">
|
|
<h2>{{ introdLoader.content.value?.introd2?.title }}</h2>
|
|
<h2>{{ introdLoader.content.value?.introd2?.title }}</h2>
|
|
</div>
|
|
</div>
|
|
<LeftRightBox
|
|
<LeftRightBox
|
|
@@ -50,18 +62,16 @@
|
|
:title="introdLoader.content.value?.introd2?.title"
|
|
:title="introdLoader.content.value?.introd2?.title"
|
|
:desc="introdLoader.content.value?.introd2?.content"
|
|
:desc="introdLoader.content.value?.introd2?.content"
|
|
:image="introdLoader.content.value?.introd2?.image"
|
|
:image="introdLoader.content.value?.introd2?.image"
|
|
- :rightItems="introdLoader.content.value?.list"
|
|
|
|
- @rightItemDefaultClick="(item) => navTo('/news/detail', { id: item.id })"
|
|
|
|
@moreClick="navTo('/introduction/about')"
|
|
@moreClick="navTo('/introduction/about')"
|
|
/>
|
|
/>
|
|
<div class="d-flex justify-content-center mt-5">
|
|
<div class="d-flex justify-content-center mt-5">
|
|
- <h2>{{ introdLoader.content.value?.introd1?.title }}</h2>
|
|
|
|
|
|
+ <h2>{{ introdLoader.content.value?.introd3?.title }}</h2>
|
|
</div>
|
|
</div>
|
|
<LeftRightBox
|
|
<LeftRightBox
|
|
class="mt-4"
|
|
class="mt-4"
|
|
- :title="introdLoader.content.value?.introd1?.title"
|
|
|
|
- :desc="introdLoader.content.value?.introd1?.content"
|
|
|
|
- :image="introdLoader.content.value?.introd1?.image"
|
|
|
|
|
|
+ :title="introdLoader.content.value?.introd3?.title"
|
|
|
|
+ :desc="introdLoader.content.value?.introd3?.content"
|
|
|
|
+ :image="introdLoader.content.value?.introd3?.image"
|
|
:showMore="false"
|
|
:showMore="false"
|
|
left
|
|
left
|
|
/>
|
|
/>
|
|
@@ -124,6 +134,9 @@
|
|
import { Carousel, Slide, Pagination, Navigation } from 'vue3-carousel'
|
|
import { Carousel, Slide, Pagination, Navigation } from 'vue3-carousel'
|
|
import { onMounted, ref, watch } from 'vue';
|
|
import { onMounted, ref, watch } from 'vue';
|
|
import { useSimplePagerDataLoader } from '@/composeable/SimplePagerDataLoader';
|
|
import { useSimplePagerDataLoader } from '@/composeable/SimplePagerDataLoader';
|
|
|
|
+import { useRouter } from 'vue-router';
|
|
|
|
+import { useSimpleDataLoader } from '@/composeable/SimpleDataLoader';
|
|
|
|
+import { usePageAction } from '@/composeable/PageAction';
|
|
import Pagination2 from '@/components/controls/Pagination.vue';
|
|
import Pagination2 from '@/components/controls/Pagination.vue';
|
|
import TitleDescBlock from '@/components/parts/TitleDescBlock.vue';
|
|
import TitleDescBlock from '@/components/parts/TitleDescBlock.vue';
|
|
import ImageTextSmallBlock from '@/components/parts/ImageTextSmallBlock.vue';
|
|
import ImageTextSmallBlock from '@/components/parts/ImageTextSmallBlock.vue';
|
|
@@ -132,9 +145,6 @@ import CommonContent, { GetContentListParams } from '@/api/CommonContent';
|
|
import DateUtils from '@/common/utils/DateUtils';
|
|
import DateUtils from '@/common/utils/DateUtils';
|
|
import PolicyContent from '@/api/introduction/PolicyContent';
|
|
import PolicyContent from '@/api/introduction/PolicyContent';
|
|
import LawsTest from '@/assets/images/inheritor/LawsTest.jpg'
|
|
import LawsTest from '@/assets/images/inheritor/LawsTest.jpg'
|
|
-import { useRouter } from 'vue-router';
|
|
|
|
-import { useSimpleDataLoader } from '@/composeable/SimpleDataLoader';
|
|
|
|
-import { usePageAction } from '@/composeable/PageAction';
|
|
|
|
import LeftRightBox from '@/components/parts/LeftRightBox.vue';
|
|
import LeftRightBox from '@/components/parts/LeftRightBox.vue';
|
|
import NewsIndexContent from '@/api/news/NewsIndexContent';
|
|
import NewsIndexContent from '@/api/news/NewsIndexContent';
|
|
|
|
|
|
@@ -169,14 +179,17 @@ const introdLoader = useSimpleDataLoader(async () => {
|
|
.setMainBodyColumnId([ 234 ])
|
|
.setMainBodyColumnId([ 234 ])
|
|
, 1, 10);
|
|
, 1, 10);
|
|
|
|
|
|
- const id1 = res2.list.find(item => item.title.includes('全国'))?.id;
|
|
|
|
- const id2 = res2.list.find(item => item.title.includes('闽南'))?.id;
|
|
|
|
|
|
+ const id1 = res2.list.find(item => item.title.includes('厦门'))?.id;
|
|
|
|
+ const id2 = res2.list.find(item => item.title.includes('闽南') && !item.title.includes('厦门'))?.id;
|
|
|
|
+ const id3 = res2.list.find(item => item.title.includes('全国'))?.id;
|
|
|
|
|
|
const introd1 = id1 ? await NewsIndexContent.getContentDetail(id1) : undefined;
|
|
const introd1 = id1 ? await NewsIndexContent.getContentDetail(id1) : undefined;
|
|
const introd2 = id2 ? await NewsIndexContent.getContentDetail(id2) : undefined;
|
|
const introd2 = id2 ? await NewsIndexContent.getContentDetail(id2) : undefined;
|
|
|
|
+ const introd3 = id3 ? await NewsIndexContent.getContentDetail(id3) : undefined;
|
|
return {
|
|
return {
|
|
introd1,
|
|
introd1,
|
|
introd2,
|
|
introd2,
|
|
|
|
+ introd3,
|
|
list: res.list,
|
|
list: res.list,
|
|
};
|
|
};
|
|
})
|
|
})
|