Merge branch 'master' of http://git.zthymaoyi.com/wangchao/businessCard

xiaochengxu/components/zhangyuhao-poster/Poster.vue

@@ -180,7 +180,6 @@ imageType：用于区分图片是本地图片还是网络图片本地图片需
 									/* 图片绘制 */
 									if (current.type === 'image') {
 										console.log('绘制图片：' + current.path);
-										console.log(current.area)
 										if (current.area) {
 											// 绘制绘图区域
 											this.ctx.save()
@@ -219,7 +218,6 @@ imageType：用于区分图片是本地图片还是网络图片本地图片需
 											this.ctx.closePath();
 											this.ctx.restore(); // 恢复之前保存的上下文
 										} else {
-											console.log(3333,current)
 											this.ctx.drawImage(current.path, current.x, current.y, current.width, current
 												.height)
 										}
@@ -285,11 +283,11 @@ imageType：用于区分图片是本地图片还是网络图片本地图片需
 					console.log(this.list[i])
 					current.index = i
 					/* 如果是文本直接放入队列 */
-					if (current.type === 'text' || current.type === 'textarea' || current.type === 'image' && current.use !== 'bg' ) {
+					if (current.type === 'text' || current.type === 'textarea' || current.type === 'image' && current.use !== 'bg'&&current.use !== 'head' ) {
 						this.drawPathQueue.push(current)
 						continue
 					}
-					if( current.use === 'head'&&current.imageType === 'wl'){
+					if( current.use === 'head'&&current.imageType === 'bd'){
 						this.drawPathQueue.push(current)
 						continue
 					}