Przeglądaj źródła

🎨 修改细节问题

快乐的梦鱼 4 tygodni temu
rodzic
commit
2ca954f410
2 zmienionych plików z 22 dodań i 18 usunięć
  1. 1 1
      src/views/AboutView.vue
  2. 21 17
      src/views/NewsDetailView.vue

+ 1 - 1
src/views/AboutView.vue

@@ -53,7 +53,6 @@
             <TitleDescBlock
               :title="item.title"
               :desc="item.desc || item.title"
-              :date="DateUtils.formatDate(item.publishAt, DateUtils.FormatStrings.YearCommon)"
             />
           </div>
         </SimplePageContentLoader>
@@ -81,6 +80,7 @@
             :key="index"
             :title="item.title"
             :image="item.image"
+            :data="item.date"
             @click="navTo('/news/detail', { id: item.id })"
           />
         </SimplePageContentLoader>

+ 21 - 17
src/views/NewsDetailView.vue

@@ -38,22 +38,6 @@
             controls
             :src="newsLoader.content.value.video" 
           />
-          <!-- 轮播 -->
-          <Carousel 
-            v-else
-            :itemsToShow="1"
-            wrapAround
-            :autoPlay="5000"
-            class="carousel"
-          >
-            <Slide v-for="(image, key) in newsLoader.content.value.images" :key="key">
-              <img :src="image" />
-            </Slide>
-            <template #addons>
-              <Navigation />
-              <Pagination />
-            </template>
-          </Carousel>
 
           <SimpleRichHtml 
             class="news-content mt-3"
@@ -62,7 +46,27 @@
               newsLoader.content.value.value,
               newsLoader.content.value.content,
             ]" 
-          />
+          >
+            <template #prepend>
+              
+              <!-- 轮播 -->
+              <Carousel 
+                v-if="!newsLoader.content.value.video && !newsLoader.content.value.audio && newsLoader.content.value.images.length > 0"
+                :itemsToShow="1"
+                wrapAround
+                :autoPlay="5000"
+                class="carousel float"
+              >
+                <Slide v-for="(image, key) in newsLoader.content.value.images" :key="key">
+                  <img :src="image" />
+                </Slide>
+                <template #addons>
+                  <Navigation />
+                  <Pagination />
+                </template>
+              </Carousel>
+            </template>
+          </SimpleRichHtml>
 
           <div class="row d-flex justify-content-center">
             <div class="back-button" @click="back">