From cd5f1efa862055bab02490a9ee03de7e118b4ea9 Mon Sep 17 00:00:00 2001 From: jing <1683105490@qq.com> Date: Mon, 26 Oct 2026 11:06:10 +0800 Subject: [PATCH] =?UTF-8?q?chore=EF=BC=9A=E5=90=8E=E5=8F=B0=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E5=BF=AB=E6=8D=B7=E6=8C=89=E9=92=AE=EF=BC=8C=E8=B5=84?= =?UTF-8?q?=E6=96=99=E7=8B=AC=E7=AB=8B=E6=A0=B7=E5=BC=8F=EF=BC=8C=E7=8B=AC?= =?UTF-8?q?=E7=AB=8B=E5=92=8C=E8=B7=9F=E9=9A=8F=E6=AD=A3=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components-diy/diy-card-mini.vue | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/components-diy/diy-card-mini.vue b/components-diy/diy-card-mini.vue index 0d6b3c8..361a057 100644 --- a/components-diy/diy-card-mini.vue +++ b/components-diy/diy-card-mini.vue @@ -870,11 +870,32 @@ export default { if (pad > 0) style.padding = px2rpx(pad) + 'rpx'; return this.$util.objToStyle(style); }, - /** 资料区最终样式: 独立块样式 + corner 让位合并 */ + /** + * 资料区是否「独立成块」: 后台「资料独立样式」开关。 + * 跟随卡片 → false(与上方资料同底连为一体, 无白卡/描边/阴影); + * 独立成块 → true(当前白卡独立块形态)。 + * 兼容: 缺模式字段时回落历史白卡(不回归存量); 配了独立块底色/圆角/内边距亦视为独立成块。 + */ + rowsIndependent() { + const c = this.c || {}; + const mode = String( + c.rowsBlockStyle || c.rowsBlockMode || c.rowsMode || c.rowsStyle || + c.rowsCardMode || c.rowsIndepStyle || c.rowsBlockType || c.rowsType || '' + ).trim().toLowerCase(); + if (/^(follow|card|跟随卡片)$/.test(mode)) return false; + if (/^(block|indep|independent|standalone|独立成块)$/.test(mode)) return true; + // 无显式模式字段: 配了独立块底色/圆角/内边距即视为独立成块, 否则回落历史白卡 + return !!(String(c.rowsBlockBg || '').trim() || num(c.rowsBlockRadius, 0) || num(c.rowsBlockPad, 0)); + }, + /** 资料区最终样式: 独立成块(白卡) 或 跟随卡片(连一体) + corner 让位合并 */ rowsFinalStyle() { const clear = this.rowsClearStyle || {}; const extra = clear.marginTop ? 'margin-top: ' + clear.marginTop + ';' : ''; - return ((this.rowsBlockStyle || '') + ' ' + extra).trim(); + if (this.rowsIndependent) { + return ((this.rowsBlockStyle || '') + ' ' + extra).trim(); + } + // 跟随卡片: 去掉 .mini-rows 静态白卡(白底/描边/阴影/圆角/内边距), 与上方资料同底连为一体 + return ('background: transparent; border: 0; box-shadow: none; border-radius: 0; padding: 0; ' + extra).trim(); }, /** 二维码(rows/bottom 流内档)最终样式: 独立块样式 + 尺寸/位移合并 */ qrBlockFinalStyle() {