Merge branch 'dev-redux' of https://github.com/ciaochaos/qrbtf into dev-redux

README.md

@@ -42,7 +42,7 @@ npm start
 
 ## React Component (react-qrbtf)
 
-See [github.com/cpunisher/react-qrbtf](https://github.com/cpunisher/react-qrbtf) for more information.
+See [CPunisher / react-qrbtf](https://github.com/cpunisher/react-qrbtf) for more information.
 
 ``` bash
 npm install react-qrbtf --save
@@ -74,6 +74,10 @@ class Component extends React.Component {
 }
 ```
 
+## Third-Party Project
+
+* [gexin1 / beautify-qrcode](https://github.com/gexin1/beautify-qrcode)
+
 ## Author
 
 * [ciaochaos](https://github.com/ciaochaos)

src/components/app/PartFooter.js

@@ -7,7 +7,7 @@ const currentYear = new Date().getFullYear();
 const PartFooter = () => (
     <div className="Qr-titled">
         <div className="Qr-Centered Qr-footer note-font">
-            <div>
+            <div className="Qr-footer-part">
                 <strong>作者</strong>&emsp;
                 <LinkTrace
                     href="https://blog.ciaochaos.com/"
@@ -20,8 +20,14 @@ const PartFooter = () => (
                     target="_blank">CPunisher
                 </LinkTrace>
                 <span className="gray">&ensp;丨&ensp;</span>
+                <span><LinkTrace href="https://www.yuque.com/qrbtf/docs/privacy" rel="noopener noreferrer"
+                                 target="_blank">隐私政策</LinkTrace><span className="gray">&ensp;丨&ensp;</span></span>
+                <span><LinkTrace href="https://www.yuque.com/qrbtf/docs/terms" rel="noopener noreferrer"
+                                 target="_blank">使用条款</LinkTrace><span className="gray">&ensp;丨&ensp;</span></span>
                 <span><LinkTrace href="https://www.yuque.com/qrbtf/docs/contact" rel="noopener noreferrer" target="_blank">
                     联系我们</LinkTrace><span className="gray">&ensp;丨&ensp;</span></span>
+                <span><LinkTrace href="https://www.yuque.com/qrbtf/docs/api" rel="noopener noreferrer" target="_blank">
+                    API 接口 <sup>测试</sup></LinkTrace><span className="gray">&ensp;丨&ensp;</span></span>
                 <span><LinkTrace href="https://www.yuque.com/qrbtf/docs/coop"
                                  rel="noopener noreferrer" target="_blank">合作咨询</LinkTrace></span>
             </div>
@@ -58,12 +64,16 @@ const PartFooter = () => (
                                  target="_blank">React.js Example</LinkTrace><span className="gray">&ensp;丨&ensp;</span></span>
                 <span><LinkTrace href="https://mp.weixin.qq.com/s/J-odC4GPd9N2V7QRhEJ23g" rel="noopener noreferrer"
                                  target="_blank">木子淇</LinkTrace><span className="gray">&ensp;丨&ensp;</span></span>
+                <span><LinkTrace href="https://github.com/gexin1/beautify-qrcode" rel="noopener noreferrer"
+                                 target="_blank">River</LinkTrace><span className="gray">&ensp;丨&ensp;</span></span>
                 <span><LinkTrace href="https://mp.weixin.qq.com/s/yy7knjp9MJ3LEuMF42gtqw" rel="noopener noreferrer"
                                  target="_blank">编程如画</LinkTrace><span className="gray">&ensp;丨&ensp;</span></span>
                 <span><LinkTrace href="https://mp.weixin.qq.com/s/YWStNIYUZ7UmcHGhIwE6eg" rel="noopener noreferrer"
                                  target="_blank">JZ Creative</LinkTrace><span className="gray">&ensp;丨&ensp;</span></span>
                 <span><LinkTrace href="https://mp.weixin.qq.com/s/5r3PNDSaQb3sOXtDQt3Jnw" rel="noopener noreferrer"
                                  target="_blank">工具狂人</LinkTrace><span className="gray">&ensp;丨&ensp;</span></span>
+                <span><LinkTrace href="https://sspai.com/post/61118" rel="noopener noreferrer"
+                                 target="_blank">少数派</LinkTrace><span className="gray">&ensp;丨&ensp;</span></span>
                 <span><LinkTrace href="https://www.v2ex.com/t/675982"
                                  rel="noopener noreferrer" target="_blank">V2EX</LinkTrace></span>
             </div>

src/components/app/PartHeader.js

@@ -8,7 +8,7 @@ const PartHeader = () => (
         <div>
             <h1 className="Qr-title"><QrbtfLogo className="Qr-title-svg" /></h1>
         </div>
-        <p className="Qr-subtitle">参数化二维码生成器 <sup className="Gray">测试版</sup></p>
+        <p className="Qr-subtitle">参数化二维码生成器{/* <sup className="Gray">测试版</sup>*/}</p>
         <InputText/>
     </div>
 )

src/components/app/PartMore.js

@@ -12,6 +12,7 @@ const PartMore = () => (
             <div className="Qr-article">
                 <p><GitHubButton href="https://github.com/ciaochaos/qrbtf" data-color-scheme="no-preference: light; light: light; dark: dark;" data-icon="octicon-star" data-size="large" data-show-count="true" aria-label="Star ciaochaos/qrbtf on GitHub">Star</GitHubButton></p>
                 <h2>最新消息</h2>
+                <p><b>2020.6.29</b><br/>新的反馈渠道！我们开始征集好玩的二维码设计啦，可以是推送尾图、海报等等，快来上传吧。<LinkTrace href='https://qrbtf-com.mikecrm.com/J2wjEEq' rel="noopener noreferrer" target="_blank">点击提交</LinkTrace>。</p>
                 <p><b>2020.6.24</b><br/>新增深色模式，新增 SP — 3 样式。</p>
                 <p><b>2020.6.22</b><br/>新增 A — a1、A — a2、A — b1、A — b2 样式，添加样式描述，新增桌面端横向拖拽滑动。</p>
                 <p><b>2020.6.11</b><br/>QRBTF React 组件发布！快在你的应用中引入 react-qrbtf 吧。<LinkTrace href='https://github.com/cpunisher/react-qrbtf' rel="noopener noreferrer" target="_blank">访问项目</LinkTrace>。</p>
@@ -37,7 +38,7 @@ const PartMore = () => (
                 <LinkButton href={"https://github.com/ciaochaos/qrbtf"} value={"Github"} />
             </div>
             <div className="div-btn">
-                <LinkButton href={"https://github.com/ciaochaos/qrbtf/issues"} value={"反馈"} />
+                <LinkButton href={"https://qrbtf-com.mikecrm.com/J2wjEEq"} value={"反馈"} />
                 <LinkButton href={"https://mp.weixin.qq.com/s/GFEMCWQu3e2qhTuBabnHmQ"} value={"开发"} />
             </div>
         </div>

src/components/renderer/RendererResImage.js

@@ -189,5 +189,5 @@ export default RendererResImage
 
 
 RendererResImage.detail = (
-    <div>满满科技感的重采样二值化像素点阵，有点东西。建议增大容错率、URL 长度以提高像素采样信息的丰富度</div>
+    <div>满满科技感的重采样二值化像素点阵，有点东西</div>
 );

src/containers/style/StyleListViewer.js

@@ -15,18 +15,18 @@ import * as React from "react";
 
 const styles = [
     {value: "A1", renderer: RendererRect},
+    {value: "C2", renderer: RendererResImage},
+    {value: "SP — 1", renderer: RendererDSJ},
     {value: "A2", renderer: RendererRound},
     {value: "A3", renderer: RendererRandRound},
     {value: "A — a1", renderer: RendererLine},
+    {value: "A — b2", renderer: RendererFuncB},
+    {value: "SP — 3", renderer: RendererCircle},
+    {value: "C1", renderer: RendererImage},
+    {value: "B1", renderer: Renderer25D},
     {value: "A — a2", renderer: RendererLine2},
     {value: "A — b1", renderer: RendererFuncA},
-    {value: "A — b2", renderer: RendererFuncB},
-    {value: "SP — 1", renderer: RendererDSJ},
     {value: "SP — 2", renderer: RendererRandRect},
-    {value: "SP — 3", renderer: RendererCircle},
-    {value: "B1", renderer: Renderer25D},
-    {value: "C1", renderer: RendererImage},
-    {value: "C2", renderer: RendererResImage},
 ]
 
 const paramInfoBuffer = new Array(16).fill(new Array(16))