Merge branch 'dev'

gcddblue · gcddblue · commit 26806bcbe0d1 · 2019-09-26T23:32:29.000+08:00
diff --git a/src/components/SlideVerify/index.vue b/src/components/SlideVerify/index.vue
@@ -144,11 +144,11 @@ export default {
       ctx.arc(x + r - 2, y + l / 2, r + 0.4, 2.76 * PI, 1.24 * PI, true)
       ctx.lineTo(x, y)
       ctx.lineWidth = 2
-      ctx.fillStyle = 'rgba(255, 255, 255, 0.7)'
-      ctx.strokeStyle = 'rgba(255, 255, 255, 0.7)'
+      ctx.fillStyle = 'rgba(255, 255, 255, 0.8)'
+      ctx.strokeStyle = 'rgba(255, 255, 255, 0.8)'
       ctx.stroke()
       ctx[operation]()
-      ctx.globalCompositeOperation = 'overlay'
+      ctx.globalCompositeOperation = 'xor'
     },
     createImg(onload) {
       const img = document.createElement('img')
diff --git a/src/style/layout.scss b/src/style/layout.scss
@@ -174,7 +174,7 @@
   width: 360px;
   box-shadow: -3px -3px 8px rgba(0, 0, 0, 0.2);
   background-color: $white;
-  z-index: 99;
+  z-index: 990;
 }
 // collapse
 #app {
