Commit 7cb2f11ea1afa39d202fe5be568e8856f075d57c
1 parent
c02591c4
幸运大转盘修改
Showing
2 changed files
with
12 additions
and
12 deletions
packageB/pages/luckactivity/luckinfo/luckinfo.js
| @@ -217,7 +217,7 @@ Page({ | @@ -217,7 +217,7 @@ Page({ | ||
| 217 | [0,2,4,6].map(function(item, index) { | 217 | [0,2,4,6].map(function(item, index) { |
| 218 | prizes[item] = { | 218 | prizes[item] = { |
| 219 | id: award[0].id, | 219 | id: award[0].id, |
| 220 | - fonts: [{ text: award[0].luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}], | 220 | + fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], |
| 221 | imgs: [ | 221 | imgs: [ |
| 222 | { | 222 | { |
| 223 | src: self.prizeSrc(award[0].lbtype), | 223 | src: self.prizeSrc(award[0].lbtype), |
| @@ -240,7 +240,7 @@ Page({ | @@ -240,7 +240,7 @@ Page({ | ||
| 240 | [0,4].map(function(item, index) { | 240 | [0,4].map(function(item, index) { |
| 241 | prizes[item] = { | 241 | prizes[item] = { |
| 242 | id: award[0].id, | 242 | id: award[0].id, |
| 243 | - fonts: [{ text: award[0].luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}], | 243 | + fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], |
| 244 | imgs: [ | 244 | imgs: [ |
| 245 | { | 245 | { |
| 246 | src: self.prizeSrc(award[0].lbtype), | 246 | src: self.prizeSrc(award[0].lbtype), |
| @@ -255,7 +255,7 @@ Page({ | @@ -255,7 +255,7 @@ Page({ | ||
| 255 | [2,6].map(function(item, index) { | 255 | [2,6].map(function(item, index) { |
| 256 | prizes[item] = { | 256 | prizes[item] = { |
| 257 | id: award[1].id, | 257 | id: award[1].id, |
| 258 | - fonts: [{ text: award[1].luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}], | 258 | + fonts: [{ text: award[1].luck_goods_name + ' x' + award[1].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], |
| 259 | imgs: [ | 259 | imgs: [ |
| 260 | { | 260 | { |
| 261 | src: self.prizeSrc(award[1].lbtype), | 261 | src: self.prizeSrc(award[1].lbtype), |
| @@ -278,7 +278,7 @@ Page({ | @@ -278,7 +278,7 @@ Page({ | ||
| 278 | [0,4].map(function(item, index) { | 278 | [0,4].map(function(item, index) { |
| 279 | prizes[item] = { | 279 | prizes[item] = { |
| 280 | id: award[0].id, | 280 | id: award[0].id, |
| 281 | - fonts: [{ text: award[0].luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}], | 281 | + fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], |
| 282 | imgs: [ | 282 | imgs: [ |
| 283 | { | 283 | { |
| 284 | src: self.prizeSrc(award[0].lbtype), | 284 | src: self.prizeSrc(award[0].lbtype), |
| @@ -293,7 +293,7 @@ Page({ | @@ -293,7 +293,7 @@ Page({ | ||
| 293 | [1,5].map(function(item, index) { | 293 | [1,5].map(function(item, index) { |
| 294 | prizes[item] = { | 294 | prizes[item] = { |
| 295 | id: award[1].id, | 295 | id: award[1].id, |
| 296 | - fonts: [{ text: award[1].luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}], | 296 | + fonts: [{ text: award[1].luck_goods_name + ' x' + award[1].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], |
| 297 | imgs: [ | 297 | imgs: [ |
| 298 | { | 298 | { |
| 299 | src: self.prizeSrc(award[1].lbtype), | 299 | src: self.prizeSrc(award[1].lbtype), |
| @@ -308,7 +308,7 @@ Page({ | @@ -308,7 +308,7 @@ Page({ | ||
| 308 | [2,6].map(function(item, index) { | 308 | [2,6].map(function(item, index) { |
| 309 | prizes[item] = { | 309 | prizes[item] = { |
| 310 | id: award[2].id, | 310 | id: award[2].id, |
| 311 | - fonts: [{ text: award[2].luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}], | 311 | + fonts: [{ text: award[2].luck_goods_name + ' x' + award[2].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], |
| 312 | imgs: [ | 312 | imgs: [ |
| 313 | { | 313 | { |
| 314 | src: self.prizeSrc(award[2].lbtype), | 314 | src: self.prizeSrc(award[2].lbtype), |
| @@ -332,7 +332,7 @@ Page({ | @@ -332,7 +332,7 @@ Page({ | ||
| 332 | [0,2,4,6].map(function(item, index) { | 332 | [0,2,4,6].map(function(item, index) { |
| 333 | prizes[item] = { | 333 | prizes[item] = { |
| 334 | id: award[index].id, | 334 | id: award[index].id, |
| 335 | - fonts: [{ text: award[index].luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}], | 335 | + fonts: [{ text: award[index].luck_goods_name + ' x' + award[index].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], |
| 336 | imgs: [ | 336 | imgs: [ |
| 337 | { | 337 | { |
| 338 | src: self.prizeSrc(award[index].lbtype), | 338 | src: self.prizeSrc(award[index].lbtype), |
| @@ -355,7 +355,7 @@ Page({ | @@ -355,7 +355,7 @@ Page({ | ||
| 355 | [0,2,3,5,6].map(function(item, index) { | 355 | [0,2,3,5,6].map(function(item, index) { |
| 356 | prizes[item] = { | 356 | prizes[item] = { |
| 357 | id: award[index].id, | 357 | id: award[index].id, |
| 358 | - fonts: [{ text: award[index].luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}], | 358 | + fonts: [{ text: award[index].luck_goods_name + ' x' + award[index].num, top: '18%', wordWrap:false, fontColor: 'transparent'}], |
| 359 | imgs: [ | 359 | imgs: [ |
| 360 | { | 360 | { |
| 361 | src: self.prizeSrc(award[index].lbtype), | 361 | src: self.prizeSrc(award[index].lbtype), |
| @@ -378,7 +378,7 @@ Page({ | @@ -378,7 +378,7 @@ Page({ | ||
| 378 | prizes = award.map(function(item, index) { | 378 | prizes = award.map(function(item, index) { |
| 379 | return { | 379 | return { |
| 380 | id: item.id, | 380 | id: item.id, |
| 381 | - fonts: [{ text: item.luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}], | 381 | + fonts: [{ text: item.luck_goods_name + ' x' + item.num, top: '18%', wordWrap:false, fontColor: 'transparent'}], |
| 382 | imgs: [ | 382 | imgs: [ |
| 383 | { | 383 | { |
| 384 | src: self.prizeSrc(item.lbtype), | 384 | src: self.prizeSrc(item.lbtype), |
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
| 1 | <wxs module="filter" src="../../../../utils/filter.wxs"></wxs> | 1 | <wxs module="filter" src="../../../../utils/filter.wxs"></wxs> |
| 2 | <wxs module="tool" src="./tool.wxs"></wxs> | 2 | <wxs module="tool" src="./tool.wxs"></wxs> |
| 3 | -<view class="luck-container" style="background: url({{bannerUrl}}) no-repeat;"> | 3 | +<view class="luck-container" style="background: {{template.colorCode}} url({{bannerUrl}}) no-repeat;"> |
| 4 | <!-- <view class="luck-container" style="background: url({{ bannerUrl}}) no-repeat;"> --> | 4 | <!-- <view class="luck-container" style="background: url({{ bannerUrl}}) no-repeat;"> --> |
| 5 | <!-- 大转盘 --> | 5 | <!-- 大转盘 --> |
| 6 | <view class="weel-container"> | 6 | <view class="weel-container"> |
| @@ -110,7 +110,7 @@ | @@ -110,7 +110,7 @@ | ||
| 110 | </view> | 110 | </view> |
| 111 | 111 | ||
| 112 | <!-- 悬浮按钮 --> | 112 | <!-- 悬浮按钮 --> |
| 113 | -<view class="gift-container active" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view> | 113 | +<view class="gift-container" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view> |
| 114 | 114 | ||
| 115 | <!-- 弹窗 --> | 115 | <!-- 弹窗 --> |
| 116 | <view class="popup-container" wx:if="{{showPopup}}"> | 116 | <view class="popup-container" wx:if="{{showPopup}}"> |
| @@ -147,7 +147,7 @@ | @@ -147,7 +147,7 @@ | ||
| 147 | </block> | 147 | </block> |
| 148 | <block wx:else> | 148 | <block wx:else> |
| 149 | <view class="bold c-tb">恭喜你获得</view> | 149 | <view class="bold c-tb">恭喜你获得</view> |
| 150 | - <view class="pdt10">{{resultTitle}}</view> | 150 | + <view class="pdt10">{{resultTitle}} </view> |
| 151 | </block> | 151 | </block> |
| 152 | </view> | 152 | </view> |
| 153 | <view class="img-container2"><image src="{{imghost + 'miniapp/images/luckDraw/gift.png'}}" class="img"></image></view> | 153 | <view class="img-container2"><image src="{{imghost + 'miniapp/images/luckDraw/gift.png'}}" class="img"></image></view> |