fe / yohobuy-shop-fe2 · Commits

Go to a project

Authored by 马力
Commit 1f70c41c7608b6d693abd68695b02d910d07c210 2 parents 48b32d76 ebe2e14f

Merge branch 'dev_店铺商品分类优化_14140' into gray 

# Conflicts:
#	dist/yohobuy-shops-fe/4.8.3/jquery/goods.netsale.Edit.js
#	dist/yohobuy-shops-fe/4.8.3/jquery/goods.netsale.Index.js
#	server/views/goods/netsale/Edit.html
#	server/views/goods/netsale/Index.html
Inline Side-by-side
Showing 3 changed files with 44 additions and 4 deletions
... ... @@ -47,7 +47,11 @@ module.exports={
{name:"categoryId",type:"Number"},
{name:"productSKN",type:"Number"},
{name:"productName",type:"String"},
{name:"page",type:"Number"}
{name:"page",type:"Number"},
{name:"maxSortId",type:"Number"},
{name:"middleSortId",type:"Number"},
{name:"smallSortId",type:"Number"},
{name:"status",type:"Number"}
]
},
... ... @@ -58,7 +62,11 @@ module.exports={
{name:"categoryId",type:"Number"},
{name:"productSKN",type:"Number"},
{name:"productName",type:"String"},
{name:"page",type:"Number"}
{name:"page",type:"Number"},
{name:"maxSortId",type:"Number"},
{name:"middleSortId",type:"Number"},
{name:"smallSortId",type:"Number"},
{name:"status",type:"Number"}
]
},
... ...
... ... @@ -20,6 +20,12 @@
<div class="filter form-inline" style="margin-bottom: 20px">
<input id="productSKN" type="text" class="form-control" placeholder="SKN" />&nbsp;&nbsp;
<input id="productName" type="text" class="form-control" placeholder="商品名称" />&nbsp;&nbsp;
<select id="status-select" class="form-control" name="status-select">
<option value="-1">请选择上下架状态</option>
<option value="0">下架</option>
<option value="1">上架</option>
</select>&nbsp;&nbsp;
<div id="sortTree" class="form-control height40" style="border: 0px; padding: 0px;"></div>
<a href="javascript:" class="btn btn-info filter-btn">查询</a>
<a href="javascript:" class="btn btn-danger cancelAll" style="float: right;display: none">全部取消</a>
</div>
... ...
... ... @@ -6,13 +6,24 @@ var curCategoryId = 0,
selectedNum = 0,
curTab = 0;
var ENUM = {
status: {
'0': '未上架',
'1': '已上架'
}
}
var g1 = new common.grid({
el: '#productTable',
parms: function() {
return {
categoryId:　curCategoryId,
productSKN: common.util.__input("productSKN"),
productName: common.util.__input("productName")
productName: common.util.__input("productName"),
maxSortId: tabTree.selected[0] ? tabTree.selected[0].id : "",
middleSortId: tabTree.selected[1] ? tabTree.selected[1].id : "",
smallSortId: tabTree.selected[2] ? tabTree.selected[2].id : "",
status: common.util.__input("status-select")
};
},
columns: [
... ... @@ -30,6 +41,10 @@ var g1 = new common.grid({
{display: "SKN", name: "productSKN"},
{display: "商品名称", name: "productName"},
{display: "销售价(元)", name: "salePrice"},
{display: "可售库存", name: "storage"},
{display: "上下架状态", render: function(item) {
return ENUM.status[item.status];
}},
{display: "分类", name: "productSort"},
{display: "商品分类", render: function (item) {
var name = item.categoryName ? item.categoryName : '未分类';
... ... @@ -64,7 +79,11 @@ var g2 = new common.grid({
return {
categoryId:　curCategoryId,
productSKN: common.util.__input("productSKN"),
productName: common.util.__input("productName")
productName: common.util.__input("productName"),
maxSortId: tabTree.selected[0] ? tabTree.selected[0].id : "",
middleSortId: tabTree.selected[1] ? tabTree.selected[1].id : "",
smallSortId: tabTree.selected[2] ? tabTree.selected[2].id : "",
status: common.util.__input("status-select")
};
},
columns: [
... ... @@ -83,6 +102,10 @@ var g2 = new common.grid({
{display: "SKN", name: "productSKN"},
{display: "商品名称", name: "productName"},
{display: "销售价(元)", name: "salePrice"},
{display: "可售库存", name: "storage"},
{display: "上下架状态", render: function(item) {
return ENUM.status[item.status];
}},
{display: "分类", name: "productSort"},
{display: "商品分类", render: function (item) {
var name = item.categoryName ? item.categoryName : '未分类';
... ... @@ -107,6 +130,9 @@ var g2 = new common.grid({
}
});
var tabTree = new common.tabTree("#sortTree");
tabTree.init();
var Bll = {
init: function () {
this.getParamsInUrl();
... ...