diff --git a/packageB/pages/luckactivity/index/index.wxml b/packageB/pages/luckactivity/index/index.wxml index 3113f0c..c9ab532 100644 --- a/packageB/pages/luckactivity/index/index.wxml +++ b/packageB/pages/luckactivity/index/index.wxml @@ -1,12 +1,13 @@ - + + - + diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js index 8875577..3f30273 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.js +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.js @@ -1,5 +1,5 @@ const app = getApp(); -const imghost = app.globalData.setting.imghost; +let imghost = app.globalData.setting.imghost; let self = null; Page({ @@ -9,6 +9,7 @@ Page({ isLoading: false, // 检测是否已经发送请求,防止重复发送请求 noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据 pageNum: 1, // 当前页数 + imghost: imghost, prizes: [], defaultConfig: { @@ -57,16 +58,18 @@ Page({ console.log('imghost+++++', imghost); self = this; this.data.options = options; - this.setData({ - imghost: imghost, - }); + // this.setData({ + // options, + // imghost, + // }); + console.log('this data', this.data.imghost); wx.setNavigationBarTitle({ title: options.title, }); app.isLogin().then(function(data) {//进入页面前已经授权登录成功 self.setData({ userInfo: data, - // imghost: app.globalData.setting.imghost, + // imghost, }); }); }, @@ -77,7 +80,6 @@ Page({ this.setData({ userInfo: app.globalData.userInfo, - // imghost: app.globalData.setting.imghost, isLogin: true, }); @@ -104,7 +106,7 @@ Page({ // console.log('luckInfo', res.data.data); let luckInfo = res.data.data; - // let imghost = self.data.imghost; + if(luckInfo && luckInfo.template_type != null && luckInfo.template_type == 1) { //获取模板 let url = `/api/weshop/marketing/marketingLuckTemplate/get/${store_id}/${luckInfo.template_id}`; app.request.get(url, { @@ -112,9 +114,9 @@ Page({ // console.log('prizes//////', res.data.data); self.setData({ template: res.data.data, - 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, //指针 + bannerUrl: imghost + (res.data.data.bannerUrl ? res.data.data.bannerUrl:'miniapp/images/luckDraw/bg.png'), //背景图 + 'blocks[0].imgs[0].src': imghost + (res.data.data.wheelBaseUrl ? res.data.data.wheelBaseUrl:'miniapp/images/luckDraw/weel.png'), //转盘 + 'buttons[0].imgs[0].src': imghost + (res.data.data.wheelPointerUrl ? res.data.data.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png'), //指针 }); }, }); @@ -194,7 +196,7 @@ Page({ prizeLayout(award) { let prizes = []; let length = award.length; - let thx = {fonts: [{ text: '谢谢\n参与', top: '18%', wordWrap:false, fontColor: 'rgba(255,255,255,.8)'}]}; + let thx = {fonts: [{ text: '谢谢\n参与', top: '18%', wordWrap:false, fontColor: 'rgba(255,255,255,.6)'}]}; if(length == 1) { [0,2,4,6].map(function(item, index) { diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml index 9ef2f34..aa67f42 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml @@ -4,7 +4,7 @@ - + @@ -50,7 +50,7 @@ - + {{item.luck_goods_name}} diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index 31f4f20..5dab34e 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -159,9 +159,9 @@ - - - + + + @@ -212,14 +212,14 @@ - + - + {{aitem.title}} diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss index 374049c..077f2e7 100644 --- a/pages/index/index/index.wxss +++ b/pages/index/index/index.wxss @@ -294,7 +294,7 @@ } .seckill-list view.imgview { - width: 200rpx; + width: 223rpx; height: 210rpx; border-radius: 10rpx; position: relative; @@ -399,6 +399,14 @@ .p_swiper { display: flex; + padding: 0 10rpx; + box-sizing: border-box; +} + +.nav { + padding: 0 10rpx; + box-sizing: border-box; + flex: 1; } .p_swiper .un_line { diff --git a/pages/user/my_service/i_service.wxml b/pages/user/my_service/i_service.wxml index 9a30489..2582208 100644 --- a/pages/user/my_service/i_service.wxml +++ b/pages/user/my_service/i_service.wxml @@ -99,4 +99,4 @@ - \ No newline at end of file + \ No newline at end of file