From 136ca9e2493c7e2ae9bda940baba758fcb2f5994 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Thu, 12 Feb 2026 21:14:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=9B=BE=E7=89=87=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/page.css                  |  3 ++
 pages/plugins/points/index/index.css | 17 ++-------
 pages/plugins/points/index/index.vue | 54 ++++++++++++++--------------
 pages/plugins/points/scan/scan.vue   | 10 +++---
 4 files changed, 37 insertions(+), 47 deletions(-)

diff --git a/common/css/page.css b/common/css/page.css
index 7ecbf325..8a9208c6 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -251,6 +251,9 @@ button:before {
 .z-i-deep {
     z-index: 2 !important;
 }
+.z-i-deeps {
+    z-index: 3 !important;
+}
 .z-i-deep-middle {
     z-index: 100 !important;
 }
diff --git a/pages/plugins/points/index/index.css b/pages/plugins/points/index/index.css
index a895100a..655e5444 100644
--- a/pages/plugins/points/index/index.css
+++ b/pages/plugins/points/index/index.css
@@ -50,21 +50,8 @@
     background: rgba(0, 0, 0, 0.3);
     border-radius: 200rpx 0 0 200rpx;
 }
-
-.rule {
-    padding: 56rpx 24rpx;
-    max-height: 50vh;
-}
-
-.rule .item {
-    padding-bottom: 100rpx;
-    max-height: calc(50vh - 164rpx);
-}
-
-.rule button {
-    margin: 20rpx 70rpx 42rpx 70rpx;
-    height: 80rpx;
-    line-height: 80rpx;
+.rule .content {
+    max-height: 80vh;
 }
 
 /**
diff --git a/pages/plugins/points/index/index.vue b/pages/plugins/points/index/index.vue
index 5b4ed652..7b2cd77e 100644
--- a/pages/plugins/points/index/index.vue
+++ b/pages/plugins/points/index/index.vue
@@ -1,21 +1,18 @@
 <template>
-    <view :class="theme_view">
-        <component-nav-back :propName="$t('index.index.t26j9z')"></component-nav-back>
+    <view :class="theme_view">
+        <view class="pr z-i-deeps">
+            <component-nav-back :propName="$t('index.index.t26j9z')"></component-nav-back>
+        </view>
         <view v-if="(data_base || null) != null" class="weixin-nav-padding-top">
             <view class="padding-top-xxxl">
                 <!-- 广告图片 -->
-                <view class="pa top-0 bg-img wh-auto">
-                    <block v-if="(data_base.right_images || null) != null">
-                        <image class="wh-auto advertisement" :src="points_static_url + 'integral-bg.png'" mode="widthFix" :data-value="data_base.right_images_url || ''" @tap="url_event"></image>
-                    </block>
-                    <block v-else>
-                        <image class="wh-auto advertisement" :src="points_static_url + 'integral-bg.png'" mode="widthFix" :data-value="data_base.right_images_url || ''" @tap="url_event"></image>
-                    </block>
+                <view class="pa top-0 bg-img wh-auto z-i">
+                    <image class="wh-auto" :src="default_images_data.home_banner_images" mode="widthFix" :data-value="data_base.home_banner_images_url || ''" @tap="url_event"></image>
                 </view>
-                <view class="pr padding-top-main">
+                <view class="padding-top-main">
                     <view class="padding-horizontal-main points-content pr">
                         <!-- 顶部 -->
-                        <view class="border-radius-main bg-white pr spacing-mb">
+                        <view class="border-radius-main bg-white pr spacing-mb z-i-deep">
                             <view class="points-user">
                                 <view class="flex-row">
                                     <block v-if="(user || null) == null">
@@ -66,10 +63,10 @@
                         </view>
 
                         <!-- 公告信息 -->
-                        <button v-if="(data_base.points_desc || null) != null && data_base.points_desc.length > 0" class="rule-btn pa right-0 tc cr-white text-size-md" @tap="quick_open_event">{{$t('index.index.u5642g')}}</button>
+                        <button v-if="(data_base.points_desc || null) != null && data_base.points_desc.length > 0" class="rule-btn pa right-0 tc cr-white text-size-md z-i-deep" @tap="quick_open_event">{{$t('index.index.u5642g')}}</button>
 
                         <!-- 商品兑换 -->
-                        <view v-if="(data_base.goods_exchange_data || null) != null && data_base.goods_exchange_data.length > 0">
+                        <view v-if="(data_base.goods_exchange_data || null) != null && data_base.goods_exchange_data.length > 0" class="pr z-i-deep">
                             <component-goods-list :propData="{ style_type: 1, title: $t('index.index.f3l1xt'), url: '/pages/goods-search/goods-search', goods_list: data_base.goods_exchange_data }" propMoreUrlKey="url" :propCurrencySymbol="currency_symbol" :propGridBtnConfig="gridBtnConfig" :propIsOpenGridBtnSet="isOpenGridBtnSet"></component-goods-list>
                         </view>
 
@@ -83,17 +80,6 @@
                             <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
                         </block>
                     </view>
-
-                    <!-- 积分规则弹窗 -->
-                    <component-popup v-if="(data_base.points_desc || null) != null && data_base.points_desc.length > 0" :propShow="popup_status" :propIsBar="propIsBar" propPosition="bottom" @onclose="quick_close_event">
-                        <view class="rule">
-                            <view class="cr-black text-size-md fw-b margin-bottom-main tc">{{$t('index.index.u5642g')}}</view>
-                            <scroll-view :scroll-y="true" class="item">
-                                <view v-for="(item, index) in data_base.points_desc" :key="index" class="cr-grey text-size-md">{{ item }}</view>
-                            </scroll-view>
-                            <button type="default" class="bg-main cr-white round text-size-md pa bottom-0 left-0 right-0" @tap="quick_close_event">{{$t('index.index.qbi72m')}}</button>
-                        </view>
-                    </component-popup>
                 </view>
             </view>
 
@@ -103,7 +89,18 @@
         <block v-else>
             <!-- 提示信息 -->
             <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
-        </block>
+        </block>
+
+        <!-- 积分规则弹窗 -->
+        <component-popup v-if="(data_base || null) != null && (data_base.points_desc || null) != null && data_base.points_desc.length > 0" :propShow="popup_status" propPosition="bottom" @onclose="quick_close_event">
+            <view class="padding-main">
+                <view class="cr-black text-size-md fw-b margin-bottom-main tc">{{$t('index.index.u5642g')}}</view>
+                <scroll-view :scroll-y="true" class="content">
+                    <view v-for="(item, index) in data_base.points_desc" :key="index" class="cr-grey text-size-md">{{ item }}</view>
+                </scroll-view>
+                <button type="default" class="bg-main cr-white round text-size-sm margin-top" @tap="quick_close_event">{{$t('index.index.qbi72m')}}</button>
+            </view>
+        </component-popup>
 
         <!-- 公共 -->
         <component-common ref="common"></component-common>
@@ -132,7 +129,8 @@
                 params: null,
                 user: null,
                 data_base: null,
-                user_integral: null,
+                user_integral: null,
+                default_images_data: {},
                 avatar_default: app.globalData.data.default_user_head_src,
                 // 自定义分享信息
                 share_info: {},
@@ -146,7 +144,6 @@
                 },
                 // 规则弹窗
                 popup_status: false,
-                propIsBar: false,
                 // 积分明细
                 integral_list: [],
             };
@@ -219,7 +216,8 @@
                             var data = res.data.data;
                             this.setData({
                                 data_base: data.base || null,
-                                user_integral: data.user_integral || null,
+                                user_integral: data.user_integral || null,
+                                default_images_data: data.default_images_data || {},
                             });
                             if ((this.data_base || null) != null) {
                                 // 基础自定义分享
diff --git a/pages/plugins/points/scan/scan.vue b/pages/plugins/points/scan/scan.vue
index 6be6de65..aaf55084 100644
--- a/pages/plugins/points/scan/scan.vue
+++ b/pages/plugins/points/scan/scan.vue
@@ -3,9 +3,9 @@
         <view v-if="(data || null) != null" :class="'page-content min-ht '+((user == null || data.status == -10000) ? 'page-bottom-fixed' : '')">
             <block v-if="data.status == -10000">
                 <!-- 顶部banner -->
-                <image v-if="(data_base.scan_top_banner || null) != null" :src="data_base.scan_top_banner" mode="widthFix" class="dis-block wh-auto auto"></image>
+                <image :src="default_images_data.scan_top_banner" mode="widthFix" class="dis-block wh-auto auto"></image>
                 <!-- 底部图片 -->
-                <image v-if="(data_base.scan_bottom_images || null) != null" :src="data_base.scan_bottom_images" mode="widthFix" class="dis-block wh-auto auto"></image>
+                <image :src="default_images_data.scan_bottom_images" mode="widthFix" class="dis-block wh-auto auto"></image>
                 <!-- 扫码 -->
                 <!-- #ifndef H5 -->
                 <view v-if="user != null" class="pf left-0 bottom-xxxxl wh-auto tc padding-horizontal-main bs-bb">
@@ -25,12 +25,12 @@
             <block v-else>
                 <!-- 领取成功 -->
                 <block v-if="data.status == 0">
-                    <image v-if="(data_base.scan_success_images || null) != null" :src="data_base.scan_success_images" mode="widthFix" class="dis-block wh-auto auto"></image>
+                    <image :src="default_images_data.scan_success_images" mode="widthFix" class="dis-block wh-auto auto"></image>
                     <view class="margin-vertical-xxxl tc">{{data.msg}}</view>
                 </block>
                 <!-- 领取失败 -->
                 <block v-else-if="data.status == -100">
-                    <image v-if="(data_base.scan_fail_images || null) != null" :src="data_base.scan_fail_images" mode="widthFix" class="dis-block wh-auto auto"></image>
+                    <image :src="default_images_data.scan_fail_images" mode="widthFix" class="dis-block wh-auto auto"></image>
                     <view class="margin-vertical-xxxl tc">{{data.msg}}</view>
                 </block>
                 <!-- 其他错误 -->
@@ -71,6 +71,7 @@
                 user: null,
                 data_base: null,
                 data: null,
+                default_images_data: {},
                 // 自定义分享信息
                 share_info: {},
             };
@@ -124,6 +125,7 @@
                             this.setData({
                                 data_base: data.base || null,
                                 data: data.data || null,
+                                default_images_data: data.default_images_data || {},
                                 data_list_loding_msg: '',
                                 data_list_loding_status: 0,
                                 data_bottom_line_status: (data.data || null) != null,