From 2d16bdae387c5e6912e65e37d8b87f05ee30d81c Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 8 Nov 2023 11:25:55 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B5=8B=E8=AF=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods-category/goods-category.vue    | 37 +++++++++++++---------
 pages/plugins/signin/detail/detail.css     |  3 --
 pages/plugins/signin/detail/detail.vue     | 14 ++++----
 pages/plugins/wallet/recharge/recharge.vue |  4 ++-
 4 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index d181cab6..a0436c4e 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -1,7 +1,7 @@
 <template>
     <view :class="theme_view">
         <view :class="popup_status ? 'fixed-top' : ''">
-            <view class="pr" :class="is_single_page == 1 ? 'margin-top-xxxl single-page-top' : ''">
+            <view class="pr" :class="is_single_page == 1 ? 'margin-top-xxxl single-page-top' : ''">
                 <block v-if="category_list.length > 0">
                     <view v-if="category_list.length > 0" class="goods-top-bg pa top-0 left-0 right-0 wh-auto oh">
                         <image :src="theme_static_url + 'top-bg.png'" mode="widthFix" class="wh-auto"></image>
@@ -356,7 +356,7 @@
                                 <button type="default" size="mini" hover-class="none" @tap="buy_submit_event" class="text-size-md radius-0 bg-main cr-white">去结算</button>
                             </view>
                         </block>
-                    </view>
+                    </view>
                 </block>
                 <view v-else>
                     <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg" class="no-data bg-base pr"></component-no-data>
@@ -464,10 +464,10 @@
             componentNavMore,
         },
         props: {},
-        
+
         onLoad(params) {
             this.setData({
-                params: params
+                params: params,
             });
         },
 
@@ -497,17 +497,6 @@
             this.popup_top = '98rpx';
             // #endif
         },
-        mounted() {
-            const query = uni.createSelectorQuery();
-            query.select('.nav-search').boundingClientRect((res) => {
-                if((res || null) != null) {
-                    // 获取搜索框高度
-                    this.setData({
-                        search_height: res.height,
-                    });
-                }
-            }).exec();
-        },
 
         methods: {
             // 初始化配置
@@ -595,10 +584,15 @@
                                     this.get_cart_data();
                                 }
                             }
+
                             // 是否首次记录
                             this.setData({
                                 is_first: 0,
                             });
+
+                            // 计算更多分类弹窗的高度
+                            this.search_height_computer();
+                            
                         } else {
                             this.setData({
                                 data_list_loding_status: 2,
@@ -1250,6 +1244,19 @@
                     url: '/pages/buy/buy?data=' + encodeURIComponent(base64.encode(JSON.stringify(data))),
                 });
             },
+
+            // 计算搜索框的高度
+            search_height_computer() {
+                const query = uni.createSelectorQuery();
+                query.select('.nav-search').boundingClientRect((res) => {
+                    if ((res || null) != null) {
+                        // 获取搜索框高度
+                        this.setData({
+                            search_height: res.height,
+                        });
+                    }
+                }).exec();
+            },
         },
     };
 </script>
diff --git a/pages/plugins/signin/detail/detail.css b/pages/plugins/signin/detail/detail.css
index fa4964e2..9376f8af 100644
--- a/pages/plugins/signin/detail/detail.css
+++ b/pages/plugins/signin/detail/detail.css
@@ -3,9 +3,6 @@
 */
 .signin-container {
     min-height: 100vh;
-}
-
-.signin-bg {
     background-color: rgb(255 209 133);
 }
 
diff --git a/pages/plugins/signin/detail/detail.vue b/pages/plugins/signin/detail/detail.vue
index 5428b080..c3829f11 100644
--- a/pages/plugins/signin/detail/detail.vue
+++ b/pages/plugins/signin/detail/detail.vue
@@ -1,8 +1,8 @@
 <template>
     <view :class="theme_view">
-        <view class="signin-container">
-            <component-nav-back></component-nav-back>
-            <view v-if="(data || null) != null" class="pr signin-bg oh">
+        <component-nav-back></component-nav-back>
+        <view v-if="(data || null) != null" class="signin-container">
+            <view class="pr oh">
                 <image :src="signin_static_url + 'signin-bg.png'" mode="widthFix" class="wh-auto"></image>
                 <view class="signin-opration-group pa flex-col cr-white">
                     <view v-if="(data_base.is_share || 0) == 1" class="share oh flex-row">
@@ -122,10 +122,10 @@
                 </view>
                 <component-share-popup ref="share"></component-share-popup>
             </view>
-            <view v-else>
-                <!-- 提示信息 -->
-                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
-            </view>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
         </view>
     </view>
 </template>
diff --git a/pages/plugins/wallet/recharge/recharge.vue b/pages/plugins/wallet/recharge/recharge.vue
index 8bd4eee0..11b44258 100644
--- a/pages/plugins/wallet/recharge/recharge.vue
+++ b/pages/plugins/wallet/recharge/recharge.vue
@@ -10,7 +10,7 @@
                         <view class="text-size-lg fw-b">账号余额</view>
                         <view class="margin-top-sm">
                             <text class="unit">{{ currency_symbol }}</text>
-                            <text class="price fw-b">380</text>
+                            <text class="price fw-b">{{ user_wallet.normal_money }}</text>
                         </view>
                     </view>
                     <view class="recharge-content bg-white spacing-mt">
@@ -88,6 +88,7 @@
                 form_submit_disabled_status: false,
                 data: [],
                 recharge_desc: '',
+                user_wallet: null,
                 select_index: null,
 
                 // 支付弹窗参数
@@ -168,6 +169,7 @@
                                 data: data.preset_data || [],
                                 payment_id: data.default_payment_id || 0,
                                 recharge_desc: data.recharge_desc || '',
+                                user_wallet: data.user_wallet || null,
                                 data_list_loding_msg: '',
                                 data_list_loding_status: 0,
                             });