From 236cae61cab86f0774d90590a18d05d8806274ab Mon Sep 17 00:00:00 2001 From: ciaochaos <1272777550@qq.com> Date: Sun, 3 May 2020 11:22:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=20Qr-item=20=E7=82=B9=E5=87=BB=E9=AB=98=E4=BA=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 11 ++++++----- src/components/Qrcode.css | 5 ++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c435f56..f72b91b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,8 +11,8 @@ - - + + @@ -447,10 +448,10 @@ - + - + diff --git a/src/components/Qrcode.css b/src/components/Qrcode.css index 7398076..4811194 100644 --- a/src/components/Qrcode.css +++ b/src/components/Qrcode.css @@ -54,7 +54,7 @@ .Qr-box { white-space: nowrap; display: flex; - padding: 0px 13px 0px 23px; + padding: 0 13px 0 23px; } @media (min-width: 1000px) { @@ -70,6 +70,9 @@ display:block!important; margin-right: 10px; cursor: pointer; + -webkit-appearance: none; + -webkit-text-size-adjust: 100%; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } .Qr-item-image { From 9e72531d50a18620ab7b013769e83407b9296232 Mon Sep 17 00:00:00 2001 From: ciaochaos <1272777550@qq.com> Date: Sun, 3 May 2020 12:00:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?footer=20Copyright=EF=BC=8C=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E6=9B=B4=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 16 ++++++++++++---- public/index.html | 2 +- src/components/Qrcode.js | 4 ++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f72b91b..9143a77 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -12,7 +12,8 @@ - + + @@ -439,10 +447,10 @@ - + - + diff --git a/public/index.html b/public/index.html index 374cba6..6b5bd12 100644 --- a/public/index.html +++ b/public/index.html @@ -25,7 +25,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - qrbtf.com 参数化二维码生成器 + QRBTF 参数化二维码生成器 diff --git a/src/components/Qrcode.js b/src/components/Qrcode.js index f351775..4a6897b 100644 --- a/src/components/Qrcode.js +++ b/src/components/Qrcode.js @@ -6,6 +6,9 @@ import QrRendererBase from "./QrRendererBase"; import QrRendererRound from "./QrRendererRound"; import QrItem from "./QrItem"; +const date = new Date(); +const currentYear = date.getFullYear(); + function getStyleList(qrcode) { const styleList = [ {value: "A1", renderer: }, @@ -144,6 +147,7 @@ class Qrcode extends React.Component {
作者 ciaochaos CPunisher
+
Copyright © {currentYear} QRBTF. All rights reserved.
From 900c6746d693d000e57edec16ede355945761470 Mon Sep 17 00:00:00 2001 From: ciaochaos <1272777550@qq.com> Date: Sun, 3 May 2020 12:42:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?footer=20=E5=AD=97=E4=BD=93=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 19 ++++++++++++++----- src/components/QrItem.js | 2 +- src/components/Qrcode.css | 13 ++++++++++++- src/components/Qrcode.js | 10 +++++----- 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9143a77..a665a38 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -12,7 +12,8 @@ - + + @@ -440,17 +448,18 @@ - - + - + diff --git a/src/components/QrItem.js b/src/components/QrItem.js index 3f33bde..c93f45b 100644 --- a/src/components/QrItem.js +++ b/src/components/QrItem.js @@ -9,7 +9,7 @@ function calViewBox(props) { } function calClassName(props) { - if (props.selected == true) return 'Qr-item Qr-item-selected'; + if (props.selected === true) return 'Qr-item Qr-item-selected'; return 'Qr-item'; } diff --git a/src/components/Qrcode.css b/src/components/Qrcode.css index 4811194..03d7732 100644 --- a/src/components/Qrcode.css +++ b/src/components/Qrcode.css @@ -318,10 +318,21 @@ table { } .Qr-footer { - font-size: 14px; + color: #1D1D1F; + font-size: 12px; margin-bottom: -4px; } +@media (min-width: 500px) { + .Qr-footer { + font-size: 14px; + } +} + +.Gray { + color: #86868B; +} + .Qr-footer div { margin-bottom: 4px; } diff --git a/src/components/Qrcode.js b/src/components/Qrcode.js index 4a6897b..93aecc6 100644 --- a/src/components/Qrcode.js +++ b/src/components/Qrcode.js @@ -70,7 +70,7 @@ class Qrcode extends React.Component { value={this.state.text} onChange={this.handleChange} onBlur={this.handleCreate} - onKeyPress={(e) => {if(e.key == 'Enter') this.handleCreate(e)}} + onKeyPress={(e) => {if(e.key === 'Enter') this.handleCreate(e)}} />
@@ -87,7 +87,7 @@ class Qrcode extends React.Component { key={style.value} qrcode={this.state.qrcode} renderer={style.renderer} - selected={style.value == this.state.selected} + selected={style.value === this.state.selected} onSelected={this.handleSelected} /> }) @@ -146,9 +146,9 @@ class Qrcode extends React.Component {
-
作者 ciaochaos CPunisher
-
Copyright © {currentYear} QRBTF. All rights reserved.
- +
作者 ciaochaos CPunisher
+
Copyright © {currentYear} QRBTF. All rights reserved.
+