cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并冲突

Browse Source
This commit is contained in:
Gaoxs
2020-09-17 19:38:59 +08:00
parent e53d9455bf 99fcfdbc5b
commit da68997cee
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pages/home/components/Banner.vue
View File

@ -46,7 +46,6 @@
that.$emit('getbgcolor', '#c40414'); that.$emit('getbgcolor', '#c40414');
// #endif // #endif
// #ifndef APP-PLUS // #ifndef APP-PLUS
// 颜色不存在 // 颜色不存在
if (bgcolor === '') { if (bgcolor === '') {
let ctx = uni.createCanvasContext('colorThief', that); let ctx = uni.createCanvasContext('colorThief', that);