Commit 02fc1dca7a7d4c3bb6b8acf3a4d7bc8d9270593d

Authored by 后端研发-苏明海
2 parents a1639a56 485d9c6b

Merge branch 'test' into 'qa'

Test

See merge request !693
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 });
... ...