diff --git a/components-diy/diy-recommend-code.vue b/components-diy/diy-recommend-code.vue index 71878ff..dc6da4b 100644 --- a/components-diy/diy-recommend-code.vue +++ b/components-diy/diy-recommend-code.vue @@ -104,9 +104,9 @@ - + 📋 - {{ nc.copyButtonText || '复制推荐码' }} + {{ nc.copyButtonText || '复制推荐码' }} @@ -175,9 +175,9 @@ - + 📋 - {{ nc.copyButtonText || '复制推荐码' }} + {{ nc.copyButtonText || '复制推荐码' }} - + 📋 - {{ nc.copyButtonText || '复制推荐码' }} + {{ nc.copyButtonText || '复制推荐码' }} - + 📋 - {{ nc.copyButtonText || '复制推荐码' }} + {{ nc.copyButtonText || '复制推荐码' }} @@ -802,21 +802,28 @@ export default { ].join(''); }, /** - * 复制按钮边框色(跟随后端 diyData.codeColor) - * 返回字符串,兼容 H5/小程序/APP/鸿蒙 + * 复制按钮样式对象(跟随后端 diyData.codeColor) + * 返回对象,用 $util.objToStyle 转字符串, + * 兼容 H5/小程序/APP/鸿蒙 + * @param {Object} preset 预设差异(可选,如 {borderRadius:'32rpx',height:'64rpx'}) + * @param {Boolean} textOnly 只返回文字样式(用于内嵌 text 节点) */ - copyBtnBorderStyle() { + copyBtnStyleObj(preset, textOnly) { const v = this.nc; const codeColor = (v && v.codeColor) ? v.codeColor : '#DC143C'; - return `2rpx solid ${codeColor}`; - }, - /** - * 复制按钮文字色(跟随后端 diyData.codeColor) - */ - copyBtnTextColor() { - const v = this.nc; - const codeColor = (v && v.codeColor) ? v.codeColor : '#DC143C'; - return codeColor; + if (textOnly) { + return Object.assign({ + fontSize: '24rpx', + color: codeColor, + fontWeight: '600' + }, preset || {}); + } + const base = { + background: '#FFFFFF', + border: `2rpx solid ${codeColor}`, + boxSizing: 'border-box' + }; + return Object.assign(base, preset || {}); }, px2rpx(val) { return Number(val || 0) * 2