From 402838be9136b99b975465b7f24af58ecf54b70f Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Mon, 7 Apr 2025 11:39:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=92=B1=E5=8C=85=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wallet/cash-create/cash-create.vue | 2 +- .../user-recharge/user-recharge.vue | 2 +- pages/plugins/wallet/recharge/recharge.vue | 2 +- pages/plugins/wallet/transfer/transfer.vue | 2 +- pages/plugins/wallet/user/user.vue | 27 ++++++++++--------- 5 files changed, 18 insertions(+), 17 deletions(-) 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..4806834d 100644 --- a/pages/plugins/wallet/transfer/transfer.vue +++ b/pages/plugins/wallet/transfer/transfer.vue @@ -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 @@ - + - + {{ item.title }} - + @@ -69,16 +69,16 @@ - + - + - + - + @@ -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 }]); }, // 滚动加载 From b03fb901cec4d943dd6e960f9f0237fb7e751ab5 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Wed, 16 Apr 2025 19:52:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=97=A8=E5=BA=97=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/plugins/givegift/code/code.vue | 24 +++++++++++----------- pages/plugins/realstore/detail/detail.vue | 13 ++++++++++-- pages/plugins/wallet/transfer/transfer.vue | 2 +- 3 files changed, 24 insertions(+), 15 deletions(-) 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/transfer/transfer.vue b/pages/plugins/wallet/transfer/transfer.vue index 4806834d..4618f2c3 100644 --- a/pages/plugins/wallet/transfer/transfer.vue +++ b/pages/plugins/wallet/transfer/transfer.vue @@ -24,7 +24,7 @@ {{ error_msg }} {{$t('transfer.transfer.2q274j')}} - + {{$t('transfer.transfer.9xe2bl')}} {{ data.normal_money }}