From 47e45fb6538a401856c467ce92ffc883a84934fc Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Fri, 15 Jul 2022 23:08:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E5=8F=B3=E6=BB=9A=E5=8A=A8=E6=9C=80?=
 =?UTF-8?q?=E5=90=8E=E4=B8=80=E4=B8=AA=E5=85=83=E7=B4=A0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=85=A8=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/page.css                  |  6 +++
 components/blog-list/blog-list.vue   | 10 ++---
 components/goods-list/goods-list.vue | 10 ++---
 pages/index/index.vue                | 56 ++++++++++++++--------------
 pages/plugins/blog/index/index.vue   | 28 +++++++-------
 5 files changed, 60 insertions(+), 50 deletions(-)

diff --git a/common/css/page.css b/common/css/page.css
index ff05aa06..e3d34f54 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -758,6 +758,12 @@ button[disabled].bg-gray {
     white-space: nowrap;
     box-sizing: border-box;
     width: 100%;
+}
+/**
+ * 滚动水平左右滑动内容宽度处理
+ */
+.rolling-horizontal .scroll-view-horizontal {
+    width: calc(100% + 20rpx);
 }
 
 /**
diff --git a/components/blog-list/blog-list.vue b/components/blog-list/blog-list.vue
index daf6a26d..111105a6 100644
--- a/components/blog-list/blog-list.vue
+++ b/components/blog-list/blog-list.vue
@@ -47,12 +47,12 @@
                                 </view>
                             </block>
                             <!-- 滚动 -->
-                            <block v-else-if="floor.style_type == 2">
-                                <view class="plugins-blog-rolling-list scroll-view-horizontal border-radius-main oh spacing-mb">
+                            <view v-else-if="floor.style_type == 2" class="rolling-horizontal border-radius-main oh spacing-mb">
+                                <view class="plugins-blog-rolling-list scroll-view-horizontal">
                                     <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">
+                                            <swiper-item>
+                                                <view class="item bg-white border-radius-main margin-right-main oh pr ht-auto pr">
                                                     <navigator :url="item.url" hover-class="none">
                                                         <image class="blog-img dis-block wh-auto" :src="item.cover" mode="aspectFill"></image>
                                                         <view class="blog-title pa single-text cr-white padding-horizontal-main padding-top-sm padding-bottom-sm">{{item.title}}</view>
@@ -62,7 +62,7 @@
                                         </block>
                                     </swiper>
                                 </view>
-                            </block>
+                            </view>
                         </block>
                     </view>
                 </block>
diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue
index ebfb9db6..63ef596b 100644
--- a/components/goods-list/goods-list.vue
+++ b/components/goods-list/goods-list.vue
@@ -65,12 +65,12 @@
                         </view>
                     </block>
                     <!-- 滚动 -->
-                    <block v-else-if="propData.style_type == 2">
-                        <view class="goods-data-rolling-list scroll-view-horizontal border-radius-main oh spacing-mb">
+                    <view v-else-if="propData.style_type == 2" class="rolling-horizontal border-radius-main oh spacing-mb">
+                        <view class="goods-data-rolling-list scroll-view-horizontal">
                             <swiper :vertical="false" :autoplay="propIsAutoPlay" :circular="false" :display-multiple-items="propData.goods_list.length < 3 ? propData.goods_list.length : 3" interval="3000">
                                 <block v-for="(item, index) in propData.goods_list" :key="index">
-                                    <swiper-item class="padding-right-main">
-                                        <view class="item bg-white border-radius-main oh pr ht-auto pr">
+                                    <swiper-item>
+                                        <view class="item bg-white border-radius-main margin-right-main oh pr ht-auto pr">
                                             <!-- 商品主体内容 -->
                                             <navigator :url="item.goods_url" hover-class="none">
                                                 <image class="goods-img dis-block wh-auto" :src="item.images" mode="aspectFit"></image>
@@ -93,7 +93,7 @@
                                 </block>
                             </swiper>
                         </view>
-                    </block>
+                    </view>
                 </block>
             </view>
         </view>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f60456c6..1e813bed 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -80,36 +80,38 @@
                                 </view>
                                 <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="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">
-                                                <!-- 商品主体内容 -->
-                                                <navigator :url="item.goods_url" hover-class="none">
-                                                    <image class="goods-img dis-block" :src="item.images" mode="aspectFit"></image>
-                                                    <view class="goods-base padding-left padding-right margin-top-sm">
-                                                        <view class="goods-title multi-text margin-bottom-sm">{{item.title}}</view>
-                                                        <view class="sales-price single-text">{{currency_symbol}}{{item.min_price}}</view>
-                                                        <view v-if="(item.min_original_price || null) != null && item.min_original_price > 0" class="original-price single-text">{{currency_symbol}}{{item.min_original_price}}</view>
-                                                        <view class="icon pa">
-                                                            <uni-icons type="cart" size="16" color="#E02020"></uni-icons>
+                            <view class="rolling-horizontal border-radius-main oh">
+                                <view class="goods-list scroll-view-horizontal">
+                                    <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>
+                                                <view class="item bg-white border-radius-main margin-right-main oh pr ht-auto">
+                                                    <!-- 商品主体内容 -->
+                                                    <navigator :url="item.goods_url" hover-class="none">
+                                                        <image class="goods-img dis-block" :src="item.images" mode="aspectFit"></image>
+                                                        <view class="goods-base padding-left padding-right margin-top-sm">
+                                                            <view class="goods-title multi-text margin-bottom-sm">{{item.title}}</view>
+                                                            <view class="sales-price single-text">{{currency_symbol}}{{item.min_price}}</view>
+                                                            <view v-if="(item.min_original_price || null) != null && item.min_original_price > 0" class="original-price single-text">{{currency_symbol}}{{item.min_original_price}}</view>
+                                                            <view class="icon pa">
+                                                                <uni-icons type="cart" size="16" color="#E02020"></uni-icons>
+                                                            </view>
                                                         </view>
+                                                    </navigator>
+                                                    <!-- 标签插件 -->
+                                                    <view v-if="(plugins_label_data || null) != null && plugins_label_data.data.length > 0" :class="'plugins-label oh pa plugins-label-'+((plugins_label_data.base.is_user_goods_label_icon || 0) == 0 ? 'text' : 'img')+' plugins-label-'+(plugins_label_data.base.user_goods_show_style || 'top-left')">
+                                                        <block v-for="(lv,li) in plugins_label_data.data" :key="li">
+                                                            <view v-if="lv.goods_ids.indexOf(item.goods_id) != -1" class="lv dis-inline-block va-m" :data-value="((plugins_label_data.base.is_user_goods_label_url || 0) == 1) ? (lv.url || '') : ''" @tap="url_event">
+                                                                <view v-if="(plugins_label_data.base.is_user_goods_label_icon || 0) == 0" class="round cr-white bg-main text-size-xs fl" :style="((lv.bg_color || null) != null ? 'background-color:'+ lv.bg_color+' !important;' : '')+((lv.text_color || null) != null ? 'color:'+ lv.text_color+' !important;' : '')">{{lv.name}}</view>
+                                                                <image v-else class="dis-block" :src="lv.icon" mode="scaleToFill"></image>
+                                                            </view>
+                                                        </block>
                                                     </view>
-                                                </navigator>
-                                                <!-- 标签插件 -->
-                                                <view v-if="(plugins_label_data || null) != null && plugins_label_data.data.length > 0" :class="'plugins-label oh pa plugins-label-'+((plugins_label_data.base.is_user_goods_label_icon || 0) == 0 ? 'text' : 'img')+' plugins-label-'+(plugins_label_data.base.user_goods_show_style || 'top-left')">
-                                                    <block v-for="(lv,li) in plugins_label_data.data" :key="li">
-                                                        <view v-if="lv.goods_ids.indexOf(item.goods_id) != -1" class="lv dis-inline-block va-m" :data-value="((plugins_label_data.base.is_user_goods_label_url || 0) == 1) ? (lv.url || '') : ''" @tap="url_event">
-                                                            <view v-if="(plugins_label_data.base.is_user_goods_label_icon || 0) == 0" class="round cr-white bg-main text-size-xs fl" :style="((lv.bg_color || null) != null ? 'background-color:'+ lv.bg_color+' !important;' : '')+((lv.text_color || null) != null ? 'color:'+ lv.text_color+' !important;' : '')">{{lv.name}}</view>
-                                                            <image v-else class="dis-block" :src="lv.icon" mode="scaleToFill"></image>
-                                                        </view>
-                                                    </block>
                                                 </view>
-                                            </view>
-                                        </swiper-item>
-                                    </block>
-                                </swiper>
+                                            </swiper-item>
+                                        </block>
+                                    </swiper>
+                                </view>
                             </view>
                         </view>
 
diff --git a/pages/plugins/blog/index/index.vue b/pages/plugins/blog/index/index.vue
index c86b8a66..d8996cc1 100644
--- a/pages/plugins/blog/index/index.vue
+++ b/pages/plugins/blog/index/index.vue
@@ -41,19 +41,21 @@
                     <text class="text-wrapper">热门博文</text>
                     <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="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">
-                                    <navigator :url="item.url" hover-class="none">
-                                        <image class="blog-img dis-block wh-auto" :src="item.cover" mode="aspectFill"></image>
-                                        <view class="blog-title pa single-text cr-white padding-horizontal-main padding-top-sm padding-bottom-sm">{{item.title}}</view>
-                                    </navigator>
-                                </view>
-                            </swiper-item>
-                        </block>
-                    </swiper>
+                <view class="rolling-horizontal border-radius-main oh">
+                    <view class="plugins-blog-rolling-list scroll-view-horizontal">
+                        <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>
+                                    <view class="item bg-white border-radius-main margin-right-main oh pr ht-auto pr">
+                                        <navigator :url="item.url" hover-class="none">
+                                            <image class="blog-img dis-block wh-auto" :src="item.cover" mode="aspectFill"></image>
+                                            <view class="blog-title pa single-text cr-white padding-horizontal-main padding-top-sm padding-bottom-sm">{{item.title}}</view>
+                                        </navigator>
+                                    </view>
+                                </swiper-item>
+                            </block>
+                        </swiper>
+                    </view>
                 </view>
             </view>