Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents f157e3a7 c93e7739
Showing 2 changed files with 31 additions and 3 deletions
packageB/pages/luckactivity/luckinfo/luckinfo.js
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
@@ -57,6 +57,10 @@ Page({
   },
 	onLoad(options) {
+		// wx.showLoading();
+		// this.setData({
+		// 	showMask2: true,
+		// });
 		// console.log('imghost+++++', imghost);
 		self = this;
 		this.data.options = options;
@@ -125,11 +129,17 @@ Page({
 								},
 							});
 						}  else {
+							// wx.hideLoading();
 							if(luckInfo && luckInfo.store_bannerUrl) {
 								self.setData({
 									bannerUrl: imghost + luckInfo.store_bannerUrl,
 								});
 							};
+							
+							// self.setData({
+							// 	showMask2: false,
+							// 	hiddenCanvas: false,
+							// });
 						};
@@ -174,12 +184,19 @@ Page({
 						luck_state: 1
 					},
 					success: function(res) {
+						console.log('success~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~');
 						if(res.data.code == 0) {
+							console.log('sssss++++++++++++++++++++++++++');
 							self.setData({
 								record: res.data.data.pageData,
 							});
+						} else {
+							console.log('fail++++++++++++++++++++++++++');
 						};
-					},	
+					},
+					fail: function(res) {
+						console.log('fail~~~~~~~~~~~~~~~~~~', res);
+					}
 				});
@@ -843,6 +860,14 @@ Page({
 	goto(e) {
 		let url = '';
 		let type = e.currentTarget.dataset.type;
+		let ordersn = null;
+		let buyreceive_id = null;
+		if(e.currentTarget.dataset.ordersn) {
+			ordersn = e.currentTarget.dataset.ordersn;
+		};
+		if(e.currentTarget.dataset.buyreceiveid) {
+			buyreceive_id = e.currentTarget.dataset.buyreceiveid;
+		};
 		switch(type) {
 			case 1: {
 				url = '/pages/user/integral/integral';
@@ -861,7 +886,7 @@ Page({
 				break;
 			};
 			case 6: {
-				url = '/packageA/pages/myGift/myGift?index=1';
+				url = `/pages/giftpack/giftpacklist/giftpacklist?orderSn=${ordersn}&lbId=${buyreceive_id}`;
 				break;
 			};
 		};
@@ -147,7 +147,8 @@
 						<view class="flex ai_c jc_fe fs26 xc-black3 ">
 							<!-- <view style="visibility: {{item.luck_type == 5 ? 'visible':'hidden'}};">兑换状态：{{item.state == 0 ? '未兑换':'已兑换'}}</view> -->
 							<!-- <view style="">兑换状态：{{item.state == 0 ? '未兑换':'已兑换'}}</view> -->
-							<view class="btn" bindtap="{{item.luck_type == 5 ? (item.state == 0 ? 'showQr':''):'goto'}}" data-type="{{item.luck_type}}" data-id="{{item.id}}">{{item.luck_type == 5 ? (item.state == 1 ? '已兑换':'兑换'):'查看'}}</view>
+							<!-- <view class="fs24 c-a">中奖时间：{{filter.format_time(item.luck_time, 1)}}</view> -->
+							<view class="btn" bindtap="{{item.luck_type == 5 ? (item.state == 0 ? 'showQr':''):'goto'}}" data-type="{{item.luck_type}}" data-id="{{item.id}}" data-ordersn="{{item.order_sn}}" data-buyreceiveid="{{item.buyreceive_id}}">{{item.luck_type == 5 ? (item.state == 1 ? '已兑换':'兑换'):'查看'}}</view>
 						</view>
 					</view>
 				</view>
@@ -192,5 +193,7 @@
 <!-- 遮罩层 -->
 <view class="mask" wx:if="{{showMask}}"></view>
+<!-- 进场遮罩层 -->
+<view class="mask2" wx:if="{{showMask2}}"></view>
 <qrcode id="qrcode" bind:close="closeQr"></qrcode>
 \ No newline at end of file