浏览代码

🚑 按要求修改问题

imengyu 1 月之前
父节点
当前提交
c15ad06502

二进制
src/assets/images/fusion/Image5.jpg


二进制
src/assets/images/research/Image1.jpg


二进制
src/assets/images/research/Image3.jpg


+ 19 - 0
src/assets/scss/news.scss

@@ -186,6 +186,25 @@
       height: 20px;
     }
   }
+  .back-button2 {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    column-gap: 10px;
+    background-color: $box-inset-color;
+    padding: 4px 5px;
+    border-radius: 5px;
+    cursor: pointer;
+
+    img { 
+      width: 20px;
+      height: 20px;
+    }
+
+    &:hover {
+      background-color: $box-hover-color;
+    }
+  }
   .back-button {
     width: 92px;
     height: 92px;

+ 1 - 1
src/components/content/ContentNode.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="d-flex flex-row justify-content-center align-items-center pt-3 pt-md-4 pt-lg-5">
     <img class="small-info img" src="@/assets/images/IconInfo.svg" />
-    <span class="small-info ms-2">此网站内容部分信息来源于网络,如涉及侵权,请及时联系我们进行删除,联系邮箱:153168270@qq.com</span>
+    <span class="small-info ms-2">此平台为公益平台,部分信息来源于网络,如涉侵权,请联系我们删除,联系邮箱:153168270@qq.com</span>
   </div>
 </template>

+ 2 - 2
src/components/parts/LeftRightBox.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-box main-left-right-box row">
     <div class="col col-12 col-lg-6 col-md-6">
-      <img v-if="left" :src="image" alt="image" />
+      <img v-if="left" :src="image" alt="image" @click="emit('moreClick')" />
       <TitleDescBlock 
         v-else 
         :title="title"
@@ -22,7 +22,7 @@
         :more="showMore"
         @moreClick="emit('moreClick')"
       />
-      <img v-else :src="image" alt="image" />
+      <img v-else :src="image" alt="image" @click="emit('moreClick')" />
     </div>
   </div>
 </template>

+ 5 - 4
src/views/FusionView.vue

@@ -115,7 +115,7 @@ const list = [
     }
   },
   {
-    title: '文旅融合示范点',
+    title: '文旅融合重点区域',
     desc: '让文化因传承而永存',
     image: Image4,
     onClick: () => {
@@ -137,7 +137,7 @@ const list = [
   }
 ]
 const daysData = ref<GetContentListItem[]>([]) as Ref<GetContentListItem[]>
-const monthSelected = ref(1)
+const monthSelected = ref(new Date().getMonth() + 1)
 const monthData = ref<{
   month: number;
   holidays: GetContentListItem[];
@@ -205,10 +205,11 @@ onMounted(async () => {
   });
 
   res.list.forEach(item => {
-    monthData.value[item.dateMonth - 1].holidays.push(item)
+    monthData.value[item.dateMonth - 1]?.holidays?.push(item)
   })
 
-  daysData.value = monthData.value[0].holidays as GetContentListItem[];
+  daysData.value = monthData.value[ monthSelected.value - 1].holidays as GetContentListItem[];
+  
 });
 
 function goDetail(id: number) {

+ 12 - 14
src/views/HomeView.vue

@@ -31,7 +31,7 @@
         </div>
 
         <SimplePageContentLoader :loader="recommend1Data">
-          <Carousel ref="carousel2Ref" v-bind="carousel2Config">
+          <Carousel ref="carousel5Ref" v-bind="carousel2Config">
             <Slide 
               v-for="(item, index) in recommend1Data.content.value"
               :key="index"
@@ -47,8 +47,8 @@
         </SimplePageContentLoader>
 
         <div class="simple-carousel2-left-right">
-          <div @click="carousel2Ref?.prev()">←</div>
-          <div @click="carousel2Ref?.next()">→</div>
+          <div @click="carousel5Ref?.prev()">←</div>
+          <div @click="carousel5Ref?.next()">→</div>
         </div>
       </div>
     </section>
@@ -91,7 +91,7 @@
         </div>
 
         <SimplePageContentLoader :loader="recommend3Data">
-          <Carousel ref="carousel2Ref" v-bind="carousel2Config">
+          <Carousel ref="carousel6Ref" v-bind="carousel2Config">
             <Slide 
               v-for="(item, index) in recommend3Data.content.value"
               :key="index"
@@ -107,8 +107,8 @@
         </SimplePageContentLoader>
 
         <div class="simple-carousel2-left-right">
-          <div @click="carousel2Ref?.prev()">←</div>
-          <div @click="carousel2Ref?.next()">→</div>
+          <div @click="carousel6Ref?.prev()">←</div>
+          <div @click="carousel6Ref?.next()">→</div>
         </div>
       </div>
     </section>
@@ -212,6 +212,7 @@ import UnmoveableContent from '@/api/inheritor/UnmoveableContent';
 import ProjectContent from '@/api/research/ProjectContent';
 import ActivityContent from '@/api/inheritor/ActivityContent';
 import ProductContent from '@/api/fusion/ProductContent';
+import ProductsContent from '@/api/inheritor/ProductsContent';
 
 const router = useRouter();
 
@@ -233,6 +234,8 @@ const carousel3Config = ref({
   autoplay: 3000,
 });
 const carousel3Ref = ref<any>(null);
+const carousel5Ref = ref<any>(null);
+const carousel6Ref = ref<any>(null);
 
 onMounted(() => {
   if (window.innerWidth <= 435) {
@@ -253,21 +256,16 @@ const overviewData = useSimpleDataLoader(async () => {
   }))).list[0]?.overview || NO_CONTENT_STRING
 });
 const recommend1Data = useSimpleDataLoader<GetContentListItem[]>(async () => {
-  return (await UnmoveableContent.getContentList(new GetContentListParams().setSelfValues({
-
-  }), 1, 6)).list;
+  return (await UnmoveableContent.getContentList(new GetContentListParams(), 1, 8)).list;
 });
 const recommend2Data = useSimpleDataLoader<GetContentListItem[]>(async () => {
-  return (await CommonContent.getContentList(new GetContentListParams()
-    .setModelId(3)
-    .setMainBodyColumnId(238)
-  , 1, 6)).list
+  return (await ProductsContent.getContentList(new GetContentListParams(), 1, 8)).list
 });
 const recommend3Data = useSimpleDataLoader<GetContentListItem[]>(async () => {
   return (await CommonContent.getContentList(new GetContentListParams()
     .setModelId(17)
     .setMainBodyColumnId(273)
-  , 1, 6)).list
+  , 1, 8)).list
 });
 const newsData = useSimpleDataLoader<GetContentListItem[]>(async () => {
   return (await NewsIndexContent.getContentList(new GetContentListParams().setSelfValues({

+ 1 - 1
src/views/InheritorView.vue

@@ -198,7 +198,7 @@ const list1 = [
     onClick: () => navTo('/inheritor/inheritor'),
   },
   {
-    title: '非遗产品',
+    title: '非遗产品(作品)',
     desc: '让文化因传承而永存',
     image: Image3,
     onClick: () => navTo('/inheritor/products'),

+ 9 - 1
src/views/NewsDetailView.vue

@@ -3,9 +3,17 @@
   <div class="main-background">
     <div class="nav-placeholder"></div>
     <!-- 新闻 -->
-    <section class="main-section main-background main-background-type0">
+    <section class="main-section main-background main-background-type0 small-h">
       <SimplePageContentLoader :loader="newsLoader">
         <div v-if="newsLoader.content.value" class="content news-detail">
+          <div class="d-flex flex-row justify-content-start">
+
+            <div class="back-button2" @click="back">
+              <img src="@/assets/images/news/IconBack.png" />
+              <span>返回列表</span>
+            </div>
+          </div>
+
           <h1>{{ newsLoader.content.value.title }}</h1>
           <div class="row p-2 p-md-3 p-lg-4">
             <div class="col-12 col-md-4 col-lg-4 col-xl-4 d-flex justify-content-center">

+ 1 - 1
src/views/fusion/demo-site.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 文旅融合 - 文旅融合示范点 -->
    <CommonListPage
-    :title="'文旅融合示范点'"
+    :title="'文旅融合重点区域'"
     :prevPage="{ title: '文旅融合' }"
     :dropDownNames="[]"
     :pageSize="8"

+ 1 - 1
src/views/inheritor/products.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 文化传承 - 非遗产品 -->
   <CommonListPage
-    :title="'非遗产品'"
+    :title="'非遗产品(作品)'"
     :prevPage="{ title: '保护传承' }"
     :dropDownNames="dropdownNames"
     :pageSize="8"