Commit 485d9c6ba0f5fa806f5c959fad00211abf8c1e97
Merge branch 'dev' into 'test'
Dev See merge request !691
Showing
1 changed file
with
3 additions
and
3 deletions
packageB/pages/luckactivity/luckinfo/luckinfo.js
... | ... | @@ -118,9 +118,9 @@ Page({ |
118 | 118 | // console.log('prizes//////', res.data.data); |
119 | 119 | self.setData({ |
120 | 120 | template: res.data.data, |
121 | - bannerUrl: imghost + (res.data.data.bannerUrl ? res.data.data.bannerUrl:'miniapp/images/luckDraw/bg.png'), //背景图 | |
122 | - 'blocks[0].imgs[0].src': imghost + (res.data.data.wheelBaseUrl ? res.data.data.wheelBaseUrl:'miniapp/images/luckDraw/weel.png'), //转盘 | |
123 | - 'buttons[0].imgs[0].src': imghost + (res.data.data.wheelPointerUrl ? res.data.data.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png'), //指针 | |
121 | + bannerUrl: imghost + ((res.data.data&&res.data.data.bannerUrl) ? res.data.data.bannerUrl:'miniapp/images/luckDraw/bg.png'), //背景图 | |
122 | + 'blocks[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelBaseUrl) ? res.data.data.wheelBaseUrl:'miniapp/images/luckDraw/weel.png'), //转盘 | |
123 | + 'buttons[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelPointerUrl) ? res.data.data.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png'), //指针 | |
124 | 124 | }); |
125 | 125 | }, |
126 | 126 | }); | ... | ... |