diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js index ed9566c..c0a8e3e 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.js +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.js @@ -38,7 +38,7 @@ let imgDraw = { "css": { "color": "#fff", "background": "#FF6768", - "width": "110px", + "width": "105px", "height": "26px", "lineHeight": "26px", "top": "70px", @@ -53,20 +53,18 @@ let imgDraw = { "type": "text", "text": "", "css": { - "color": "red", "width": "554px", "padding": "20px", "left": "20px", - "top": "140px", + "top": "160px", "fontSize": "28px", - "textAlign": "center", + "textAlign": "left", "maxLines": "1", - "fontWeight": "bold", } }, { //4.分享内容 "type": "text", - "text": "分享内容分享内容分享内容分享内容分享内容分享内容分享内容分享内容分享内容", + "text": "", "css": { "color": "#000000", "width": "554px", @@ -82,9 +80,11 @@ let imgDraw = { "type": "image", "url": "/packageB/images/luckDraw/jiang.png", "css": { - "width": "554px", + "width": "auto", "height": "350px", - "top": "240px", + "top": "230px", + "left": "277px", + "align": "center", "mode": "aspectFill", } }, @@ -364,7 +364,7 @@ Page({ self.setData({ 'imgDraw.views[3].text': self.data.luckInfo.act_name,//分享标题 - 'imgDraw.views[4].text': '快来一起抽奖吧,精美奖品等着你!',//分享内容 + // 'imgDraw.views[4].text': '快来一起抽奖吧,精美奖品等着你!',//分享内容 'imgDraw.views[14].text': util.formar_no_full(self.data.luckInfo.begindate) + ' 至 ' + util.formar_no_full(self.data.luckInfo.enddate),//活动时间 }); @@ -372,18 +372,30 @@ Page({ let url = `/api/weshop/marketing/marketingLuckTemplate/get/0/${luckInfo.template_id}`; app.request.get(url, { success: function(res) { - // if(res.data.code == 0) { + if(res.data.code == 0) { self.setData({ template: res.data.data, - 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'), //指针 - 'imgDraw.views[3].text': (res.data.data&&res.data.data.title) ? res.data.data.title : self.data.luckInfo.act_name,//分享标题 - 'imgDraw.views[4].text': (res.data.data&&res.data.data.share_content) ? res.data.data.share_content : '快来一起抽奖吧,精美奖品等着你!',//分享标题 - 'imgDraw.views[5].url': (res.data.data&&res.data.data.share_image) ? (imghost + res.data.data.share_image):(self.data.luckInfo.imageurl ? (imghost + self.data.luckInfo.imageurl):'/packpageB/images/luckDraw/jiang.png'),//分享图片 - 'imgDraw.views[14].text': util.formar_no_full(self.data.luckInfo.begindate) + ' 至 ' + util.formar_no_full(self.data.luckInfo.enddate),//活动时间 + bannerUrl: imghost + res.data.data.bannerUrl, //背景图 + 'blocks[0].imgs[0].src': imghost + res.data.data.wheelBaseUrl, //转盘 + 'buttons[0].imgs[0].src': imghost + res.data.data.wheelPointerUrl, //指针 + 'imgDraw.views[3].text': res.data.data.title, //分享标题 + 'imgDraw.views[5].url': imghost + res.data.data.share_image, //分享图片 }); - // }; + + // self.setData({ + // template: res.data.data, + // bannerUrl: imghost + res.data.data.bannerUrl, //背景图 + // //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'), //指针 + // 'imgDraw.views[3].text': (res.data.data&&res.data.data.title) ? res.data.data.title : self.data.luckInfo.act_name,//分享标题 + // // 'imgDraw.views[4].text': (res.data.data&&res.data.data.share_content) ? res.data.data.share_content : '快来一起抽奖吧,精美奖品等着你!',//分享内容 + // 'imgDraw.views[5].url': (res.data.data&&res.data.data.share_image) ? (imghost + res.data.data.share_image):(self.data.luckInfo.imageurl ? (imghost + self.data.luckInfo.imageurl):'/packpageB/images/luckDraw/jiang.png'),//分享图片 + // 'imgDraw.views[14].text': util.formar_no_full(self.data.luckInfo.begindate) + ' 至 ' + util.formar_no_full(self.data.luckInfo.enddate),//活动时间 + // }); + } else { + + }; }, }); @@ -392,6 +404,7 @@ Page({ if(luckInfo && luckInfo.store_bannerUrl) { self.setData({ bannerUrl: imghost + luckInfo.store_bannerUrl, + custom: true, }); }; @@ -470,9 +483,9 @@ Page({ // let user_id = app.globalData.userInfo.user_id; wx.getImageInfo({ - src: `${mainUrl}/api/wx/open/app/user/getWeAppEwm/${store_id}?sceneValue=${user_id}_${cj_id}&pageValue=packageB/pages/luckactivity/luckinfo/luckinfo`, + src: `${mainUrl}/api/wx/open/app/user/getWeAppEwm/${store_id}?sceneValue=${user_id}_${cj_id}&pageValue=pages/index/index/index`, success (res) { - if(res.data.code != -1) { + if(res.code != -1) { self.setData({ 'imgDraw.views[16].url': res.path, }); diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml index 8608cd8..ba7cb95 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml @@ -1,6 +1,6 @@ - + @@ -36,7 +36,7 @@ /> 今天你有 不限次 抽奖机会 - 今天你还有 {{filter.show_default(luckInfo.user_LuckNumDay, '0')}} 次抽奖机会 + 今天你还有 {{filter.show_default(luckInfo.user_LuckNumDay, '0')}} 次抽奖机会 diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.wxss b/packageB/pages/luckactivity/luckinfo/luckinfo.wxss index 93d1a92..a10b90b 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.wxss +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.wxss @@ -470,7 +470,7 @@ page, } .luck-container.on .panel { - box-shadow: 0 16rpx 24rpx #e7e9eb; + box-shadow: 0 0 24rpx #e7e9eb; } .luck-container.on .cs {