From 99d3eb5dd4d688e89f8668ce64d0abf609ad4d67 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Tue, 22 Oct 2024 10:02:29 +0800
Subject: [PATCH 1/4] =?UTF-8?q?1.=E9=80=89=E9=A1=B9=E5=8D=A1=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/modules/tabs-view.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/diy/modules/tabs-view.vue b/components/diy/modules/tabs-view.vue
index 96d61bdf..3d90a685 100644
--- a/components/diy/modules/tabs-view.vue
+++ b/components/diy/modules/tabs-view.vue
@@ -142,8 +142,8 @@
};
// 标题样式
const new_tabs_theme_style = {
- tabs_title_checked: `font-weight: ${new_style.tabs_weight_checked};font-size: ${new_style.tabs_size_checked * 2}rpx;color:${new_style.tabs_color_checked};` + (['2', '4'].includes(this.tabs_theme_index) ? this.tabs_check : ``),
- tabs_title: `font-weight: ${new_style.tabs_weight};font-size: ${new_style.tabs_size * 2}rpx;color:${new_style.tabs_color};`,
+ tabs_title_checked: `font-weight: ${new_style.tabs_weight_checked};font-size: ${new_style.tabs_size_checked * 2}rpx;line-height: ${new_style.tabs_size_checked * 2}rpx;color:${new_style.tabs_color_checked};` + (['2', '4'].includes(this.tabs_theme_index) ? this.tabs_check : ``),
+ tabs_title: `font-weight: ${new_style.tabs_weight};font-size: ${new_style.tabs_size * 2}rpx;line-height: ${new_style.tabs_size * 2}rpx;color:${new_style.tabs_color};`,
};
this.setData({
tabs_spacing: Number(new_style.tabs_spacing),
@@ -261,7 +261,7 @@
}
.tabs-bottom-line-theme {
opacity: 0.6;
- bottom: 16rpx;
+ bottom: 0;
z-index: 0;
height: 14rpx;
border-radius: 0;
From d530e87c23fdf4ad80f0fde0958686f58d4a5a27 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Tue, 22 Oct 2024 10:11:37 +0800
Subject: [PATCH 2/4] =?UTF-8?q?1.=E9=80=89=E9=A1=B9=E5=8D=A1=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/modules/tabs-view.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/diy/modules/tabs-view.vue b/components/diy/modules/tabs-view.vue
index 3d90a685..997d4c78 100644
--- a/components/diy/modules/tabs-view.vue
+++ b/components/diy/modules/tabs-view.vue
@@ -287,7 +287,7 @@
.title {
background: #ff2222;
border-radius: 40rpx;
- padding: 4rpx 24rpx;
+ padding: 12rpx 24rpx;
color: #fff;
}
}
From 913ac49ce1d90808baa5c1ae1a944bcd43c93bfd Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Tue, 22 Oct 2024 11:09:27 +0800
Subject: [PATCH 3/4] =?UTF-8?q?1.=E6=94=AF=E4=BB=98=E5=AE=9D=E5=B0=8F?=
=?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=85=BC=E5=AE=B9=E6=80=A7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/diy/diy.vue | 42 ++++++++++++++++++------------------
components/diy/nav-group.vue | 10 ++++-----
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index ff1668b6..21243944 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -16,29 +16,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/components/diy/nav-group.vue b/components/diy/nav-group.vue
index f71bef7d..73d29316 100644
--- a/components/diy/nav-group.vue
+++ b/components/diy/nav-group.vue
@@ -3,7 +3,7 @@
-
+
@@ -46,7 +46,7 @@
},
},
propKey: {
- type: [String,Number],
+ type: [String, Number],
default: '',
},
// 组件渲染的下标
@@ -102,11 +102,11 @@
nav_style: new_content.nav_style || 'image_with_text', // 是否显示文字和图片
nav_content_list: this.get_nav_content_list(new_content),
});
- setTimeout(() => {
+ this.$nextTick(() => {
const query = uni.createSelectorQuery().in(this);
// 选择我们想要的元素
query
- .select('.banner-img')
+ .select('.banner-img-' + this.propKey)
.boundingClientRect((res) => {
if ((res || null) != null) {
// data包含元素的宽度、高度等信息
@@ -116,7 +116,7 @@
}
})
.exec(); // 执行查询
- }, 0);
+ });
},
get_nav_content_list(data) {
// 深拷贝一下，确保不会出现问题
From b931266ed58e904552529060957afc025f3b13d6 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Tue, 22 Oct 2024 13:37:19 +0800
Subject: [PATCH 4/4] =?UTF-8?q?1.=E6=94=AF=E4=BB=98=E5=AE=9D=E5=B0=8F?=
=?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=85=BC=E5=AE=B9=E6=80=A7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/js/common/common.js | 89 ++++++++++++++--------------
components/diy/article-list.vue | 8 ++-
components/diy/goods-tabs.vue | 5 +-
components/diy/modules/tabs-view.vue | 2 +
4 files changed, 56 insertions(+), 48 deletions(-)
diff --git a/common/js/common/common.js b/common/js/common/common.js
index 74d8c42f..f5aac732 100644
--- a/common/js/common/common.js
+++ b/common/js/common/common.js
@@ -9,14 +9,13 @@ const app = getApp();
* @param obj 要检查的对象。可以是任何类型的对象，包括数组。
* @returns 如果对象为空，则返回true；否则返回false。
*/
-export function is_obj_empty (obj) {
+export function is_obj_empty(obj) {
return Object.keys(obj).length === 0;
}
-
/**
* 判断对象数组等是否为空。
*/
-export function isEmpty (value) {
+export function isEmpty(value) {
return (
value === null ||
value === undefined ||
@@ -37,7 +36,7 @@ export function isEmpty (value) {
* @param obj 未知类型的参数，待检查是否为对象
* @returns 如果参数是对象，则返回 true；否则返回 false
*/
-export function is_obj (obj) {
+export function is_obj(obj) {
// 特殊处理 null值，因为 typeof null 返回 "object"，但 null 并不是我们要检查的对象
if (obj === null) return false;
// 使用 typeof 排除非对象类型
@@ -52,7 +51,7 @@ export function is_obj (obj) {
* @param {string[], string} path
* @returns {string}
*/
-export function gradient_computer (new_style, is_return_all = true) {
+export function gradient_computer(new_style, is_return_all = true) {
let color_list = new_style.color_list;
let direction = new_style.direction;
return gradient_handle(color_list, direction, is_return_all);
@@ -65,7 +64,7 @@ export function gradient_computer (new_style, is_return_all = true) {
* @param is_return_all 是否返回所有样式，包括渐变类型、颜色列表和方向。默认为false，只返回渐变样式。
* @returns 返回一个字符串，包含生成的线性渐变样式。
*/
-export function gradient_handle (color_list, direction, is_return_all = true) {
+export function gradient_handle(color_list, direction, is_return_all = true) {
let container_common_styles = ``;
if (color_list && color_list.length > 0) {
if (is_return_all) {
@@ -108,30 +107,34 @@ export function gradient_handle (color_list, direction, is_return_all = true) {
* @param {string[], string} path
* @returns {string}
*/
-export function padding_computer (new_style, scale = 1, is_custom = false, index) {
- if (!is_custom) {
- let padding_top = '';
- if (index == 0) {
- // 状态栏高度
- var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
- // #ifdef MP-TOUTIAO
- bar_height = 0;
- // #endif
- let sticky_top = 0;
- // #ifdef MP
- sticky_top = bar_height + 5 + 12;
- // #endif
- // #ifdef H5 || MP-TOUTIAO
- sticky_top = bar_height + 7 + 12;
- // #endif
- // #ifdef APP
- sticky_top = bar_height + 0 + 12;
- // #endif
- padding_top = `padding-top:calc(${new_style.padding_top * 2 || 0}rpx + ${sticky_top}px);`;
+export function padding_computer(new_style, scale = 1, is_custom = false, index) {
+ if (new_style) {
+ if (!is_custom) {
+ let padding_top = '';
+ if (index == 0) {
+ // 状态栏高度
+ var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+ // #ifdef MP-TOUTIAO
+ bar_height = 0;
+ // #endif
+ let sticky_top = 0;
+ // #ifdef MP
+ sticky_top = bar_height + 5 + 12;
+ // #endif
+ // #ifdef H5 || MP-TOUTIAO
+ sticky_top = bar_height + 7 + 12;
+ // #endif
+ // #ifdef APP
+ sticky_top = bar_height + 0 + 12;
+ // #endif
+ padding_top = `padding-top:calc(${new_style.padding_top * 2 || 0}rpx + ${sticky_top}px);`;
+ }
+ return `padding: ${new_style.padding_top * 2 || 0}rpx ${new_style.padding_right * 2 || 0}rpx ${new_style.padding_bottom * 2 || 0}rpx ${new_style.padding_left * 2 || 0}rpx;` + padding_top;
+ } else {
+ return `padding: ${new_style.padding_top * scale || 0}px ${new_style.padding_right * scale || 0}px ${new_style.padding_bottom * scale || 0}px ${new_style.padding_left * scale || 0}px;`;
}
- return `padding: ${new_style.padding_top * 2 || 0}rpx ${new_style.padding_right * 2 || 0}rpx ${new_style.padding_bottom * 2 || 0}rpx ${new_style.padding_left * 2 || 0}rpx;` + padding_top;
} else {
- return `padding: ${new_style.padding_top * scale || 0}px ${new_style.padding_right * scale || 0}px ${new_style.padding_bottom * scale || 0}px ${new_style.padding_left * scale || 0}px;`;
+ return '';
}
}
/**
@@ -140,7 +143,7 @@ export function padding_computer (new_style, scale = 1, is_custom = false, index
* @param {string[], string} path
* @returns {string}
*/
-export function margin_computer (new_style) {
+export function margin_computer(new_style) {
return `margin: ${new_style.margin_top * 2 || 0}rpx ${new_style.margin_right * 2 || 0}rpx ${new_style.margin_bottom * 2 || 0}rpx ${new_style.margin_left * 2 || 0}rpx;`;
}
/**
@@ -149,13 +152,16 @@ export function margin_computer (new_style) {
* @param {string[], string} path
* @returns {string}
*/
-export function radius_computer (new_style, scale = 1, is_custom = false) {
- if (!is_custom) {
- return `border-radius: ${new_style.radius_top_left * 2 || 0}rpx ${new_style.radius_top_right * 2 || 0}rpx ${new_style.radius_bottom_right * 2 || 0}rpx ${new_style.radius_bottom_left * 2 || 0}rpx;`;
+export function radius_computer(new_style, scale = 1, is_custom = false) {
+ if (new_style) {
+ if (!is_custom) {
+ return `border-radius: ${new_style.radius_top_left * 2 || 0}rpx ${new_style.radius_top_right * 2 || 0}rpx ${new_style.radius_bottom_right * 2 || 0}rpx ${new_style.radius_bottom_left * 2 || 0}rpx;`;
+ } else {
+ return `border-radius: ${new_style.radius_top_left * scale || 0}px ${new_style.radius_top_right * scale || 0}px ${new_style.radius_bottom_right * scale || 0}px ${new_style.radius_bottom_left * scale || 0}px;`;
+ }
} else {
- return `border-radius: ${new_style.radius_top_left * scale || 0}px ${new_style.radius_top_right * scale || 0}px ${new_style.radius_bottom_right * scale || 0}px ${new_style.radius_bottom_left * scale || 0}px;`;
+ return '';
}
-
}
/**
* 设置阴影样式
@@ -163,7 +169,7 @@ export function radius_computer (new_style, scale = 1, is_custom = false) {
* @param {string[], string} path
* @returns {string}
*/
-export function box_shadow_computer (new_style) {
+export function box_shadow_computer(new_style) {
return `box-shadow: ${new_style.box_shadow_x * 2 || 0}rpx ${new_style.box_shadow_y * 2 || 0}rpx ${new_style.box_shadow_blur * 2 || 0}rpx ${new_style.box_shadow_spread * 2 || 0}rpx ${new_style.box_shadow_color || 'rgba(0,0,0,0)'};`;
}
/**
@@ -172,13 +178,12 @@ export function box_shadow_computer (new_style) {
* @param {string[], string} path
* @returns {string}
*/
-export function background_computer (new_style) {
+export function background_computer(new_style) {
if (new_style.background_img.length > 0) {
let url_styke = '';
if (new_style.background_img_style == '1') {
url_styke = 'background-repeat: repeat;';
- } else if (new_style.background_img_style == '2') {
- } else {
+ } else if (new_style.background_img_style == '2') {} else {
url_styke = `background-repeat: no-repeat;background-position: center;`;
}
switch (new_style.background_img_style) {
@@ -212,18 +217,17 @@ export function background_computer (new_style) {
* @param new_style 组件的新样式对象，包含了需要计算的样式属性。
* @returns 返回一个字符串，包含了计算后的样式定义，可以被直接应用于组件的样式属性。
*/
-export function common_styles_computer (new_style) {
+export function common_styles_computer(new_style) {
return gradient_computer(new_style) + margin_computer(new_style) + radius_computer(new_style) + box_shadow_computer(new_style) + `overflow:hidden;`;
}
-
-export function common_img_computer (new_style, index, bool) {
+export function common_img_computer(new_style, index, bool) {
return padding_computer(new_style, 1, false, index, bool) + background_computer(new_style) + `overflow:hidden;box-sizing: border-box;`;
}
/**
* 生成一个随机数学字符串。
* @returns {string} 一个6位的36进制随机字符串。
*/
-export function get_math () {
+export function get_math() {
// 通过Math.random()生成随机数，并转换为36进制的字符串
let randomString = Math.random().toString(36);
// 确保随机字符串至少有6位，因为substring(2)可能会使短于6位的字符串产生错误。
@@ -232,7 +236,6 @@ export function get_math () {
// 截取掉随机字符串开头的'0.'部分，获得最终的6位随机字符串。
return randomString.substring(2);
}
-
/**
* 将大小计算成百分比
*
diff --git a/components/diy/article-list.vue b/components/diy/article-list.vue
index 050d3601..164ec610 100644
--- a/components/diy/article-list.vue
+++ b/components/diy/article-list.vue
@@ -157,18 +157,20 @@
data_list:
new_content.data_type == '0'
? new_content.data_list
- : new_content.data_auto_list.map((item) => ({
+ : new_content.data_auto_list && new_content.data_auto_list.length > 0
+ ? new_content.data_auto_list.map((item) => ({
id: get_math(),
new_title: '',
new_cover: [],
data: item,
- })),
+ }))
+ : [],
article_theme_class: this.article_theme_class_computer(new_content.theme),
article_theme: new_content.theme,
field_show: new_content.field_show,
// 样式
article_name: 'font-size:' + new_style.name_size + 'px;' + 'font-weight:' + new_style.name_weight + ';' + 'color:' + new_style.name_color + ';',
- article_desc: 'font-size:' + new_style.desc_size + 'px;line-height:' + new_style.desc_size + 'px;height:'+ new_style.desc_size + 'px;color:' + new_style.desc_color + ';',
+ article_desc: 'font-size:' + new_style.desc_size + 'px;line-height:' + new_style.desc_size + 'px;height:' + new_style.desc_size + 'px;color:' + new_style.desc_color + ';',
article_date: 'font-size:' + new_style.time_size + 'px;' + 'font-weight:' + new_style.time_weight + ';' + 'color:' + new_style.time_color + ';',
article_page_view: 'font-size:' + new_style.page_view_size + 'px;' + 'font-weight:' + new_style.page_view_weight + ';' + 'color:' + new_style.page_view_color + ';',
content_radius: radius_computer(new_style.content_radius),
diff --git a/components/diy/goods-tabs.vue b/components/diy/goods-tabs.vue
index 0b954dc8..6be0527f 100644
--- a/components/diy/goods-tabs.vue
+++ b/components/diy/goods-tabs.vue
@@ -131,7 +131,7 @@
},
methods: {
init() {
- let new_data = typeof(this.propValue) == 'string' ? JSON.parse(JSON.stringify(this.propValue)) : this.propValue;
+ let new_data = typeof this.propValue == 'string' ? JSON.parse(JSON.stringify(this.propValue)) : this.propValue;
const new_content = new_data.content || {};
const new_style = new_data.style || {};
// 产品的值
@@ -157,12 +157,13 @@
margin_top: 0,
});
this.setData({
- top_up:new_content.tabs_top_up,
+ top_up: new_content.tabs_top_up,
goods_tabs: new_data,
style_container: common_styles_computer(common_style),
style_img_container: common_img_computer(common_style, this.propIndex),
tabs_style: new_tabs_style,
});
+ console.log(this.propValue);
},
tabs_click_event(index) {
let new_data = JSON.parse(JSON.stringify(this.propValue));
diff --git a/components/diy/modules/tabs-view.vue b/components/diy/modules/tabs-view.vue
index 997d4c78..6696943f 100644
--- a/components/diy/modules/tabs-view.vue
+++ b/components/diy/modules/tabs-view.vue
@@ -3,6 +3,7 @@
+ {{ tabs_list }}
@@ -159,6 +160,7 @@
tabs_bottom_line_theme: new_style.tabs_one_theme == '1' ? 'tabs-bottom-line-theme' : '',
tabs_theme_1_style: new_style.tabs_one_theme == '1',
});
+ console.log(this.propValue);
},
// 获取选项卡主题
get_tabs_theme(data) {