diff --git a/src/components/Common/Typesetting/typesetting.js b/src/components/Common/Typesetting/typesetting.js index 530291a..74b1004 100644 --- a/src/components/Common/Typesetting/typesetting.js +++ b/src/components/Common/Typesetting/typesetting.js @@ -929,7 +929,8 @@ const Typesetting = props => { height:'300px', lineHeight:'300px', fontSize:'20px', - fontWeight:'700' + fontWeight:'700', + color:'#B9B9B9' }}>排版尺寸大于上机尺寸,请确认参数! )} diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index 5c901cc..64cdca0 100644 --- a/src/components/QuickQuote/index.jsx +++ b/src/components/QuickQuote/index.jsx @@ -1391,7 +1391,9 @@ const BoxComponent = props => { ) { return false; } - + if (selectedNode.sTypeKey !== 'kapai' && item.sName === 'sMagnification') { + return false + } return item.iTag === iTag; }); let boxConfigList = [];