Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/reserve/share_qrcode.vue

@@ -97,17 +97,14 @@
 				uni.getImageInfo({
 					src: that.qrcode.PosterBgImg,
 					success: function(image) {
-						console.log('绘制')
 						ctx.drawImage(image.path, 0, 0, 750, 1344); //绘制图	
 						if (that.qrcode.IsShowNick == 0) {
-							console.log('绘制文字')
 							that.drawTitle(ctx); //绘制文字
 						}
 						if (that.qrcode.IsShowHead == 0) {
 							uni.getImageInfo({ //头像
-								src: that.fenxqrcode,
+								src: that.ServiceLogo,
 								success: function(image) {
-									console.log(image,'imagesssssssss');
 									ctx.save(); // 先保存状态 已便于画完圆再用
 									ctx.beginPath(); //开始绘制
 									//先画个圆
@@ -118,10 +115,9 @@
 										that.qrcode.HeadSize); //绘制头像
 									ctx.restore(); //恢复之前保存的绘图上下文 恢复之前保存的绘图上下午即状态 可以继续绘制
 									if (that.qrcode.IsShowQrCode == 0) { //二维码
-										console.log('绘制二维码')
 										uni.getImageInfo({
 											// src: that.UserInfo.Photo,
-											src: that.ServiceLogo,
+											src: that.fenxqrcode,
 											success: function(image) {
 												if (that.qrcode.QrCodeType == 0) {
 													ctx.arc(that.qrcode.QrCodeSize / 2 + that.qrcode.QrCodePaddingLeft, that.qrcode.QrCodeSize / 2 +
@@ -140,9 +136,6 @@
 							});
 						} else {
 							if (that.qrcode.IsShowQrCode == 0) {
-								console.log('进入与');
-								console.log(that.fenxqrcode,'that.fenxqrcode2');
-								console.log('绘制二维码11111')
 								uni.getImageInfo({ //头像
 									src: that.fenxqrcode,
 									success: function(image) {