From 548a0607499ffcf16e0a66ecfc8d64ab8d81e299 Mon Sep 17 00:00:00 2001
From: yangjie <812952667@qq.com>
Date: Thu, 30 Sep 2021 11:32:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=AD=E5=A5=96=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=20=20=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subPages/lottery/lottery.vue                              | 8 ++++++--
 .../components/almost-lottery/almost-lottery.vue          | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/subPages/lottery/lottery.vue b/subPages/lottery/lottery.vue
index e2047ca..08604f2 100644
--- a/subPages/lottery/lottery.vue
+++ b/subPages/lottery/lottery.vue
@@ -201,6 +201,7 @@
 							pris.prizeId = r.id;
 							pris.prizeImage = this.imageUrl + r.img;
 							pris.prizeName = r.name;
+							pris.prizeStr = r.prizeStr;
 							prizesList.push(pris);
 						})
 						this.activityInfo =  this.transform(res.return_data.activityInfo.content);
@@ -255,12 +256,14 @@
 				console.log('旋转结束，执行拿到结果后到逻辑')
 				// 旋转结束后，开始处理拿到结果后的逻辑
 				this.prizeing = false
-				let prizeName = this.prizeList[this.prizeIndex].prizeName
+				let prizeName = this.prizeList[this.prizeIndex].prizeName;
+				let prizeStr = this.prizeList[this.prizeIndex].prizeStr;
 				let tipContent = ''
 				// if (prizeName === '参与奖') {
 				// 	tipContent = '很遗憾，没有中奖，请再接再厉！'
 				// } else {
-					tipContent = `恭喜您，获得 "${prizeName} "！`
+					tipContent = `恭喜您获得了${prizeName} : `+` ${prizeStr}`+` , 请前往我的优惠券查看`
+				
 				// }
 				this.getUserLotteryNum();
 				this.getWinLotteryList();
@@ -292,6 +295,7 @@
 		prizeId = ''
 		prizeName = ''
 		prizeImage = ''
+		prizeStr = ''
 	}
 </script>
 
diff --git a/uni_modules/almost-lottery/components/almost-lottery/almost-lottery.vue b/uni_modules/almost-lottery/components/almost-lottery/almost-lottery.vue
index fd689ab..54627b2 100644
--- a/uni_modules/almost-lottery/components/almost-lottery/almost-lottery.vue
+++ b/uni_modules/almost-lottery/components/almost-lottery/almost-lottery.vue
@@ -184,7 +184,7 @@
 			// 奖品图片距离奖品文字的距离
 			imgMarginStr: {
 				type: Number,
-				default: 60
+				default: 40
 			},
 			// 奖品文字多行情况下的行高
 			strLineHeight: {
@@ -204,12 +204,12 @@
 			// 奖品图片的宽
 			imgWidth: {
 				type: Number,
-				default: 50
+				default: 80
 			},
 			// 奖品图片的高
 			imgHeight: {
 				type: Number,
-				default: 50
+				default: 80
 			},
 			// 是否绘制奖品图片
 			imgDrawed: {