From 9c0b6bf1771860dfe2ca628ba171f8fe8b1fd73f Mon Sep 17 00:00:00 2001
From: ciaochaos <1272777550@qq.com>
Date: Mon, 22 Jun 2020 12:17:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B7=E5=BC=8F=20A=20?=
 =?UTF-8?q?=E2=80=94=20b?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/renderer/RendererFunc.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/renderer/RendererFunc.js b/src/components/renderer/RendererFunc.js
index 6f5af9f..f08e1fd 100644
--- a/src/components/renderer/RendererFunc.js
+++ b/src/components/renderer/RendererFunc.js
@@ -29,7 +29,7 @@ function listPoints(qrcode, params) {
     if (size <= 0) size = 1.0
 
 
-    if (funcType === 1) {
+    if (funcType === 1 && type === 1) {
         pointList.push(<circle key={id++} fill="none" strokeWidth={nCount / 15} stroke={otherColor2}  cx={nCount/2} cy={nCount/2} r={nCount/2*Math.sqrt(2)*13/40} />)
     }
 
@@ -86,13 +86,17 @@ function listPoints(qrcode, params) {
                         opacityF = 1
                     } else {
                         sizeF = 1/4
+                        if (type === 0) {
+                            sizeF = 1/4 - 0.1
+                        }
                     }
                     if (type === 0) {
-                        sizeF = sizeF + 0.2;
+                        sizeF = 2 * sizeF + 0.1;
                         if (qrcode.isDark(x, y)) {
                             pointList.push(<rect opacity={opacityF} width={sizeF} height={sizeF} key={id++} fill={colorF} x={x + (1 - sizeF)/2} y={y + (1 - sizeF)/2}/>)
                         } else {
-                            pointList.push(<rect opacity={opacityF} width={sizeF} height={sizeF} key={id++} stroke={colorF} strokeWidth={0.2} fill="#FFFFFF" x={x + (1 - sizeF)/2} y={y + (1 - sizeF)/2}/>)
+                            sizeF = sizeF - 0.1
+                            pointList.push(<rect opacity={opacityF} width={sizeF} height={sizeF} key={id++} stroke={colorF} strokeWidth={0.1} fill="#FFFFFF" x={x + (1 - sizeF)/2} y={y + (1 - sizeF)/2}/>)
                         }
                     }
                     else if (type === 1) {