diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c59561a..1528219 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -12,8 +12,9 @@ - + + @@ -413,30 +422,38 @@ - - + - + - - + + + + + + + - - + + - + + + \ No newline at end of file diff --git a/src/components/QrItem.js b/src/components/QrItem.js index 6db85d2..3f33bde 100644 --- a/src/components/QrItem.js +++ b/src/components/QrItem.js @@ -9,8 +9,8 @@ function calViewBox(props) { } function calClassName(props) { - if (props.selected == true) return 'Qr-item-image Qr-item-image-selected'; - return 'Qr-item-image'; + if (props.selected == true) return 'Qr-item Qr-item-selected'; + return 'Qr-item'; } class QrItem extends React.Component { @@ -29,8 +29,8 @@ class QrItem extends React.Component { render() { return ( -
-
+
+
{this.props.renderer} diff --git a/src/components/Qrcode.css b/src/components/Qrcode.css index 93fdf48..4bb5b60 100644 --- a/src/components/Qrcode.css +++ b/src/components/Qrcode.css @@ -108,12 +108,16 @@ } } -.Qr-item-image-selected { +.Qr-item-selected .Qr-item-image { border-color: #44D7B6 !important; } -.Qr-item:hover .Qr-item-image { - border-color: #44D7B6; +.Qr-item-selected .Qr-item-image-inner { + opacity: 1; +} + +.Qr-item-selected .Qr-item-detail { + color: #000000; } .Qr-item:hover .Qr-item-image-inner { diff --git a/src/components/Qrcode.js b/src/components/Qrcode.js index 9177fc1..a632266 100644 --- a/src/components/Qrcode.js +++ b/src/components/Qrcode.js @@ -49,7 +49,7 @@ class Qrcode extends React.Component { if (text.length > 0) this.setState({options: {text: text}, qrcode: getQrcodeData({text: text})}); else { - text = 'http://qrbtf.com/'; + text = 'https://qrbtf.com/'; this.setState({text: text, options: {text: text}, qrcode: getQrcodeData({text: text})}); } e.target.blur(); @@ -81,6 +81,7 @@ class Qrcode extends React.Component { getStyleList().map((style) => { return