合并冲突

2020-09-17 19:38:59 +08:00
parent e53d9455bf 99fcfdbc5b
commit da68997cee
1 changed files with 0 additions and 1 deletions
--- a/pages/home/components/Banner.vue
+++ b/pages/home/components/Banner.vue
@ -46,7 +46,6 @@
                that.$emit('getbgcolor', '#c40414');
                // #endif
                // #ifndef APP-PLUS
-
                // 颜色不存在
                if (bgcolor === '') {
                    let ctx = uni.createCanvasContext('colorThief', that);