幸运大转盘

taiyuan
1 parent 56d99bb7
Showing 11 changed files with 451 additions and 57 deletions
components/my-qrcode/my-qrcode.js
components/my-qrcode/my-qrcode.json
components/my-qrcode/my-qrcode.wxml
components/my-qrcode/my-qrcode.wxss
packageB/pages/luckactivity/index/g_filter.wxs
packageB/pages/luckactivity/index/index.js
packageB/pages/luckactivity/index/index.wxml
packageB/pages/luckactivity/luckinfo/luckinfo.js
packageB/pages/luckactivity/luckinfo/luckinfo.json
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
packageB/pages/luckactivity/luckinfo/luckinfo.wxss
+// pages/user/yhq/qr_code/qr_code.js
+const {
+  barcode,
+  qrcode
+} = require('../../utils/index.js')
+
+Component({
+  data: {
+      q_show:0,
+      object:null,
+      index:0,
+      is_fw:0,
+
+      barcode_canvas:null,
+      qrcode_canvas:null,
+  },
+  properties: {
+    // 这里定义了innerText属性，属性值可以在组件使用时指定
+  },
+  ready: function () {
+  },
+
+  methods: {
+    //关闭
+    close: function (e) {
+        this.setData({q_show: 0,barcode_canvas:null,qrcode_canvas:null });
+				this.triggerEvent('close',{},{bubbles: true});
+    },
+
+    //打开
+    open:function (e) {
+        this.data.index++;
+        var list=[{index:this.data.index }];
+
+        this.setData({q_show: 1,object:e,barcode_canvas:list,qrcode_canvas:list,is_fw:e.is_fw });
+        var val=e.val;
+
+        // barcode('barcode'+this.data.index,val, 620, 160,this);
+        qrcode('qrcode'+this.data.index, val, 520, 520,this);
+    }  
+  },
+ 
+  
+ 
+ 
+})
 \ No newline at end of file
+{
+    "component": true,
+  "usingComponents": {}
+}
 \ No newline at end of file
+<view class="xc-pop-up"  wx:if="{{q_show}}" catchtouchmove='true'>
+	<view class="shut"><text class="iconfont icon-close"  bindtap="close"></text></view>
+		<view class="barqrcode">
+			<canvas  class="qrcode" canvas-id="qrcode{{item.index}}"  wx:for="{{barcode_canvas}}"/>
+			<view class="q_code fs28">兑换码：{{object.val}}</view>
+			<view class="c-9 pdt10">请向店员出示二维码核销兑换</view>
+			<!-- <view class="c-9 fs28">有效期：{{object.now}} 至 {{object.validay}}</view> -->
+		</view>
+</view>
+
+@import '../../app.wxss';
+
+.xc-pop-up{
+  position:fixed;
+	z-index:5;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+}
+
+
+.xc-obscuration{
+  position: fixed;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 11;
+    background: rgba(0,0,0,0.4);
+    width: 100%;
+    height: 100%;
+
+
+
+}
+
+ /* Y */
+.xc-qr-frame{ 
+	/* width:90%;
+ min-height: 696rpx;
+	background: #fff;
+	z-index: 55;
+  position: fixed;
+  top:180rpx; */
+  /* height: auto; */
+  /* padding-bottom:20rpx; */
+  /* left:35rpx; */
+ /* overflow: hidden;
+ border-radius: 16rpx; */
+}
+
+/* 二维码和条形码的边框Y */
+.barqrcode{
+	background-color: white;
+	border-radius: 16rpx;
+	padding: 0 40rpx 40rpx;
+	text-align: center;
+}
+/* 点击条形Y */
+.barcode {
+	/* background-color: white;
+	border-radius: 12rpx; */
+}
+canvas{
+  width:100%;
+	height:55px;
+display:block;
+
+}
+.q_code{
+	color: #333;
+}
+  
+
+/* 二维码边框Y*/
+.qrcode_rim {
+ width: 550rpx;
+ height:544rpx;
+display:flex;
+flex-direction:column;
+position: absolute;
+left: 75rpx;
+top: 5rpx;
+
+}
+.qrcode{
+ width: 520rpx;
+ height: 520rpx;
+}
+.r-code{
+  /* font-size:28rpx;
+  padding-left: 25rpx; */
+	/* margin-top: -5.5rpx; */
+
+}
+
+.shut{
+	color: white;
+	text-align: right;
+	padding-bottom: 30rpx;
+	position: relative;
+}
+
+
+.icon-close {
+	font-size: 48rpx;
+}
+
+.shut::after {
+	content: '';
+	width: 2rpx;
+	height: 32rpx;
+	background-color: white;
+	position: absolute;
+	bottom: 0;
+	right: 24rpx;
+}
+
+.mt{ margin-top:130rpx}
+.mts{ margin-top:70rpx}
+.flex{
+  display: flex;
+  justify-content:center;
+}
+
+.code_show{
+	text-align: center;position: relative; left: -20rpx;
+}
+
+.c-9 {
+	color: #999;
+}
 \ No newline at end of file
+var g_filters = {
+	has_char:function(url,key){
+	  if(!url)	return -1;
+	  return url.indexOf(key);		
+	},
+	beg_time:function(beg_date){
+	    var fmt1 = beg_date.substring(0, 19);
+        var reg = getRegExp("-", "g");
+        var fmt2 = fmt1.replace(reg, '/');
+        var t1 = getDate(fmt2);
+        var tnow=getDate();
+        if(t1<=tnow) return 1;
+        return 0;
+	},
+	end_time:function(end_date){
+	        var fmt1 = end_date.substring(0, 19);
+            var reg = getRegExp("-", "g");
+            var fmt2 = fmt1.replace(reg, '/');
+            var t1 = getDate(fmt2);
+            var tnow=getDate();
+            if(t1>=tnow) return 1;
+            return 0;
+	}
+}
+module.exports = {
+	has_char: g_filters.has_char,
+	beg_time: g_filters.beg_time,
+	end_time: g_filters.end_time,
+}
 \ No newline at end of file
@@ -93,8 +93,40 @@ Page({
 						currentData: data,
 					});
 				});
+				
+				// 获取广告
+				app.request.promiseGet("/api/weshop/ad/page", {
+				  data: {
+				    pid: 1201,
+				    store_id: app.globalData.setting.stoid, 
+				    enabled: 1
+				  }
+				}).then(res => {
+					if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+						var a = res.data.data.pageData;
+						var narr=[];
+						for(var i in a){
+							var tt = {
+							  'ad_code': os.imghost + a[i].ad_code,
+							  'media_link': '',
+							  'ad_weapplink':a[i].ad_weapplink
+							};
+							narr.push(tt);
+						}
+
+						self.setData({
+							ad_data: narr,
+						});				
+					}					 			
+				})
+				
+				
 			};
 		};
+		
+		
+		
+		
   },
   /**
 <wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
+<wxs module="g_filter" src="g_filter.wxs"></wxs>
 <view>
-	<!-- <view class="img-container"><image src="../../../images/luckDraw/weel.png" class="img" mode="aspectFit"></image></view> -->
+	<swiper class="swiper" circular="true" autoplay="true" indicator-dots="true" interval="2500" wx:if="{{ad_data}}">
+		<block wx:for="{{ad_data}}">
+			<swiper-item>
+				<!-- <navigator url="{{item.ad_weapplink}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.ad_weapplink,'plugin')>=0}}"> -->
+				<navigator url="{{item.ad_weapplink}}" style="height: 100%;" hover-class="none" open-type="reLaunch">
+					<image src="{{item.ad_code}}" class="img" bindload="imageLoad" data-index="{{index}}" mode="aspectFit" lazy-load="true"/>
+				</navigator>
+			</swiper-item>
+		</block>
+	</swiper>
 	<view class="tab-title" bindtap="clickTab">
 		<view class="tab-title-item {{currentIndex == index ? 'active':''}}" wx:for="{{tabArr}}" data-index="{{index}}">{{item}}</view>
 	</view>
 	<view class="tab-content">
-		
-		<view class="tab-item" wx:for="{{list.pageData}}">
-			<text class="iconfont icon-zhuanpan"></text>
-			<view class="desc-container">
-				<view class="">
-					<!-- 标题 -->
-					<view class="ellipsis-1x taj">{{item.act_name}}</view>
-					<!-- 时间 -->
-					<view class="date pdt10 pdb20" wx:if="{{currentIndex == 0}}">活动时间：{{filter.format_time(item.begindate) + ' 至 ' + filter.format_time(item.enddate)}}</view>
-					<view class="date pdt10 pdb20" wx:else>兑换时间：{{filter.format_time(item.begindate) + ' 至 ' + filter.format_time(item.enddate)}}</view>
-				</view>
-				<!-- 按钮 -->
-				<view class="btn-container">
-					<view bindtap="goto" data-id="{{item.id}}" data-title="{{item.act_name}}" class="btn red" wx:if="{{currentIndex == 0}}">立即参与</view>
-					<view bindtap="goto" data-id="{{item.id}}" data-title="{{item.act_name}}" class="btn red" wx:else>去兑换</view>
+		<block wx:for="{{list.pageData}}">
+			<view class="tab-item" bindtap="goto" data-id="{{item.id}}" data-title="{{item.act_name}}">
+				<text class="iconfont icon-zhuanpan"></text>
+				<view class="desc-container">
+					<view class="">
+						<!-- 标题 -->
+						<view class="ellipsis-1x taj">{{item.act_name}}</view>
+						<!-- 时间 -->
+						<view class="date pdt10 pdb20" wx:if="{{currentIndex == 0}}">活动时间：{{filter.format_time(item.begindate) + ' 至 ' + filter.format_time(item.enddate)}}</view>
+						<view class="date pdt10 pdb20" wx:else>兑换时间：{{filter.format_time(item.begindate) + ' 至 ' + filter.format_time(item.enddate)}}</view>
+					</view>
+					<!-- 按钮 -->
+					<view class="btn-container">
+						<view class="btn red" wx:if="{{currentIndex == 0}}">立即参与</view>
+						<view class="btn red" wx:else>去兑换</view>
+					</view>
 				</view>
 			</view>
-		</view>
+		</block>
+		
 		<nodata nodataContainer="t-c" wx:if="{{list.pageData.length == 0}}"></nodata>
 const app = getApp();
+const imghost = app.globalData.setting.imghost;
 let self = null;
 Page({
@@ -13,7 +14,7 @@ Page({
       { fonts: [{ text: '积分', top: '18%', wordWrap:false, fontColor: 'transparent'}], 
 				imgs: [
 					{
-						src: '../../../images/luckDraw/jf.png',
+						src: '',
 						width: '135rpx',
 						height: '107rpx',
 						top: '15%',
@@ -23,7 +24,7 @@ Page({
       { fonts: [{ text: '优惠券', top: '18%', wordWrap:false, fontColor: 'transparent'}],
       	imgs: [
       		{
-      			src: '../../../images/luckDraw/yhq.png',
+      			src: '',
       			width: '135rpx',
       			height: '107rpx',
       			top: '15%',
@@ -33,7 +34,7 @@ Page({
       { fonts: [{ text: '美容', top: '18%', wordWrap:false, fontColor: 'transparent'}],
       	imgs: [
       		{
-      			src: '../../../images/luckDraw/mr1.png',
+      			src: '',
       			width: '135rpx',
       			height: '107rpx',
       			top: '15%',
@@ -44,7 +45,7 @@ Page({
       { fonts: [{ text: '积分', top: '18%', wordWrap:false, fontColor: 'transparent'}],
       	imgs: [
       		{
-      			src: '../../../images/luckDraw/jf.png',
+      			src: '',
       			width: '135rpx',
       			height: '107rpx',
       			top: '15%',
@@ -54,7 +55,7 @@ Page({
       { fonts: [{ text: '优惠券', top: '18%', wordWrap:false, fontColor: 'transparent'}],
       	imgs: [
       		{
-      			src: '../../../images/luckDraw/yhq.png',
+      			src: '',
       			width: '135rpx',
       			height: '107rpx',
       			top: '15%',
@@ -64,7 +65,7 @@ Page({
       { fonts: [{ text: '美容', top: '18%', wordWrap:false, fontColor: 'transparent'}],
       	imgs: [
       		{
-      			src: '../../../images/luckDraw/mr1.png',
+      			src: '',
       			width: '135rpx',
       			height: '107rpx',
       			top: '15%',
@@ -86,7 +87,7 @@ Page({
 				padding: '76rpx',
 				// background: 'pink',
 				imgs: [{
-					src: 'http://201442.image.myqcloud.com/201442/0/1c825ca4-f155-453c-9f85-2cb0381824fe/original',
+					src: imghost + 'miniapp/images/luckDraw/weel.png',
 					width: '700rpx',
 					height: '700rpx',
 					rotate: true,
@@ -106,7 +107,7 @@ Page({
 				// background: 'black',
 				// pointer: true,
 				imgs: [{
-					src: 'http://201442.image.myqcloud.com/201442/0/b29290ec-aeb3-40e9-9444-8f15fd9acda3/original',
+					src: imghost + 'miniapp/images/luckDraw/pointer.png',
 					width: '188rpx',
 					height: '230rpx',
 					top: '-130rpx',
@@ -116,15 +117,19 @@ Page({
   },
 	onLoad(options) {
+		// console.log('imghost', imghost);
 		self = this;
 		this.data.options = options;
+		this.setData({
+			imghost: imghost,
+		});
 		wx.setNavigationBarTitle({
 			title: options.title,
 		});
 		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
 			self.setData({
 				userInfo: data,
-				imghost: app.globalData.setting.imghost,
+				// imghost: app.globalData.setting.imghost,
 			});
 		});
 	},
@@ -135,11 +140,11 @@ Page({
 				this.setData({
 					userInfo: app.globalData.userInfo,
-					imghost: app.globalData.setting.imghost,
+					// imghost: app.globalData.setting.imghost,
 					isLogin: true,
 				});
-				console.log('imghost', this.data.imghost);
+				// console.log('imghost', this.data.imghost);
 				let user_id = app.globalData.userInfo.user_id;
 				let store_id = app.globalData.setting.stoid;
 				let id = this.data.options.id;
@@ -160,14 +165,14 @@ Page({
 							self.data.msg = res.data.msg;
 						};
-						console.log('luckInfo', res.data.data);
+						// console.log('luckInfo', res.data.data);
 						let luckInfo = res.data.data;
-						let imghost = self.data.imghost;
-						if(luckInfo.template_type == 1) { //获取模板
+						// let imghost = self.data.imghost;
+						if(luckInfo.template_type != null && luckInfo.template_type == 1) { //获取模板
 							let url = `/api/weshop/marketing/marketingLuckTemplate/get/${store_id}/${luckInfo.template_id}`;
 							app.request.get(url, {
 								success: function(res) {
-									console.log('prizes//////', res.data.data);
+									// console.log('prizes//////', res.data.data);
 									self.setData({
 										template: res.data.data,
 										bannerUrl: imghost + res.data.data.bannerUrl, //背景图
@@ -201,8 +206,46 @@ Page({
 						self.prizeLayout(award);
 					},
-					
 				});
+				
+				
+				//获取兑奖记录
+				app.request.get('/api/weshop/marketing/marketingLuckRecord/page', {
+					isShowLoading: false,
+					data: {
+						store_id: app.globalData.setting.stoid,
+						user_id: app.globalData.userInfo.user_id,
+						luck_formid: this.data.options.id,
+						luck_state: 1
+					},
+					success: function(res) {
+						if(res.data.code == 0) {
+							self.setData({
+								record: res.data.data.pageData,
+							});
+						};
+					},	
+				});
+				
+				
+				//获取中奖人员名单
+				app.request.get('/api/weshop/marketing/marketingLuckRecord/page', {
+					isShowLoading: false,
+					data: {
+						store_id: app.globalData.setting.stoid,
+						luck_formid: this.data.options.id,
+						luck_state: 1,
+						pageSize: 20,
+					},
+					success: function(res) {
+						if(res.data.code == 0) {
+							self.setData({
+								nameList: res.data.data.pageData,
+							});
+						};
+					},	
+				});
+				
 			};
 		};
 	},
@@ -211,12 +254,13 @@ Page({
 	prizeLayout(award) {
 		let prizes = [];
 		let length = award.length;
-		let thx = {fonts: [{ text: '谢谢\n参与', top: '18%', wordWrap:false, fontColor: 'rgba(0,0,0,.5)'}]};
+		let thx = {fonts: [{ text: '谢谢\n参与', top: '18%', wordWrap:false, fontColor: 'rgba(255,255,255,.8)'}]};
 		if(length == 1) {
 			[0,2,4,6].map(function(item, index) {
 				prizes[item] = {
 					id: award[0].id,
+					lbtype: award[0].lbtype,
 					fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 					imgs: [
 						{
@@ -240,6 +284,7 @@ Page({
 			[0,4].map(function(item, index) {
 				prizes[item] = {
 					id: award[0].id,
+					lbtype: award[0].lbtype,
 					fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 					imgs: [
 						{
@@ -255,6 +300,7 @@ Page({
 			[2,6].map(function(item, index) {
 				prizes[item] = {
 					id: award[1].id,
+					lbtype: award[1].lbtype,
 					fonts: [{ text: award[1].luck_goods_name + ' x' + award[1].num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 					imgs: [
 						{
@@ -278,6 +324,7 @@ Page({
 			[0,4].map(function(item, index) {
 				prizes[item] = {
 					id: award[0].id,
+					lbtype: award[0].lbtype,
 					fonts: [{ text: award[0].luck_goods_name + ' x' + award[0].num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 					imgs: [
 						{
@@ -293,6 +340,7 @@ Page({
 			[1,5].map(function(item, index) {
 				prizes[item] = {
 					id: award[1].id,
+					lbtype: award[1].lbtype,
 					fonts: [{ text: award[1].luck_goods_name + ' x' + award[1].num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 					imgs: [
 						{
@@ -308,6 +356,7 @@ Page({
 			[2,6].map(function(item, index) {
 				prizes[item] = {
 					id: award[2].id,
+					lbtype: award[2].lbtype,
 					fonts: [{ text: award[2].luck_goods_name + ' x' + award[2].num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 					imgs: [
 						{
@@ -332,6 +381,7 @@ Page({
 			[0,2,4,6].map(function(item, index) {
 				prizes[item] = {
 					id: award[index].id,
+					lbtype: award[index].lbtype,
 					fonts: [{ text: award[index].luck_goods_name + ' x' + award[index].num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 					imgs: [
 						{
@@ -355,6 +405,7 @@ Page({
 			[0,2,3,5,6].map(function(item, index) {
 				prizes[item] = {
 					id: award[index].id,
+					lbtype: award[index].lbtype,
 					fonts: [{ text: award[index].luck_goods_name + ' x' + award[index].num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 					imgs: [
 						{
@@ -378,6 +429,7 @@ Page({
 			prizes = award.map(function(item, index) {
 				return {
 					id: item.id,
+					lbtype: item.lbtype,
 					fonts: [{ text: item.luck_goods_name + ' x' + item.num, top: '18%', wordWrap:false, fontColor: 'transparent'}],
 						imgs: [
 							{
@@ -396,7 +448,7 @@ Page({
 			this.data.thxIndexArr = [3,7];
 		};
-		console.log('prizes', prizes);
+		// console.log('prizes', prizes);
 		this.setData({
 			prizes,
@@ -406,7 +458,7 @@ Page({
 	// 根据lbtype指定奖品类别图标
 	prizeSrc(lbtype) {
 		let src = '';
-		let imghost = this.data.imghost;
+		// let imghost = this.data.imghost;
 		switch(lbtype) {
 			case 1: { //积分
 				src = imghost + 'miniapp/images/luckDraw/jf.png';
@@ -488,8 +540,8 @@ Page({
 					},
 					success: function(res) {
-						// console.log('开始摇奖', res.data.data.id, res.data.data);
 						if(res.data.code == 0) {
+							console.log('开始摇奖', res.data.data);
 							self.setData({
 								'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1
 							});
@@ -509,7 +561,7 @@ Page({
 						} else {
-							console.log('请求出错');
+							// console.log('请求出错');
 							let thxIndexArr = self.data.thxIndexArr;
 							const random = Math.random() * thxIndexArr.length >> 0;
 							const index = thxIndexArr[random];
@@ -523,8 +575,7 @@ Page({
 					},
 					fail: function() {
-						
-						console.log('出错');
+						// console.log('出错');
 						let thxIndexArr = self.data.thxIndexArr;
 						const random = Math.random() * thxIndexArr.length >> 0;
 						const index = thxIndexArr[random];
@@ -549,13 +600,20 @@ Page({
   },
   end (event) {
     // 中奖奖品详情
-    // console.log('zjiangla~~',event.detail.fonts[0].text.replace('\n',''));
+    // console.log('zjiangla~~',event.detail.lbtype);
+		let lbtype;
 		let resultTitle = event.detail.fonts[0].text.replace('\n','');
+		if(event.detail.lbtype == 5) {
+			lbtype = 5;
+		} else {
+			lbtype = -1;
+		};
 		this.setData({
 			hiddenCanvas: true,
 			showResult: true,
 			showMask: true,
-			resultTitle, 
+			resultTitle,
+			currentLbtype: lbtype,
 		});
   },
@@ -737,6 +795,7 @@ Page({
 			success: function(res) {
 				if(res.data.code == 0) {
 					let data = res.data.data;
+					console.log('data!!!!', data);
 					let barcode = self.selectComponent("#qrcode"); 
 					barcode.open({val: data});
 					self.setData({
@@ -749,10 +808,17 @@ Page({
 		});
 	},
-	closeCode() {
+	closeQr() {
 		this.setData({
 			hiddenCanvas: false,
 			showMask: false,
 		});
 	},
+	
+	clickReceive() {
+		this.setData({
+			showResult: false,
+		});
+		this.showPopup();
+	},
 })
 \ No newline at end of file
 {
   "usingComponents": {
 		"lucky-wheel":"/packageB/miniprogram_npm/mini-luck-draw/lucky-wheel/index",
-		"qrcode": "/components/qr_code/qr_code",
+		"qrcode": "/components/my-qrcode/my-qrcode",
 		"nodata": "/components/nodata/nodata"
 	},
 	"enablePullDownRefresh": false,
@@ -2,6 +2,22 @@
 <wxs module="tool" src="./tool.wxs"></wxs>
 <view class="luck-container" style="background: {{template.colorCode}} url({{bannerUrl}}) no-repeat;">
 <!-- <view class="luck-container" style="background: url({{ bannerUrl}}) no-repeat;"> -->
+	<!-- 中奖人员 -->
+	<view class="swiper-container" wx:if="{{nameList && nameList.length != 0}}">
+		<swiper class="swiper" autoplay="true" circular="true" vertical="true" interval="1000">
+			<swiper-item class="swiper-item" wx:for="{{nameList}}">
+				<view class="item">
+					<view class="avatar-container">
+						<image src="{{item.head_pic}}" class="img-block"></image>
+					</view>
+					<view class="flex ai_c pdr10">
+						<view class="nickname ellipsis-1x">{{item.nickname}}</view>
+						<view style="flex-shrink: 0;">获得了"{{item.luck_goods_name}}"</view>
+					</view>
+				</view>
+			</swiper-item>
+		</swiper>
+	</view>
   <!-- 大转盘 -->
 	<view class="weel-container">
 		<view>
@@ -47,10 +63,10 @@
 		</view>
 	</view>
 	<!-- 活动展示 -->
-	<view wx:if="{{basic.remark}}">
+	<view wx:if="{{luckInfo.remark}}">
 		<view class="badge-container"><image src="{{imghost + 'miniapp/images/luckDraw/badge.png'}}" class="badge activity"></image></view>
 		<view class="bg-white br12 pd20">
-			{{basic.remark}}
+			{{luckInfo.remark}}
 			<!-- 时间 -->
 			<!-- <view class="bdb">
 				<view class="">
@@ -110,7 +126,7 @@
 </view>
 <!-- 悬浮按钮 -->
-<view class="gift-container" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
+<view class="gift-container {{record && record.length != 0 ? 'active':''}}" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
 <!-- 弹窗 -->
 <view class="popup-container" wx:if="{{showPopup}}">
@@ -143,17 +159,18 @@
 	<view class="popup">
 		<view class="t-c">
 			<block wx:if="{{resultTitle == '谢谢参与'}}">
-				<view class="bold c-tb">{{resultTitle}}</view>
+				<view class="bold c-tb fs40">{{resultTitle}}</view>
+				<view class="pdt10">继续加油噢~</view>
 			</block>
 			<block wx:else>
-				<view class="bold c-tb">恭喜你获得</view>
+				<view class="bold c-tb fs40">恭喜你获得</view>
 				<view class="pdt10">{{resultTitle}} </view>
 			</block>
 		</view>
 		<view class="img-container2"><image src="{{imghost + 'miniapp/images/luckDraw/gift.png'}}" class="img"></image></view>
-		<!-- <view class="flex jc-center mgt30 mgb20">
-			<view class="btn btn2" bindtap="closeResult">再抽一次</view>
-		</view> -->
+		<view class="pdt40" wx:if="{{currentLbtype == 5}}">
+			<view class="btn btn2" bindtap="clickReceive">立即领取</view>
+		</view>
 		<!-- <view class="note">注：未领取就关闭弹窗视为主动放弃奖品。</view> -->
 	</view>
 </view>
@@ -162,4 +179,4 @@
 <!-- 遮罩层 -->
 <view class="mask" wx:if="{{showMask}}"></view>
-<qrcode id="qrcode" bindtap="closeCode"></qrcode>
 \ No newline at end of file
+<qrcode id="qrcode" bind:close="closeQr"></qrcode>
 \ No newline at end of file
@@ -268,7 +268,8 @@ page,
 	font-size: 26rpx;
 	color: white;
 	background-color: #ff2d4b;
-	padding: 10rpx 40rpx;
+	padding: 20rpx 40rpx;
+	text-align: center;
 }
 .close-container {
@@ -337,12 +338,13 @@ page,
 	left: 50%;
 	transform: translate(-50%, -50%);
 	z-index: 999;
+	width: 85%;
 }
 .popup {
 	background-color: white;
 	border-radius: 12rpx;
-	padding: 40rpx;
+	padding: 60rpx;
 	margin-top: 20rpx;
 }
@@ -353,7 +355,7 @@ page,
 .img-container2 {
 	width: 300rpx;
 	height: 200rpx;
-	margin: 20rpx auto 0;
+	margin: 60rpx auto 0;
 }
 .note {
@@ -371,4 +373,58 @@ page,
 	color: #bbb;
 	text-align: center;
 	font-size: 22rpx;
-}
 \ No newline at end of file
+}
+
+.my-qrcode {
+	/* background-color: red; */
+}
+
+.swiper-container {
+	position: absolute;
+	top: 0;
+	left: 0;
+	padding: 20rpx 10rpx;
+	width: 100%;
+	box-sizing: border-box;
+}
+
+.swiper {
+	height: 60rpx;
+	color: white;
+	font-size: 26rpx;
+}
+
+.swiper-item {
+	/* width: auto !important;
+	background-color: rgba(0,0,0,.4);
+	border-radius: 60rpx; */
+	position: relative;
+}
+
+.item {
+	position: absolute;
+	display: flex;
+	align-items: center;
+	border-radius: 60rpx;
+	background-color: rgba(0,0,0,.4);
+}
+
+.avatar-container {
+	width: 60rpx;
+	height: 60rpx;
+	border-radius: 50%;
+	overflow: hidden;
+	flex-shrink: 0;
+}
+
+.img-block {
+	width: 100%;
+	height: 100%;
+	display: block;
+}
+
+.nickname {
+	color: #FFE12F;
+	padding: 0 10rpx;
+}
+