diff --git a/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp b/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp index e1f0511..a9c5c43 100644 --- a/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp +++ b/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp @@ -107,7 +107,7 @@
- +
@@ -233,17 +233,18 @@ contentType: "application/json;charset=UTF-8", data: JSON.stringify(submitData), success: function(data) { - layer.msg('操作成功'); + layer.msg('保存成功'); + clearForm(); }, error: function(xhr, type) { - layer.msg('操作失败'); + layer.msg('保存失败'); } }); return false; }) //重置 - $(".resetBtn").on("click", function() { + function clearForm(){ $("[name=name]").val(""); $("[name=description]").val(""); $("[name=imgUrl]").val(""); @@ -259,6 +260,10 @@ $("[name=sellerAddress]").val(""); $("[name=sellerPhone]").val(""); form.render(); + } + + $(".resetBtn").on("click", function() { + clearForm(); }) diff --git a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp index d8ce4fe..795b5ec 100644 --- a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp +++ b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp @@ -37,6 +37,9 @@ width: 100px; height: 100px; } + .tipbox{ + display: none; + } @@ -103,7 +106,7 @@ -
提示语设置
+
@@ -170,7 +173,7 @@
-
+
保存 @@ -346,11 +349,20 @@ var submitData = prizeInfo; submitData.num = $("[name=num]").val(); submitData.probability = $("[name=probability]").val(); - submitData.isMoney = toBool($("[name=isMoney]").val()); - submitData.mixMoney = $("[name=mixMoney]").val(); - submitData.maxMoney = $("[name=maxMoney]").val(); - submitData.imgUrl = $("[name=imgUrl]").val(); - submitData.name = $("[name=name]").val(); + if(toBool($("[name=isMoney]").val())){ + submitData.isMoney = toBool($("[name=isMoney]").val()); + submitData.mixMoney = $("[name=mixMoney]").val(); + submitData.maxMoney = $("[name=maxMoney]").val(); + submitData.imgUrl = ""; + submitData.name = ""; + }else{ + submitData.isMoney = toBool($("[name=isMoney]").val()); + submitData.mixMoney = 0; + submitData.maxMoney = 0; + submitData.imgUrl = $("[name=imgUrl]").val(); + submitData.name = $("[name=name]").val(); + } + $.ajax({ type: 'POST', url: '/zzhnc/activity/editActivityPrize/' + id, diff --git a/WebContent/WEB-INF/jsp/pc/report/goods.jsp b/WebContent/WEB-INF/jsp/pc/report/goods.jsp index 617bd76..9659e56 100644 --- a/WebContent/WEB-INF/jsp/pc/report/goods.jsp +++ b/WebContent/WEB-INF/jsp/pc/report/goods.jsp @@ -29,9 +29,18 @@
+
+ +
+
@@ -65,6 +74,7 @@ page: 1, size: 10, sellerId: 0, + sort: 1, key: null }; @@ -116,14 +126,17 @@ form.on('submit(querybtn)', function(data) { queryObj.page = 1; queryObj.key = $("[name=key]").val(); + queryObj.sort = $("[name=sort]").val(); initData(queryObj); }); //重置 $(".resetBtn").on("click", function() { $("[name=key]").val(""); + $("[name=sort]").val("1"); queryObj.page = 1; queryObj.key = null; + queryObj.sort = 1; initData(queryObj); })