From 577a1fabb5326497f7fe10ad4507099faecdd7ca Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 25 Jan 2022 01:29:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E8=AF=A6=E6=83=85=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=A7=86=E9=A2=91+=E4=B8=8A=E4=B8=80=E7=AF=87?=
 =?UTF-8?q?=E5=92=8C=E4=B8=8B=E4=B8=80=E7=AF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/page.css                     |  7 +++++++
 components/blog-list/blog-list.vue      |  2 +-
 pages/article-detail/article-detail.vue |  4 +++-
 pages/index/index.vue                   |  2 +-
 pages/plugins/blog/detail/detail.vue    | 21 +++++++++++++++++++--
 pages/plugins/blog/index/index.vue      |  2 +-
 6 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/common/css/page.css b/common/css/page.css
index 1f7b23e0..41ceee58 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -751,4 +751,11 @@ button[disabled].bg-gray {
  */
 .single-page-top {
     padding-top: 110rpx;
+}
+
+/**
+ * 上一篇、下一篇
+ */
+.last-next-data navigator {
+    width: calc(100% - 120rpx);
 }
\ No newline at end of file
diff --git a/components/blog-list/blog-list.vue b/components/blog-list/blog-list.vue
index d7a6f5cc..5ea93c8c 100644
--- a/components/blog-list/blog-list.vue
+++ b/components/blog-list/blog-list.vue
@@ -45,7 +45,7 @@
                         </block>
                         <block v-else-if="floor.style_type == 2">
                             <view class="plugins-blog-rolling-list scroll-view-horizontal border-radius-main oh">
-                                <swiper :vertical="false" :autoplay="(propConfig.is_home_hot_auto_play || 0) == 1" :circular="true" :display-multiple-items="floor.blog_list.length < 3 ? floor.blog_list.length : 3" interval="3000">
+                                <swiper :vertical="false" :autoplay="(propConfig.is_home_hot_auto_play || 0) == 1" :circular="false" :display-multiple-items="floor.blog_list.length < 3 ? floor.blog_list.length : 3" interval="3000">
                                     <block v-for="(item, index) in floor.blog_list" :key="index">
                                         <swiper-item class="padding-right-main">
                                             <view class="item bg-white border-radius-main oh pr ht-auto pr">
diff --git a/pages/article-detail/article-detail.vue b/pages/article-detail/article-detail.vue
index 54ae7855..2ea74202 100644
--- a/pages/article-detail/article-detail.vue
+++ b/pages/article-detail/article-detail.vue
@@ -16,7 +16,9 @@
             </view>
             <view class="padding-main border-radius-main bg-white oh spacing-mb">
                 <mp-html :content="data.content" />
-            </view>
+            </view>
+            
+            <!-- 上一篇、下一篇 -->
             <view v-if="(last_next || null) != null" class="last-next-data spacing-mb">
                 <view v-if="(last_next.last || null) != null">
                     <text class="cr-gray va-m">上一篇：</text>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 067ed742..9637148c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -78,7 +78,7 @@
                         <navigator url="/pages/plugins/seckill/index/index" hover-class="none" class="arrow-right padding-right-xxxl cr-gray fr">更多</navigator>
                     </view>
                     <view class="goods-list scroll-view-horizontal border-radius-main oh">
-                        <swiper :vertical="false" :autoplay="(plugins_seckill_data.base || null) != null && (plugins_seckill_data.base.is_home_auto_play || 0) == 1" :circular="true" :display-multiple-items="plugins_seckill_data.goods.length < 3 ? plugins_seckill_data.goods.length : 3" interval="3000">
+                        <swiper :vertical="false" :autoplay="(plugins_seckill_data.base || null) != null && (plugins_seckill_data.base.is_home_auto_play || 0) == 1" :circular="false" :display-multiple-items="plugins_seckill_data.goods.length < 3 ? plugins_seckill_data.goods.length : 3" interval="3000">
                             <block v-for="(item, index) in plugins_seckill_data.goods" :key="index">
                                 <swiper-item class="padding-right-main">
                                     <view class="item bg-white border-radius-main oh pr ht-auto">
diff --git a/pages/plugins/blog/detail/detail.vue b/pages/plugins/blog/detail/detail.vue
index 044bb0e0..d847b319 100644
--- a/pages/plugins/blog/detail/detail.vue
+++ b/pages/plugins/blog/detail/detail.vue
@@ -15,7 +15,22 @@
                 </view>
             </view>
             <view class="padding-main border-radius-main bg-white oh spacing-mb">
+                <view v-if="(data.video_url || null) != null && (data.is_live_play || 0) == 0">
+                    <video :src="data.video_url" class="wh-auto" :autoplay="false" :controls="true"></video>
+                </view>
                 <mp-html :content="data.content" />
+            </view>
+            
+            <!-- 上一篇、下一篇 -->
+            <view v-if="(last_next || null) != null" class="last-next-data spacing-mb">
+                <view v-if="(last_next.last || null) != null">
+                    <text class="cr-gray va-m">上一篇：</text>
+                    <navigator :url="last_next.last.url" open-type="redirect" hover-class="none" class="dis-inline-block va-m cr-blue">{{last_next.last.title}}</navigator>
+                </view>
+                <view v-if="(last_next.next || null) != null" class="margin-top-sm">
+                    <text class="cr-gray va-m">下一篇：</text>
+                    <navigator :url="last_next.next.url" open-type="redirect" hover-class="none" class="dis-inline-block va-m cr-blue">{{last_next.next.title}}</navigator>
+                </view>
             </view>
             
             <!-- 推荐博文 -->
@@ -81,7 +96,8 @@
                 params: null,
                 data_base: null,
                 data: null,
-                right_list: [],
+                right_list: [],
+                last_next: null,
                 // 自定义分享信息
                 share_info: {}
             };
@@ -145,7 +161,8 @@
                                 data_list_loding_status: 3,
                                 data_base: data.base || null,
                                 data: blog,
-                                right_list: data.right_list || []
+                                right_list: data.right_list || [],
+                                last_next: data.last_next || null
                             });
 
                             // 基础自定义分享
diff --git a/pages/plugins/blog/index/index.vue b/pages/plugins/blog/index/index.vue
index e40b511e..fc284d13 100644
--- a/pages/plugins/blog/index/index.vue
+++ b/pages/plugins/blog/index/index.vue
@@ -42,7 +42,7 @@
                     <navigator url="/pages/plugins/blog/search/search" hover-class="none" class="arrow-right padding-right-xxxl cr-gray fr">更多</navigator>
                 </view>
                 <view class="plugins-blog-rolling-list scroll-view-horizontal border-radius-main oh">
-                    <swiper :vertical="false" :autoplay="(data_base.is_home_hot_auto_play || 0) == 1" :circular="true" :display-multiple-items="hot_list.length < 3 ? hot_list.length : 3" interval="3000">
+                    <swiper :vertical="false" :autoplay="(data_base.is_home_hot_auto_play || 0) == 1" :circular="false" :display-multiple-items="hot_list.length < 3 ? hot_list.length : 3" interval="3000">
                         <block v-for="(item, index) in hot_list" :key="index">
                             <swiper-item class="padding-right-main">
                                 <view class="item bg-white border-radius-main oh pr ht-auto pr">