From 45dfd5e1f9298d31f6aaf240030f701e1c896ec5 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 25 Sep 2024 15:48:17 +0800
Subject: [PATCH 1/3] 1.diy---header
---
components/diy/diy.vue | 8 ++++++--
components/diy/modules/tabs-view.vue | 13 +++++++++++--
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index 9b043feb..1a584519 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -11,7 +11,7 @@
-
+
@@ -55,7 +55,9 @@
-
+
+
+
@@ -164,6 +166,7 @@
// 选项卡数据
tabs_data: {},
diy_data: [],
+ is_show_footer: '0',
tabs_home_id: this.propHomeId,
// 商品列表
goods_list: [],
@@ -197,6 +200,7 @@
// 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,
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() {
From f8432afc832dfe0058d298d45506b72de07d29e6 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 25 Sep 2024 16:39:28 +0800
Subject: [PATCH 2/3] 1.diy---header
---
components/diy/diy.vue | 2 +-
components/diy/header.vue | 10 ++++++++--
components/diy/user-info.vue | 4 ++--
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index 1a584519..f8319e6f 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -207,7 +207,7 @@
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;
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/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 }}
From bfb21af9d182fa01e5daa5cb5b613e31e9742f11 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 25 Sep 2024 16:42:29 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.diy---=E4=BB=A3=E7=A0=81=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/diy/diy.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index f8319e6f..e67dc007 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -214,7 +214,7 @@
},
// 选项卡回调更新数据
tabs_click_event(tabs_id, bool, params = {}) {
- let new_data = this.value.diy_data;
+ let new_data = [];
this.setData({
is_tabs_type: bool,
});
@@ -261,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,