updated 代码优化

mumuy · Aug 12, 2024 · 3d09587 · 3d09587
1 parent 5f4a7e5
commit 3d09587
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/dist/widget-qrcode.min.js b/dist/widget-qrcode.min.js
diff --git a/index.html b/index.html
@@ -215,7 +215,7 @@
                             <widget-qrcode template="glitter" foreground-color="#fe4365,#fc9d9a,#6d9d88,#490a3d" background-color="#f9f1f1" inner-color="#881600" outer-color="#343838"></widget-qrcode>
                             <widget-qrcode template="rect" foreground-color="#4abdac,#fc4a1a,#f7b733" background-color="#f9f6f3" inner-color="#d66c44" outer-color="#037584"></widget-qrcode>
                             <widget-qrcode template="star" level="L" foreground-color="#fc9000,#ffa935,#ffb756" background-color="#034690"></widget-qrcode>
-                            <widget-qrcode template="stroke" foreground-color="#150f3f,#fb3242,#018bf8" background-color="#edfaff" inner-color="#150f3f" outer-color="#fc0000"></widget-qrcode>
+                            <widget-qrcode template="stroke" foreground-color="#150f3f,#fb3242,#018bf8" background-color="#edfaff"></widget-qrcode>
                         </div>
                         <script type="text/javascript">
                             let $show = document.querySelector('widget-qrcode#show');

diff --git a/src/module/template/stroke.js b/src/module/template/stroke.js
@@ -25,8 +25,8 @@ export default function(context,data,options){
         if(!options.foregroundColor&&resources.foregroundImage){
             foregroundImage = api.getImageBrush(resources.foregroundImage);
         }
-        let innerColor = options.innerColor||colors?.[1]||foregroundImage;
-        let outerColor = options.outerColor||foregroundImage;
+        let innerColor = options.innerColor||foregroundImage;
+        let outerColor = options.outerColor||colors?.[1]||foregroundImage;
         let backgroundImage = backgroundColor;
         if(!options.backgroundColor&&resources.backgroundImage){
             backgroundImage = api.getImageBrush(resources.backgroundImage);
@@ -88,8 +88,6 @@ export default function(context,data,options){
                     if(api.isPositionPoint(i,j)==1){
                         context.fillStyle = innerColor;
                     }else if(api.isPositionPoint(i,j)==2){
-                        let color = colors[1+(i*j)%(colors.length-1)];
-                        let outerColor = options.outerColor||color;
                         context.fillStyle = outerColor;
                     }else{
                         let fillColor = colors[1+(i*j)%(colors.length-1)];