Skip to content

zhangtai / zzhnc

转到一个项目
Commit a9c3782c 由 zxt@theyeasy.com
选项

Merge branch 'master' into zxt

2 个父辈 5c465839 52bc274a
内嵌 并排
正在显示 3 个修改的文件 包含 259 行增加 和 336 行删除
.project
......@@ -20,12 +20,38 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.aptana.ide.core.unifiedBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.aptana.projects.webnature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
<filteredResources>
<filter>
<id>1514875987450</id>
<name></name>
<type>26</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-node_modules</arguments>
</matcher>
</filter>
<filter>
<id>1514875987498</id>
<name></name>
<type>26</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-node_modules</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
......@@ -11,20 +11,6 @@
<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
<style>
.layui-form-label {
height: 28px;
line-height: 28px;
padding: 5px 15px;
}
.layui-form-radio {
margin: 0;
}
.tipbox {
display: none;
}
.tipbox .layui-form-label {
display: block;
width: 100%;
......@@ -34,6 +20,10 @@
.tipbox .layui-input-block {
margin-left: 0;
}
.popupbos .layui-form-label {
width: 110px;
}
</style>
<body class="wrap">
......@@ -84,159 +74,20 @@
<div class="layui-form-mid layui-word-aux">提示：(该金额为缓存的已发放金额，每个保存会清零，实际发放金额以抽奖记录为准）</div>
</div>
<blockquote class="layui-elem-quote">奖项配置</blockquote>
<div class="prize-item">
<fieldset class="layui-elem-field layui-field-title">
<legend>一等奖</legend>
<div class="layui-field-box">
<div class="layui-form-item">
<label class="layui-form-label">奖品数量：</label>
<div class="layui-input-inline">
<input type="number" min="0" name="num1" class="layui-input" />
</div>
<div class="layui-form-mid">名</div>
<label class="layui-form-label">中奖概率：</label>
<div class="layui-input-inline" style="width:100px;">
<input type="number" value="0" name="probability1" class="layui-input" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><input type="radio" name="isMoney1" lay-filter="isMoney1" value="1" title="红包"></label>
<label class="layui-form-label">红包随机金额 </label>
<div class="layui-input-inline" style="width:100px;">
<input type="number" value="0" name="mixMoney1" class="layui-input" lay-verify="required" min="1">
</div>
<div class="layui-form-mid">至</div>
<div class="layui-input-inline" style="width:100px;">
<input type="number" value="0" name="maxMoney1" class="layui-input" lay-verify="required" min="1" />
</div>
<div class="layui-form-mid">分</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><input type="radio" name="isMoney1" lay-filter="isMoney1" value="2" title="物品"></label>
<label class="layui-form-label">礼品名称 </label>
<div class="layui-input-inline">
<input type="text" name="name1" class="layui-input" />
</div>
</div>
</div>
</fieldset>
</div>
<div class="prize-item">
<fieldset class="layui-elem-field layui-field-title">
<legend>二等奖</legend>
<div class="layui-field-box">
<div class="layui-form-item">
<label class="layui-form-label">奖品数量：</label>
<div class="layui-input-inline">
<input type="number" min="0" name="num2" class="layui-input" />
</div>
<div class="layui-form-mid">名</div>
<label class="layui-form-label">中奖概率：</label>
<div class="layui-input-inline" style="width:100px;">
<input type="number" name="probability2" class="layui-input" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><input type="radio" name="isMoney2" lay-filter="isMoney2" value="1" title="红包"></label>
<label class="layui-form-label">红包随机金额 </label>
<div class="layui-input-inline" style="width:100px;">
<input type="number" value="0" name="mixMoney2" class="layui-input" lay-verify="required" min="1">
</div>
<div class="layui-form-mid">至</div>
<div class="layui-input-inline" style="width:100px;">
<input type="number" value="0" name="maxMoney2" class="layui-input" lay-verify="required" min="1" />
</div>
<div class="layui-form-mid">分</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><input type="radio" name="isMoney2" lay-filter="isMoney2" value="2" title="物品"></label>
<label class="layui-form-label">礼品名称 </label>
<div class="layui-input-inline">
<input type="text" name="name2" class="layui-input" />
</div>
</div>
</div>
</fieldset>
</div>
<div class="prize-item">
<fieldset class="layui-elem-field layui-field-title">
<legend>三等奖</legend>
<div class="layui-field-box">
<div class="layui-form-item">
<label class="layui-form-label">奖品数量：</label>
<div class="layui-input-inline">
<input type="number" min="0" name="num3" class="layui-input" />
</div>
<div class="layui-form-mid">名</div>
<label class="layui-form-label">中奖概率：</label>
<div class="layui-input-inline" style="width:100px;">
<input type="number" name="probability3" class="layui-input" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><input type="radio" name="isMoney3" lay-filter="isMoney3" value="1" title="红包"></label>
<label class="layui-form-label">红包随机金额 </label>
<div class="layui-input-inline" style="width:100px;">
<input type="number" value="0" name="mixMoney3" class="layui-input" lay-verify="required" min="1">
</div>
<div class="layui-form-mid">至</div>
<div class="layui-input-inline" style="width:100px;">
<input type="number" value="0" name="maxMoney3" class="layui-input" lay-verify="required" min="1" />
</div>
<div class="layui-form-mid">分</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><input type="radio" name="isMoney3" lay-filter="isMoney3" value="2" title="物品"></label>
<label class="layui-form-label">礼品名称 </label>
<div class="layui-input-inline">
<input type="text" name="name3" class="layui-input" />
</div>
</div>
</div>
</fieldset>
</div>
<div class="prize-item">
<fieldset class="layui-elem-field layui-field-title">
<legend>四等奖</legend>
<div class="layui-field-box">
<div class="layui-form-item">
<label class="layui-form-label">奖品数量：</label>
<div class="layui-input-inline">
<input type="number" min="0" name="num4" class="layui-input" />
</div>
<div class="layui-form-mid">名</div>
<label class="layui-form-label">中奖概率：</label>
<div class="layui-input-inline" style="width:100px;">
<input type="number" name="probability4" class="layui-input" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><input type="radio" name="isMoney4" lay-filter="isMoney4" value="1" title="红包"></label>
<label class="layui-form-label">红包随机金额 </label>
<div class="layui-input-inline" style="width:100px;">
<input type="number" value="0" name="mixMoney4" class="layui-input" lay-verify="required" min="1">
</div>
<div class="layui-form-mid">至</div>
<div class="layui-input-inline" style="width:100px;">
<input type="number" value="0" name="maxMoney4" class="layui-input" lay-verify="required" min="1" />
</div>
<div class="layui-form-mid">分</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><input type="radio" name="isMoney4" lay-filter="isMoney4" value="2" title="物品"></label>
<label class="layui-form-label">礼品名称 </label>
<div class="layui-input-inline">
<input type="text" name="name4" class="layui-input" />
</div>
</div>
</div>
</fieldset>
</div>
<blockquote class="layui-elem-quote" style="display: none;">提示语设置</blockquote>
<table class="layui-table">
<thead>
<th>奖项</th>
<th>奖品数量</th>
<th>中奖概率(%)</th>
<th>奖品类型</th>
<th>奖品名称</th>
<th>操作</th>
</thead>
<tbody id="prize-list">
</tbody>
</table>
<blockquote class="layui-elem-quote">提示语设置</blockquote>
<div class="layui-form-item tipbox">
<label class="layui-form-label">粉丝输入以下关键字将触发抽奖功能（多个关键字请以“|”分隔）</label>
<div class="layui-input-block">
......@@ -312,7 +163,55 @@
</div>
</form>
</body>
<div class="popupbox" style="display:none;">
<div class="popupbos">
<div class="layui-form">
<div class="layui-field-box">
<div class="layui-form-item">
<label class="layui-form-label">奖品数量：</label>
<div class="layui-input-inline" style="width:100px;">
<input type="number" min="0" name="num" class="layui-input" />
</div>
<div class="layui-form-mid">名</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">中奖概率：</label>
<div class="layui-input-inline" style="width:100px;">
<input type="number" value="0" name="probability" class="layui-input" />
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">类型：</label>
<div class="layui-input-inline" style="width: 140px;">
<select name="isMoney" lay-verify="required" lay-filter="isMoney">
<option value="">请选择</option>
<option value="1">红包</option>
<option value="2">物品</option>
</select>
</div>
</div>
<div class="layui-form-item redpakage">
<label class="layui-form-label">红包随机金额 ：</label>
<div class="layui-input-inline" style="width:100px;">
<input type="number" value="0" name="mixMoney" class="layui-input" lay-verify="required" min="1">
</div>
<div class="layui-form-mid">至</div>
<div class="layui-input-inline" style="width:100px;">
<input type="number" value="0" name="maxMoney" class="layui-input" lay-verify="required" min="1" />
</div>
<div class="layui-form-mid">分</div>
</div>
<div class="layui-form-item prizeName">
<label class="layui-form-label">礼品名称 ：</label>
<div class="layui-input-inline" style="width:235px;">
<input type="text" name="name" class="layui-input" />
</div>
</div>
</div>
</div>
</div>
</div>
<script src='/zzhnc/res/js/jquery.min.js'></script>
<script src="/zzhnc/res/plugins/layui/layui.js"></script>
<script src="/zzhnc/res/js/me.js"></script>
......@@ -323,166 +222,131 @@
laydate = layui.laydate,
layer = layui.layer,
laypage = layui.laypage;
laydate.render({
elem: '[name=beginTime]',
type: 'datetime'
elem: '[name=beginTime]',
type: 'datetime'
});
$.get("/zzhnc/activity/getActivitySetting", function(data) {
console.log(data)
if(data.code == 0) {
//基本信息
$("[name=beginTime]").val(data.data.beginTime);
$("[name=status]").val(data.data.status);
$("[name=turn]").val(data.data.turn);
$("[name=planMny]").val(data.data.planMny);
$("[name=currentMny]").val(data.data.currentMny.toFixed(2));
$("[name=city]").val(data.data.city);
//奖项设置
for(var i = 1; i < 5; i++) {
if(i == 1) {
var list = data.data.p1
} else if(i == 2) {
var list = data.data.p2
} else if(i == 3) {
var list = data.data.p3
} else if(i == 4) {
var list = data.data.p4
}
if(list != null) {
$("[name=num" + i + "]").val(list.num);
$("[name=probability" + i + "]").val(list.probability);
if(list.isMoney) {
$("[name=isMoney" + i + "]")[0].checked = true;
$("[name=mixMoney" + i + "], [name=maxMoney" + i + "]").attr("lay-verify", "required").removeAttr("disabled").removeClass("layui-disabled");
$("[name=name"+i+"]").removeAttr("lay-verify").attr("disabled", "disabled").addClass("layui-disabled");
} else {
$("[name=isMoney" + i + "]")[1].checked = true;
$("[name=mixMoney" + i + "], [name=maxMoney" + i + "]").removeAttr("lay-verify").attr("disabled", "disabled").addClass("layui-disabled");
$("[name=name"+i+"]").attr("lay-verify", "required").removeAttr("disabled").removeClass("layui-disabled");
}
$("[name=mixMoney" + i + "]").val(list.mixMoney);
$("[name=maxMoney" + i + "]").val(list.maxMoney);
$("[name=name" + i + "]").val(list.name);
} else {
$("[name=name" + i + "]").val("")
}
}
//提示语
$("[name=keyword]").val(data.data.keyword);
$("[name=replyWelcome]").val(data.data.replyWelcome);
$("[name=replyWait]").val(data.data.replyWait);
$("[name=replySucceed]").val(data.data.replySucceed);
$("[name=unLotteryReply]").val(data.data.unLotteryReply);
$("[name=replyFailed2]").val(data.data.replyFailed2);
$("[name=finishReply]").val(data.data.finishReply);
$("[name=lotteryTitle]").val(data.data.lotteryTitle);
$("[name=lotterySubTitle]").val(data.data.lotterySubTitle);
$("[name=noChanceReply]").val(data.data.noChanceReply);
$("[name=badWordsReply]").val(data.data.badWordsReply);
var prizelist = [];
form.render();
} else {
top.layer.msg(data.msg);
}
})
form.on('submit(submit)', function(e) {
console.log(e.field)
var p1, p2, p3, p4 = {};
var p = {
num: 0,
probability: 0,
isMoney: true,
mixMoney: 0,
maxMoney: 0,
name: ""
}
if(e.field.num1 > 0) {
p1 = {
id: 1,
num: parseInt(e.field.num1, 10),
probability: parseInt(e.field.probability1, 10),
isMoney: toBool(e.field.isMoney1),
mixMoney: parseInt(e.field.mixMoney1, 10),
maxMoney: parseInt(e.field.maxMoney1, 10),
name: e.field.name1
}
} else {
p1 = p;
p1.id = 1;
}
if(e.field.num2 > 0) {
p2 = {
id: 2,
num: parseInt(e.field.num2, 10),
probability: parseInt(e.field.probability2, 10),
isMoney: toBool(e.field.isMoney2),
mixMoney: parseInt(e.field.mixMoney2, 10),
maxMoney: parseInt(e.field.maxMoney2, 10),
name: e.field.name2
function initData() {
$.get("/zzhnc/activity/getActivitySetting", function(data) {
console.log(data)
if(data.code == 0) {
//基本信息
$("[name=beginTime]").val(data.data.activity.beginTime);
$("[name=status]").val(data.data.activity.status);
$("[name=turn]").val(data.data.activity.turn);
$("[name=planMny]").val(data.data.activity.planMny);
$("[name=currentMny]").val(data.data.activity.currentMny.toFixed(2));
$("[name=city]").val(data.data.activity.city);
//提示语
$("[name=keyword]").val(data.data.activity.keyword);
$("[name=replyWelcome]").val(data.data.activity.replyWelcome);
$("[name=replyWait]").val(data.data.activity.replyWait);
$("[name=replySucceed]").val(data.data.activity.replySucceed);
$("[name=unLotteryReply]").val(data.data.activity.unLotteryReply);
$("[name=replyFailed2]").val(data.data.activity.replyFailed2);
$("[name=finishReply]").val(data.data.activity.finishReply);
$("[name=lotteryTitle]").val(data.data.activity.lotteryTitle);
$("[name=lotterySubTitle]").val(data.data.activity.lotterySubTitle);
$("[name=noChanceReply]").val(data.data.activity.noChanceReply);
$("[name=badWordsReply]").val(data.data.activity.badWordsReply);
//奖项设置
prizelist = data.data.prizeList;
prizeList(prizelist);
form.render();
} else {
top.layer.msg(data.msg);
}
} else {
p2 = p;
p2.id = 2;
}
})
}
if(e.field.num3 > 0) {
p3 = {
id: 3,
num: parseInt(e.field.num3, 10),
probability: parseInt(e.field.probability3, 10),
isMoney: toBool(e.field.isMoney3),
mixMoney: parseInt(e.field.mixMoney3, 10),
maxMoney: parseInt(e.field.maxMoney3, 10),
name: e.field.name3
}
} else {
p3 = p;
p3.id = 3;
initData();
function prizeList(list){
var str = "";
for(var i = 0; i < list.length; i++) {
str += '<tr data-id=' + list[i].id + '>' +
'<td>奖品' + (i + 1) + '</td>' +
'<td>' + list[i].num + '</td>' +
'<td>' + list[i].probability + '</td>' +
'<td>' + type(list[i].isMoney) + '</td>' +
'<td>' + money(list[i].isMoney, list[i].mixMoney, list[i].maxMoney, list[i].name) + '</td>' +
'<td><a href="#" class="layui-btn layui-btn-sm updataBtn">修改</a>' +
'</td>' +
'</tr>';
}
$("#prize-list").html(str);
form.render();
}
if(e.field.num4 > 0) {
p4 = {
id: 4,
num: parseInt(e.field.num4, 10),
probability: parseInt(e.field.probability4, 10),
isMoney: toBool(e.field.isMoney4),
mixMoney: parseInt(e.field.mixMoney4, 10),
maxMoney: parseInt(e.field.maxMoney4, 10),
name: e.field.name4
//修改奖品信息
$(document).on("click", ".updataBtn", function() {
var id = $(this).parents("tr").attr("data-id");
var title = "奖品" + id;
var prizeInfo = getPrize(id);
layer.open({
type: 1,
title: title,
area: ["650px", "400px"],
content: $(".popupbox"),
btnAlign: "c",
btn: ["提交", "取消"],
scrollbar: false,
yes: function(index, layero) {
var submitData = prizeInfo;
prizeInfo.num = $("[name=num]").val();
prizeInfo.probability = $("[name=probability]").val();
prizeInfo.isMoney = toBool($("[name=isMoney]").val());
prizeInfo.mixMoney = $("[name=mixMoney]").val();
prizeInfo.maxMoney = $("[name=maxMoney]").val();
prizeInfo.name = $("[name=name]").val();
$.ajax({
type: 'POST',
url: '/zzhnc/activity/editActivityPrize/' + id,
dataType: 'json',
async: true,
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(submitData),
success: function(data) {
layer.msg('操作成功');
layer.close(index);
prizelist = updatePrizeList(id, submitData);
prizeList(prizelist);
},
error: function(xhr, type) {
layer.msg('操作失败');
}
});
form.render();
},
success: function() {
console.log(prizeInfo)
$("[name=num]").val(prizeInfo.num);
$("[name=probability]").val(prizeInfo.probability);
if(prizeInfo.isMoney) {
$(".redpakage").show();
$(".prizeName").hide();
$("[name=isMoney]").val("1");
$("[name=mixMoney]").val(prizeInfo.mixMoney);
$("[name=maxMoney]").val(prizeInfo.maxMoney);
} else {
$(".prizeName").show();
$(".redpakage").hide();
$("[name=isMoney]").val("2");
$("[name=name]").val(prizeInfo.name);
}
form.render();
}
} else {
p4 = p;
p4.id = 4;
}
})
})
var submitData = {
beginTime: e.field.beginTime,
status: e.field.status,
turn: e.field.turn,
planMny: e.field.planMny,
city: e.field.city,
currentMny: e.field.currentMny,
p1: p1,
p2: p2,
p3: p3,
p4: p4,
keyword: e.field.keyword,
replyWelcome: e.field.replyWelcome,
badWordsReply: e.field.badWordsReply,
replyWait: e.field.replyWait,
replySucceed: e.field.replySucceed,
unLotteryReply: e.field.unLotteryReply,
replyFailed2: e.field.replyFailed2,
finishReply: e.field.finishReply,
lotteryTitle: e.field.lotteryTitle,
lotterySubTitle: e.field.lotterySubTitle,
noChanceReply: e.field.noChanceReply
}
//提交事件
form.on('submit(submit)', function(e) {
console.log(e.field)
var submitData = e.field;
$.ajax({
type: 'POST',
url: '/zzhnc/activity/editActivitySetting',
......@@ -538,7 +402,7 @@
layer.msg("只有进行中的活动可以结束");
}
});
//设置下一轮
form.on('submit(nextround)', function(e) {
var status = $("select[name=status]").val();
......@@ -566,23 +430,60 @@
return v;
}
//监控奖项类型变化
function monitorPrizeType(selector, name1, name2) {
form.on(selector, function(data) {
if(data.value == 1) {
$(name1).attr("lay-verify", "required").removeAttr("disabled").removeClass("layui-disabled");
$(name2).removeAttr("lay-verify").attr("disabled", "disabled").addClass("layui-disabled");
//渲染列表时，显示类型是红包还是奖品
function type(t) {
if(t) {
return t = "红包"
} else {
return t = "礼品"
}
}
//渲染列表时，显示的奖品名称
function money(type, min, max, name) {
var text = "";
if(type) {
if(min != max) {
text = min + " - " + max + " 分 "
} else {
$(name1).removeAttr("lay-verify").attr("disabled", "disabled").addClass("layui-disabled");
$(name2).attr("lay-verify", "required").removeAttr("disabled").removeClass("layui-disabled");
text = min + " 分 "
}
} else {
text = name;
}
return text;
}
//得到单个奖品的信息
function getPrize(id) {
for(var i = 0; i < prizelist.length; i++) {
if(prizelist[i].id == id) {
return prizelist[i];
}
});
}
}
//将单个奖品的数据保存到list中
function updatePrizeList(id, info){
for(var i = 0; i < prizelist.length; i++) {
if(prizelist[i].id == id) {
prizelist[i] == info;
}
}
return prizelist;
}
monitorPrizeType("radio(isMoney1)", "[name=mixMoney1],[name=maxMoney1]", "[name=name1]");
monitorPrizeType("radio(isMoney2)", "[name=mixMoney2],[name=maxMoney2]", "[name=name2]");
monitorPrizeType("radio(isMoney3)", "[name=mixMoney3],[name=maxMoney3]", "[name=name3]");
monitorPrizeType("radio(isMoney4)", "[name=mixMoney4],[name=maxMoney4]", "[name=name4]");
//监控类型选择
form.on("select(isMoney)", function(e) {
console.log(e);
if(e.value == "1") {
$(".redpakage").show();
$(".prizeName").hide();
} else if(e.value == "2") {
$(".prizeName").show();
$(".redpakage").hide();
}
})
})
</script>
......
WebContent/WEB-INF/res/css/basic.css
......@@ -188,9 +188,5 @@
margin-left: 90px;
}
.popupbos .layui-form-mid {
padding: 0!important;
}
/*-------------弹出框 end-------------*/
\ No newline at end of file
Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
请先完成此消息的编辑！