Authored by weiqingting

提交

@@ -28,6 +28,9 @@ module.exports = function (app){ @@ -28,6 +28,9 @@ module.exports = function (app){
28 //店铺装修审核列表 28 //店铺装修审核列表
29 app.post("/supplier/store/ajax/shenhezx","shopAudit_findAuditShopsDecorator"); 29 app.post("/supplier/store/ajax/shenhezx","shopAudit_findAuditShopsDecorator");
30 30
31 - //店铺装修审核 31 + //yoho店铺装修审核通过,驳回
32 app.post("/shop/ShopsDecoratorRest/auditShopsDecorator","shopAudit_auditShopsDecorator"); 32 app.post("/shop/ShopsDecoratorRest/auditShopsDecorator","shopAudit_auditShopsDecorator");
  33 +
  34 + //blk店铺装修审核通过,驳回
  35 + app.post("/shop/ShopsDecoratorRest/auditBlkShopsDecorator","shopAudit_auditBlkShopsDecorator");
33 } 36 }
1 module.exports = function (app) { 1 module.exports = function (app) {
2 2
  3 + /******************************店铺管理列表*************************************/
  4 +
3 app.get("/supplier/shop/decoration", "shop.DecorationList", function (req,res){ 5 app.get("/supplier/shop/decoration", "shop.DecorationList", function (req,res){
4 this.$extend={ 6 this.$extend={
5 moduleName:"店铺管理", 7 moduleName:"店铺管理",
@@ -7,21 +9,30 @@ module.exports = function (app) { @@ -7,21 +9,30 @@ module.exports = function (app) {
7 }; 9 };
8 }); 10 });
9 11
10 - app.get("/supplier/store/decorationDetail/:shopsId/:shopType/:shopsType/:id/", "shop.Decoration");  
11 -  
12 //店铺列表 12 //店铺列表
13 app.post("/shop/ShopsDecoratorRest/findShopsDecorator","shopDecoration_findShopsDecorator"); 13 app.post("/shop/ShopsDecoratorRest/findShopsDecorator","shopDecoration_findShopsDecorator");
14 14
15 - //关店 15 + //yoho关店
16 app.post("/supplier/store/closeShops","shopDecoration_closeShops"); 16 app.post("/supplier/store/closeShops","shopDecoration_closeShops");
17 17
18 - //开店 18 + //yoho开店
19 app.post("/supplier/store/openShops","shopDecoration_openShops"); 19 app.post("/supplier/store/openShops","shopDecoration_openShops");
20 -  
21 - //店铺装修详情 20 +
  21 + //blk关店
  22 + app.post("/supplier/store/closeBlkShops","shopDecoration_closeBlkShops");
  23 +
  24 + //blk开店
  25 + app.post("/supplier/store/openBlkShops","shopDecoration_openBlkShops");
  26 +
  27 + /******************************yoho装修*************************************/
  28 +
  29 + //yoho店铺装修,编辑,查看,审核
  30 + app.get("/supplier/store/decorationDetail/:shopsId/:shopType/:shopsType/:id/", "shop.Decoration");
  31 +
  32 + //yoho店铺装修详情
22 app.post("/shop/ShopsDecoratorRest/findShopsDecoratorDetail","shopDecoration_findShopsDecoratorDetail"); 33 app.post("/shop/ShopsDecoratorRest/findShopsDecoratorDetail","shopDecoration_findShopsDecoratorDetail");
23 34
24 - //店铺装修保存 35 + //yoho店铺装修保存,提交审核
25 app.post("/shop/ShopsDecoratorRest/saveShopsDecorator","shopDecoration_saveShopsDecorator"); 36 app.post("/shop/ShopsDecoratorRest/saveShopsDecorator","shopDecoration_saveShopsDecorator");
26 37
27 //热销 38 //热销
@@ -30,5 +41,30 @@ module.exports = function (app) { @@ -30,5 +41,30 @@ module.exports = function (app) {
30 //最新 41 //最新
31 app.post("/shop/ShopsDecoratorRest/findNewProductList","shopDecoration_findNewProductList"); 42 app.post("/shop/ShopsDecoratorRest/findNewProductList","shopDecoration_findNewProductList");
32 43
33 - 44 + /******************************BLK装修*************************************/
  45 +
  46 + //blk店铺装修编辑
  47 + app.get("/shop/decoration/blkEdit/:shopsId", "shop.DecorationBLK", "shopDecoration_findBlkShopsDecoratorDetail", function (data,req,res){
  48 + data.operation = 1;
  49 + return data;
  50 + });
  51 +
  52 + //blk店铺装修查看
  53 + app.get("/shop/decoration/blkView/:shopsId", "shop.DecorationBLK", "shopDecoration_findBlkShopsDecoratorDetail", function (data,req,res){
  54 + data.operation = 0;
  55 + return data;
  56 + });
  57 +
  58 + //blk店铺装修审核
  59 + app.get("/shop/decoration/blkCheck/:shopsId", "shop.DecorationBLK", "shopDecoration_findBlkShopsDecoratorDetail", function (data,req,res){
  60 + data.operation = 2;
  61 + return data;
  62 + });
  63 +
  64 + //BLK店铺装修保存,提交审核
  65 + app.post("/shop/decoration/saveBlkShopsDecorator","shopDecoration_saveBlkShopsDecorator");
  66 +
  67 + //获取店铺下的BLK商品
  68 + app.post("/shop/decoration/findBlkProductByShopsId","shopDecoration_findBlkProductByShopsId");
  69 +
34 } 70 }
@@ -43,7 +43,7 @@ var apiCofig = { @@ -43,7 +43,7 @@ var apiCofig = {
43 //root:__dirname, 43 //root:__dirname,
44 EnvConst:{ 44 EnvConst:{
45 domain:"http://192.168.102.210:8088/platform", 45 domain:"http://192.168.102.210:8088/platform",
46 - //domain:"http://172.16.6.225:8080/platform", 46 + //domain:"http://172.16.6.148:8088/platform",
47 yohoSearch: 'http://192.168.102.216:8080/yohosearch', 47 yohoSearch: 'http://192.168.102.216:8080/yohosearch',
48 system:Iaccount 48 system:Iaccount
49 }, 49 },
@@ -110,7 +110,8 @@ module.exports={ @@ -110,7 +110,8 @@ module.exports={
110 title:'', 110 title:'',
111 url: '/guang/article/getSortList', 111 url: '/guang/article/getSortList',
112 params: [ 112 params: [
113 - {name: "parentId", type: "Number"} 113 + {name: "parentId", type: "Number"},
  114 + {name:"appType",type:"Number"}
114 ] 115 ]
115 }, 116 },
116 queryList:{ 117 queryList:{
@@ -23,7 +23,8 @@ module.exports={ @@ -23,7 +23,8 @@ module.exports={
23 {name: 'orderBy', type: 'Number'}, 23 {name: 'orderBy', type: 'Number'},
24 {name: 'status', type: 'Number'}, 24 {name: 'status', type: 'Number'},
25 {name: 'name', type: 'String'}, 25 {name: 'name', type: 'String'},
26 - {name: 'advertCode', type: 'String'} 26 + {name: 'advertCode', type: 'String'},
  27 + {name: 'appType', type: 'Number'}
27 ] 28 ]
28 }, 29 },
29 addSort:{ 30 addSort:{
@@ -34,7 +35,8 @@ module.exports={ @@ -34,7 +35,8 @@ module.exports={
34 {name: 'orderBy', type: 'Number'}, 35 {name: 'orderBy', type: 'Number'},
35 {name: 'status', type: 'Number'}, 36 {name: 'status', type: 'Number'},
36 {name: 'name', type: 'String'}, 37 {name: 'name', type: 'String'},
37 - {name: 'advertCode', type: 'String'} 38 + {name: 'advertCode', type: 'String'},
  39 + {name: 'appType', type: 'Number'}
38 ] 40 ]
39 }, 41 },
40 delSort:{ 42 delSort:{
@@ -72,7 +72,6 @@ module.exports={ @@ -72,7 +72,6 @@ module.exports={
72 params: [ 72 params: [
73 {name: 'status', type: 'Number'}, 73 {name: 'status', type: 'Number'},
74 {name: 'idName', type: 'String'} 74 {name: 'idName', type: 'String'}
75 -  
76 ] 75 ]
77 }, 76 },
78 getCategoryNames:{ 77 getCategoryNames:{
@@ -99,7 +98,8 @@ module.exports={ @@ -99,7 +98,8 @@ module.exports={
99 {name:"url",type:"String"}, 98 {name:"url",type:"String"},
100 {name:"contentData",type:"String"}, 99 {name:"contentData",type:"String"},
101 {name:"brands",type:"String"}, 100 {name:"brands",type:"String"},
102 - {name:"tag",type:"String"} 101 + {name:"tag",type:"String"},
  102 + {name:"appType",type:"Number"}
103 ] 103 ]
104 }, 104 },
105 updateArticle:{ 105 updateArticle:{
@@ -120,7 +120,8 @@ module.exports={ @@ -120,7 +120,8 @@ module.exports={
120 {name:"url",type:"String"}, 120 {name:"url",type:"String"},
121 {name:"contentData",type:"String"}, 121 {name:"contentData",type:"String"},
122 {name:"brands",type:"String"}, 122 {name:"brands",type:"String"},
123 - {name:"tag",type:"String"} 123 + {name:"tag",type:"String"},
  124 + {name:"appType",type:"Number"}
124 ] 125 ]
125 }, 126 },
126 getDetail:{ 127 getDetail:{
@@ -133,23 +134,6 @@ module.exports={ @@ -133,23 +134,6 @@ module.exports={
133 getTags:{ 134 getTags:{
134 title: "获取标签列表", 135 title: "获取标签列表",
135 url:'/guang/tags/getTags' 136 url:'/guang/tags/getTags'
136 - },  
137 - queryAllGoodsSort:{  
138 - title: "标签搜索,所有(没用到)",  
139 - apis: {  
140 - colorList: {  
141 - url: '/erpproduct/product/colorList'  
142 - },  
143 - materialList: {  
144 - url: '/erpproduct/attribute/index',  
145 - params: [{  
146 - name: 'status',  
147 - type: 'String',  
148 - def:1  
149 - }]  
150 - }  
151 - }  
152 - },  
153 - 137 + }
154 } 138 }
155 } 139 }
@@ -28,7 +28,8 @@ module.exports={ @@ -28,7 +28,8 @@ module.exports={
28 {name: 'isHot', type: 'Number'}, 28 {name: 'isHot', type: 'Number'},
29 {name: 'status', type: 'Number'}, 29 {name: 'status', type: 'Number'},
30 {name: 'orderBy', type:'Number'}, 30 {name: 'orderBy', type:'Number'},
31 - {name: 'cover', type:'String'} 31 + {name: 'cover', type:'String'},
  32 + {name:'appType',type:'Number'}
32 ] 33 ]
33 }, 34 },
34 addTag:{ 35 addTag:{
@@ -40,7 +41,8 @@ module.exports={ @@ -40,7 +41,8 @@ module.exports={
40 {name: 'isHot', type: 'Number'}, 41 {name: 'isHot', type: 'Number'},
41 {name: 'status', type: 'Number'}, 42 {name: 'status', type: 'Number'},
42 {name: 'orderBy', type:'Number'}, 43 {name: 'orderBy', type:'Number'},
43 - {name: 'cover', type:'String'} 44 + {name: 'cover', type:'String'},
  45 + {name:'appType',type:'Number'}
44 ] 46 ]
45 }, 47 },
46 delTag:{ 48 delTag:{
@@ -4,7 +4,9 @@ module.exports= { @@ -4,7 +4,9 @@ module.exports= {
4 getAllHelpCategory:{ 4 getAllHelpCategory:{
5 title:"所有帮助分类列表", 5 title:"所有帮助分类列表",
6 url:"/HelpCategoryRest/getAllHelpCategory", 6 url:"/HelpCategoryRest/getAllHelpCategory",
7 - params:[] 7 + params:{
  8 + platform:{type:String}
  9 + }
8 }, 10 },
9 11
10 addCategory:{ 12 addCategory:{
@@ -34,19 +34,29 @@ module.exports={ @@ -34,19 +34,29 @@ module.exports={
34 params:[ 34 params:[
35 {name: 'supplierId', type: 'Number'}, 35 {name: 'supplierId', type: 'Number'},
36 {name: 'brandId', type: 'Number'}, 36 {name: 'brandId', type: 'Number'},
37 - {name: 'checkStatus', type: 'Number'} 37 + {name: 'checkStatus', type: 'Number'},
  38 + {name: 'blkCheckStatus', type: 'Number'}
38 ] 39 ]
39 }, 40 },
40 41
41 auditShopsDecorator:{ 42 auditShopsDecorator:{
42 - title:"店铺装修审核", 43 + title:"yoho店铺装修审核通过,驳回",
43 url:"/ShopsDecoratorRest/auditShopsDecorator", 44 url:"/ShopsDecoratorRest/auditShopsDecorator",
44 params:[ 45 params:[
45 {name: 'id', type: 'Number'}, 46 {name: 'id', type: 'Number'},
46 {name: 'checkStatus', type: 'Number'}, 47 {name: 'checkStatus', type: 'Number'},
47 {name: 'comment', type: 'String'} 48 {name: 'comment', type: 'String'}
48 ] 49 ]
  50 + },
  51 +
  52 + auditBlkShopsDecorator:{
  53 + title:"blk店铺装修审核通过,驳回",
  54 + url:"/ShopsDecoratorRest/auditBlkShopsDecorator",
  55 + params:[
  56 + {name: 'id', type: 'Number'},
  57 + {name: 'blkCheckStatus', type: 'Number'},
  58 + {name: 'blkComment', type: 'String'}
  59 + ]
49 } 60 }
50 } 61 }
51 -}  
52 - 62 +}
@@ -10,14 +10,15 @@ @@ -10,14 +10,15 @@
10 {name: 'page', type: 'number'}, 10 {name: 'page', type: 'number'},
11 {name: 'size', type: 'number'}, 11 {name: 'size', type: 'number'},
12 {name: 'shopsId', type: 'number'}, 12 {name: 'shopsId', type: 'number'},
13 - {name: 'checkStatus', type: 'number'}, 13 + {name: 'checkStatus', type: 'number'},
  14 + {name: 'blkCheckStatus', type: 'number'},
14 {name: 'supplierId', type: 'number'}, 15 {name: 'supplierId', type: 'number'},
15 {name: 'brandId', type: 'number'} 16 {name: 'brandId', type: 'number'}
16 ] 17 ]
17 }, 18 },
18 19
19 closeShops:{ 20 closeShops:{
20 - title:"关店", 21 + title:"yoho关店",
21 url:"/ShopsRest/closeShops", 22 url:"/ShopsRest/closeShops",
22 params: [ 23 params: [
23 {name:"shopsId",type:"Number"} 24 {name:"shopsId",type:"Number"}
@@ -25,12 +26,28 @@ @@ -25,12 +26,28 @@
25 }, 26 },
26 27
27 openShops:{ 28 openShops:{
28 - title:"开店", 29 + title:"yoho开店",
29 url:"/ShopsRest/openShops", 30 url:"/ShopsRest/openShops",
30 params: [ 31 params: [
31 {name:"shopsId",type:"Number"} 32 {name:"shopsId",type:"Number"}
32 ] 33 ]
33 }, 34 },
  35 +
  36 + closeBlkShops:{
  37 + title:"blk关店",
  38 + url:"/ShopsRest/closeBlkShops",
  39 + params: [
  40 + {name:"shopsId",type:"Number"}
  41 + ]
  42 + },
  43 +
  44 + openBlkShops:{
  45 + title:"blk开店",
  46 + url:"/ShopsRest/openBlkShops",
  47 + params: [
  48 + {name:"shopsId",type:"Number"}
  49 + ]
  50 + },
34 51
35 /*****************店铺装修详情*********************/ 52 /*****************店铺装修详情*********************/
36 53
@@ -70,6 +87,40 @@ @@ -70,6 +87,40 @@
70 {name: 'shopsId', type: 'Number'}, 87 {name: 'shopsId', type: 'Number'},
71 {name: 'size', type: 'Number'} 88 {name: 'size', type: 'Number'}
72 ] 89 ]
  90 + },
  91 +
  92 + /*****************BLK店铺装修详情*********************/
  93 +
  94 + findBlkShopsDecoratorDetail:{
  95 + title:"BLK店铺装修详情",
  96 + url:"/ShopsDecoratorRest/findBlkShopsDecoratorDetail",
  97 + params:[
  98 + {name: 'shopsId', type: 'Number'}
  99 + ]
  100 + },
  101 +
  102 + saveBlkShopsDecorator:{
  103 + title:"保存BLK店铺装修信息",
  104 + url:"/ShopsDecoratorRest/saveBlkShopsDecorator",
  105 + params:[
  106 + {name: 'shopsId', type: 'Number'},
  107 + {name: 'platform', type: 'String'},
  108 + {name: 'templateName', type: 'String'},
  109 + {name: 'templateType', type: 'Number'},
  110 + {name: 'resources', type: 'String'},
  111 + {name: 'appType', type: 'Number'},
  112 + {name: 'submitStatus', type: 'Number'}
  113 + ]
  114 + },
  115 +
  116 + findBlkProductByShopsId:{
  117 + title:"获取店铺下的BLK商品",
  118 + url:"/ShopsDecoratorRest/findBlkProductByShopsId",
  119 + params:[
  120 + {name: 'shopsId', type: 'Number'},
  121 + {name: 'productSkn', type: 'Number'},
  122 + {name: 'size', type: 'number'}
  123 + ]
73 } 124 }
74 } 125 }
75 } 126 }
@@ -45,6 +45,16 @@ @@ -45,6 +45,16 @@
45 </div> 45 </div>
46 46
47 <div class="form-group"> 47 <div class="form-group">
  48 + <label for="advertCode" class="col-sm-2 control-label">是否BLK</label>
  49 + <div class="col-sm-10">
  50 + <select class="form-control" id="appType" value="[[appType]]">
  51 + <option value="0"></option>
  52 + <option value="1"></option>
  53 + </select>
  54 + </div>
  55 + </div>
  56 +
  57 + <div class="form-group">
48 <label for="status" class="col-sm-2 control-label" style="margin-top: 10px">是否启用:</label> 58 <label for="status" class="col-sm-2 control-label" style="margin-top: 10px">是否启用:</label>
49 <div class="col-sm-10 radio"> 59 <div class="col-sm-10 radio">
50 <label><input type="radio" value="1" name="status" kl_vkbd_parsed="true">开启</label> 60 <label><input type="radio" value="1" name="status" kl_vkbd_parsed="true">开启</label>
@@ -34,6 +34,16 @@ @@ -34,6 +34,16 @@
34 </div> 34 </div>
35 </div> 35 </div>
36 <div class="form-group"> 36 <div class="form-group">
  37 + <label class="col-sm-2 control-label">是否BLK:</label>
  38 +
  39 + <div class="col-sm-8">
  40 + <select class="form-control" id="appType" value="[[appType]]">
  41 + <option value="0"></option>
  42 + <option value="1"></option>
  43 + </select>
  44 + </div>
  45 + </div>
  46 + <div class="form-group">
37 <label class="col-sm-2 control-label">文章分类:</label> 47 <label class="col-sm-2 control-label">文章分类:</label>
38 <!--文章分类--> 48 <!--文章分类-->
39 <div class="col-sm-2"> 49 <div class="col-sm-2">
@@ -69,6 +79,7 @@ @@ -69,6 +79,7 @@
69 </select> 79 </select>
70 </div> 80 </div>
71 </div> 81 </div>
  82 +
72 <div class="form-group"> 83 <div class="form-group">
73 <label class="col-sm-2 control-label">文章摘要:</label> 84 <label class="col-sm-2 control-label">文章摘要:</label>
74 85
@@ -94,6 +94,17 @@ @@ -94,6 +94,17 @@
94 <input id="status" type="hidden" value="[[status]]" for="radio" kl_vkbd_parsed="true"> 94 <input id="status" type="hidden" value="[[status]]" for="radio" kl_vkbd_parsed="true">
95 </div> 95 </div>
96 96
  97 + <div class="form-group">
  98 + <label class="col-sm-2 control-label">是否BLK:</label>
  99 +
  100 + <div class="col-sm-8">
  101 + <select class="form-control" id="appType" value="[[appType]]">
  102 + <option value="0"></option>
  103 + <option value="1"></option>
  104 + </select>
  105 + </div>
  106 + </div>
  107 +
97 <div class="form-group" style="margin-bottom: 0"> 108 <div class="form-group" style="margin-bottom: 0">
98 <label class="col-sm-2 control-label">上传图片:</label> 109 <label class="col-sm-2 control-label">上传图片:</label>
99 <div class="col-sm-offset-1 col-sm-9"> 110 <div class="col-sm-offset-1 col-sm-9">
@@ -5,6 +5,29 @@ @@ -5,6 +5,29 @@
5 <div style="margin-bottom: 20px"> 5 <div style="margin-bottom: 20px">
6 <a class="btn btn-success" id="add-category"><i class="fa fa-plus"></i> 添加帮助分类</a> 6 <a class="btn btn-success" id="add-category"><i class="fa fa-plus"></i> 添加帮助分类</a>
7 </div> 7 </div>
  8 + <div class="panel-body">
  9 + <div class="form-group">
  10 + <div class="col-sm-3">
  11 + <select class="form-control observe noEdit" id="platform">
  12 + <option value="-1">品牌风格</option>
  13 + <option value="iphone">IOS手机</option>
  14 + <option value="ipad">IOS Pad</option>
  15 + <option value="android">安卓手机</option>
  16 + <option value="androidpad">安卓Pad</option>
  17 + <option value="h5">手机网站</option>
  18 + <option value="web">网站</option>
  19 + <option value="platform">平台</option>
  20 + <option value="BLK_APP">BLK_APP</option>
  21 + <option value="BLK_PC">BLK_PC</option>
  22 + </select>
  23 + </div>
  24 + <div class="panel-col">
  25 + <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
  26 + <a id="all-btn" href="" class="btn btn-info">全部</a>
  27 + </div>
  28 + </div>
  29 + </div>
  30 + </div>
8 <div class="panel"> 31 <div class="panel">
9 <div class="panel-body nopadding"> 32 <div class="panel-body nopadding">
10 <div class="dataTables_wrapper no-footer" id="help_list"></div> 33 <div class="dataTables_wrapper no-footer" id="help_list"></div>
@@ -40,6 +63,9 @@ @@ -40,6 +63,9 @@
40 <label style="cursor: pointer;"><input type="checkbox" name="platform" value="h5">手机网站</label> 63 <label style="cursor: pointer;"><input type="checkbox" name="platform" value="h5">手机网站</label>
41 <label style="cursor: pointer;"><input type="checkbox" name="platform" value="web">网站</label> 64 <label style="cursor: pointer;"><input type="checkbox" name="platform" value="web">网站</label>
42 <label style="cursor: pointer;"><input type="checkbox" name="platform" value="platform">平台</label> 65 <label style="cursor: pointer;"><input type="checkbox" name="platform" value="platform">平台</label>
  66 +
  67 + <label style="cursor: pointer;"><input type="checkbox" name="platform" value="BLK_APP">BLK_APP</label>
  68 + <label style="cursor: pointer;"><input type="checkbox" name="platform" value="BLK_PC">BLK_PC</label>
43 </div> 69 </div>
44 <input type="hidden" id="platform" value="{platform}" for="checkbox"> 70 <input type="hidden" id="platform" value="{platform}" for="checkbox">
45 </div> 71 </div>
@@ -21,8 +21,18 @@ @@ -21,8 +21,18 @@
21 </select> 21 </select>
22 </div> 22 </div>
23 <div class="panel-col"> 23 <div class="panel-col">
24 - <select name="status" id="status" tabindex="-1" title="" class="form-control">  
25 - <option value="" selected="">选择状态</option> 24 + <select name="status" id="yohoStatus" tabindex="-1" title="" class="form-control">
  25 + <option value="" selected="">YOHO状态</option>
  26 + <option value="0">待装修</option>
  27 + <option value="100">暂存</option>
  28 + <option value="200">待审核</option>
  29 + <option value="300">审核通过</option>
  30 + <option value="900">驳回</option>
  31 + </select>
  32 + </div>
  33 + <div class="panel-col">
  34 + <select name="status" id="blkStatus" tabindex="-1" title="" class="form-control">
  35 + <option value="" selected="">BLK状态</option>
26 <option value="0">待装修</option> 36 <option value="0">待装修</option>
27 <option value="100">暂存</option> 37 <option value="100">暂存</option>
28 <option value="200">待审核</option> 38 <option value="200">待审核</option>