fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by 马力
Commit e80cd886465c5f9e29dbf659bdd92ebb93347d00 2 parents 188a6406 48fed735

Merge branch 'dev_店铺装修优化_15353' into grey

Inline Side-by-side
Showing 10 changed files with 68 additions and 16 deletions
... ... @@ -27,6 +27,8 @@ module.exports=function(app) {
app.post("/ShopsRest/queryAllShops","select_queryAllShops");
/*查询通过审核店铺列表接口*/
app.post("/ShopsRest/selectCheckPassShopsByName","select_selectCheckPassShopsByName");
/* 店铺创建、店铺信息管理、店铺审核管理页面，下拉选择店铺名称，列表筛选 */
app.post("/ShopsRest/selectShopsByName","select_selectShopsByName");
/*根据品牌查询店铺*/
app.post("/ShopsRest/queryShopsByBrandId","select_queryShopsByBrandId");
/*模糊查询*/
... ...
... ... @@ -100,6 +100,16 @@ module.exports={
{name: 'idName', type: 'String'}
]
},
selectShopsByName:{
title: '店铺创建、店铺信息管理、店铺审核管理页面，下拉选择店铺名称，列表筛选',
url: '/ShopsRest/selectShopsByName',
params: [
{name: 'idName', type: 'String'},
{name: 'operationStatus', type: 'Number'},
{name: 'checkStatus', type: 'Number'},
{name: 'checkStatusArr', type: 'String'}
]
},
queryShopsByBrandId:{
title:'根据品牌查询店铺',
url: '/ShopsRest/queryShopsByBrandId',
... ...
... ... @@ -35,7 +35,8 @@ module.exports={
{name: 'supplierId', type: 'Number'},
{name: 'brandId', type: 'Number'},
{name: 'checkStatus', type: 'Number'},
{name: 'blkCheckStatus', type: 'Number'}
{name: 'blkCheckStatus', type: 'Number'},
{name: 'shopsId', type: 'Number'}
]
},
... ...
... ... @@ -13,7 +13,9 @@
{name: 'checkStatus', type: 'number'},
{name: 'blkCheckStatus', type: 'number'},
{name: 'supplierId', type: 'number'},
{name: 'brandId', type: 'number'}
{name: 'brandId', type: 'number'},
{name: 'shopStatus', type: 'number'},
{name: 'blkShopStatus', type: 'number'}
]
},
... ...
... ... @@ -10,6 +10,7 @@ module.exports={
{name: 'operationStatus', type: 'Number'},
{name: 'checkStatus', type: 'Number'},
{name: 'checkStatusArr', type: 'String'},
{name: 'shopsId', type: 'Number'},
{name: 'size', type: 'Number'},
{name: 'page', type: 'Number'}
]
... ...
... ... @@ -40,6 +40,20 @@
<option value="900">驳回</option>
</select>
</div>
<div class="panel-col">
<select name="shopStatus" id="shopStatus" tabindex="-1" title="" class="form-control">
<option value="" selected="">有货开店状态</option>
<option value="0">未开店</option>
<option value="1">已开店</option>
</select>
</div>
<div class="panel-col">
<select name="blkShopStatus" id="blkShopStatus" tabindex="-1" title="" class="form-control">
<option value="" selected="">BLK开店状态</option>
<option value="0">未开店</option>
<option value="1">已开店</option>
</select>
</div>
<div class="panel-col2">
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="all-btn" href="" class="btn btn-info">全部</a>
... ...
... ... @@ -11,14 +11,14 @@
<div class="panel-body">
<div class="row">
<%if selectShop%>
<!--<%if selectShop%>
<div class="panel-col2">
<select name="shop-name" id="shop-name" style="width: 280px;" tabindex="-1" title=""
class="form-control">
<option value="-1">选择店铺</option>
</select>
</div>
<%/if%>
<%/if%>-->
<%if checkStatus%>
<div class="panel-col2">
... ... @@ -34,6 +34,13 @@
<%/if%>
<div class="panel-col2">
<select name="shop-name" id="shop-name" style="width: 280px;" tabindex="-1" title=""
class="form-control">
<option value="-1">请选择店铺</option>
</select>
</div>
<div class="panel-col2">
<select name="supplier-name" id="supplier-name" style="width: 280px;" tabindex="-1" title=""
class="form-control">
<option value="-1">选择供应商</option>
... ...
... ... @@ -12,6 +12,7 @@ var urlObj = {
'querySupplier': '/supplier/supplier/queryAllSupplier', //查询供应商列表接口
'queryShop': '/ShopsRest/queryAllShops', // 查询店铺列表接口
'queryShopPass': '/ShopsRest/selectCheckPassShopsByName', // 查询通过审核店铺列表接口
'queryShopNames': '/ShopsRest/selectShopsByName', // 店铺创建、店铺信息管理、店铺审核管理页面，下拉选择店铺名称，列表筛选
'maxSort': '/product/queryMaxSortByName', //查询一级类目列表接口
'shopsRest': '/ShopsRest/selectCheckPassShopsByName', // 店铺列表
'xiangouID': '/DrawlineActivityRest/selectActivityListForSelect', //限购ID
... ...
... ... @@ -34,7 +34,9 @@ var g = new common.grid({
checkStatus: common.util.__input("yohoStatus"),
blkCheckStatus: common.util.__input("blkStatus"),
supplierId: common.util.__input("supplier-name"),
brandId: common.util.__input("brand-name")
brandId: common.util.__input("brand-name"),
shopStatus: common.util.__input("shopStatus"),
blkShopStatus: common.util.__input("blkShopStatus")
};
},
columns: [{
... ... @@ -61,16 +63,6 @@ var g = new common.grid({
}
}
}, {
display: "创建时间",
name: "createTime",
render: function(item) {
if (item.createTime) {
return common.util.__dateFormat(new Date(item.createTime * 1000), "yyyy-MM-dd hh:mm:ss");
} else {
return '';
}
}
}, {
display: "更新时间",
name: "updateTime",
render: function(item) {
... ... @@ -81,6 +73,20 @@ var g = new common.grid({
}
}
}, {
display: "开店时间",
render: function(item) {
var htmArr = [];
if(item.openTime && item.openTime != 0) {
htmArr.push("<p>有货店铺: " + common.util.__dateFormat(new Date(item.openTime * 1000), "yyyy-MM-dd hh:mm:ss" + "</p>"));
}
if(item.blkOpenTime && item.blkOpenTime != 0) {
htmArr.push("<p>BLK店铺: " + common.util.__dateFormat(new Date(item.blkOpenTime * 1000), "yyyy-MM-dd hh:mm:ss" + "</p>"));
}
return htmArr.join(' ');
}
}, {
display: "有货状态",
name: "checkStatus",
render: function(item) {
... ...
... ... @@ -58,6 +58,13 @@ new common.dropDown({el: "#store-type"});
new common.dropDown({el: "#store-model"});
new common.dropDown({el: "#brand-name", ajax: "brand"});
new common.dropDown({el: "#supplier-name", ajax: "supplier"});
new common.dropDown({el: "#shop-name", ajax: "queryShopNames", params: function() {
return {
"checkStatus": (+t.active) ? 0 : common.util.__input("status"),
"operationStatus": (+t.active) ? 2 : authority.operationStatus, // 店铺表中只有创建和未创建两个状态，没有operation_status为0的店铺信息
"checkStatusArr": (+t.active) ? "100,200,300" : authority.checkStatusArr
};
}});
var authority = JSON.parse($("#authority").val());
... ... @@ -74,7 +81,8 @@ var g = new common.grid({
"checkStatus": (+t.active) ? 200 : common.util.__input("status"),
"operationStatus": authority.operationStatus,
"checkStatusArr": authority.checkStatusArr,
"blkCheckStatus": 200
"blkCheckStatus": 200,
"shopsId": common.util.__input("shop-name")
};
},
columns: [
... ...