fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by weiqingting
Commit 633d12cba7650662ecf33a2d52b64f38d6e4db42 1 parent e2eb4dec

提交

Inline Side-by-side
Showing 15 changed files with 200 additions and 41 deletions
... ... @@ -28,6 +28,9 @@ module.exports = function (app){
//店铺装修审核列表
app.post("/supplier/store/ajax/shenhezx","shopAudit_findAuditShopsDecorator");
//店铺装修审核
//yoho店铺装修审核通过，驳回
app.post("/shop/ShopsDecoratorRest/auditShopsDecorator","shopAudit_auditShopsDecorator");
//blk店铺装修审核通过，驳回
app.post("/shop/ShopsDecoratorRest/auditBlkShopsDecorator","shopAudit_auditBlkShopsDecorator");
}
\ No newline at end of file
... ...
module.exports = function (app) {
/******************************店铺管理列表*************************************/
app.get("/supplier/shop/decoration", "shop.DecorationList", function (req,res){
this.$extend={
moduleName:"店铺管理",
... ... @@ -7,21 +9,30 @@ module.exports = function (app) {
};
});
app.get("/supplier/store/decorationDetail/:shopsId/:shopType/:shopsType/:id/", "shop.Decoration");
//店铺列表
app.post("/shop/ShopsDecoratorRest/findShopsDecorator","shopDecoration_findShopsDecorator");
//关店
//yoho关店
app.post("/supplier/store/closeShops","shopDecoration_closeShops");
//开店
//yoho开店
app.post("/supplier/store/openShops","shopDecoration_openShops");
//店铺装修详情
//blk关店
app.post("/supplier/store/closeBlkShops","shopDecoration_closeBlkShops");
//blk开店
app.post("/supplier/store/openBlkShops","shopDecoration_openBlkShops");
/******************************yoho装修*************************************/
//yoho店铺装修，编辑，查看，审核
app.get("/supplier/store/decorationDetail/:shopsId/:shopType/:shopsType/:id/", "shop.Decoration");
//yoho店铺装修详情
app.post("/shop/ShopsDecoratorRest/findShopsDecoratorDetail","shopDecoration_findShopsDecoratorDetail");
//店铺装修保存
//yoho店铺装修保存，提交审核
app.post("/shop/ShopsDecoratorRest/saveShopsDecorator","shopDecoration_saveShopsDecorator");
//热销
... ... @@ -30,5 +41,30 @@ module.exports = function (app) {
//最新
app.post("/shop/ShopsDecoratorRest/findNewProductList","shopDecoration_findNewProductList");
/******************************BLK装修*************************************/
//blk店铺装修编辑
app.get("/shop/decoration/blkEdit/:shopsId", "shop.DecorationBLK", "shopDecoration_findBlkShopsDecoratorDetail", function (data,req,res){
data.operation = 1;
return data;
});
//blk店铺装修查看
app.get("/shop/decoration/blkView/:shopsId", "shop.DecorationBLK", "shopDecoration_findBlkShopsDecoratorDetail", function (data,req,res){
data.operation = 0;
return data;
});
//blk店铺装修审核
app.get("/shop/decoration/blkCheck/:shopsId", "shop.DecorationBLK", "shopDecoration_findBlkShopsDecoratorDetail", function (data,req,res){
data.operation = 2;
return data;
});
//BLK店铺装修保存，提交审核
app.post("/shop/decoration/saveBlkShopsDecorator","shopDecoration_saveBlkShopsDecorator");
//获取店铺下的BLK商品
app.post("/shop/decoration/findBlkProductByShopsId","shopDecoration_findBlkProductByShopsId");
}
\ No newline at end of file
... ...
... ... @@ -43,7 +43,7 @@ var apiCofig = {
//root:__dirname,
EnvConst:{
domain:"http://192.168.102.210:8088/platform",
//domain:"http://172.16.6.225:8080/platform",
//domain:"http://172.16.6.148:8088/platform",
yohoSearch: 'http://192.168.102.216:8080/yohosearch',
system:Iaccount
},
... ...
... ... @@ -110,7 +110,8 @@ module.exports={
title:'',
url: '/guang/article/getSortList',
params: [
{name: "parentId", type: "Number"}
{name: "parentId", type: "Number"},
{name:"appType",type:"Number"}
]
},
queryList:{
... ...
... ... @@ -23,7 +23,8 @@ module.exports={
{name: 'orderBy', type: 'Number'},
{name: 'status', type: 'Number'},
{name: 'name', type: 'String'},
{name: 'advertCode', type: 'String'}
{name: 'advertCode', type: 'String'},
{name: 'appType', type: 'Number'}
]
},
addSort:{
... ... @@ -34,7 +35,8 @@ module.exports={
{name: 'orderBy', type: 'Number'},
{name: 'status', type: 'Number'},
{name: 'name', type: 'String'},
{name: 'advertCode', type: 'String'}
{name: 'advertCode', type: 'String'},
{name: 'appType', type: 'Number'}
]
},
delSort:{
... ...
... ... @@ -72,7 +72,6 @@ module.exports={
params: [
{name: 'status', type: 'Number'},
{name: 'idName', type: 'String'}
]
},
getCategoryNames:{
... ... @@ -99,7 +98,8 @@ module.exports={
{name:"url",type:"String"},
{name:"contentData",type:"String"},
{name:"brands",type:"String"},
{name:"tag",type:"String"}
{name:"tag",type:"String"},
{name:"appType",type:"Number"}
]
},
updateArticle:{
... ... @@ -120,7 +120,8 @@ module.exports={
{name:"url",type:"String"},
{name:"contentData",type:"String"},
{name:"brands",type:"String"},
{name:"tag",type:"String"}
{name:"tag",type:"String"},
{name:"appType",type:"Number"}
]
},
getDetail:{
... ... @@ -133,23 +134,6 @@ module.exports={
getTags:{
title: "获取标签列表",
url:'/guang/tags/getTags'
},
queryAllGoodsSort:{
title: "标签搜索，所有(没用到)",
apis: {
colorList: {
url: '/erpproduct/product/colorList'
},
materialList: {
url: '/erpproduct/attribute/index',
params: [{
name: 'status',
type: 'String',
def:1
}]
}
}
},
}
}
\ No newline at end of file
... ...
... ... @@ -28,7 +28,8 @@ module.exports={
{name: 'isHot', type: 'Number'},
{name: 'status', type: 'Number'},
{name: 'orderBy', type:'Number'},
{name: 'cover', type:'String'}
{name: 'cover', type:'String'},
{name:'appType',type:'Number'}
]
},
addTag:{
... ... @@ -40,7 +41,8 @@ module.exports={
{name: 'isHot', type: 'Number'},
{name: 'status', type: 'Number'},
{name: 'orderBy', type:'Number'},
{name: 'cover', type:'String'}
{name: 'cover', type:'String'},
{name:'appType',type:'Number'}
]
},
delTag:{
... ...
... ... @@ -4,7 +4,9 @@ module.exports= {
getAllHelpCategory:{
title:"所有帮助分类列表",
url:"/HelpCategoryRest/getAllHelpCategory",
params:[]
params:{
platform:{type:String}
}
},
addCategory:{
... ...
... ... @@ -34,19 +34,29 @@ module.exports={
params:[
{name: 'supplierId', type: 'Number'},
{name: 'brandId', type: 'Number'},
{name: 'checkStatus', type: 'Number'}
{name: 'checkStatus', type: 'Number'},
{name: 'blkCheckStatus', type: 'Number'}
]
},
auditShopsDecorator:{
title:"店铺装修审核",
title:"yoho店铺装修审核通过，驳回",
url:"/ShopsDecoratorRest/auditShopsDecorator",
params:[
{name: 'id', type: 'Number'},
{name: 'checkStatus', type: 'Number'},
{name: 'comment', type: 'String'}
]
},
auditBlkShopsDecorator:{
title:"blk店铺装修审核通过，驳回",
url:"/ShopsDecoratorRest/auditBlkShopsDecorator",
params:[
{name: 'id', type: 'Number'},
{name: 'blkCheckStatus', type: 'Number'},
{name: 'blkComment', type: 'String'}
]
}
}
}
\ No newline at end of file
... ...
... ... @@ -11,13 +11,14 @@
{name: 'size', type: 'number'},
{name: 'shopsId', type: 'number'},
{name: 'checkStatus', type: 'number'},
{name: 'blkCheckStatus', type: 'number'},
{name: 'supplierId', type: 'number'},
{name: 'brandId', type: 'number'}
]
},
closeShops:{
title:"关店",
title:"yoho关店",
url:"/ShopsRest/closeShops",
params: [
{name:"shopsId",type:"Number"}
... ... @@ -25,13 +26,29 @@
},
openShops:{
title:"开店",
title:"yoho开店",
url:"/ShopsRest/openShops",
params: [
{name:"shopsId",type:"Number"}
]
},
closeBlkShops:{
title:"blk关店",
url:"/ShopsRest/closeBlkShops",
params: [
{name:"shopsId",type:"Number"}
]
},
openBlkShops:{
title:"blk开店",
url:"/ShopsRest/openBlkShops",
params: [
{name:"shopsId",type:"Number"}
]
},
/*****************店铺装修详情*********************/
findShopsDecoratorDetail:{
... ... @@ -70,6 +87,40 @@
{name: 'shopsId', type: 'Number'},
{name: 'size', type: 'Number'}
]
},
/*****************BLK店铺装修详情*********************/
findBlkShopsDecoratorDetail:{
title:"BLK店铺装修详情",
url:"/ShopsDecoratorRest/findBlkShopsDecoratorDetail",
params:[
{name: 'shopsId', type: 'Number'}
]
},
saveBlkShopsDecorator:{
title:"保存BLK店铺装修信息",
url:"/ShopsDecoratorRest/saveBlkShopsDecorator",
params:[
{name: 'shopsId', type: 'Number'},
{name: 'platform', type: 'String'},
{name: 'templateName', type: 'String'},
{name: 'templateType', type: 'Number'},
{name: 'resources', type: 'String'},
{name: 'appType', type: 'Number'},
{name: 'submitStatus', type: 'Number'}
]
},
findBlkProductByShopsId:{
title:"获取店铺下的BLK商品",
url:"/ShopsDecoratorRest/findBlkProductByShopsId",
params:[
{name: 'shopsId', type: 'Number'},
{name: 'productSkn', type: 'Number'},
{name: 'size', type: 'number'}
]
}
}
}
\ No newline at end of file
... ...
... ... @@ -45,6 +45,16 @@
</div>
<div class="form-group">
<label for="advertCode" class="col-sm-2 control-label">是否BLK：</label>
<div class="col-sm-10">
<select class="form-control" id="appType" value="[[appType]]">
<option value="0">否</option>
<option value="1">是</option>
</select>
</div>
</div>
<div class="form-group">
<label for="status" class="col-sm-2 control-label" style="margin-top: 10px">是否启用：</label>
<div class="col-sm-10 radio">
<label><input type="radio" value="1" name="status" kl_vkbd_parsed="true">开启</label>
... ...
... ... @@ -34,6 +34,16 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">是否BLK:</label>
<div class="col-sm-8">
<select class="form-control" id="appType" value="[[appType]]">
<option value="0">否</option>
<option value="1">是</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">文章分类:</label>
<!--文章分类-->
<div class="col-sm-2">
... ... @@ -69,6 +79,7 @@
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">文章摘要:</label>
... ...
... ... @@ -94,6 +94,17 @@
<input id="status" type="hidden" value="[[status]]" for="radio" kl_vkbd_parsed="true">
</div>
<div class="form-group">
<label class="col-sm-2 control-label">是否BLK:</label>
<div class="col-sm-8">
<select class="form-control" id="appType" value="[[appType]]">
<option value="0">否</option>
<option value="1">是</option>
</select>
</div>
</div>
<div class="form-group" style="margin-bottom: 0">
<label class="col-sm-2 control-label">上传图片：</label>
<div class="col-sm-offset-1 col-sm-9">
... ...
... ... @@ -5,6 +5,29 @@
<div style="margin-bottom: 20px">
<a class="btn btn-success" id="add-category"><i class="fa fa-plus"></i> 添加帮助分类</a>
</div>
<div class="panel-body">
<div class="form-group">
<div class="col-sm-3">
<select class="form-control observe noEdit" id="platform">
<option value="-1">品牌风格</option>
<option value="iphone">IOS手机</option>
<option value="ipad">IOS Pad</option>
<option value="android">安卓手机</option>
<option value="androidpad">安卓Pad</option>
<option value="h5">手机网站</option>
<option value="web">网站</option>
<option value="platform">平台</option>
<option value="BLK_APP">BLK_APP</option>
<option value="BLK_PC">BLK_PC</option>
</select>
</div>
<div class="panel-col">
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="all-btn" href="" class="btn btn-info">全部</a>
</div>
</div>
</div>
</div>
<div class="panel">
<div class="panel-body nopadding">
<div class="dataTables_wrapper no-footer" id="help_list"></div>
... ... @@ -40,6 +63,9 @@
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="h5">手机网站</label>
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="web">网站</label>
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="platform">平台</label>
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="BLK_APP">BLK_APP</label>
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="BLK_PC">BLK_PC</label>
</div>
<input type="hidden" id="platform" value="{platform}" for="checkbox">
</div>
... ...
... ... @@ -21,8 +21,18 @@
</select>
</div>
<div class="panel-col">
<select name="status" id="status" tabindex="-1" title="" class="form-control">
<option value="" selected="">选择状态</option>
<select name="status" id="yohoStatus" tabindex="-1" title="" class="form-control">
<option value="" selected="">YOHO状态</option>
<option value="0">待装修</option>
<option value="100">暂存</option>
<option value="200">待审核</option>
<option value="300">审核通过</option>
<option value="900">驳回</option>
</select>
</div>
<div class="panel-col">
<select name="status" id="blkStatus" tabindex="-1" title="" class="form-control">
<option value="" selected="">BLK状态</option>
<option value="0">待装修</option>
<option value="100">暂存</option>
<option value="200">待审核</option>
... ...