sileya-ai
/
vr-shopxo-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev

master
gongfuxiang 2025-04-11 09:42:48 +08:00
parent ba72f3fc40 c8dd9e9866
commit 9f5a38460d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/js/common/common.js
View File

@ -585,7 +585,7 @@ export const border_computer = (new_style) => {
// 根据边框是否需要显示的标志，决定是否构造并返回边框样式字符串
if (border_is_show == '1') {
return `border-width: ${border_size.padding_top}px ${border_size.padding_right}px ${border_size.padding_bottom}px ${border_size.padding_left}px;border-style: ${ border_style };border-color: ${border_color};`
return `border-width: ${border_size.padding_top}px ${border_size.padding_right}px ${border_size.padding_bottom}px ${border_size.padding_left}px;border-style: ${ border_style };border-color: ${border_color};box-sizing: border-box;`
}
// 如果边框不需要显示，返回空字符串

2
pages/diy/components/diy/goods-list.vue
View File

@ -397,7 +397,7 @@
get_layout_style(new_style, form) {
const { shop_margin = old_margin } = new_style;
const radius = form.theme == '6' ? '' : radius_computer(new_style.shop_radius);
const style = form.theme != '6' ? gradient_handle(new_style?.shop_color_list || [], new_style?.shop_direction || '') + margin_computer(shop_margin) + border_computer(new_style) + box_shadow_computer(new_style) : '';
const style = form.theme != '6' ? gradient_handle(new_style?.shop_color_list || [], new_style?.shop_direction || '') + margin_computer(shop_margin) + border_computer(new_style) + box_shadow_computer(new_style) + 'box-sizing: border-box;' : '';
let size_style = ``;
const shop_left_right_width = shop_margin.margin_left + shop_margin.margin_right;
if (['1', '4'].includes(form.theme)) {