diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml index f1f109e..cdd2466 100644 --- a/components/goods_list/goods_list.wxml +++ b/components/goods_list/goods_list.wxml @@ -4,8 +4,8 @@ - - + + diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 3580f61..06683ea 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -199,8 +199,10 @@ Page({ //------初始化加载---------- onLoad: function(t) { - console.log("--服务卡项--"); - console.log(t); + // console.log("--服务卡项--"); + // console.log('fdsfasfasf111111111111111====================',t); + + var ee = this, that = ee, diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js index 7be448a..8875577 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.js +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.js @@ -10,70 +10,7 @@ Page({ noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据 pageNum: 1, // 当前页数 - prizes: [ - { fonts: [{ text: '积分', top: '18%', wordWrap:false, fontColor: 'transparent'}], - imgs: [ - { - src: '', - width: '135rpx', - height: '107rpx', - top: '15%', - } - ], - }, - { fonts: [{ text: '优惠券', top: '18%', wordWrap:false, fontColor: 'transparent'}], - imgs: [ - { - src: '', - width: '135rpx', - height: '107rpx', - top: '15%', - } - ], - }, - { fonts: [{ text: '美容', top: '18%', wordWrap:false, fontColor: 'transparent'}], - imgs: [ - { - src: '', - width: '135rpx', - height: '107rpx', - top: '15%', - } - ], - }, - { fonts: [{ text: '谢谢\n参与', top: '18%', wordWrap:false, fontColor: 'white'}]}, - { fonts: [{ text: '积分', top: '18%', wordWrap:false, fontColor: 'transparent'}], - imgs: [ - { - src: '', - width: '135rpx', - height: '107rpx', - top: '15%', - } - ], - }, - { fonts: [{ text: '优惠券', top: '18%', wordWrap:false, fontColor: 'transparent'}], - imgs: [ - { - src: '', - width: '135rpx', - height: '107rpx', - top: '15%', - } - ], - }, - { fonts: [{ text: '美容', top: '18%', wordWrap:false, fontColor: 'transparent'}], - imgs: [ - { - src: '', - width: '135rpx', - height: '107rpx', - top: '15%', - } - ], - }, - { fonts: [{ text: '谢谢\n参与', top: '18%', wordWrap:false, fontColor: 'white'}], }, - ], + prizes: [], defaultConfig: { offsetDegree: 22.5, }, @@ -117,7 +54,7 @@ Page({ }, onLoad(options) { - // console.log('imghost', imghost); + console.log('imghost+++++', imghost); self = this; this.data.options = options; this.setData({ @@ -168,7 +105,7 @@ Page({ // console.log('luckInfo', res.data.data); let luckInfo = res.data.data; // let imghost = self.data.imghost; - if(luckInfo.template_type != null && luckInfo.template_type == 1) { //获取模板 + 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, { success: function(res) { @@ -182,9 +119,12 @@ Page({ }, }); } else { - self.setData({ - bannerUrl: imghost + luckInfo.store_bannerUrl, - }); + if(luckInfo && luckInfo.store_bannerUrl) { + self.setData({ + bannerUrl: imghost + luckInfo.store_bannerUrl, + }); + }; + }; }, @@ -264,7 +204,7 @@ Page({ fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ { - src: self.prizeSrc(award[0].lbtype), + src: self.prizeSrc(award[0].lbtype) ? self.prizeSrc(award[0].lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), width: '135rpx', height: '107rpx', top: '12%', @@ -288,7 +228,7 @@ Page({ fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ { - src: self.prizeSrc(award[0].lbtype), + src: self.prizeSrc(award[0].lbtype) ? self.prizeSrc(award[0].lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), width: '135rpx', height: '107rpx', top: '12%', @@ -304,7 +244,7 @@ Page({ fonts: [{ text: award[1].luck_goods_name + ' x' + award[1].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ { - src: self.prizeSrc(award[1].lbtype), + src: self.prizeSrc(award[1].lbtype) ? self.prizeSrc(award[1].lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), width: '135rpx', height: '107rpx', top: '12%', @@ -328,7 +268,7 @@ Page({ fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ { - src: self.prizeSrc(award[0].lbtype), + src: self.prizeSrc(award[0].lbtype) ? self.prizeSrc(award[0].lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), width: '135rpx', height: '107rpx', top: '12%', @@ -344,7 +284,7 @@ Page({ fonts: [{ text: award[1].luck_goods_name + ' x' + award[1].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ { - src: self.prizeSrc(award[1].lbtype), + src: self.prizeSrc(award[1].lbtype) ? self.prizeSrc(award[1].lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), width: '135rpx', height: '107rpx', top: '12%', @@ -360,7 +300,7 @@ Page({ fonts: [{ text: award[2].luck_goods_name + ' x' + award[2].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ { - src: self.prizeSrc(award[2].lbtype), + src: self.prizeSrc(award[2].lbtype) ? self.prizeSrc(award[2].lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), width: '135rpx', height: '107rpx', top: '12%', @@ -385,7 +325,7 @@ Page({ fonts: [{ text: award[index].luck_goods_name + ' x' + award[index].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ { - src: self.prizeSrc(award[index].lbtype), + src: self.prizeSrc(award[index].lbtype) ? self.prizeSrc(award[index].lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), width: '135rpx', height: '107rpx', top: '12%', @@ -409,7 +349,7 @@ Page({ fonts: [{ text: award[index].luck_goods_name + ' x' + award[index].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ { - src: self.prizeSrc(award[index].lbtype), + src: self.prizeSrc(award[index].lbtype) ? self.prizeSrc(award[index].lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), width: '135rpx', height: '107rpx', top: '12%', @@ -433,7 +373,7 @@ Page({ fonts: [{ text: item.luck_goods_name + ' x' + item.num, top: '18%', wordWrap:false, fontColor: 'transparent'}], imgs: [ { - src: self.prizeSrc(item.lbtype), + src: self.prizeSrc(item.lbtype) ? self.prizeSrc(item.lbtype): (imghost + 'miniapp/images/luckDraw/lb.png'), width: '135rpx', height: '107rpx', top: '12%', diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml index 95ebe93..9ef2f34 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml @@ -1,6 +1,6 @@ - + @@ -45,7 +45,7 @@ - + @@ -64,7 +64,7 @@ - + {{luckInfo.remark}} @@ -121,7 +121,7 @@ - 提供技术支持 + 提供技术支持