幸运大转盘未中奖送积分或成长值

taiyuan
1 parent cd4fb867
Showing 5 changed files with 83 additions and 24 deletions
app.wxss
packageB/pages/luckactivity/index/index.wxml
packageB/pages/luckactivity/luckinfo/luckinfo.js
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
packageB/pages/luckactivity/luckinfo/luckinfo.wxss
@@ -703,9 +703,9 @@ background: #ffe3e2;
 /* 图标字体(ty) */
 @font-face {
   font-family: 'iconfont';  /* Project id 2054717 */
-  src: url('//at.alicdn.com/t/font_2054717_v0znypg14xq.woff2?t=1627541682562') format('woff2'),
-       url('//at.alicdn.com/t/font_2054717_v0znypg14xq.woff?t=1627541682562') format('woff'),
-       url('//at.alicdn.com/t/font_2054717_v0znypg14xq.ttf?t=1627541682562') format('truetype');
+  src: url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.woff2?t=1627893975776') format('woff2'),
+       url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.woff?t=1627893975776') format('woff'),
+       url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.ttf?t=1627893975776') format('truetype');
 }
  
 .iconfont {
@@ -716,6 +716,10 @@ background: #ffe3e2;
   -moz-osx-font-smoothing: grayscale;
 }
  
+.icon-zhuanfa1:before {
+  content: "\e614";
+}
+
  
 .icon-zhiwen:before {
   content: "\e6aa";
@@ -20,7 +20,7 @@
 		<block wx:for="{{list.pageData}}">
 			<view class="tab-item" bindtap="goto" data-id="{{item.id}}" data-title="{{item.act_name}}">
 				<view class="img-container">
-					<image wx:if="{{item.imageurl}}" src="{{imghost + item.imageurl}}" class="img"></image>
+					<image wx:if="{{item.imageurl}}" src="{{imghost + item.imageurl}}" class="img" mode="aspectFit"></image>
 					<text class="iconfont icon-zhuanpan" wx:else></text>
 				</view>
 				<view class="desc-container">
@@ -118,9 +118,9 @@ Page({
 									// console.log('prizes//////', res.data.data);
 									self.setData({
 										template: res.data.data,
-										bannerUrl: imghost + ((res.data.data&&res.data.data.bannerUrl) ? res.data.data.bannerUrl:'miniapp/images/luckDraw/bg.png'), //背景图
-										'blocks[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelBaseUrl) ? res.data.data.wheelBaseUrl:'miniapp/images/luckDraw/weel.png'), //转盘
-										'buttons[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelPointerUrl) ? res.data.data.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png'), //指针
+										bannerUrl: imghost + ((res.data.data&&res.data.data.bannerUrl) ? res.data.data.bannerUrl:'miniapp/images/luckDraw/bg.png?v=2'), //背景图
+										'blocks[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelBaseUrl) ? res.data.data.wheelBaseUrl:'miniapp/images/luckDraw/weel.png?v=2'), //转盘
+										'buttons[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelPointerUrl) ? res.data.data.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png?v=2'), //指针
 									});
 								},
 							});
@@ -575,6 +575,8 @@ Page({
 							}, 3000);
  
  
+							
+							
 							if(res.data.code == -1) {
 								wx.showToast({
 									title: res.data.msg,
@@ -585,13 +587,15 @@ Page({
 								// self.data.start = true;
 							};
 							// console.log('请求出错');
-							if(self.data.luckInfo.vip_act_num != 0) {
+							if(res.data.code == -2 && self.data.luckInfo.vip_act_num != 0) {
 								self.setData({
 									'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1,
 								});
 							};
  
  
+							
+							
 						};
 					},
  
@@ -640,13 +644,14 @@ Page({
 			showResult: true,
 			showMask: true,
 			resultTitle,
+			showPopup: false,
 			currentLbtype: lbtype,
 		});
  
  
  
  
-		if(no_luck_urltype == 1 && (resultTitle == '谢谢参与')) {
+		if(no_luck_urltype == 1 && resultTitle == '谢谢参与') {
 			if(this.data.luckInfo.no_luck_weappurl) {
 				let num = this.data.num;
 				let url = this.data.luckInfo.no_luck_weappurl;
@@ -662,8 +667,47 @@ Page({
 				}, 1000);
  
 			};
+			
 		};
  
+		
+		if(self.data.luckInfo.give_user) {
+			if(resultTitle == '谢谢参与') {
+				if(self.data.luckInfo.give_type == 1) {
+					if(self.data.luckInfo.give_integral > 0) {
+						wx.showToast({
+							title: `获得游戏奖励积分${self.data.luckInfo.give_integral}`,
+							icon: 'none',
+						});
+					};
+				} else if((self.data.luckInfo.give_type == 2)) {
+					if(self.data.luckInfo.give_integral > 0) {
+						wx.showToast({
+							title: `获得游戏奖励成长值${self.data.luckInfo.give_growth}`,
+							icon: 'none',
+						});
+					};
+				};
+			};
+		} else {
+			if(self.data.luckInfo.give_type == 1) {
+				if(self.data.luckInfo.give_integral > 0) {
+					wx.showToast({
+						title: `获得游戏奖励积分${self.data.luckInfo.give_integral}`,
+						icon: 'none',
+					});
+				};
+			} else if((self.data.luckInfo.give_type == 2)) {
+				if(self.data.luckInfo.give_integral > 0) {
+					wx.showToast({
+						title: `获得游戏奖励成长值${self.data.luckInfo.give_growth}`,
+						icon: 'none',
+					});
+				};
+			};
+		};
+		
+		
   },
  
 	showPopup() {
@@ -817,7 +861,7 @@ Page({
 				break;
 			};
 			case 6: {
-				url = '/packageA/pages/myGift/myGift';
+				url = '/packageA/pages/myGift/myGift?index=1';
 				break;
 			};
 		};
 <wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
 <wxs module="tool" src="./tool.wxs"></wxs>
-<view class="luck-container" style="background: {{template.colorCode ? template.colorCode:'#8102FD'}} url({{bannerUrl ? bannerUrl:(imghost + 'miniapp/images/luckDraw/bg.png')}}) no-repeat;">
-<!-- <view class="luck-container" style="background: url({{ bannerUrl}}) no-repeat;"> -->
+<view class="luck-container" style="background: {{template.colorCode ? template.colorCode:'#da104b'}} url({{bannerUrl ? bannerUrl:(imghost + 'miniapp/images/luckDraw/bg.png?v=2')}}) no-repeat;">
 	<!-- 中奖人员 -->
 	<view class="swiper-container" wx:if="{{nameList && nameList.length != 0}}">
 		<swiper class="swiper" autoplay="true" circular="true" vertical="true" interval="3000">
@@ -127,8 +126,11 @@
 	</view>
 </view>
  
+<!-- 分享按钮 -->
+<!-- <view class="circle-container zhuanfa" bindtap=""><text class="iconfont icon-zhuanfa1"></text></view> -->
+
 <!-- 悬浮按钮 -->
-<view class="gift-container {{((record && record.length != 0) || isActive) ? 'active':''}}" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
+<view class="circle-container gift {{((record && record.length != 0) || isActive) ? 'active':''}}" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
  
 <!-- 弹窗 -->
 <view class="popup-container" wx:if="{{showPopup}}">
@@ -179,7 +181,7 @@
 		</view>
  
 		<view class="pdt40" wx:if="{{currentLbtype == 5}}">
-			<view class="btn btn2" bindtap="clickReceive">立即领取</view>
+			<view class="btn btn2" bindtap="clickReceive">立即兑换</view>
 		</view>
  
  
@@ -68,7 +68,7 @@ page,
 	width: 140rpx;
 	height: 140rpx;
 	margin-right: 20rpx;
-	background-color: #f5f5f5;
+	/* background-color: #f5f5f5; */
 }
  
 .img {
@@ -118,7 +118,7 @@ page,
 	margin-right: 10rpx;
 }
  
-.gift-container {
+.circle-container {
 	background-color: rgba(44, 44, 44, 0.2);
 	width: 100rpx;
 	height: 100rpx;
@@ -126,14 +126,21 @@ page,
 	color: white;
 	position: fixed;
 	right: 20rpx;
-	bottom: 20rpx;
 	display: flex;
 	justify-content: center;
 	align-items: center;
 	z-index: 1;
 }
  
-.gift-container.active::after {
+.circle-container.gift {
+	bottom: 20rpx;
+}
+
+.circle-container.zhuanfa {
+	bottom: 160rpx;
+}
+
+.circle-container.active::after {
 	content: '';
 	position: absolute;
 	width: 14rpx;
@@ -145,7 +152,8 @@ page,
 	right: 10rpx;
 }
  
-.icon-liwu {
+.icon-liwu,
+.icon-zhuanfa1 {
 	font-size: 40rpx;
 }
  
@@ -161,7 +169,7 @@ page,
   width: 6rem;
   z-index: 2;
   -webkit-transform: translate(0, -50%); */
-  transform: translate(0, -50%);
+  /* transform: translate(0, -50%); */
   /* color: #fff;
   font: normal 400 20px/1 'Josefin Sans', sans-serif;
   letter-spacing: .1em;
@@ -175,9 +183,10 @@ page,
   left: 50%;
   width: 1rem;
   height: 1rem;
-  margin-left: -12px;
-  border-left: 1px solid #fff;
-  border-bottom: 1px solid #fff;
+	/* transform: translateX(-50%); */
+  margin-left: -13rpx;
+  border-left: 2rpx solid #fff;
+  border-bottom: 2rpx solid #fff;
   -webkit-transform: rotate(-45deg);
   transform: rotate(-45deg);
   -webkit-animation: sdb07 2s infinite;
@@ -190,7 +199,7 @@ page,
   animation-delay: 0s;
 }
 .tip-to-down text:nth-of-type(2) {
-  top: 16px;
+  top: 32rpx;
   -webkit-animation-delay: .15s;
   animation-delay: .15s;
 }