diff --git a/.project b/.project
index c6828b1..8e57e12 100644
--- a/.project
+++ b/.project
@@ -20,12 +20,38 @@
+
+ com.aptana.ide.core.unifiedBuilder
+
+
+
+ com.aptana.projects.webnature
org.eclipse.jem.workbench.JavaEMFNature
org.eclipse.wst.common.modulecore.ModuleCoreNature
org.eclipse.wst.common.project.facet.core.nature
org.eclipse.jdt.core.javanature
org.eclipse.wst.jsdt.core.jsNature
+
+
+ 1514875987450
+
+ 26
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-node_modules
+
+
+
+ 1514875987498
+
+ 26
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-node_modules
+
+
+
diff --git a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
index 66f5aa6..29fe0a6 100644
--- a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
+++ b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
@@ -11,20 +11,6 @@
@@ -84,159 +74,20 @@
@@ -312,7 +163,55 @@
-
+
@@ -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 += '
' +
+ '奖品' + (i + 1) + ' | ' +
+ '' + list[i].num + ' | ' +
+ '' + list[i].probability + ' | ' +
+ '' + type(list[i].isMoney) + ' | ' +
+ '' + money(list[i].isMoney, list[i].mixMoney, list[i].maxMoney, list[i].name) + ' | ' +
+ '修改' +
+ ' | ' +
+ '
';
}
+ $("#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();
+ }
+ })
})
diff --git a/WebContent/WEB-INF/res/css/basic.css b/WebContent/WEB-INF/res/css/basic.css
index 3ebcbf2..7ce05bd 100644
--- a/WebContent/WEB-INF/res/css/basic.css
+++ b/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