diff --git a/app.wxss b/app.wxss index fc9341a..52b691a 100644 --- a/app.wxss +++ b/app.wxss @@ -1,6 +1,9 @@ @import './utils/weapp-icon.wxss'; @import "./utils/wxParse/wxParse.wxss"; +.pdt4 { + padding-top: 4rpx; +} .pd10 { padding: 10rpx; } diff --git a/packageB/pages/luckactivity/index/index.wxss b/packageB/pages/luckactivity/index/index.wxss index ea67f4a..97ae442 100644 --- a/packageB/pages/luckactivity/index/index.wxss +++ b/packageB/pages/luckactivity/index/index.wxss @@ -97,15 +97,15 @@ page { } .icon-zhuanpan { - font-size: 120rpx; + font-size: 140rpx; color: #FF6768; } .img-container { /* background-color: #dedede; */ /* height: 300rpx; */ - width: 160rpx; - height: 160rpx; + width: 140rpx; + height: 140rpx; line-height: 160rpx; text-align: center; } diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js index 4ae0e1e..a831d4d 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.js +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.js @@ -22,7 +22,7 @@ let imgDraw = { }, { //1.昵称 "type": "text", - "text": "", + // "text": "", "css": { "color": "#000000", "width": "400px", @@ -158,7 +158,7 @@ let imgDraw = { { //12.横线 "type": "rect", "css": { - "background": "#f0f0f0", + "background": "#f8f8f8", "width": "554px", "height": "1px", "top": "676px", @@ -217,7 +217,7 @@ let imgDraw = { Page({ data: { - imgDraw, + imgDraw: imgDraw, start: false, list: null, isLoading: false, // 检测是否已经发送请求,防止重复发送请求 @@ -336,7 +336,7 @@ Page({ isLogin: true, 'imgDraw.views[1].text': app.globalData.userInfo.nickname,//昵称 }); - // console.log('imghost', this.data.imghost); + // console.log('imgDraw.views[1].text+++++++++', imgDraw.views[1], app.globalData.userInfo.nickname); let user_id = app.globalData.userInfo.user_id; let store_id = app.globalData.setting.stoid; let id = this.data.options.id; @@ -372,10 +372,11 @@ Page({ self.setData({ 'imgDraw.views[3].text': self.data.luckInfo.act_name,//分享标题 // 'imgDraw.views[4].text': '快来一起抽奖吧,精美奖品等着你!',//分享内容 - 'imgDraw.views[14].text': util.formar_no_full(self.data.luckInfo.begindate) + ' 至 ' + util.formar_no_full(self.data.luckInfo.enddate),//活动时间 + 'imgDraw.views[14].text': util.formar_no_full(luckInfo.begindate) + ' 至 ' + util.formar_no_full(luckInfo.enddate),//活动时间 }); + let luckStyle = null; @@ -391,15 +392,16 @@ Page({ bannerUrl: imghost + template.bannerUrl, //背景图 'blocks[0].imgs[0].src': imghost + ((template&&template.wheelBaseUrl) ? template.wheelBaseUrl:'miniapp/images/luckDraw/weel.png?v=3'), 'buttons[0].imgs[0].src': imghost + ((template&&template.wheelPointerUrl) ? template.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png?v=3'), //指针 - 'imgDraw.views[3].text': template.title, //分享标题 + 'imgDraw.views[3].text': template.share_title ? template.share_title:self.data.luckInfo.act_name, //分享标题 'imgDraw.views[5].url': imghost + (template&&template.share_image ? template.share_image:self.data.luckInfo.imageurl), //分享图片 - imgDraw: imgDraw, + }); let color = template&&template.colorCode ? template.colorCode:'#da104b'; luckStyle = `background: ${color} url(${self.data.bannerUrl}) no-repeat;`; self.setData({ luckStyle, + }); // self.setData({ // template: res.data.data, @@ -1304,11 +1306,18 @@ Page({ }, showPoster() { - this.setData({ - hiddenCanvas: true, - showMask: true, - showPoster: true, + wx.showLoading({ + title: '生成海报中', }); + setTimeout(function() { + wx.hideLoading(); + self.setData({ + hiddenCanvas: true, + showMask: true, + showPoster: true, + }); + }, 3000); + }, closePoster() { diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml index aecd4c8..9289292 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml @@ -164,7 +164,7 @@ {{luckInfo.no_luck_name}} {{luckInfo.no_luck_remark}} - + {{num}}s后自动跳转... @@ -172,8 +172,8 @@ {{resultTitle}} - - + + @@ -191,7 +191,7 @@ - + 长按图片保存至相册 @@ -205,4 +205,4 @@ - \ No newline at end of file + \ No newline at end of file