diff --git a/components/diy/diy.vue b/components/diy/diy.vue index 9b043feb..e67dc007 100644 --- a/components/diy/diy.vue +++ b/components/diy/diy.vue @@ -11,7 +11,7 @@ @@ -164,6 +166,7 @@ // 选项卡数据 tabs_data: {}, diy_data: [], + is_show_footer: '0', tabs_home_id: this.propHomeId, // 商品列表 goods_list: [], @@ -197,20 +200,21 @@ // tabs选项卡数据过滤 // const filter_tabs_list = this.value.tabs_data || []; this.setData({ + is_show_footer: this.value.header.com_data.content.bottom_navigation_show, key: get_math(), header_data: this.value.header, footer_data: this.value.footer, diy_data: this.value.diy_data, tabs_data: this.value.tabs_data, }); - uni.setStorageSync('diy-data-' + this.propId, this.value.diy_data); + uni.setStorageSync('diy-data-' + this.tabs_home_id, this.value.diy_data); }, footer_height_computer(number) { this.padding_footer_computer = number * 2; }, // 选项卡回调更新数据 tabs_click_event(tabs_id, bool, params = {}) { - let new_data = this.value.diy_data; + let new_data = []; this.setData({ is_tabs_type: bool, }); @@ -257,7 +261,9 @@ this.get_goods_list(1); } } else { - new_data = uni.getStorageSync('diy-data-' + this.tabs_home_id) || []; + if (tabs_id == '') { + new_data = uni.getStorageSync('diy-data-' + this.tabs_home_id) || []; + } // 先使用缓存数据展示 this.setData({ diy_data: new_data, diff --git a/components/diy/header.vue b/components/diy/header.vue index 43b90bd3..f4212603 100644 --- a/components/diy/header.vue +++ b/components/diy/header.vue @@ -20,7 +20,7 @@ - + {{ form.content.positioning_name }} @@ -32,7 +32,7 @@ - + @@ -123,6 +123,12 @@ header_style: menuButtonInfo, }); }, + go_map_event() { + console.log('地图方法'); + }, + url_event(e) { + app.globalData.url_event(e); + }, }, }; diff --git a/components/diy/modules/tabs-view.vue b/components/diy/modules/tabs-view.vue index 063ef499..23b1e84c 100644 --- a/components/diy/modules/tabs-view.vue +++ b/components/diy/modules/tabs-view.vue @@ -31,7 +31,7 @@ - + {{ $t('nav-more.nav-more.h9g4b1') }} @@ -85,7 +85,16 @@ // 过滤弹窗 popup_status: false, propIsBar: false, - propTop: bar_height + 120 + 'rpx', + // 5,7,0 是误差,, 12 是下边距,60是高度,bar_height是不同小程序下的导航栏距离顶部的高度 + // #ifdef MP + propTop: bar_height + 34 + 5 + 12 + 'px;', + // #endif + // #ifdef H5 || MP-TOUTIAO + propTop: bar_height + 34 + 7 + 12 + 'px;', + // #endif + // #ifdef APP + propTop: bar_height + 34 + 0 + 12 + 'px;', + // #endif }; }, mounted() { diff --git a/components/diy/user-info.vue b/components/diy/user-info.vue index 8db9eecd..9fed6c9b 100644 --- a/components/diy/user-info.vue +++ b/components/diy/user-info.vue @@ -4,8 +4,8 @@ - - + + {{ (user_info.user || null) !== null ? user_info.user.user_name_view : user.user_name_view }} ID:{{ user_info.user.number_code }}