diff --git a/app.wxss b/app.wxss index 1b890d0..fc9341a 100644 --- a/app.wxss +++ b/app.wxss @@ -703,9 +703,9 @@ background: #ffe3e2; /* 图标字体(ty) */ @font-face { font-family: 'iconfont'; /* Project id 2054717 */ - src: url('//at.alicdn.com/t/font_2054717_v0znypg14xq.woff2?t=1627541682562') format('woff2'), - url('//at.alicdn.com/t/font_2054717_v0znypg14xq.woff?t=1627541682562') format('woff'), - url('//at.alicdn.com/t/font_2054717_v0znypg14xq.ttf?t=1627541682562') format('truetype'); + src: url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.woff2?t=1627893975776') format('woff2'), + url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.woff?t=1627893975776') format('woff'), + url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.ttf?t=1627893975776') format('truetype'); } .iconfont { @@ -716,6 +716,10 @@ background: #ffe3e2; -moz-osx-font-smoothing: grayscale; } +.icon-zhuanfa1:before { + content: "\e614"; +} + .icon-zhiwen:before { content: "\e6aa"; diff --git a/components/my_confirm/my_confirm.wxss b/components/my_confirm/my_confirm.wxss index f7bf1af..55f8f7a 100644 --- a/components/my_confirm/my_confirm.wxss +++ b/components/my_confirm/my_confirm.wxss @@ -1,4 +1,4 @@ - +@import '../../app.wxss'; /* 弹窗样式 */ .xc-pop-up{ width: 100%; @@ -23,19 +23,19 @@ .shut{ display: block; - width: 54rpx; - height: 54rpx; - font-size: 50rpx; - line-height:47rpx; + width: 45rpx; + height: 45rpx; + line-height:36rpx; border-radius: 50%; -moz-border-radius: 50%; -webkit-border-radius: 50%; + font-size: 40rpx; color: #fff; text-align: center; position: fixed; - margin-top: -25rpx; z-index: 66666; - right: 65rpx; + right: 75rpx; + top: 465rpx; background: #c8162c; } .xc-qr-frame{ @@ -50,7 +50,7 @@ margin-left: -280rpx; border-radius:10rpx } -.ck_btn{width:44%;height:52rpx;line-height:60rpx;background:#f35e73;border-radius:10rpx;} +.ck_btn{color: #000; width:44%;height:52rpx;line-height:60rpx;background:#f35e73;border-radius:10rpx;} .fs36{ font-size: 36rpx; } .fs30{ font-size: 30rpx; } diff --git a/components/qr_code/qr_code.wxml b/components/qr_code/qr_code.wxml index 216c4fa..5219afc 100644 --- a/components/qr_code/qr_code.wxml +++ b/components/qr_code/qr_code.wxml @@ -24,7 +24,7 @@ - ⅹ + \ No newline at end of file diff --git a/components/qr_code/qr_code.wxss b/components/qr_code/qr_code.wxss index cb454b0..d953bbd 100644 --- a/components/qr_code/qr_code.wxss +++ b/components/qr_code/qr_code.wxss @@ -1,3 +1,5 @@ +@import '../../app.wxss'; + .xc-pop-up{ width: 100%; height: 100%; @@ -102,17 +104,17 @@ top: 5rpx; } .shut{ - display: block; + /* display: block; width: 54rpx; height: 54rpx; border: 2rpx solid #fff; font-size: 50rpx; - z-index:55; - line-height:47rpx; + line-height:54rpx; margin-top: 45rpx; border-radius: 50%; -moz-border-radius: 50%; - -webkit-border-radius: 50%; + -webkit-border-radius: 50%; */ + z-index:55; color: #fff; text-align: center; position: fixed; @@ -120,6 +122,10 @@ top: 5rpx; left:50%; transform: translateX(-50%); } +.icon-close:before { + content: "\e62e"; + font-size: 50rpx; +} .mt{ margin-top:130rpx} .mts{ margin-top:70rpx} diff --git a/packageA/pages/myGift/myGift.js b/packageA/pages/myGift/myGift.js index ae90c8c..d94dd7d 100644 --- a/packageA/pages/myGift/myGift.js +++ b/packageA/pages/myGift/myGift.js @@ -144,7 +144,7 @@ Page({ isShowLoading: true, }) .then(function(res) { - + console.log(res); if(res.data.code == 0) { self.setData({ diff --git a/packageA/pages/myGift/myGift.wxml b/packageA/pages/myGift/myGift.wxml index 378203b..171e8ef 100644 --- a/packageA/pages/myGift/myGift.wxml +++ b/packageA/pages/myGift/myGift.wxml @@ -36,7 +36,7 @@ 已售{{item.salenum}}件 - 活动截止日期 {{filter.format_time(item.endtime)}} + 活动结束日期 {{filter.format_time(item.endtime)}} @@ -55,7 +55,7 @@ {{item.lbtitle}} - 兑换截止日期 {{filter.format_time(item.endtime)}} + 兑换截止日期 {{filter.format_time(item.expdate,1)}} 活动说明 diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml index a318257..1e93278 100644 --- a/packageA/pages/myGiftDetails/myGiftDetails.wxml +++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml @@ -3,7 +3,17 @@ - 兑换结束时间：{{filter.format_time(details.endtime,1)}} + + + 活动结束时间：{{filter.format_time(details.endtime,1)}} + + + + 兑换结束时间：{{filter.format_time(details.expdate,1)}} + + + + @@ -30,7 +40,7 @@ 已售{{details.salenum}}件 - 活动截止日期 {{details.expdate ? filter.format_time(details.expdate):filter.format_time(details.endtime)}} + diff --git a/packageB/pages/luckactivity/index/index.wxml b/packageB/pages/luckactivity/index/index.wxml index 2fbe303..d653fc6 100644 --- a/packageB/pages/luckactivity/index/index.wxml +++ b/packageB/pages/luckactivity/index/index.wxml @@ -20,7 +20,7 @@ - + diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js index 95c1623..d36d23b 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; @@ -118,18 +122,24 @@ Page({ // console.log('prizes//////', res.data.data); self.setData({ template: res.data.data, - bannerUrl: imghost + ((res.data.data&&res.data.data.bannerUrl) ? res.data.data.bannerUrl:'miniapp/images/luckDraw/bg.png'), //背景图 - 'blocks[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelBaseUrl) ? res.data.data.wheelBaseUrl:'miniapp/images/luckDraw/weel.png'), //转盘 - 'buttons[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelPointerUrl) ? res.data.data.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png'), //指针 + bannerUrl: imghost + ((res.data.data&&res.data.data.bannerUrl) ? res.data.data.bannerUrl:'miniapp/images/luckDraw/bg.png?v=2'), //背景图 + 'blocks[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelBaseUrl) ? res.data.data.wheelBaseUrl:'miniapp/images/luckDraw/weel.png?v=2'), //转盘 + 'buttons[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelPointerUrl) ? res.data.data.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png?v=2'), //指针 }); }, }); } else { + // wx.hideLoading(); if(luckInfo && luckInfo.store_bannerUrl) { self.setData({ bannerUrl: imghost + luckInfo.store_bannerUrl, }); }; + + // self.setData({ + // showMask2: false, + // hiddenCanvas: false, + // }); }; @@ -178,8 +188,8 @@ Page({ self.setData({ record: res.data.data.pageData, }); - }; - }, + } + }, }); @@ -575,6 +585,8 @@ Page({ }, 3000); + + if(res.data.code == -1) { wx.showToast({ title: res.data.msg, @@ -585,13 +597,15 @@ Page({ // self.data.start = true; }; // console.log('请求出错'); - if(self.data.luckInfo.vip_act_num != 0) { + if(res.data.code == -2 && self.data.luckInfo.vip_act_num != 0) { self.setData({ 'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1, }); }; + + }; }, @@ -640,13 +654,14 @@ Page({ showResult: true, showMask: true, resultTitle, + showPopup: false, currentLbtype: lbtype, }); - if(no_luck_urltype == 1 && (resultTitle == '谢谢参与')) { + if(no_luck_urltype == 1 && resultTitle == '谢谢参与') { if(this.data.luckInfo.no_luck_weappurl) { let num = this.data.num; let url = this.data.luckInfo.no_luck_weappurl; @@ -662,8 +677,47 @@ Page({ }, 1000); }; + }; + + if(self.data.luckInfo.give_user) { + if(resultTitle == '谢谢参与') { + if(self.data.luckInfo.give_type == 1) { + if(self.data.luckInfo.give_integral > 0) { + wx.showToast({ + title: `获得游戏奖励积分${self.data.luckInfo.give_integral}`, + icon: 'none', + }); + }; + } else if((self.data.luckInfo.give_type == 2)) { + if(self.data.luckInfo.give_integral > 0) { + wx.showToast({ + title: `获得游戏奖励成长值${self.data.luckInfo.give_growth}`, + icon: 'none', + }); + }; + }; + }; + } else { + if(self.data.luckInfo.give_type == 1) { + if(self.data.luckInfo.give_integral > 0) { + wx.showToast({ + title: `获得游戏奖励积分${self.data.luckInfo.give_integral}`, + icon: 'none', + }); + }; + } else if((self.data.luckInfo.give_type == 2)) { + if(self.data.luckInfo.give_integral > 0) { + wx.showToast({ + title: `获得游戏奖励成长值${self.data.luckInfo.give_growth}`, + icon: 'none', + }); + }; + }; + }; + + }, showPopup() { @@ -799,6 +853,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'; @@ -817,7 +879,7 @@ Page({ break; }; case 6: { - url = '/packageA/pages/myGift/myGift'; + url = `/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&orderSn=${ordersn}&lbId=${buyreceive_id}`; break; }; }; diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml index 7fd4803..e49b1a8 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml @@ -1,7 +1,6 @@ - - + @@ -63,28 +62,24 @@ - + -