diff --git a/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp b/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp index 649d664..6ee3edd 100644 --- a/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp +++ b/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp @@ -35,7 +35,7 @@
- +
不超过20个汉字
@@ -47,7 +47,7 @@ 建议尺寸：200*200
- +
diff --git a/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp b/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp index 7d311c7..a3763aa 100644 --- a/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp +++ b/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp @@ -14,9 +14,9 @@
- +
- +
不超过20个汉字
@@ -28,20 +28,32 @@ 建议尺寸：200*200
- +
+ +
+ +
+
+
- +
元
- +
元
@@ -58,19 +70,19 @@
- +
- +
- +
@@ -112,6 +124,7 @@ $("[name=description]").val(data.description); $(".mainpictrue").attr("src", data.bannerUrl).css("margin-top", "15px"); $("[name=bannerUrl]").val(data.bannerUrl); + $("[name=categoryName]").val(data.categoryName); $("[name=primePrice]").val(data.primePrice); $("[name=price]").val(data.price); if(data.isHome) { @@ -172,6 +185,7 @@ description: data.field.description, bannerUrl: $("[name=bannerUrl]").val(), imgUrl: $("[name=bannerUrl]").val(), + categoryName: $("[name=categoryName]").val(), isHome: isHome, isHot: isHot, primePrice: data.field.primePrice, @@ -204,6 +218,7 @@ $("[name=description]").val(""); $("[name=bannerUrl]").val(""); $(".mainpictrue").attr("src", "").css("margin-top", "0"); + $("[name=categoryName]").val(""); $("[name=isHome]").val("on"); $("[name=isHot]").val("on"); $("[name=primePrice]").val(""); diff --git a/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp b/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp index bfb09a4..443d094 100644 --- a/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp +++ b/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp @@ -28,8 +28,8 @@ No 商品主图 - 商品标题 - 商品副标题 + 商品名称 + 商品类别 原价 现价 商家名称 @@ -81,7 +81,7 @@ '' + ((data.page - 1) * data.pageSize + i + 1) + '' + '' + '' + data.rows[i].name + '' + - '' + data.rows[i].description + '' + + '' + data.rows[i].categoryName + '' + '' + data.rows[i].primePrice + '' + '' + data.rows[i].price + '' + '' + data.rows[i].sellerName + '' + diff --git a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp index 576ca72..9592c10 100644 --- a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp +++ b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp @@ -43,7 +43,7 @@
- +
@@ -306,8 +306,8 @@
保存 - - + +
@@ -323,17 +323,22 @@ laydate = layui.laydate, layer = layui.layer, laypage = layui.laypage; - + + laydate.render({ + elem: '[name=beginTime]', + type: 'datetime' + }); + $.get("/zzhnc/activity/getActivitySetting", function(data) { console.log(data) if(data.code == 0) { //基本信息 - $("input[name=beginTime]").val(toTime_G(data.data.beginTime)); - $("select[name=status]").val(data.data.status); - $("input[name=turn]").val(data.data.turn); - $("input[name=planMny]").val(data.data.planMny); - $("input[name=currentMny]").val(data.data.currentMny.toFixed(2)); - $("input[name=city]").val(data.data.city); + $("[name=beginTime]").val(toTime_G(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) { @@ -366,17 +371,17 @@ } //提示语 - $("input[name=keyword]").val(data.data.keyword); - $("textarea[name=replyWelcome]").val(data.data.replyWelcome); - $("input[name=replyWait]").val(data.data.replyWait); - $("input[name=replySucceed]").val(data.data.replySucceed); - $("input[name=unLotteryReply]").val(data.data.unLotteryReply); - $("input[name=replyFailed2]").val(data.data.replyFailed2); - $("input[name=finishReply]").val(data.data.finishReply); - $("input[name=lotteryTitle]").val(data.data.lotteryTitle); - $("input[name=lotterySubTitle]").val(data.data.lotterySubTitle); - $("input[name=noChanceReply]").val(data.data.noChanceReply); - $("input[name=badWordsReply]").val(data.data.badWordsReply); + $("[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); form.render(); } else { @@ -456,7 +461,7 @@ } var submitData = { - beginTime: e.field.beginTime, + //beginTime: e.field.beginTime, status: e.field.status, turn: e.field.turn, planMny: e.field.planMny, @@ -495,7 +500,7 @@ }); //立即开始 - form.on('submit(status2)', function(e) { + form.on('submit(start)', function(e) { var status = $("select[name=status]").val(); console.log(status) if(status == "1") { @@ -516,7 +521,7 @@ }); //立即结束 - form.on('submit(status3)', function(e) { + form.on('submit(finish)', function(e) { var status = $("select[name=status]").val(); if(status == "2") { $.post("/zzhnc/activity/updateActivityStatus", { diff --git a/WebContent/WEB-INF/jsp/pc/report/goods.jsp b/WebContent/WEB-INF/jsp/pc/report/goods.jsp index 862c782..7bf00a3 100644 --- a/WebContent/WEB-INF/jsp/pc/report/goods.jsp +++ b/WebContent/WEB-INF/jsp/pc/report/goods.jsp @@ -6,7 +6,7 @@ - 抽奖记录 + 商品报表