diff --git a/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp b/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp index 50fbb1d..7d311c7 100644 --- a/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp +++ b/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp @@ -213,6 +213,8 @@ $("[name=sellerPhone]").val(""); form.render(); }) + + }) diff --git a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp index 89214b8..576ca72 100644 --- a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp +++ b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp @@ -21,6 +21,10 @@ margin: 0; } + .tipbox { + display: none; + } + .tipbox .layui-form-label { display: block; width: 100%; @@ -100,11 +104,11 @@
- +
- +
@@ -138,11 +142,11 @@
- +
- +
@@ -176,11 +180,11 @@
- +
- +
@@ -214,11 +218,11 @@
- +
- +
@@ -232,7 +236,7 @@ -
提示语设置
+
@@ -346,9 +350,12 @@ $("[name=probability" + i + "]").val(list.probability); if(list.isMoney) { $("[name=isMoney" + i + "]")[0].checked = true; - //$("[name=name"+i+"]").addClass("layui-disabled").attr("disabled", "disabled"); + $("[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); @@ -379,55 +386,112 @@ form.on('submit(submit)', function(e) { console.log(e.field) - //console.log(e.field.${"num"+"1"}) - var p1, p2 = {}; - if(e.field.num1 > 0){ + var p1, p2, p3, p4 = {}; + var p = { + num: 0, + probability: 0, + isMoney: true, + mixMoney: 0, + maxMoney: 0, + name: "" + } + if(e.field.num1 > 0) { p1 = { - num: e.field.num1, - probability: e.field.probability1, + id: 1, + num: parseInt(e.field.num1, 10), + probability: parseInt(e.field.probability1, 10), isMoney: toBool(e.field.isMoney1), - mixMoney: e.field.mixMoney1, - maxMoney: e.filed.maxMoney1, + mixMoney: parseInt(e.field.mixMoney1, 10), + maxMoney: parseInt(e.field.maxMoney1, 10), name: e.field.name1 } - }else{ - p1 = null + } else { + p1 = p; + p1.id = 1; } - - if(e.field.num2 > 0){ + + if(e.field.num2 > 0) { p2 = { - num: e.field.num2, - probability: e.field.probability2, + id: 2, + num: parseInt(e.field.num2, 10), + probability: parseInt(e.field.probability2, 10), isMoney: toBool(e.field.isMoney2), - mixMoney: e.field.mixMoney2, - maxMoney: e.filed.maxMoney2, + mixMoney: parseInt(e.field.mixMoney2, 10), + maxMoney: parseInt(e.field.maxMoney2, 10), name: e.field.name2 } - }else{ - p2 = null + } else { + p2 = p; + p2.id = 2; } - - if(e.field.num2 > 0){ - var p1 = { - num: e.field.num2, - probability: e.field.probability2, - isMoney: toBool(e.field.isMoney2), - mixMoney: e.field.mixMoney2, - maxMoney: e.filed.maxMoney2, - name: e.field.name2 + + 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{ - var p1 = null + } else { + p3 = p; + p3.id = 3; } - - /*$.post("/zzhnc/activity/editActivitySetting", data_, function(data) { - console.log(data); - if(data.code == 0) { - top.layer.msg("修改成功"); - } else { - top.layer.msg(data.msg); + + 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 } - })*/ + } 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 + } + $.ajax({ + type: 'POST', + url: '/zzhnc/activity/editActivitySetting', + dataType: 'json', + async: true, + contentType: "application/json;charset=UTF-8", + data: JSON.stringify(submitData), + success: function(data) { + layer.msg('操作成功'); + }, + error: function(xhr, type) { + layer.msg('操作失败'); + } + }); }); //立即开始 @@ -490,19 +554,36 @@ } }); - + //数值转为true或false - function toBool(v){ - if(v == "1"){ + function toBool(v) { + if(v == "1") { v = true - }else{ + } else { v = false } 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"); + } else { + $(name1).removeAttr("lay-verify").attr("disabled", "disabled").addClass("layui-disabled"); + $(name2).attr("lay-verify", "required").removeAttr("disabled").removeClass("layui-disabled"); + + } + }); + } + 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]"); + }) - \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/pc/report/goods.jsp b/WebContent/WEB-INF/jsp/pc/report/goods.jsp index 5cd97e0..0992f93 100644 --- a/WebContent/WEB-INF/jsp/pc/report/goods.jsp +++ b/WebContent/WEB-INF/jsp/pc/report/goods.jsp @@ -87,8 +87,8 @@ '' + ((data.page - 1) * data.pageSize + i + 1) + '' + '' + '' + data.rows[i].name + '' + - '' + data.rows[i].name + '' + - '' + data.rows[i].name + '' + + '' + data.rows[i].shareCount + '' + + '' + data.rows[i].pageViews + '' + ''; } $("#tablelist").html(str);