Merge branch 'test' into 'qa'

Test See merge request !722

Merge branch 'test' into 'qa'
Test See merge request !722
后端研发-苏明海
2 parents 60661c6d f03a5ecf
Showing 3 changed files with 79 additions and 20 deletions
packageB/pages/luckactivity/luckinfo/luckinfo.js
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
packageB/pages/luckactivity/luckinfo/luckinfo.wxss
@@ -158,11 +158,12 @@ let imgDraw = {
 			{ //12.横线
 				"type": "rect",
 				"css": {
-					"background": "#f8f8f8",
-					"width": "554px",
+					"color": "#eee",
+					"width": "548px",
 					"height": "1px",
 					"top": "676px",
-					"left": "0px",
+					"left": "277px",
+					"align": "center",
 				}
 			},
 			{	//13
@@ -217,7 +218,7 @@ let imgDraw = {
 Page({
   data: {
-		imgDraw: {},
+		imgDraw: imgDraw,
 		start: false,
 		list: null,
@@ -322,7 +323,6 @@ Page({
 				this.setData({
-					imgDraw: imgDraw,
 					userInfo: app.globalData.userInfo,
 					isLogin: true,
 					'imgDraw.views[1].text': app.globalData.userInfo.nickname,//昵称
@@ -544,6 +544,7 @@ Page({
 				if(res.code != -1) {
 					self.setData({
 						'imgDraw.views[16].url': res.path,
+						getMiniCode: true,
 					});	
 				};
 		  }
@@ -1047,7 +1048,7 @@ Page({
 							num: --num, 
 						});
 					}
-				}, 1000);
+				}, 500);
 			};
@@ -1304,20 +1305,67 @@ Page({
 		this.showQr();
 	},
+	
+	
 	showPoster() {
+		
+		console.log('已经生成图片!!!!!!', self.data.imgPath);
+		// console.log(Promise.resolve(this.onImgOK));
 		wx.showLoading({
 			title: '生成海报中',
 		});
-		setTimeout(function() {
+		var timer;
+		if(this.data.isImgOk && this.data.getMiniCode) {
+			wx.hideLoading();
 			self.setData({
+				myimg: self.data.imgPath,
 				hiddenCanvas: true,
 				showMask: true,
 				showPoster: true,
 			});
-			wx.hideLoading();
-		}, 3000)
-		
+		} else {
+			timer = setInterval(function() {
+				if(self.data.isImgOk && self.data.getMiniCode) {
+					clearInterval(timer);
+					wx.hideLoading();
+					self.setData({
+						myimg: self.data.imgPath,
+						hiddenCanvas: true,
+						showMask: true,
+						showPoster: true,
+					});
+				};
+			}, 500);
+		};
+		// if(this.data.isImgOk) {
+		// 	setTimeout(function() {
+		// 		wx.hideLoading();
+		// 		self.setData({
+		// 			myimg: self.data.imgPath,
+		// 			hiddenCanvas: true,
+		// 			showMask: true,
+		// 			showPoster: true,
+		// 		});
+		// 	}, 300);
+			
+		// } else {
+		// 	wx.showToast({
+		// 		title: '生成失败，请重新点击',
+		// 		icon: 'none',
+		// 	});
+		// };
+		// setTimeout(function() {
+		// 	// if(self.data.myimg) {
+		// 		if(self.data.imgPath) {
+		// 			wx.hideLoading();
+					
+		// 		} else {
+		// 			console.log('没有生成图片!!!!!!', self.data.imgPath);
+		// 		};
+				
+		// 	// }
+		// }, 300);
 	},
 	closePoster() {
@@ -1331,9 +1379,19 @@ Page({
 	onImgOK(e) {
-		this.setData({
-			myimg: e.detail.path,
-		});
+		console.log('图片绘制成功', e.detail.path);
+		// this.setData({
+		// 	imgPath: e.detail.path,
+		// });
+		if(e&&e.detail.path) {
+			this.setData({
+				isImgOk: true,
+				imgPath: e.detail.path,
+			});
+		};
+		
 	},
+	
+	
 })
 \ No newline at end of file
@@ -70,14 +70,14 @@
 			<import src="../../../../utils/wxParse/wxParse.wxml"/>
 			<!-- <template is="wxParse" data="{{wxParseData:content.nodes}}"/> -->
 			<!-- 时间 -->
-			<view class="bdt">
+			<view class="brdt">
 				<!-- <view class=""> -->
 					<view class="txt-red">活动时间：</view>
 					<view class="fs28 pdv20">{{filter.format_time(luckInfo.begindate, 1) + ' 至 ' + filter.format_time(luckInfo.enddate, 1)}}</view>
 				<!-- </view> -->
 			</view>
 			<!-- 规则 -->
-			<view class="bdt" wx:if="{{luckInfo.remark}}">
+			<view class="brdt" wx:if="{{luckInfo.remark}}">
 				<view class="txt-red pdt20">活动说明：</view>
 				<view class="fs28 pdv20"><template is="wxParse" data="{{wxParseData:content.nodes}}"/></view>
 			</view>
@@ -189,9 +189,9 @@
 <!-- 海报 -->
-	<view class="poster-container" hidden="{{!showPoster}}">
+	<view class="poster-container" wx:if="{{showPoster}}">
 		<view class="t-r pdb20 white2"><text class="iconfont icon-close fs40" bindtap="closePoster"></text></view>
-		<image src="{{myimg}}" class="poster" show-menu-by-longpress lazy-load></image>
+		<image src="{{myimg}}" class="poster" show-menu-by-longpress></image>
 		<view class="pdt10 fs26 white2"><text class="iconfont icon-zhiwen"></text> 长按图片保存至相册</view>
 	</view>
@@ -205,4 +205,4 @@
 <qrcode id="qrcode" bind:close="closeQr"></qrcode>
-<painter style="position: absolute; top: -9999rpx;" palette="{{imgDraw}}" bind:imgOK="onImgOK"/>
 \ No newline at end of file
+<painter style="position: absolute;" palette="{{imgDraw}}" bind:imgOK="onImgOK"/>
 \ No newline at end of file
@@ -434,11 +434,12 @@ page,
 	color: #FFE12F;
 	padding: 0 10rpx;
 }
-.bdt:only-child {
+.brdt:only-of-type {
 	border-top: none;
 }
-.bdt ~ .bdt {
+.brdt ~ .brdt {
 	border-top: 2rpx solid #ebedf0;
+	/* border-top: 2rpx solid red; */
 }
 .poster-container {