From 7cb2f11ea1afa39d202fe5be568e8856f075d57c Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Mon, 19 Jul 2021 11:15:59 +0800
Subject: [PATCH] 幸运大转盘修改

---
 packageB/pages/luckactivity/luckinfo/luckinfo.js   | 18 +++++++++---------
 packageB/pages/luckactivity/luckinfo/luckinfo.wxml |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js
index 1ea9c01..c330de6 100644
--- a/packageB/pages/luckactivity/luckinfo/luckinfo.js
+++ b/packageB/pages/luckactivity/luckinfo/luckinfo.js
@@ -217,7 +217,7 @@ Page({
 			[0,2,4,6].map(function(item, index) {
 				prizes[item] = {
 					id: award[0].id,
-					fonts: [{ text: award[0].luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}],
+					fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 					imgs: [
 						{
 							src: self.prizeSrc(award[0].lbtype),
@@ -240,7 +240,7 @@ Page({
 			[0,4].map(function(item, index) {
 				prizes[item] = {
 					id: award[0].id,
-					fonts: [{ text: award[0].luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}],
+					fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 					imgs: [
 						{
 							src: self.prizeSrc(award[0].lbtype),
@@ -255,7 +255,7 @@ Page({
 			[2,6].map(function(item, index) {
 				prizes[item] = {
 					id: award[1].id,
-					fonts: [{ text: award[1].luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}],
+					fonts: [{ text: award[1].luck_goods_name + ' x' + award[1].num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 					imgs: [
 						{
 							src: self.prizeSrc(award[1].lbtype),
@@ -278,7 +278,7 @@ Page({
 			[0,4].map(function(item, index) {
 				prizes[item] = {
 					id: award[0].id,
-					fonts: [{ text: award[0].luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}],
+					fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 					imgs: [
 						{
 							src: self.prizeSrc(award[0].lbtype),
@@ -293,7 +293,7 @@ Page({
 			[1,5].map(function(item, index) {
 				prizes[item] = {
 					id: award[1].id,
-					fonts: [{ text: award[1].luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}],
+					fonts: [{ text: award[1].luck_goods_name + ' x' + award[1].num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 					imgs: [
 						{
 							src: self.prizeSrc(award[1].lbtype),
@@ -308,7 +308,7 @@ Page({
 			[2,6].map(function(item, index) {
 				prizes[item] = {
 					id: award[2].id,
-					fonts: [{ text: award[2].luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}],
+					fonts: [{ text: award[2].luck_goods_name + ' x' + award[2].num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 					imgs: [
 						{
 							src: self.prizeSrc(award[2].lbtype),
@@ -332,7 +332,7 @@ Page({
 			[0,2,4,6].map(function(item, index) {
 				prizes[item] = {
 					id: award[index].id,
-					fonts: [{ text: award[index].luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}],
+					fonts: [{ text: award[index].luck_goods_name + ' x' + award[index].num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 					imgs: [
 						{
 							src: self.prizeSrc(award[index].lbtype),
@@ -355,7 +355,7 @@ Page({
 			[0,2,3,5,6].map(function(item, index) {
 				prizes[item] = {
 					id: award[index].id,
-					fonts: [{ text: award[index].luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}],
+					fonts: [{ text: award[index].luck_goods_name + ' x' + award[index].num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 					imgs: [
 						{
 							src: self.prizeSrc(award[index].lbtype),
@@ -378,7 +378,7 @@ Page({
 			prizes = award.map(function(item, index) {
 				return {
 					id: item.id,
-					fonts: [{ text: item.luck_goods_name, top: '18%', wordWrap:false, fontColor: 'transparent'}],
+					fonts: [{ text: item.luck_goods_name + ' x' + item.num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 						imgs: [
 							{
 								src: self.prizeSrc(item.lbtype),
diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml
index 979484e..e933a12 100644
--- a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml
+++ b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml
@@ -1,6 +1,6 @@
 <wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
 <wxs module="tool" src="./tool.wxs"></wxs>
-<view class="luck-container" style="background: url({{bannerUrl}}) no-repeat;">
+<view class="luck-container" style="background: {{template.colorCode}} url({{bannerUrl}}) no-repeat;">
 <!-- <view class="luck-container" style="background: url({{ bannerUrl}}) no-repeat;"> -->
   <!-- 大转盘 -->
 	<view class="weel-container">
@@ -110,7 +110,7 @@
 </view>
 
 <!-- 悬浮按钮 -->
-<view class="gift-container active" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
+<view class="gift-container" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
 
 <!-- 弹窗 -->
 <view class="popup-container" wx:if="{{showPopup}}">
@@ -147,7 +147,7 @@
 			</block>
 			<block wx:else>
 				<view class="bold c-tb">恭喜你获得</view>
-				<view class="pdt10">{{resultTitle}}</view>
+				<view class="pdt10">{{resultTitle}} </view>
 			</block>
 		</view>
 		<view class="img-container2"><image src="{{imghost + 'miniapp/images/luckDraw/gift.png'}}" class="img"></image></view>
--
libgit2 0.21.4