Skip to content

zhangtai / zzhnc

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

Merge branch 'shenzi'

2 个父辈 e07e06e4 e5339c7d
内嵌 并排
正在显示 3 个修改的文件 包含 93 行增加 和 70 行删除
WebContent/WEB-INF/jsp/pc/autoresponse/autoresponse.jsp
...@@ -77,8 +77,8 @@ ...@@ -77,8 +77,8 @@
//查询条件 //查询条件
var queryObj = { var queryObj = {
page: 1, page: 1,
keyword: null, size: 10,
isRedirectStaff: null keyword: null
} }
//页面初始化 //页面初始化
...@@ -107,17 +107,16 @@ ...@@ -107,17 +107,16 @@
$("#tablelist").html(str); $("#tablelist").html(str);
laypage({ laypage.render({
cont: 'page', elem: 'page',
pages: data.totalPages, count: data.totalPages,
limit: queryObj.size,
curr: queryObj.page, curr: queryObj.page,
skip: true,
jump: function(obj, first) { jump: function(obj, first) {
if(!first) { if(!first) {
queryObj.page = obj.curr queryObj.page = obj.curr
initdata(queryObj); initdata(queryObj);
} }
} }
}); });
...@@ -140,15 +139,13 @@ ...@@ -140,15 +139,13 @@
$("input[name=keyword]").val(""); $("input[name=keyword]").val("");
form.render(); form.render();
queryObj.keyword = null; queryObj.keyword = null;
queryObj.isRedirectStaff = null; initdata(queryObj);
queryObj.projectId = null,
initdata(queryObj);
}) })
//发布操作 //发布操作
$(".publicBtn").on("click", function() { $(".publicBtn").on("click", function() {
$.get("/zzhnc/autoreply/publish", function(data) { $.get("/zzhnc/autoreply/publish", function(data) {
var data = JSON.parse(data) console.log(data)
if(data.code == 0) { if(data.code == 0) {
top.layer.msg("发布成功！"); top.layer.msg("发布成功！");
} else { } else {
...@@ -195,6 +192,8 @@ ...@@ -195,6 +192,8 @@
layer.close(index); layer.close(index);
queryObj.page = 1; queryObj.page = 1;
initdata(queryObj); initdata(queryObj);
$("[name=keywords]").val("");
$("[name=content]").val("");
} }
}); });
form.render(); form.render();
...@@ -244,14 +243,7 @@ ...@@ -244,14 +243,7 @@
}); });
form.render(); form.render();
}, },
btn2: function(index, layero) {
layer.close(index);
},
cancel: function(index, layero) {
layer.close(index);
},
success: function(){ success: function(){
//获取当前需修改的关键字信息
$.post("/zzhnc/autoreply/getAutoReply", { $.post("/zzhnc/autoreply/getAutoReply", {
id: id id: id
}, function(data) { }, function(data) {
...@@ -277,7 +269,7 @@ ...@@ -277,7 +269,7 @@
if(data.code == 0) { if(data.code == 0) {
top.layer.msg("删除成功"); top.layer.msg("删除成功");
queryObj.page = 1; queryObj.page = 1;
initdata(queryObj) initdata(queryObj);
layer.close(index); layer.close(index);
} else { } else {
top.layer.msg(data.msg); top.layer.msg(data.msg);
......
WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp
...@@ -15,6 +15,12 @@ ...@@ -15,6 +15,12 @@
color: red; color: red;
margin-right: 5px; margin-right: 5px;
} }
.layui-form-label{
width: 100px;
}
#container{
margin-left: 20px;
}
</style> </style>
<body class="wrap"> <body class="wrap">
...@@ -48,9 +54,22 @@ ...@@ -48,9 +54,22 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"><i class="red">*</i>所属商家</label> <label class="layui-form-label"><i class="red">*</i>商品原价</label>
<div class="layui-input-inline" style="width: 100px;">
<input type="number" name="subtitle" lay-verify="title" placeholder="商品原价" class="layui-input">
</div>
<div class="layui-form-mid">元</div>
<label class="layui-form-label"><i class="red">*</i>商品现价</label>
<div class="layui-input-inline" style="width: 100px;">
<input type="number" name="subtitle" lay-verify="title" placeholder="商品现价" class="layui-input">
</div>
<div class="layui-form-mid">元</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><i class="red">*</i>商家名称</label>
<div class="layui-input-inline" style="width: 390px;"> <div class="layui-input-inline" style="width: 390px;">
<input type="text" name="subtitle" lay-verify="title" placeholder="商品所属商家" class="layui-input"> <input type="text" name="subtitle" lay-verify="title" placeholder="商家名称" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
...@@ -60,6 +79,12 @@ ...@@ -60,6 +79,12 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"><i class="red">*</i>商家电话</label>
<div class="layui-input-inline" style="width: 390px;">
<input type="text" name="subtitle" lay-verify="title" placeholder="商家电话" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><i class="red">*</i>详细信息</label> <label class="layui-form-label"><i class="red">*</i>详细信息</label>
<div class="layui-input-block"> <div class="layui-input-block">
<!-- 加载编辑器的容器 --> <!-- 加载编辑器的容器 -->
......
WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp
...@@ -9,6 +9,13 @@ ...@@ -9,6 +9,13 @@
<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">
<style>
.imgUrl{
width: 50px;
height: 50px;
display: block;
}
</style>
</head> </head>
<body class="wrap"> <body class="wrap">
<div class="layui-form"> <div class="layui-form">
...@@ -57,28 +64,15 @@ ...@@ -57,28 +64,15 @@
var queryObj = { var queryObj = {
page: 1, page: 1,
pagesize: 10, size: 10,
keyword: '' sellerId: 0
}; };
function initdata(queryObj) { function initData(queryObj) {
$.get("/zzhnc/goods/search", queryObj, function(data) {
$.post("/zzhnc/article/getArticlesList", queryObj, function(data) {
data = data.data; data = data.data;
console.log(data) console.log(data)
laypage.render({
elem: 'page',
pages: data.totalPages, //总页数
curr: queryObj.page,
skip: true,
jump: function(obj, first) {
if(!first) {
queryObj.page = obj.curr
initdata(queryObj);
}
}
});
var str = ""; var str = "";
if(data.rows.length < 1) { if(data.rows.length < 1) {
$(".nodata").show(); $(".nodata").show();
...@@ -87,9 +81,11 @@ ...@@ -87,9 +81,11 @@
for(var i = 0; i < data.rows.length; i++) { for(var i = 0; i < data.rows.length; i++) {
str += '<tr data-id=' + data.rows[i].id + '>' + str += '<tr data-id=' + data.rows[i].id + '>' +
'<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' + '<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' +
'<td style="text-align:left;">' + data.rows[i].title + '</td>' + '<td><img class="imgUrl" src="' + data.rows[i].bannerUrl + '" /></td>' +
'<td>' + data.rows[i].imgurl + '</td>' + '<td>' + data.rows[i].name + '</td>' +
'<td>' + toTime_G(data.rows[i].createdtime) + '</td>' + '<td>' + data.rows[i].description + '</td>' +
'<td>' + data.rows[i].sellerId + '</td>' +
'<td>' + data.rows[i].sellerId + '</td>' +
'<td>' + '<td>' +
'<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>' + '<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>' +
'<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>' + '<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>' +
...@@ -100,70 +96,80 @@ ...@@ -100,70 +96,80 @@
$("#tablelist").html(str); $("#tablelist").html(str);
toNull_G(); toNull_G();
laypage.render({
elem: 'page',
count: data.totalPages,
curr: queryObj.page,
jump: function(obj, first) {
if(!first) {
queryObj.page = obj.curr
initData(queryObj);
}
}
});
}) })
} }
initdata(queryObj); //初始化数据
initData(queryObj);
//查询 //查询
form.on('submit(querybtn)', function(data) { form.on('submit(querybtn)', function(data) {
queryObj.keyword = $("[name=keyword]").val(); queryObj.keyword = $("[name=keyword]").val();
queryObj.page = 1; queryObj.page = 1;
initdata(queryObj) initData(queryObj)
}); });
//重置
$(".resetBtn").on("click", function() { $(".resetBtn").on("click", function() {
$("[name=keyword]").val("") $("[name=keyword]").val("");
queryObj = { queryObj.page = 1;
page: 1, queryObj.sellerId = 0;
pagesize: 10, initData(queryObj)
keyword: ""
};
initdata(queryObj)
return false return false
}) })
//初始化数据
initdata(queryObj);
//添加商品
//添加文章
$(document).on("click", ".createBtn", function() { $(document).on("click", ".createBtn", function() {
if(parent.tab.exists("添加文章") > 0) { if(parent.tab.exists("添加商品") > 0) {
var tabid = parent.tab.getTabId("添加文章"); var tabid = parent.tab.getTabId("添加商品");
parent.tab.deleteTab(tabid); parent.tab.deleteTab(tabid);
} }
parent.tab.tabAdd({ parent.tab.tabAdd({
href: "/zzhnc/article/articleEdit", href: "/zzhnc/goods/goodsEdit",
icon: "fa-cubes", icon: "fa-cubes",
title: "添加文章" title: "添加商品"
}); });
}) })
//修改文章
//修改商品
$(document).on("click", ".updataBtn", function() { $(document).on("click", ".updataBtn", function() {
var id = $(this).parents("tr").attr("data-id"); var id = $(this).parents("tr").attr("data-id");
if(parent.tab.exists("修改文章") > 0) { if(parent.tab.exists("修改商品") > 0) {
var tabid = parent.tab.getTabId("修改文章"); var tabid = parent.tab.getTabId("修改商品");
parent.tab.deleteTab(tabid); parent.tab.deleteTab(tabid);
} }
parent.tab.tabAdd({ parent.tab.tabAdd({
href: "/zzhnc/article/articleEdit?id=" + id, href: "/zzhnc/goods/goodsEdit?id=" + id,
icon: "fa-cubes", icon: "fa-cubes",
title: "修改文章" title: "修改商品"
}); });
}) })
//删除文章
//删除商品
$(document).on("click", ".deleteBtn", function() { $(document).on("click", ".deleteBtn", function() {
var id = $(this).parents("tr").attr("data-id"); var id = $(this).parents("tr").attr("data-id");
layer.confirm('您确定要删除该文章吗？', { layer.confirm('您确定要删除该爆款商品吗？', {
btn: ['确定', '取消'] //按钮 btn: ['确定', '取消']
}, function(index, layero) { }, function(index, layero) {
$.post("/zzhnc/article/deleteArticle", { $.post("/zzhnc/goods/update", {
id: id id: id
}, function(data) { }, function(data) {
console.log(data) console.log(data)
if(data.code == 0) { if(data.code == 0) {
top.layer.msg("删除成功"); top.layer.msg("删除成功");
initdata(queryObj); initData(queryObj);
layer.close(index); layer.close(index);
} else { } else {
top.layer.msg(data.msg); top.layer.msg(data.msg);
......
Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
请先完成此消息的编辑！