diff --git a/pages/plugins/givegift/code/code.vue b/pages/plugins/givegift/code/code.vue
index fa5bb505..21e4110f 100644
--- a/pages/plugins/givegift/code/code.vue
+++ b/pages/plugins/givegift/code/code.vue
@@ -51,11 +51,11 @@
                 data_total: 0,
                 data_page_total: 0,
                 data_page: 1,
-                data_list_loding_status: 1,
+                data_list_loding_status: 1,
                 data_list_loding_msg: '',
                 data_bottom_line_status: false,
                 data_is_loading: 0,
-                params: null,
+                params: {},
                 field_list: [],
             };
         },
@@ -223,7 +223,7 @@
                                 this.setData({
                                     data_list: temp_data_list,
                                     data_total: data.data_total,
-                                    data_page_total: data.page_total,
+                                    data_page_total: data.page_total,
                                     field_list: data.field_list || [],
                                     data_list_loding_status: 3,
                                     data_page: this.data_page + 1,
@@ -234,15 +234,15 @@
                                     data_bottom_line_status: this.data_list.length > 0 && this.data_page > 1 && this.data_page > this.data_page_total,
                                 });
                             } else {
-                                this.setData({
-                                    data_list_loding_status: 0,
-                                    data_is_loading: 0,
-                                });
-                                if (this.data_page <= 1) {
-                                    this.setData({
-                                        data_list: [],
-                                        data_bottom_line_status: false,
-                                    });
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_is_loading: 0,
+                                });
+                                if (this.data_page <= 1) {
+                                    this.setData({
+                                        data_list: [],
+                                        data_bottom_line_status: false,
+                                    });
                                 }
                             }
                         } else {
diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue
index a20038dc..3934165c 100644
--- a/pages/plugins/realstore/detail/detail.vue
+++ b/pages/plugins/realstore/detail/detail.vue
@@ -327,7 +327,7 @@
                 is_base_mode: 0,
                 is_base_mode_show_type: 0,
                 is_cart_nav: false,
-                params: null,
+                params: {},
                 is_first: 1,
                 scroll_top: 0,
                 scroll_top_old: 0,
@@ -570,12 +570,21 @@
                                 // #endif
 
                                 // 基础自定义分享
+                                // 指定商品
+                                var source_goods_id = this.params.source_goods_id || null;
+                                var source_goods = (source_goods_id == null) ? '' : '&source_goods_id='+source_goods_id;
+                                // 桌码
+                                var tablecode_id = this.params.tablecode_id || null;
+                                var tablecode = (tablecode_id == null) ? '' : '&tablecode_id='+tablecode_id;
+                                // 关键字
+                                var keywords_value = this.search_keywords_value || null;
+                                var keywords = (keywords_value == null) ? '' : '&keywords_value='+keywords_value;
                                 this.setData({
                                     share_info: {
                                         title: this.info.seo_title || this.info.name,
                                         desc: this.info.seo_desc || this.info.describe,
                                         path: '/pages/plugins/realstore/detail/detail',
-                                        query: 'id=' + this.info.id,
+                                        query: 'id=' + this.info.id+source_goods+tablecode+keywords,
                                         img: this.info.share_images || this.info.logo,
                                     },
                                 });
diff --git a/pages/plugins/wallet/cash-create/cash-create.vue b/pages/plugins/wallet/cash-create/cash-create.vue
index eeba5457..4c37c764 100644
--- a/pages/plugins/wallet/cash-create/cash-create.vue
+++ b/pages/plugins/wallet/cash-create/cash-create.vue
@@ -296,7 +296,7 @@
                             if (res.data.code == 0) {
                                 app.globalData.showToast(res.data.msg, 'success');
                                 setTimeout(function () {
-                                    app.globalData.url_open('/pages/plugins/wallet/user/user?type=2', true);
+                                    app.globalData.url_open('/pages/plugins/wallet/user/user?type=cash', true);
                                 }, 1000);
                             } else {
                                 this.setData({
diff --git a/pages/plugins/wallet/components/user-recharge/user-recharge.vue b/pages/plugins/wallet/components/user-recharge/user-recharge.vue
index 793a18cd..07518383 100644
--- a/pages/plugins/wallet/components/user-recharge/user-recharge.vue
+++ b/pages/plugins/wallet/components/user-recharge/user-recharge.vue
@@ -112,7 +112,7 @@
                 default_payment_id: 0,
                 is_show_payment_popup: false,
                 pay_price: 0,
-                to_appoint_page: '/pages/plugins/wallet/user/user?type=1',
+                to_appoint_page: '/pages/plugins/wallet/user/user?type=wallet',
             };
         },
 
diff --git a/pages/plugins/wallet/recharge/recharge.vue b/pages/plugins/wallet/recharge/recharge.vue
index f75ba740..ac405371 100644
--- a/pages/plugins/wallet/recharge/recharge.vue
+++ b/pages/plugins/wallet/recharge/recharge.vue
@@ -108,7 +108,7 @@
                 payment_id: 0,
                 // 支付失败跳转的页面
                 to_fail_page: '/pages/plugins/wallet/user/user',
-                to_appoint_page: '/pages/plugins/wallet/user/user?type=3',
+                to_appoint_page: '/pages/plugins/wallet/user/user?type=recharge',
             };
         },
 
diff --git a/pages/plugins/wallet/transfer/transfer.vue b/pages/plugins/wallet/transfer/transfer.vue
index e97c987f..4618f2c3 100644
--- a/pages/plugins/wallet/transfer/transfer.vue
+++ b/pages/plugins/wallet/transfer/transfer.vue
@@ -24,7 +24,7 @@
                     <view v-if="is_error_msg" class="error-msg text-size-xs padding-vertical">{{ error_msg }}</view>
                     <view class="border-radius-main bg-white padding-main spacing-mb">
                         <view class="title fw-b text-size margin-bottom-xxxl padding-bottom-xl">{{$t('transfer.transfer.2q274j')}}</view>
-                        <input name="money" type="number" class="text-size-xl tc cr-red" :placeholder="$t('transfer.transfer.g22y5v')" placeholder-class="cr-grey-c" />
+                        <input name="money" type="digit" class="text-size-xl tc cr-red" :placeholder="$t('transfer.transfer.g22y5v')" placeholder-class="cr-grey-c" />
                         <view class="tc spacing-mt-10 margin-bottom-xxxl padding-bottom-main">
                             <text class="cr-grey-9">{{$t('transfer.transfer.9xe2bl')}}</text>
                             <text class="fw-b">{{ data.normal_money }}</text>
@@ -209,7 +209,7 @@
                             success: (res) => {
                                 uni.hideLoading();
                                 if (res.data.code == 0) {
-                                    app.globalData.url_open('/pages/plugins/wallet/user/user?type=3', true);
+                                    app.globalData.url_open('/pages/plugins/wallet/user/user?type=transfer', true);
                                 } else {
                                     if (app.globalData.is_login_check(res.data, this, 'form_submit', e)) {
                                         app.globalData.showToast(res.data.msg);
diff --git a/pages/plugins/wallet/user/user.vue b/pages/plugins/wallet/user/user.vue
index df761ad2..1d49ceb7 100644
--- a/pages/plugins/wallet/user/user.vue
+++ b/pages/plugins/wallet/user/user.vue
@@ -56,12 +56,12 @@
                                 <view class="padding-main padding-top-xxxl">
                                     <!-- 导航 -->
                                     <view v-if="nav_list.length > 0" class="nav oh margin-bottom-xl">
-                                        <view class="flex-row jc-sb align-c">
+                                        <view :class="'flex-row align-c '+(nav_list.length <= 3 ? 'gap-20' : 'jc-sb')">
                                             <block v-for="(item, index) in nav_list" :key="index">
-                                                <view class="text-size fw-b" :data-index="index" @tap="nav_change">
+                                                <view class="text-size fw-b" :data-value="item.control" @tap="nav_change">
                                                     <view class="pr dis-inline-block">
                                                         {{ item.title }}
-                                                        <view v-if="current === index" class="pa active" :style="'background: linear-gradient(90deg, ' + theme_color + ' 0%, rgba(255, 255, 255, 0.27) 100%)'"></view>
+                                                        <view v-if="current == item.control" class="pa active" :style="'background: linear-gradient(90deg, ' + theme_color + ' 0%, rgba(255, 255, 255, 0.27) 100%)'"></view>
                                                     </view>
                                                 </view>
                                             </block>
@@ -69,16 +69,16 @@
                                     </view>
                                     <!-- 明细 -->
                                     <view class="nav-detail margin-bottom-lg">
-                                        <view v-if="current === 0">
+                                        <view v-if="current == 'wallet'">
                                             <component-wallet-log :propPullDownRefresh="propPullDownRefresh" :propScrollLower="scroll_lower_bool"></component-wallet-log>
                                         </view>
-                                        <view v-if="current === 1">
+                                        <view v-if="current == 'recharge'">
                                             <component-user-recharge :propPullDownRefresh="propPullDownRefresh" :propScrollLower="scroll_lower_bool" @pay-success="pay_success_event"></component-user-recharge>
                                         </view>
-                                        <view v-if="current === 2">
+                                        <view v-if="current == 'cash'">
                                             <component-user-cash :propPullDownRefresh="propPullDownRefresh" :propScrollLower="scroll_lower_bool"></component-user-cash>
                                         </view>
-                                        <view v-if="current === 3">
+                                        <view v-if="current == 'transfer'">
                                             <component-transfer :propPullDownRefresh="propPullDownRefresh" :propScrollLower="scroll_lower_bool"></component-transfer>
                                         </view>
                                     </view>
@@ -142,7 +142,7 @@
                 is_price_show: false,
                 // 账户明细
                 params: null,
-                current: 0,
+                current: 'wallet',
                 propPullDownRefresh: false,
                 scroll_lower_bool: false,
                 payment_page_url: null,
@@ -168,7 +168,7 @@
             if ((params.type || null) != null) {
                 this.setData({
                     params: params,
-                    current: Number(params.type),
+                    current: params.type || 'wallet',
                 });
             }
 
@@ -177,7 +177,7 @@
             if (pay_data !== null) {
                 uni.removeStorageSync(ck);
                 this.setData({
-                    current: pay_data.type || 0,
+                    current: pay_data.type || 'wallet',
                 });
                 setTimeout(() => {
                     app.globalData.update_query_string_parameter([{ key: 'type', value: pay_data.type }]);
@@ -262,11 +262,12 @@
                 });
             },
             // 明细导航切换
-            nav_change(e) {
+            nav_change(e) {
+                var value = e.currentTarget.dataset.value || 'wallet';
                 this.setData({
-                    current: e.currentTarget.dataset.index || 0,
+                    current: value,
                 });
-                app.globalData.update_query_string_parameter([{ key: 'type', value: e.currentTarget.dataset.index }]);
+                app.globalData.update_query_string_parameter([{ key: 'type', value: value }]);
             },
 
             // 滚动加载