ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增娃娃机抽奖记录查询播报展示

This commit is contained in:
xu0625 2021-04-21 14:35:13 +08:00
parent 59e68e4eb7
commit e5a574db86
3 changed files with 75 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java
View File

@ -209,7 +209,7 @@ public class DrawController {
result.setRecord(prizes); result.setRecord(prizes);
return result; return result;
}*/ }*/
String userId ="1328495419744"; String userId ="";
/* if (!"1".equals(isAll)) { /* if (!"1".equals(isAll)) {
Long userId1 = ShiroUtils.getUserId(); Long userId1 = ShiroUtils.getUserId();
userId = userInfo.getOpenid(); userId = userInfo.getOpenid();

87
sino-act-web/src/main/resources/public/doll/index.html
View File

@ -1,12 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh"> <html lang="zh">
<head> <head>
<meta charset="GBK"> <meta charset="UTF-8">
<title>积分抓好运</title> <title>积分抓好运</title>
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<link rel="stylesheet" type="text/css" href="css/reset.css" /> <link rel="stylesheet" type="text/css" href="css/reset.css" />
<link rel="stylesheet" type="text/css" href="css/main.css?v=542" /> <link rel="stylesheet" type="text/css" href="css/main.css?v=542" />
<link rel="stylesheet" type="text/css" href="css/iosSelect.css" /> <link rel="stylesheet" type="text/css" href="css/iosSelect.css" />
<script src="/js/config.js"></script>
</head> </head>
<body> <body>
<div class="lottery"> <div class="lottery">
@ -23,21 +24,21 @@
</div> </div>
<p class="lottery_role"></p> <p class="lottery_role"></p>
<p class="lottery_prize"></p> <p class="lottery_prize"></p>
<p class="lottery_tips">每次消耗<span class="integral">50</span>积分</p> <p class="lottery_tips">每次消耗<span class="integral">50</span>积分</p>
<button class="lottery_go"></button> <button class="lottery_go"></button>
<p class="lottery_points">您还剩余<span class="num">0</span>积分</p> <p class="lottery_points">您还剩余<span class="num">0</span>积分</p>
<a href="javascript:void(0);" class="lottery_link"></a> <a href="javascript:void(0);" class="lottery_link"></a>
</div> </div>
<input type="hidden" class="drawType"/> <input type="hidden" class="drawType"/>
<!--未中奖--> <!--未中奖-->
<div class="pop pop_fail" style="display:none;"> <div class="pop pop_fail" style="display:none;">
<div class="pop_bg"> <div class="pop_bg">
<span class="closed"></span> <span class="closed"></span>
<div class="contact">就差一点点<br/>再接再厉哦</div> <div class="contact">就差一点点<br/>再接再厉哦</div>
<p class="btn"></p> <p class="btn"></p>
</div> </div>
</div> </div>
<!--中奖--> <!--中奖-->
<div class="pop pop_success" style="display:none;"> <div class="pop pop_success" style="display:none;">
<div class="pop_bg"> <div class="pop_bg">
<span class="closed"></span> <span class="closed"></span>
@ -48,41 +49,33 @@
<p class="btn"></p> <p class="btn"></p>
</div> </div>
</div> </div>
<!--填写信息--> <!--填写信息-->
<div class="pop pop_fillin" style="display:none;"> <div class="pop pop_fillin" style="display:none;">
<div class="pop_bg"> <div class="pop_bg">
<span class="closed"></span> <span class="closed"></span>
<div class="contact"> <div class="contact">
<p><span>收&nbsp;&nbsp;货&nbsp;&nbsp;人:</span><input class="uname" type="text" placeholder="请输入"/></p> <p><span>收&nbsp;&nbsp;货&nbsp;&nbsp;人:</span><input class="uname" type="text" placeholder="请输入"/></p>
<p><span>身份证号:</span><input class="idcard" type="text" maxlength="18" placeholder="请输入"/></p> <p><span>身份证号:</span><input class="idcard" type="text" maxlength="18" placeholder="请输入"/></p>
<p><span>联系电话:</span><input class="phone" type="text" maxlength="11" placeholder="请输入"/></p> <p><span>联系电话:</span><input class="phone" type="text" maxlength="11" placeholder="请输入"/></p>
<p><span>所在地区:</span><input class="contact_sel city" type="text" placeholder="请输入" readonly value="北京市 北京市 西城区" id="select_contact" data-city-code="110100" data-province-code="110000" data-district-code="110102"/></p> <p><span>所在地区:</span><input class="contact_sel city" type="text" placeholder="请输入" readonly value="北京市 北京市 西城区" id="select_contact" data-city-code="110100" data-province-code="110000" data-district-code="110102"/></p>
<p><span>详细地址:</span><textarea class="addr" placeholder="请输入详细地址信息，如道路、门牌号、 小区、楼栋好、单元室等"></textarea></p> <p><span>详细地址:</span><textarea class="addr" placeholder="请输入详细地址信息，如道路、门牌号、 小区、楼栋好、单元室等"></textarea></p>
<p class="contact_btn"></p> <p class="contact_btn"></p>
</div> </div>
</div> </div>
</div> </div>
<!--我的奖品--> <!--我的奖品-->
<div class="pop pop_prize" style="display:none;"> <div class="pop pop_prize" style="display:none;">
<div class="pop_bg"> <div class="pop_bg">
<h3 class="title"></h3> <h3 class="title"></h3>
<span class="closed"></span> <span class="closed"></span>
<div class="contact"> <div class="contact">
<ul class="content_list myPrizes"> <ul class="content_list myPrizes">
<li><img src="images/img_prize01.png" /><span>50积分</span><span class="list_date">2020-11-23</span></li>
<li><img src="images/img_prize02.png" /><span>猫眼50</span><span class="list_date">2020-11-23</span></li>
<li><img src="images/img_prize03.png" /><span>猫眼70</span><span class="list_date">2020-11-23</span></li>
<li><img src="images/img_prize04.png" /><span>网易季卡</span><span class="list_date">2020-11-23</span></li>
<li><img src="images/img_prize05.png" /><span>网易月卡</span><span class="list_date">2020-11-23</span></li>
<li><img src="images/img_prize06.png" /><span>QQ音乐</span><span class="list_date">2020-11-23</span></li>
<li><img src="images/img_prize07.png" /><span>优酷月卡</span><span class="list_date">2020-11-23</span></li>
<li><img src="images/img_prize08.png" /><span>优酷季卡</span><span class="list_date">2020-11-23</span></li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
<!--活动规则--> <!--活动规则-->
<div class="pop pop_role role" style="display:none;"> <div class="pop pop_role" style="display:none;">
<div class="pop_bg"> <div class="pop_bg">
<h3 class="title"></h3> <h3 class="title"></h3>
<span class="closed"></span> <span class="closed"></span>
@ -96,16 +89,17 @@
<img class="prize" src="" alt=""> <img class="prize" src="" alt="">
</div> </div>
<ul class="" style="display: none;"> <ul class="" style="display: none;">
<li class="award">恭喜 151****3445 获得京东E卡</li> <li class="award">恭喜 151****3445 获得京东E卡</li>
</ul> </ul>
<ul class="" style="display: none;"> <ul class="" style="display: none;">
<li class="prize_li"><img src="images/img_prize01.png" /><span class="pname">50积分</span><span class="list_date time">2020-11-23</span></li> <li class="prize_li"><img src="images/img_prize01.png" /><span class="pname">50积分</span><span class="list_date time">2020-11-23</span></li>
</ul> </ul>
<script src="js/jquery-1.11.0.min.js"></script> <script src="js/jquery-1.11.0.min.js"></script>
<script src="js/common.js"></script> <script src="js/common.js"></script>
<script src="js/scroll.js"></script> <script src="js/scroll.js"></script>
<script src="js/iosSelect.js"></script> <script src="js/iosSelect.js"></script>
<script src="js/areaData_v2.js" charset="GBK"></script> <script src="js/areaData_v2.js" charset="GBK"></script>
<script src="../draw/js/util.js"></script>
<script src="../../common/taglibs.js"></script> <script src="../../common/taglibs.js"></script>
<script src="../../js/jsencrypt.min.js"></script> <script src="../../js/jsencrypt.min.js"></script>
<script src="../../js/encryptUtil.js"></script> <script src="../../js/encryptUtil.js"></script>
@ -114,27 +108,26 @@
<script src="../../js/layui/layer.js"></script> <script src="../../js/layui/layer.js"></script>
<script src="../../js/layui/layerUtils.js"></script> <script src="../../js/layui/layerUtils.js"></script>
<script src="../draw/js/draw.js"></script> <script src="../draw/js/draw.js"></script>
<script src="/js/config.js"></script>
<script src="js/main.js"></script> <script src="js/main.js"></script>
<script> <script>
const DOLL = 'doll'; const DOLL = 'doll';
$(function () { $(function () {
init(DOLL); //init(DOLL);
initAwards(); initAwards();
}); });
//抽奖 //抽奖
var cH = $(".tool")[0].clientHeight; var cH = $(".tool")[0].clientHeight;
var tH = $(".tool")[0].offsetTop; var tH = $(".tool")[0].offsetTop;
var lH = $('.tool_line')[0].clientHeight; var lH = $('.tool_line')[0].clientHeight;
var timer = null; var timer = null;
$('.lottery_go').click(function(){ $('.lottery_go').click(function(){
//中奖传1，2，3，4，5，6，7，8（对应奖品）,未中奖传-1 //中奖传1，2，3，4，5，6，7，8（对应奖品）,未中奖传-1
//1:50积分,2:猫眼50,3:猫眼70,4:网易季卡,5:网易月卡,6:QQ音乐,7:优酷月卡,8:优酷季卡 //1:50积分,2:猫眼50,3:猫眼70,4:网易季卡,5:网易月卡,6:QQ音乐,7:优酷月卡,8:优酷季卡
fnLottery(-1); fnLottery(-1);
}); });
function fnLottery(status){ function fnLottery(status){
try{ try{
zhuge.track('娃娃机-开始抓奖按钮【'+drawCode+'】'); zhuge.track('娃娃机-开始抓奖按钮【'+drawCode+'】');
}catch(err){console.log(err);} }catch(err){console.log(err);}
if (running) { if (running) {
console.log('running...'); console.log('running...');
@ -161,7 +154,7 @@
} }
$('.tool_line').animate({height:lH},1500); $('.tool_line').animate({height:lH},1500);
$(".tool").animate({top:tH},1500,function(){ $(".tool").animate({top:tH},1500,function(){
//中奖啦 //中奖啦
if(status != -1){ if(status != -1){
$('.pop_success').show(); $('.pop_success').show();
$(".tool img").hide(); $(".tool img").hide();
@ -169,7 +162,7 @@
let imgSrc = $('img[p-code='+prizeCode+']').attr('src'); let imgSrc = $('img[p-code='+prizeCode+']').attr('src');
$(".contact img").attr('src',imgSrc); $(".contact img").attr('src',imgSrc);
} }
//未中奖 //未中奖
if(status == -1){ if(status == -1){
$('.pop_fail').show(); $('.pop_fail').show();
} }
@ -178,16 +171,16 @@
}, 2500); }, 2500);
} }
//所在地区选择 //所在地区选择
var selectContactDom = $('#select_contact'); var selectContactDom = $('#select_contact');
selectContactDom.bind('click', function () { selectContactDom.bind('click', function () {
var oneLevelId = selectContactDom.attr('data-province-code'); //省code var oneLevelId = selectContactDom.attr('data-province-code'); //省code
var twoLevelId = selectContactDom.attr('data-city-code');//市code var twoLevelId = selectContactDom.attr('data-city-code');//市code
var threeLevelId = selectContactDom.attr('data-district-code');//区code var threeLevelId = selectContactDom.attr('data-district-code');//区code
var iosSelect = new IosSelect(3, var iosSelect = new IosSelect(3,
[iosProvinces, iosCitys, iosCountys], [iosProvinces, iosCitys, iosCountys],
{ {
title: '地址选择', title: '地址选择',
itemHeight: 35, itemHeight: 35,
relation: [1, 1], relation: [1, 1],
oneLevelId: oneLevelId, oneLevelId: oneLevelId,
@ -201,29 +194,31 @@
} }
}); });
}); });
//活动规则 //活动规则
$('.lottery_role').click(function(){ $('.lottery_role').click(function(){
drawrule(); drawrule();
$('.pop_role').show(); $('.pop_role').show();
}) })
//关闭弹层 //关闭弹层
$('.closed,.btn').click(function(){ $('.closed,.btn').click(function(){
$(this).parents('.pop').hide(); $(this).parents('.pop').hide();
}) })
//未中奖确认关闭弹层 //未中奖确认关闭弹层
$('.pop_fail .btn').click(function(){ $('.pop_fail .btn').click(function(){
$(this).parents('.pop').hide(); $(this).parents('.pop').hide();
}) })
//中奖立即领取 //中奖立即领取
$('.pop_success .btn').click(function(){ $('.pop_success .btn').click(function(){
$(this).parents('.pop').hide(); /*$(this).parents('.pop').hide();
let cue = body.cue; let cue = body.cue;
let prizeType = body.prizeType; let prizeType = body.prizeType;
if (prizeType === 'materialObject') { if (prizeType === 'materialObject') {
$('.pop_fillin').show(); $('.pop_fillin').show();
} else { } else {
layerTip(cue); layerTip(cue);
} }*/
window.location.href='../act/address.html?drawCode='+drawCode;
}); });
$('.contact_btn').click(function () { $('.contact_btn').click(function () {
saveAddr() saveAddr()
@ -233,7 +228,7 @@
}) })
$('.lottery_link').click(function () { $('.lottery_link').click(function () {
try{ try{
zhuge.track('娃娃机-点我赚积分按钮【'+drawCode+'】'); zhuge.track('娃娃机-点我赚积分按钮【'+drawCode+'】');
}catch(err){console.log(err);} }catch(err){console.log(err);}
// location.href = contextRootPath+'/wechat/user/toPension.do?ak=pensionSecond'; // location.href = contextRootPath+'/wechat/user/toPension.do?ak=pensionSecond';
location.href = contextRootPath+'/activity/tree/index.html?showTask=1&cl='+cl; location.href = contextRootPath+'/activity/tree/index.html?showTask=1&cl='+cl;

66
sino-act-web/src/main/resources/public/doll/js/main.js
View File

@ -3,7 +3,7 @@ let cl = getParameter('cl');
let uid = getParameter('uid'); let uid = getParameter('uid');
let running = false; let running = false;
let body; let body;
//剩余次数或积分 //剩余次数或积分
function init(facade){ function init(facade){
$.ajax({ $.ajax({
type:'POST', type:'POST',
@ -38,40 +38,40 @@ function init(facade){
}, },
error:function(XMLHttpRequest, textStatus, errorThrown){ error:function(XMLHttpRequest, textStatus, errorThrown){
console.log(textStatus); console.log(textStatus);
layerTip('网络异常，请检查网络环境'); layerTip('网络异常，请检查网络环境');
} }
}); });
} }
function initAwards(){ function initAwards(){
$.ajax({ $.ajax({
type:'POST', type:'POST',
url:contextRootPath+'/integral/active/getRollList.do', url:contextRootPath+'/draw/prizes.action',
data: {"drawCode": drawCode}, data: {"drawCode": drawCode, isAll: 1},
dataType:'json', dataType:'json',
success:function(data){ success:function(data){
let awards = data.awardPrizeLists; let awards = data.record;
if (!awards) { if (!awards) {
return; return;
} }
$.each(awards, function (i, n) { $.each(awards, function (i, n) {
let userName = n.userName; let userName = n.username;
let prizeName = n.prizeName; let prizeName = n.prizename;
let dateStr = n.dateStr; let dateStr = n.createtimestamp;
let award = $('.award').clone(); let award = $('.award').clone();
award.show(); award.show();
award.removeClass('award'); award.removeClass('award');
award.html('恭喜'+userName+'获得'+prizeName); award.html('恭喜'+userName+'获得'+prizeName);
$('.awards').append(award); $('.awards').append(award);
}); });
//中奖名单滚动 //中奖名单滚动
$('.my_scroll').myScroll({ $('.my_scroll').myScroll({
speed: 100, //数值越大，速度越慢 speed: 100, //数值越大，速度越慢
rowHeight: 38//li的高度 rowHeight: 38//li的高度
}); });
}, },
error:function(XMLHttpRequest, textStatus, errorThrown){ error:function(XMLHttpRequest, textStatus, errorThrown){
console.log(textStatus); console.log(textStatus);
layerTip('网络异常，请检查网络环境'); layerTip('网络异常，请检查网络环境');
} }
}); });
} }
@ -80,23 +80,23 @@ function myprizes(facade) {
$('.pop_prize').show(); $('.pop_prize').show();
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: contextRootPath+'/integral/active/awardPrizeList.do', url: contextRootPath+'/draw/prizes.action',
data: {drawCode: drawCode, facade: facade}, data: {drawCode: drawCode, facade: facade},
dataType: "json", dataType: "json",
success: function(data){ success: function(data){
let prizes = data.awardPrizeLists; let prizes = data.record;
if (!prizes) { if (!prizes) {
return; return;
} }
$.each(prizes, function (i, n) { $.each(prizes, function (i, n) {
let ptype = n.prizeType; let ptype = n.prizetype;
let status = n.status; let status = n.status;
let prizeCode = n.prizeCode; let prizeCode = n.prizecode;
let prize = $('.prize_li').clone(); let prize = $('.prize_li').clone();
prize.show(); prize.show();
prize.removeClass('prize_li'); prize.removeClass('prize_li');
prize.find('.pname').html(n.prizeName); prize.find('.pname').html(n.prizename);
prize.find('.time').html(n.dateStr); prize.find('.time').html(n.createtimestamp);
let imgSrc = $('img[p-code=' + prizeCode + ']').attr('src'); let imgSrc = $('img[p-code=' + prizeCode + ']').attr('src');
prize.find("img").attr('src', imgSrc); prize.find("img").attr('src', imgSrc);
let link = n.link; let link = n.link;
@ -106,13 +106,13 @@ function myprizes(facade) {
}); });
} }
$(prize).attr('val', prizeCode); $(prize).attr('val', prizeCode);
$(prize).attr('flow', n.gatewayFolw); $(prize).attr('flow', n.drawtranseqno);
$(prize).attr('ptype', ptype); $(prize).attr('ptype', ptype);
$('.myPrizes').append(prize); $('.myPrizes').append(prize);
}); });
}, },
error: function (XMLHttpRequest, textStatus, errorThrown) { error: function (XMLHttpRequest, textStatus, errorThrown) {
console.log('网络异常', textStatus, errorThrown); console.log('网络异常', textStatus, errorThrown);
} }
}); });
@ -128,23 +128,23 @@ function saveAddr(type) {
if ('integral' == prizeType) { if ('integral' == prizeType) {
} else if ('materialObject' == prizeType) { } else if ('materialObject' == prizeType) {
if (!uname) { if (!uname) {
layerTip('请输入收货人姓名'); layerTip('请输入收货人姓名');
return; return;
} }
if (!idcard) { if (!idcard) {
layerTip('请输入身份证号'); layerTip('请输入身份证号');
return; return;
} }
if (!phone) { if (!phone) {
layerTip('请输入联系电话'); layerTip('请输入联系电话');
return; return;
} }
if (!city) { if (!city) {
layerTip('请选择所在地区'); layerTip('请选择所在地区');
return; return;
} }
if (!addr) { if (!addr) {
layerTip('请输入详细地址'); layerTip('请输入详细地址');
return; return;
} }
} else { } else {
@ -168,11 +168,11 @@ function saveAddr(type) {
} else { } else {
} }
$('.pop_fillin').hide(); $('.pop_fillin').hide();
layerTip('保存成功') layerTip('保存成功')
}, },
error: function (XMLHttpRequest, textStatus, errorThrown) { error: function (XMLHttpRequest, textStatus, errorThrown) {
console.log('网络异常', textStatus, errorThrown); console.log('网络异常', textStatus, errorThrown);
layerTip('网络异常，请检查网络环境'); layerTip('网络异常，请检查网络环境');
} }
}); });
@ -199,7 +199,7 @@ function start() {
return; return;
} else if (code == '-1') { } else if (code == '-1') {
running = false; running = false;
layerTip('请先完善手机号'); layerTip('请先完善手机号');
return; return;
} }
if (code != '0') { if (code != '0') {
@ -213,11 +213,11 @@ function start() {
error:function(XMLHttpRequest, textStatus, errorThrown){ error:function(XMLHttpRequest, textStatus, errorThrown){
running = false; running = false;
console.log(textStatus); console.log(textStatus);
layerTip('网络异常，请检查网络环境'); layerTip('网络异常，请检查网络环境');
} }
}); });
} }
//剩余次数或积分 //剩余次数或积分
function num(drawType){ function num(drawType){
// let drawType = $('.drawType').val(); // let drawType = $('.drawType').val();
$.ajax({ $.ajax({
@ -232,7 +232,7 @@ function num(drawType){
}, },
error:function(XMLHttpRequest, textStatus, errorThrown){ error:function(XMLHttpRequest, textStatus, errorThrown){
console.log(textStatus); console.log(textStatus);
layerTip('网络异常，请检查网络环境'); layerTip('网络异常，请检查网络环境');
} }
}); });
} }