Parcourir la source

💄 首页非遗文物顺序修改

imengyu il y a 1 mois
Parent
commit
b49fd90de5
3 fichiers modifiés avec 30 ajouts et 22 suppressions
  1. 16 16
      src/views/HomeView.vue
  2. 0 1
      src/views/NewsDetailView.vue
  3. 14 5
      src/views/details/ArtifactDetailView.vue

+ 16 - 16
src/views/HomeView.vue

@@ -23,19 +23,19 @@
       </template>
     </Carousel>
 
-    <!-- 精选推荐文物 -->
+    <!-- 精选推荐非遗 -->
     <section class="main-section main-background main-background-type1">
       <div class="content">
         <div class="title">
-          <h2>精选文物</h2>
+          <h2>精选非遗</h2>
         </div>
 
-        <SimplePageContentLoader :loader="recommend1Data">
-          <Carousel ref="carousel5Ref" v-bind="carousel2Config">
+        <SimplePageContentLoader :loader="recommend2Data">
+          <Carousel ref="carousel2Ref" v-bind="carousel2Config">
             <Slide 
-              v-for="(item, index) in recommend1Data.content.value"
+              v-for="(item, index) in recommend2Data.content.value"
               :key="index"
-              @click="router.push({ name: 'artifact-detail', query: { id: item.id } })"
+              @click="router.push({ name: 'news-detail', query: { id: item.id } })"
             >
               <ImageTitleBlock 
                 :image="item.image"
@@ -47,25 +47,25 @@
         </SimplePageContentLoader>
 
         <div class="simple-carousel2-left-right">
-          <div @click="carousel5Ref?.prev()">←</div>
-          <div @click="carousel5Ref?.next()">→</div>
+          <div @click="carousel2Ref?.prev()">←</div>
+          <div @click="carousel2Ref?.next()">→</div>
         </div>
       </div>
     </section>
 
-    <!-- 精选推荐非遗 -->
+    <!-- 精选推荐文物 -->
     <section class="main-section main-background main-background-type1">
       <div class="content">
         <div class="title">
-          <h2>精选非遗</h2>
+          <h2>精选文物</h2>
         </div>
 
-        <SimplePageContentLoader :loader="recommend2Data">
-          <Carousel ref="carousel2Ref" v-bind="carousel2Config">
+        <SimplePageContentLoader :loader="recommend1Data">
+          <Carousel ref="carousel5Ref" v-bind="carousel2Config">
             <Slide 
-              v-for="(item, index) in recommend2Data.content.value"
+              v-for="(item, index) in recommend1Data.content.value"
               :key="index"
-              @click="router.push({ name: 'news-detail', query: { id: item.id } })"
+              @click="router.push({ name: 'artifact-detail', query: { id: item.id } })"
             >
               <ImageTitleBlock 
                 :image="item.image"
@@ -77,8 +77,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>

+ 0 - 1
src/views/NewsDetailView.vue

@@ -7,7 +7,6 @@
       <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>

+ 14 - 5
src/views/details/ArtifactDetailView.vue

@@ -6,6 +6,13 @@
     <section class="main-section main-background main-background-type0 small-h">
       <SimplePageContentLoader :loader="loader">
         <div v-if="loader.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>{{ loader.content.value.title }}</h1>
           <p class="small-info">
             {{ loader.content.value.address }} 
@@ -30,30 +37,32 @@
           <div class="info-list mb-2">
             <div class="entry">
               <div class="label">开放时间:</div>
-              <div class="value">{{ loader.content.value.openStatusText }}</div>
+              <div class="value">{{ loader.content.value.openStatusText || '暂无' }}</div>
             </div>
             <div class="entry">
               <div class="label">年代:</div>
-              <div class="value">{{ loader.content.value.age }}</div>
+              <div class="value">{{ loader.content.value.age || '暂无' }}</div>
             </div>
             <div class="entry">
               <div class="label">文物类型:</div>
-              <div class="value">{{ loader.content.value.crTypeText }}</div>
+              <div class="value">{{ loader.content.value.crTypeText || '暂无' }}</div>
             </div>
             <div class="entry">
               <div class="label">所属区域:</div>
-              <div class="value">{{ loader.content.value.regionText }}</div>
+              <div class="value">{{ loader.content.value.regionText || '暂无' }}</div>
             </div>
             <div class="entry">
               <div class="label">级别:</div>
-              <div class="value">{{ loader.content.value.levelText }}</div>
+              <div class="value">{{ loader.content.value.levelText || '暂无' }}</div>
             </div>
             <div class="entry">
               <div class="label">保护范围:</div>
               <div class="value">
                 <SimpleRichHtml 
+                  v-if="loader.content.value.protectedArea"
                   :contents="[loader.content.value.protectedArea as string]" 
                 />
+                <span v-else>暂无</span>
               </div>
             </div>
           </div>