Skip to content

zhangtai / zzhnc

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

增加抽奖状态、商品banner图尺寸等

1 个父辈 251fc022
内嵌 并排
正在显示 3 个修改的文件 包含 66 行增加 和 28 行删除
WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp
...@@ -15,17 +15,17 @@ ...@@ -15,17 +15,17 @@
<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: 450px;">
<input type="text" name="name" lay-verify="required" 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>
<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: 450px;">
<div class="layui-upload"> <div class="layui-upload">
<button type="button" class="layui-btn" id="uploadImg">上传主图</button> <button type="button" class="layui-btn" id="uploadImg">上传主图</button>
<span class="layui-form-mid layui-word-aux">建议尺寸：200*200，用于首页和列表页面显示</span> <div class="layui-form-mid layui-word-aux">建议尺寸：200*200，用于首页和列表页面显示</div>
<div class="layui-upload-list"> <div class="layui-upload-list">
<img class="layui-upload-img imgPic" src=""> <img class="layui-upload-img imgPic" src="">
<input type="text" style="display:none;" name="imageUrl" lay-verify="required"> <input type="text" style="display:none;" name="imageUrl" lay-verify="required">
...@@ -34,11 +34,11 @@ ...@@ -34,11 +34,11 @@
</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>上传banner图</label>
<div class="layui-input-inline" style="width: 400px;"> <div class="layui-input-inline" style="width: 450px;">
<div class="layui-upload"> <div class="layui-upload">
<button type="button" class="layui-btn" id="uploadBanner">上传详情图</button> <button type="button" class="layui-btn" id="uploadBanner">上传banner图</button>
<span class="layui-form-mid layui-word-aux">建议尺寸：750*440，用于商品详情页显示</span> <div class="layui-form-mid layui-word-aux">建议尺寸：750*470，用于商品详情页显示</div>
<div class="layui-upload-list"> <div class="layui-upload-list">
<img class="layui-upload-img bannerPic" src=""> <img class="layui-upload-img bannerPic" src="">
<input type="text" style="display:none;" name="bannerUrl" lay-verify="required"> <input type="text" style="display:none;" name="bannerUrl" lay-verify="required">
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</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: 140px;"> <div class="layui-input-inline" style="width: 450px;">
<select name="categoryName" lay-verify="required"> <select name="categoryName" lay-verify="required">
<option value="">请选择</option> <option value="">请选择</option>
<option value="小商品">小商品</option> <option value="小商品">小商品</option>
...@@ -60,41 +60,41 @@ ...@@ -60,41 +60,41 @@
</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: 100px;"> <div class="layui-input-inline" style="width: 130px;">
<input type="number" lay-verify="required" 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: 130px;">
<input type="number" lay-verify="required" 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>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">是否首页显示</label> <label class="layui-form-label">是否首页显示</label>
<div class="layui-input-inline" style="width: 100px;"> <div class="layui-input-inline" style="width: 154px;">
<input type="checkbox" checked name="isHome" lay-skin="switch" lay-text="是|否"> <input type="checkbox" checked name="isHome" lay-skin="switch" lay-text="是|否">
</div> </div>
<label class="layui-form-label">是否爆款</label> <label class="layui-form-label">是否爆款</label>
<div class="layui-input-inline" style="width: 100px;"> <div class="layui-input-inline" style="width: 154px;">
<input type="checkbox" checked name="isHot" lay-skin="switch" lay-text="是|否"> <input type="checkbox" checked name="isHot" lay-skin="switch" lay-text="是|否">
</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: 450px;">
<input type="text" lay-verify="required" 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: 450px;">
<input type="text" lay-verify="required" 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">商家电话</label> <label class="layui-form-label">商家电话</label>
<div class="layui-input-inline" style="width: 400px;"> <div class="layui-input-inline" style="width: 450px;">
<input type="text" name="sellerPhone" placeholder="商家电话" class="layui-input"> <input type="text" name="sellerPhone" placeholder="商家电话" class="layui-input">
</div> </div>
</div> </div>
......
WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
...@@ -33,6 +33,10 @@ ...@@ -33,6 +33,10 @@
max-width: 50px; max-width: 50px;
height: auto; height: auto;
} }
.mainpictrue{
width: 100px;
height: 100px;
}
</style> </style>
<body class="wrap"> <body class="wrap">
...@@ -50,8 +54,8 @@ ...@@ -50,8 +54,8 @@
<select name="status" lay-verify="required" disabled> <select name="status" lay-verify="required" disabled>
<option value="0">请选择状态 </option> <option value="0">请选择状态 </option>
<option value="1">未开启 </option> <option value="1">未开启 </option>
<option value="2"> 进行中</option> <option value="2">进行中</option>
<option value="3"> 已结束</option> <option value="3">已结束</option>
</select> </select>
</div> </div>
</div> </div>
...@@ -230,7 +234,6 @@ ...@@ -230,7 +234,6 @@
<div class="layui-input-inline" style="width:300px;"> <div class="layui-input-inline" style="width:300px;">
<input type="text" name="name" class="layui-input" /> <input type="text" name="name" class="layui-input" />
</div> </div>
<div class="layui-form-mid layui-word-aux">(礼品名称在6个字以内)</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -292,6 +295,7 @@ ...@@ -292,6 +295,7 @@
function prizeList(list) { function prizeList(list) {
var str = ""; var str = "";
for(var i = 0; i < list.length; i++) { for(var i = 0; i < list.length; i++) {
if(list[i] != null){
str += '<tr data-id=' + list[i].id + '>' + str += '<tr data-id=' + list[i].id + '>' +
'<td>奖品' + (i + 1) + '</td>' + '<td>奖品' + (i + 1) + '</td>' +
'<td>' + list[i].num + '</td>' + '<td>' + list[i].num + '</td>' +
...@@ -302,6 +306,7 @@ ...@@ -302,6 +306,7 @@
'</td>' + '</td>' +
'</tr>'; '</tr>';
} }
}
$("#prize-list").html(str); $("#prize-list").html(str);
form.render(); form.render();
} }
...@@ -317,7 +322,7 @@ ...@@ -317,7 +322,7 @@
console.log(data) console.log(data)
if(data.code == 0) { if(data.code == 0) {
$("[name=imgUrl]").val(data.data.imgurl); $("[name=imgUrl]").val(data.data.imgurl);
$(".mainpictrue").attr("src", data.data.imgurl).css("margin-top", "15px"); $(".mainpictrue").attr("src", data.data.imgurl).css("margin", "15px 0");
} else { } else {
return layer.msg('上传失败'); return layer.msg('上传失败');
} }
...@@ -380,7 +385,7 @@ ...@@ -380,7 +385,7 @@
$(".redpakage").hide(); $(".redpakage").hide();
$("[name=isMoney]").val("2"); $("[name=isMoney]").val("2");
$("[name=imgUrl]").val(prizeInfo.imgUrl); $("[name=imgUrl]").val(prizeInfo.imgUrl);
$(".mainpictrue").attr("src", prizeInfo.imgUrl).css("margin-top", "15px"); $(".mainpictrue").attr("src", prizeInfo.imgUrl).css("margin", "15px 0");
$("[name=name]").val(prizeInfo.name); $("[name=name]").val(prizeInfo.name);
} }
form.render(); form.render();
......
WebContent/WEB-INF/jsp/pc/report/prize.jsp
...@@ -31,10 +31,9 @@ ...@@ -31,10 +31,9 @@
</div> </div>
<div class="layui-input-inline" style="width: 140px;"> <div class="layui-input-inline" style="width: 140px;">
<select name="status"> <select name="status">
<option value="">请选择</option> <option value="">状态</option>
<option value="100">全部</option> <option value="1">未兑换</option>
<option value="0">未中奖</option> <option value="2">已兑换</option>
<option value="1">中奖</option>
</select> </select>
</div> </div>
<div class="layui-input-inline" style="width: 140px;"> <div class="layui-input-inline" style="width: 140px;">
...@@ -54,6 +53,7 @@ ...@@ -54,6 +53,7 @@
<th>中奖人员</th> <th>中奖人员</th>
<th>红包</th> <th>红包</th>
<th>礼品</th> <th>礼品</th>
<th>状态</th>
<th style="min-width: 84px;">时间 </th> <th style="min-width: 84px;">时间 </th>
</tr> </tr>
</thead> </thead>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
var queryObj = { var queryObj = {
page: 1, page: 1,
pagesize: 10, pagesize: 10,
turn: 0, turn: null,
status: null, status: null,
keyword: null keyword: null
} }
...@@ -100,8 +100,9 @@ ...@@ -100,8 +100,9 @@
'<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' + '<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' +
'<td>' + data.rows[i].turn + '</td>' + '<td>' + data.rows[i].turn + '</td>' +
'<td><img class="fansImg" src="' + data.rows[i].logo + '" />' + data.rows[i].nickname + '</td>' + '<td><img class="fansImg" src="' + data.rows[i].logo + '" />' + data.rows[i].nickname + '</td>' +
'<td>' + data.rows[i].mny + '元</td>' + '<td>' + showMny(data.rows[i].mny) + '</td>' +
'<td>' + data.rows[i].name + '</td>' + '<td>' + showPrizeName(data.rows[i].mny, data.rows[i].prizeName) + '</td>' +
'<td>' + showStatus(data.rows[i].status) + '</td>'+
'<td>' + toTime_G(data.rows[i].createdtime) + '</td>' + '<td>' + toTime_G(data.rows[i].createdtime) + '</td>' +
'</tr>'; '</tr>';
} }
...@@ -136,7 +137,7 @@ ...@@ -136,7 +137,7 @@
queryObj.page = 1; queryObj.page = 1;
queryObj.keyword = $("[name=keyword]").val(); queryObj.keyword = $("[name=keyword]").val();
queryObj.turn = $("[name=turn]").val(); queryObj.turn = $("[name=turn]").val();
queryObj.status = (queryObj.status == 100 ? "" : queryObj.status) queryObj.status = $("[name=status]").val();
initData(queryObj); initData(queryObj);
}); });
...@@ -152,6 +153,38 @@ ...@@ -152,6 +153,38 @@
initData(queryObj); initData(queryObj);
}) })
//显示红包
function showMny(mny){
var val = "";
if(mny > 0){
val = mny + "元";
}else{
val = "";
}
return val;
}
//显示礼品
function showPrizeName(mny, name){
var val = "";
if(mny > 0){
val = "";
}else{
val = name;
}
return val;
}
//显示状态
function showStatus(s){
var val = "";
if(s == 1){
val = "未兑换";
}else if(s == 2){
val = "已兑换";
}
return val;
}
}) })
</script> </script>
......
Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
请先完成此消息的编辑！