From 9bb849f9328356f28f620ebc90e955aa1c4011bc Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 22 Nov 2023 19:18:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3h5=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=B8=8D=E5=A4=9A=E6=9B=B4=E5=A4=9A=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=202.=E8=A7=A3=E5=86=B3=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E9=97=B4=E8=B7=9D=E9=97=AE=E9=A2=98=203.=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E9=AD=94=E6=96=B9=E5=A4=A7=E5=B1=8F=E5=9B=BE=E7=89=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=85=A8=E7=9A=84=E9=97=AE=E9=A2=98=202023.1?=
 =?UTF-8?q?1.22=E5=91=A8=E4=B8=89--sws?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/magic-list/magic-list.vue | 21 ++++++++++-----------
 pages/index/index.vue                | 21 +++++++++------------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/components/magic-list/magic-list.vue b/components/magic-list/magic-list.vue
index 0d2634c0..2308d3a9 100644
--- a/components/magic-list/magic-list.vue
+++ b/components/magic-list/magic-list.vue
@@ -2,7 +2,7 @@
     <view :class="theme_view">
         <view v-if="(data_goods_list || null) != null && data_goods_list.length > 0">
             <view v-for="(items, indexs) in data_goods_list" :key="indexs" class="bg-white border-radius-main spacing-mb">
-                <view class="padding-top-main" :style="(items.bg_images || null) !== null ? 'background-image: url(' + items.bg_images + ');background-size: auto 100%;' : ''">
+                <view class="padding-vertical-main" :style="(items.bg_images || null) !== null ? 'background-image: url(' + items.bg_images + ');background-size: auto 100%;' : ''">
                     <view class="hot-list flex-row flex-warp">
                         <view v-for="(item, index) in items.data" :key="index" :class="items.data.length % 2 == 0 ? 'flex-width-half' : items.data.length === index + 1 ? 'wh-auto' : 'flex-width-half'">
                             <view class="padding-horizontal-main">
@@ -15,20 +15,13 @@
                                     </view>
                                 </view>
                                 <view class="cr-grey-9 text-size-xs margin-bottom-sm">{{ item.describe }}</view>
-                                <swiper
-                                    :class="items.data.length % 2 == 0 ? 'swiper-2' : items.data.length === index + 1 ? 'swiper-1' : 'swiper-2'"
-                                    circular
-                                    :autoplay="(item.rolling_time || null) !== null ? true : false"
-                                    :vertical="propVertical"
-                                    :interval="(item.rolling_time || null) !== null ? Number(item.rolling_time) * 1000 : '6000'"
-                                    :duration="propDuration"
-                                >
+                                <swiper :class="items.data.length % 2 == 0 ? 'swiper-2' : items.data.length === index + 1 ? 'swiper-1' : 'swiper-2'" circular :autoplay="(item.rolling_time || null) !== null ? true : false" :vertical="propVertical" :interval="(item.rolling_time || null) !== null ? Number(item.rolling_time) * 1000 : '6000'" :duration="propDuration">
                                     <swiper-item v-for="(swiperItem, swiperIndex) in item.data" :key="swiperIndex">
                                         <view class="swiper-item">
                                             <view class="flex-row">
                                                 <view v-for="(listItem, listIndex) in swiperItem" :key="listIndex" :class="items.data.length % 2 == 0 ? 'flex-width-half' : items.data.length === index + 1 ? 'flex-width-half-2' : 'flex-width-half'">
-                                                    <view class="padding-horizontal-main" :data-value="(listItem.goods_url || null) !== null ? listItem.goods_url : ''" @tap="url_event">
-                                                        <image :src="(listItem.images || null) !== null ? listItem.images : ''" mode="widthFix" class="wh-auto border-radius-sm"> </image>
+                                                    <view class="padding-horizontal-main tc" :data-value="(listItem.goods_url || null) !== null ? listItem.goods_url : ''" @tap="url_event">
+                                                        <image :src="(listItem.images || null) !== null ? listItem.images : ''" mode="heightFix" class="swiper-img border-radius-sm"> </image>
                                                         <view class="price tc single-text">
                                                             <text class="sales-price va-m text-size-xss va-b">{{ currency_symbol }}</text>
                                                             <text class="sales-price va-m text-size-xs">{{ listItem.min_price }}</text>
@@ -137,10 +130,16 @@
     .hot-list .swiper-2 {
         height: 176rpx;
     }
+    .hot-list .swiper-2 .swiper-img {
+        height: 124rpx;
+    }
 
     .hot-list .swiper-1 {
         height: 187rpx;
     }
+    .hot-list .swiper-1 .swiper-img {
+        height: 135rpx;
+    }
 
     .hot-go {
         height: 34rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4ba64369..5ff75817 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -26,11 +26,11 @@
                         <view v-if="common_app_is_enable_search == 1" class="search-content-input dis-inline-block va-m" :style="top_content_search_style">
                             <!-- 是否开启搜索框前面icon扫一扫 -->
                             <block v-if="is_home_search_scan == 1">
-                                <component-search propPlaceholder="输入商品名称搜索" propPlaceholderClass="cr-grey-c" propIconColor="#999" propBgColor="#fff" 
-                                <!-- #ifndef H5 -->
-                                @onicon="search_icon_event" propIcon="icon-mendian-sousuosm" :propIsIconOnEvent="true"
-                                <!-- #endif -->
-                                ></component-search>
+                                <component-search propPlaceholder="输入商品名称搜索" propPlaceholderClass="cr-grey-c" propIconColor="#999" propBgColor="#fff" <!-- #ifndef H5 -->
+                                    @onicon="search_icon_event" propIcon="icon-mendian-sousuosm" :propIsIconOnEvent="true"
+                                    <!-- #endif -->
+                                    ></component-search
+                                >
                             </block>
                             <block v-else>
                                 <component-search propPlaceholder="输入商品名称搜索" propPlaceholderClass="cr-grey-c" propIconColor="#999" propBgColor="#fff"></component-search>
@@ -57,7 +57,7 @@
                     <component-banner :propData="banner_list" @changeBanner="change_banner"></component-banner>
                 </view>
                 <!-- 导航 -->
-                <view v-if="navigation.length > 0" class="spacing-mt">
+                <view v-if="navigation.length > 0" class="spacing-mt" :class="load_status == 1 && (common_shop_notice || null) != null ? '' : ' spacing-mb'">
                     <view class="padding-horizontal-main">
                         <view class="bg-white border-radius-main">
                             <component-icon-nav :propData="navigation"></component-icon-nav>
@@ -67,13 +67,13 @@
             </view>
 
             <!-- 内容 -->
-            <view class="content padding-horizontal-main">
+            <view class="content padding-horizontal-main pr">
                 <!-- 商城公告 -->
                 <view v-if="load_status == 1 && (common_shop_notice || null) != null" class="notice">
                     <uni-notice-bar show-icon scrollable :text="common_shop_notice" background-color="transparent" color="#666" />
                 </view>
                 <!-- 推荐文章 -->
-                <view v-if="article_list.length > 0" class="article-list padding-main border-radius-main oh bg-white spacing-mb" :class="load_status == 1 && (common_shop_notice || null) != null ? '' : 'spacing-mt'">
+                <view v-if="article_list.length > 0" class="article-list padding-main border-radius-main oh bg-white spacing-mb">
                     <view mode="aspectFit" class="new-icon va-m fl cp pr divider-r" data-value="/pages/article-category/article-category" @tap="url_event"> <text>最新</text><text class="cr-red">资讯</text> </view>
                     <view class="right-content fr va-m">
                         <swiper :vertical="true" :autoplay="true" :circular="true" display-multiple-items="1" interval="3000">
@@ -98,10 +98,7 @@
                         </view>
 
                         <!-- 限时秒杀 - 插件 -->
-                        <view
-                            v-if="pv.plugins == 'seckill' && (plugins_seckill_data || null) != null && (plugins_seckill_data.data || null) != null && (plugins_seckill_data.data.goods || null) != null && plugins_seckill_data.data.goods.length > 0"
-                            class="plugins-seckill-data border-radius-main spacing-mb bg-white"
-                            :style="'background-image: url(' + seckill_static_url + 'seckill-bg.png);'">
+                        <view v-if="pv.plugins == 'seckill' && (plugins_seckill_data || null) != null && (plugins_seckill_data.data || null) != null && (plugins_seckill_data.data.goods || null) != null && plugins_seckill_data.data.goods.length > 0" class="plugins-seckill-data border-radius-main spacing-mb bg-white" :style="'background-image: url(' + seckill_static_url + 'seckill-bg.png);'">
                             <view class="flex-row jc-sb align-c padding-top-main padding-horizontal-main">
                                 <view class="flex-1">
                                     <image class="dis-inline-block va-m icon" :src="plugins_seckill_data.data.home_title_icon" mode="widthFix"></image>