diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js
index 4b845aa..c6afa6d 100644
--- a/packageB/pages/luckactivity/luckinfo/luckinfo.js
+++ b/packageB/pages/luckactivity/luckinfo/luckinfo.js
@@ -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;
};
};
diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml
index 4f15ff3..de1cf7f 100644
--- a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml
+++ b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml
@@ -147,7 +147,8 @@
- {{item.luck_type == 5 ? (item.state == 1 ? '已兑换':'兑换'):'查看'}}
+
+ {{item.luck_type == 5 ? (item.state == 1 ? '已兑换':'兑换'):'查看'}}
@@ -192,5 +193,7 @@
+
+
\ No newline at end of file