Skip to content

zhangtai / zzhnc

转到一个项目
Commit f7c8cf44 由 沈姿.前端(已离职)
选项

Merge branch 'shenzi'

2 个父辈 5c5bdf21 dd7d7852
内嵌 并排
正在显示 5 个修改的文件 包含 58 行增加 和 38 行删除
WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"><i class="redrequired">*</i>文章标题</label> <label class="layui-form-label"><i class="redrequired">*</i>文章标题</label>
<div class="layui-input-inline" style="width: 400px;"> <div class="layui-input-inline" style="width: 400px;">
<input type="text" name="title" lay-verify="title" placeholder="文章标题" class="layui-input"> <input type="text" name="title" lay-verify="required|title" placeholder="文章标题" class="layui-input">
</div> </div>
<div class="layui-form-mid layui-word-aux">不超过20个汉字</div> <div class="layui-form-mid layui-word-aux">不超过20个汉字</div>
</div> </div>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<span class="layui-form-mid layui-word-aux">建议尺寸：200*200</span> <span class="layui-form-mid layui-word-aux">建议尺寸：200*200</span>
<div class="layui-upload-list"> <div class="layui-upload-list">
<img class="layui-upload-img mainpictrue" src=""> <img class="layui-upload-img mainpictrue" src="">
<input type="text" style="display:none;" name="imgurl"> <input type="text" style="display:none;" name="imgurl" lay-verify="required">
</div> </div>
</div> </div>
</div> </div>
......
WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
<body class="wrap"> <body class="wrap">
<form class="layui-form"> <form class="layui-form">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"><i class="redrequired">*</i>商品标题</label> <label class="layui-form-label"><i class="redrequired">*</i>商品名称</label>
<div class="layui-input-inline" style="width: 400px;"> <div class="layui-input-inline" style="width: 400px;">
<input type="text" name="name" placeholder="商品标题" class="layui-input"> <input type="text" name="name" lay-verify="required" placeholder="商品名称" class="layui-input">
</div> </div>
<div class="layui-form-mid layui-word-aux">不超过20个汉字</div> <div class="layui-form-mid layui-word-aux">不超过20个汉字</div>
</div> </div>
...@@ -28,20 +28,32 @@ ...@@ -28,20 +28,32 @@
<span class="layui-form-mid layui-word-aux">建议尺寸：200*200</span> <span class="layui-form-mid layui-word-aux">建议尺寸：200*200</span>
<div class="layui-upload-list"> <div class="layui-upload-list">
<img class="layui-upload-img mainpictrue" src=""> <img class="layui-upload-img mainpictrue" src="">
<input type="text" style="display:none;" name="bannerUrl"> <input type="text" style="display:none;" name="bannerUrl" lay-verify="required">
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"><i class="redrequired">*</i>商品类别</label>
<div class="layui-input-inline" style="width: 140px;">
<select name="categoryName" lay-verify="required">
<option value="">请选择</option>
<option value="小商品">小商品</option>
<option value="服装">服装</option>
<option value="副食">副食</option>
<option value="汽摩配件">汽摩配件</option>
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><i class="redrequired">*</i>商品原价</label> <label class="layui-form-label"><i class="redrequired">*</i>商品原价</label>
<div class="layui-input-inline" style="width: 100px;"> <div class="layui-input-inline" style="width: 100px;">
<input type="number" name="primePrice" placeholder="商品原价" class="layui-input"> <input type="number" lay-verify="required" name="primePrice" placeholder="商品原价" class="layui-input">
</div> </div>
<div class="layui-form-mid">元</div> <div class="layui-form-mid">元</div>
<label class="layui-form-label"><i class="redrequired">*</i>商品现价</label> <label class="layui-form-label"><i class="redrequired">*</i>商品现价</label>
<div class="layui-input-inline" style="width: 100px;"> <div class="layui-input-inline" style="width: 100px;">
<input type="number" name="price" placeholder="商品现价" class="layui-input"> <input type="number" lay-verify="required" name="price" placeholder="商品现价" class="layui-input">
</div> </div>
<div class="layui-form-mid">元</div> <div class="layui-form-mid">元</div>
</div> </div>
...@@ -58,19 +70,19 @@ ...@@ -58,19 +70,19 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"><i class="redrequired">*</i>商家名称</label> <label class="layui-form-label"><i class="redrequired">*</i>商家名称</label>
<div class="layui-input-inline" style="width: 400px;"> <div class="layui-input-inline" style="width: 400px;">
<input type="text" name="sellerName" placeholder="商家名称" class="layui-input"> <input type="text" lay-verify="required" name="sellerName" placeholder="商家名称" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"><i class="redrequired">*</i>商家店铺号</label> <label class="layui-form-label"><i class="redrequired">*</i>商家店铺号</label>
<div class="layui-input-inline" style="width: 400px;"> <div class="layui-input-inline" style="width: 400px;">
<input type="text" name="sellerAddress" placeholder="商家店铺号" class="layui-input"> <input type="text" lay-verify="required" name="sellerAddress" placeholder="商家店铺号" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"><i class="redrequired">*</i>商家电话</label> <label class="layui-form-label"><i class="redrequired">*</i>商家电话</label>
<div class="layui-input-inline" style="width: 400px;"> <div class="layui-input-inline" style="width: 400px;">
<input type="text" name="sellerPhone" placeholder="商家电话" class="layui-input"> <input type="text" lay-verify="required" name="sellerPhone" placeholder="商家电话" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
...@@ -112,6 +124,7 @@ ...@@ -112,6 +124,7 @@
$("[name=description]").val(data.description); $("[name=description]").val(data.description);
$(".mainpictrue").attr("src", data.bannerUrl).css("margin-top", "15px"); $(".mainpictrue").attr("src", data.bannerUrl).css("margin-top", "15px");
$("[name=bannerUrl]").val(data.bannerUrl); $("[name=bannerUrl]").val(data.bannerUrl);
$("[name=categoryName]").val(data.categoryName);
$("[name=primePrice]").val(data.primePrice); $("[name=primePrice]").val(data.primePrice);
$("[name=price]").val(data.price); $("[name=price]").val(data.price);
if(data.isHome) { if(data.isHome) {
...@@ -172,6 +185,7 @@ ...@@ -172,6 +185,7 @@
description: data.field.description, description: data.field.description,
bannerUrl: $("[name=bannerUrl]").val(), bannerUrl: $("[name=bannerUrl]").val(),
imgUrl: $("[name=bannerUrl]").val(), imgUrl: $("[name=bannerUrl]").val(),
categoryName: $("[name=categoryName]").val(),
isHome: isHome, isHome: isHome,
isHot: isHot, isHot: isHot,
primePrice: data.field.primePrice, primePrice: data.field.primePrice,
...@@ -204,6 +218,7 @@ ...@@ -204,6 +218,7 @@
$("[name=description]").val(""); $("[name=description]").val("");
$("[name=bannerUrl]").val(""); $("[name=bannerUrl]").val("");
$(".mainpictrue").attr("src", "").css("margin-top", "0"); $(".mainpictrue").attr("src", "").css("margin-top", "0");
$("[name=categoryName]").val("");
$("[name=isHome]").val("on"); $("[name=isHome]").val("on");
$("[name=isHot]").val("on"); $("[name=isHot]").val("on");
$("[name=primePrice]").val(""); $("[name=primePrice]").val("");
......
WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
<tr> <tr>
<th>No</th> <th>No</th>
<th>商品主图</th> <th>商品主图</th>
<th>商品标题</th> <th>商品名称</th>
<th>商品副标题</th> <th>商品类别</th>
<th>原价</th> <th>原价</th>
<th>现价</th> <th>现价</th>
<th>商家名称</th> <th>商家名称</th>
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
'<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' + '<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' +
'<td><img class="imgUrl" src="' + data.rows[i].bannerUrl + '" /></td>' + '<td><img class="imgUrl" src="' + data.rows[i].bannerUrl + '" /></td>' +
'<td>' + data.rows[i].name + '</td>' + '<td>' + data.rows[i].name + '</td>' +
'<td>' + data.rows[i].description + '</td>' + '<td>' + data.rows[i].categoryName + '</td>' +
'<td>' + data.rows[i].primePrice + '</td>' + '<td>' + data.rows[i].primePrice + '</td>' +
'<td>' + data.rows[i].price + '</td>' + '<td>' + data.rows[i].price + '</td>' +
'<td>' + data.rows[i].sellerName + '</td>' + '<td>' + data.rows[i].sellerName + '</td>' +
......
WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<label class="layui-form-label"><i class="redrequired">*</i>活动开启时间 </label> <label class="layui-form-label"><i class="redrequired">*</i>活动开启时间 </label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" name="beginTime" autocomplete="on" id="stTime" placeholder="- 开始时间 -" class="layui-input" lay-verify="required" onclick="layui.laydate({elem: this,format: 'YYYY-MM-DD hh:mm',istime: true,min:laydate.now(-1)})"> <input type="text" name="beginTime" placeholder="- 开始时间 -" class="layui-input" lay-verify="required" />
</div> </div>
</div> </div>
</div> </div>
...@@ -306,8 +306,8 @@ ...@@ -306,8 +306,8 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"></label> <label class="layui-form-label"></label>
<a class="layui-btn" lay-submit lay-filter="submit">保存</a> <a class="layui-btn" lay-submit lay-filter="submit">保存</a>
<button class="layui-btn" lay-submit lay-filter="status2">立即开启活动</button> <button class="layui-btn" lay-submit lay-filter="start">立即开启活动</button>
<button class="layui-btn" lay-submit lay-filter="status3">立即结束活动</button> <button class="layui-btn" lay-submit lay-filter="finish">立即结束活动</button>
<button class="layui-btn" lay-submit lay-filter="nextround">开启下一轮</button> <button class="layui-btn" lay-submit lay-filter="nextround">开启下一轮</button>
</div> </div>
</form> </form>
...@@ -323,17 +323,22 @@ ...@@ -323,17 +323,22 @@
laydate = layui.laydate, laydate = layui.laydate,
layer = layui.layer, layer = layui.layer,
laypage = layui.laypage; laypage = layui.laypage;
laydate.render({
elem: '[name=beginTime]',
type: 'datetime'
});
$.get("/zzhnc/activity/getActivitySetting", function(data) { $.get("/zzhnc/activity/getActivitySetting", function(data) {
console.log(data) console.log(data)
if(data.code == 0) { if(data.code == 0) {
//基本信息 //基本信息
$("input[name=beginTime]").val(toTime_G(data.data.beginTime)); $("[name=beginTime]").val(toTime_G(data.data.beginTime));
$("select[name=status]").val(data.data.status); $("[name=status]").val(data.data.status);
$("input[name=turn]").val(data.data.turn); $("[name=turn]").val(data.data.turn);
$("input[name=planMny]").val(data.data.planMny); $("[name=planMny]").val(data.data.planMny);
$("input[name=currentMny]").val(data.data.currentMny.toFixed(2)); $("[name=currentMny]").val(data.data.currentMny.toFixed(2));
$("input[name=city]").val(data.data.city); $("[name=city]").val(data.data.city);
//奖项设置 //奖项设置
for(var i = 1; i < 5; i++) { for(var i = 1; i < 5; i++) {
if(i == 1) { if(i == 1) {
...@@ -366,17 +371,17 @@ ...@@ -366,17 +371,17 @@
} }
//提示语 //提示语
$("input[name=keyword]").val(data.data.keyword); $("[name=keyword]").val(data.data.keyword);
$("textarea[name=replyWelcome]").val(data.data.replyWelcome); $("[name=replyWelcome]").val(data.data.replyWelcome);
$("input[name=replyWait]").val(data.data.replyWait); $("[name=replyWait]").val(data.data.replyWait);
$("input[name=replySucceed]").val(data.data.replySucceed); $("[name=replySucceed]").val(data.data.replySucceed);
$("input[name=unLotteryReply]").val(data.data.unLotteryReply); $("[name=unLotteryReply]").val(data.data.unLotteryReply);
$("input[name=replyFailed2]").val(data.data.replyFailed2); $("[name=replyFailed2]").val(data.data.replyFailed2);
$("input[name=finishReply]").val(data.data.finishReply); $("[name=finishReply]").val(data.data.finishReply);
$("input[name=lotteryTitle]").val(data.data.lotteryTitle); $("[name=lotteryTitle]").val(data.data.lotteryTitle);
$("input[name=lotterySubTitle]").val(data.data.lotterySubTitle); $("[name=lotterySubTitle]").val(data.data.lotterySubTitle);
$("input[name=noChanceReply]").val(data.data.noChanceReply); $("[name=noChanceReply]").val(data.data.noChanceReply);
$("input[name=badWordsReply]").val(data.data.badWordsReply); $("[name=badWordsReply]").val(data.data.badWordsReply);
form.render(); form.render();
} else { } else {
...@@ -456,7 +461,7 @@ ...@@ -456,7 +461,7 @@
} }
var submitData = { var submitData = {
beginTime: e.field.beginTime, //beginTime: e.field.beginTime,
status: e.field.status, status: e.field.status,
turn: e.field.turn, turn: e.field.turn,
planMny: e.field.planMny, planMny: e.field.planMny,
...@@ -495,7 +500,7 @@ ...@@ -495,7 +500,7 @@
}); });
//立即开始 //立即开始
form.on('submit(status2)', function(e) { form.on('submit(start)', function(e) {
var status = $("select[name=status]").val(); var status = $("select[name=status]").val();
console.log(status) console.log(status)
if(status == "1") { if(status == "1") {
...@@ -516,7 +521,7 @@ ...@@ -516,7 +521,7 @@
}); });
//立即结束 //立即结束
form.on('submit(status3)', function(e) { form.on('submit(finish)', function(e) {
var status = $("select[name=status]").val(); var status = $("select[name=status]").val();
if(status == "2") { if(status == "2") {
$.post("/zzhnc/activity/updateActivityStatus", { $.post("/zzhnc/activity/updateActivityStatus", {
......
WebContent/WEB-INF/jsp/pc/report/goods.jsp
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>抽奖记录</title> <title>商品报表</title>
<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css"> <link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
<link rel="stylesheet" href="/zzhnc/res/css/basic.css"> <link rel="stylesheet" href="/zzhnc/res/css/basic.css">
</head> </head>
......
Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
请先完成此消息的编辑！