From c950c8f3de4771a8ffbf617dcdd8c3aaee067568 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 1 Nov 2023 18:42:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=89=AB=E7=A0=81=E6=94=AF=E4=BB=98=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue                 | 27 ++++++++-------------------
 pages/plugins/scanpay/index/index.css |  2 +-
 pages/plugins/scanpay/index/index.vue |  2 +-
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 555083bf..8dbf1b2e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -24,25 +24,14 @@
                         <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-white"
-                                    propIconColor="#fff"
-                                    propBgColor="rgb(255 255 255 / 0.5)"
-                                    <!-- #ifndef H5 -->
-                                    @onicon="search_icon_event"
-                                    propIcon="icon-mendian-sousuosm"
-                                    :propIsIconOnEvent="true"
+                                <component-search propPlaceholder="输入商品名称搜索" propPlaceholderClass="cr-white" propIconColor="#fff" propBgColor="rgb(255 255 255 / 0.5)" <!-- #ifndef H5 -->
+                                    @onicon="search_icon_event" propIcon="icon-mendian-sousuosm" :propIsIconOnEvent="true"
                                     <!-- #endif -->
-                                ></component-search>
+                                    ></component-search
+                                >
                             </block>
                             <block v-else>
-                                <component-search
-                                    propPlaceholder="输入商品名称搜索"
-                                    propPlaceholderClass="cr-white"
-                                    propIconColor="#fff"
-                                    propBgColor="rgb(255 255 255 / 0.5)"
-                                ></component-search>
+                                <component-search propPlaceholder="输入商品名称搜索" propPlaceholderClass="cr-white" propIconColor="#fff" propBgColor="rgb(255 255 255 / 0.5)"></component-search>
                             </block>
                         </view>
                         <!-- #ifdef H5 || MP-TOUTIAO || APP -->
@@ -82,7 +71,7 @@
                     <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">
+                <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 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">
@@ -648,8 +637,8 @@
             // 搜索icon扫码事件
             search_icon_event(e) {
                 app.globalData.scan_handle();
-            }
-        }
+            },
+        },
     };
 </script>
 <style>
diff --git a/pages/plugins/scanpay/index/index.css b/pages/plugins/scanpay/index/index.css
index 88060241..a64a2857 100644
--- a/pages/plugins/scanpay/index/index.css
+++ b/pages/plugins/scanpay/index/index.css
@@ -23,7 +23,7 @@
 
 .pay-scroll {
     max-height: calc(100vh - 1102rpx);
-    min-height: calc(140rpx);
+    min-height: 140rpx;
     overflow-y: auto;
 }
 
diff --git a/pages/plugins/scanpay/index/index.vue b/pages/plugins/scanpay/index/index.vue
index 78259aee..f0c3a26a 100644
--- a/pages/plugins/scanpay/index/index.vue
+++ b/pages/plugins/scanpay/index/index.vue
@@ -24,7 +24,7 @@
                 </view>
                 <view class="bg-white border-radius-main padding-main spacing-mb">
                     <view class="text-size fw-b spacing-mb">支付方式</view>
-                    <view class="flex-col jc-sa" :class="is_more ? 'pay-scroll' : ''">
+                    <view class="flex-col" :class="is_more ? 'pay-scroll' : ''">
                         <view v-for="(item, index) in is_more ? data.payment_list : data.payment_list.slice(0, 2)" :key="index" class="flex-row jc-sb align-c padding-vertical-sm" @tap="change_event(index, item.id)">
                             <div class="flex-1 flex-width flex-row align-c">
                                 <image v-if="item.logo" :src="item.logo" mode="widthFix" class="circle img-pay margin-right-main" />