fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by weiqingting
Commit 8d1421b9c51bb956534c7206fb7246cc7b9fd3b4 1 parent 2ab6b853

提交

Inline Side-by-side
Showing 4 changed files with 26 additions and 13 deletions
@@ -15,14 +15,17 @@ module.exports=function(app) { @@ -15,14 +15,17 @@ module.exports=function(app) {
15 }); 15 });
16 16
17 /*添加*/ 17 /*添加*/
18 - app.get("/guang/article/contentAdd","guang.info.Edit", "common_aggStyle",function (style) { 18 + app.get("/guang/article/contentAdd","guang.info.Edit", ["common_aggStyle"],function (style,req,res) {
19 this.$extend = { 19 this.$extend = {
20 action:"/guang/article/addArticle", 20 action:"/guang/article/addArticle",
21 moduleName: "文章管理", 21 moduleName: "文章管理",
22 pageName: "添加文章" 22 pageName: "添加文章"
23 }; 23 };
24 -  
25 - return style.data; 24 + var style=(JSON.parse(style)).data;
  25 + style=style.map(function(item){
  26 + return {stylename:item.style_name};
  27 + });
  28 + return {style:style};
26 }); 29 });
27 30
28 /*编辑*/ 31 /*编辑*/
@@ -32,7 +35,11 @@ module.exports=function(app) { @@ -32,7 +35,11 @@ module.exports=function(app) {
32 moduleName: "文章管理", 35 moduleName: "文章管理",
33 pageName: "修改文章" 36 pageName: "修改文章"
34 }; 37 };
35 - return style.data; 38 + var style=(JSON.parse(style)).data;
  39 + style=style.map(function(item){
  40 + return {stylename:item.style_name};
  41 + });
  42 + return {style:style};
36 }); 43 });
37 44
38 /*资讯管理列表数据*/ 45 /*资讯管理列表数据*/
@@ -42,8 +42,8 @@ var Iaccount = { @@ -42,8 +42,8 @@ var Iaccount = {
42 var apiCofig = { 42 var apiCofig = {
43 //root:__dirname, 43 //root:__dirname,
44 EnvConst:{ 44 EnvConst:{
45 - domain:"http://192.168.102.210:8088/platform",  
46 - // domain:"http://172.16.6.200:8088/platform", 45 + // domain:"http://192.168.102.210:8088/platform",
  46 + domain:"http://172.16.6.200: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 },
@@ -554,8 +554,7 @@ $(document).on("keyup", "#brandsearch", function () { @@ -554,8 +554,7 @@ $(document).on("keyup", "#brandsearch", function () {
554 */ 554 */
555 var Bll2 = { 555 var Bll2 = {
556 colors:[],//颜色 556 colors:[],//颜色
557 - styles :[{id: 1, stylename: "街头"}, {id: 2, stylename: "趣味"}, {id: 3, stylename: "运动"}, {id: 4, stylename: "美式"},  
558 - {id: 5, stylename: "简约"}, {id: 5, stylename: "潮流"}],//风格 557 + styles :window.ViewModel.style,//风格
559 genders :[{id: 1, gendername: "男"}, {id: 2, gendername: "女"}, {id: 3, gendername: "通用"}],//性别 558 genders :[{id: 1, gendername: "男"}, {id: 2, gendername: "女"}, {id: 3, gendername: "通用"}],//性别
560 sorts:[], 559 sorts:[],
561 /** 560 /**
@@ -656,7 +655,7 @@ var goodsgird = new common.grid({ @@ -656,7 +655,7 @@ var goodsgird = new common.grid({
656 query: common.util.__input('skns'), 655 query: common.util.__input('skns'),
657 price: price, 656 price: price,
658 color: Bll2.getIds(Bll.sorts[0].list), 657 color: Bll2.getIds(Bll.sorts[0].list),
659 - //style: getIds(Bll.sorts[1].list),//风格先不管 658 + style: getIds(Bll.sorts[1].list),//风格先不管
660 msort: Bll2.getIds(Bll.sorts[2].list), 659 msort: Bll2.getIds(Bll.sorts[2].list),
661 brand: Bll2.getIds(Bll.sorts[3].list), 660 brand: Bll2.getIds(Bll.sorts[3].list),
662 gender: Bll2.getIds(Bll.sorts[4].list) 661 gender: Bll2.getIds(Bll.sorts[4].list)
@@ -15,14 +15,17 @@ module.exports=function(app) { @@ -15,14 +15,17 @@ module.exports=function(app) {
15 }); 15 });
16 16
17 /*添加*/ 17 /*添加*/
18 - app.get("/guang/article/contentAdd","guang.info.Edit", "common_aggStyle",function (style) { 18 + app.get("/guang/article/contentAdd","guang.info.Edit", ["common_aggStyle","common_aggStyle"],function (style,req,res) {
19 this.$extend = { 19 this.$extend = {
20 action:"/guang/article/addArticle", 20 action:"/guang/article/addArticle",
21 moduleName: "文章管理", 21 moduleName: "文章管理",
22 pageName: "添加文章" 22 pageName: "添加文章"
23 }; 23 };
24 -  
25 - return style.data; 24 + var style=(JSON.parse(style)).data;
  25 + style=style.map(function(item){
  26 + return {stylename:item.style_name};
  27 + });
  28 + return {style:style};
26 }); 29 });
27 30
28 /*编辑*/ 31 /*编辑*/
@@ -32,7 +35,11 @@ module.exports=function(app) { @@ -32,7 +35,11 @@ module.exports=function(app) {
32 moduleName: "文章管理", 35 moduleName: "文章管理",
33 pageName: "修改文章" 36 pageName: "修改文章"
34 }; 37 };
35 - return style.data; 38 + var style=(JSON.parse(style)).data;
  39 + style=style.map(function(item){
  40 + return {stylename:item.style_name};
  41 + });
  42 + return {style:style};
36 }); 43 });
37 44
38 /*资讯管理列表数据*/ 45 /*资讯管理列表数据*/