diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ec38d93..b910f36 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -423,7 +423,21 @@
1588438351027
-
+
+ 1588476169668
+
+
+
+ 1588476169668
+
+
+ 1588478457716
+
+
+
+ 1588478457716
+
+
@@ -449,26 +463,33 @@
-
+
+
+
+<<<<<<< HEAD
+=======
+
+>>>>>>> 900c6746d693d000e57edec16ede355945761470
-
+
+<<<<<<< HEAD
@@ -478,9 +499,12 @@
+=======
+
+>>>>>>> 900c6746d693d000e57edec16ede355945761470
-
+
@@ -494,4 +518,4 @@
-
\ No newline at end of file
+
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/QrItem.js b/src/components/QrItem.js
index 09cdf0b..272937b 100644
--- a/src/components/QrItem.js
+++ b/src/components/QrItem.js
@@ -2,7 +2,7 @@ import React from "react";
import './Qrcode.css'
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 7398076..03d7732 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 {
@@ -315,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 6cf8dcd..415be47 100644
--- a/src/components/Qrcode.js
+++ b/src/components/Qrcode.js
@@ -9,6 +9,9 @@ import QrRendererRound from "./QrRendererRound";
import QrRendererBlank from "./QrRendererBlank";
import QrItem from "./QrItem";
+const date = new Date();
+const currentYear = date.getFullYear();
+
const styleList = [
{value: "A1", renderer: QrRendererBase},
{value: "A2", renderer: QrRendererRound},
@@ -83,7 +86,7 @@ class Qrcode extends React.Component {
placeholder="Input your URL here"
onChange={this.handleChange}
onBlur={this.handleCreate}
- onKeyPress={(e) => {if(e.key == 'Enter') this.handleCreate(e)}}
+ onKeyPress={(e) => {if(e.key === 'Enter') this.handleCreate(e)}}
/>
@@ -162,8 +165,9 @@ class Qrcode extends React.Component {
-
-
+
+
Copyright © {currentYear} QRBTF. All rights reserved.
+