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 }}