Merge branch 'release/qqtest' of http://git.dev.yoho.cn/platform/yohobuy-portal-…
…fe into release/qqtest
Showing
4 changed files
with
13 additions
and
7 deletions
@@ -49,7 +49,7 @@ var AgeLevelEnum = { | @@ -49,7 +49,7 @@ var AgeLevelEnum = { | ||
49 | 1: "成人", | 49 | 1: "成人", |
50 | 2: "大童", | 50 | 2: "大童", |
51 | 3: "小童", | 51 | 3: "小童", |
52 | - "": "未知年龄" | 52 | + "2|3": "大小童" |
53 | } | 53 | } |
54 | } | 54 | } |
55 | 55 | ||
@@ -171,7 +171,7 @@ var t = new common.tab({ | @@ -171,7 +171,7 @@ var t = new common.tab({ | ||
171 | }, { | 171 | }, { |
172 | name: "all", | 172 | name: "all", |
173 | display: "全部商品({all})", | 173 | display: "全部商品({all})", |
174 | - value: '2,3,4,5,6,7' | 174 | + value: '1,2,3,4,5,6,7' |
175 | }] | 175 | }] |
176 | }).init(ENUM.tips); | 176 | }).init(ENUM.tips); |
177 | 177 | ||
@@ -192,7 +192,7 @@ var g = new common.grid({ | @@ -192,7 +192,7 @@ var g = new common.grid({ | ||
192 | middleSortId: tabTree.selected.length > 1 ? tabTree.selected[1].id : "", // 二级类目 | 192 | middleSortId: tabTree.selected.length > 1 ? tabTree.selected[1].id : "", // 二级类目 |
193 | smallSortId: tabTree.selected.length > 2 ? tabTree.selected[2].id : "", // 三级类目 | 193 | smallSortId: tabTree.selected.length > 2 ? tabTree.selected[2].id : "", // 三级类目 |
194 | size: common.util.__input("size"), | 194 | size: common.util.__input("size"), |
195 | - productStatusStr: t.value ? t.value : '2,3,4,5,6,7' | 195 | + productStatusStr: t.value ? t.value : '1,2,3,4,5,6,7' |
196 | 196 | ||
197 | }; | 197 | }; |
198 | }, | 198 | }, |
@@ -19,10 +19,10 @@ var config = { | @@ -19,10 +19,10 @@ var config = { | ||
19 | // domain:'http://172.16.6.141:9090/',// 赵琪 | 19 | // domain:'http://172.16.6.141:9090/',// 赵琪 |
20 | // domain: 'http://172.16.6.214:8088/platform',//陈超 | 20 | // domain: 'http://172.16.6.214:8088/platform',//陈超 |
21 | //http://172.16.6.124:8088/platform/product/queryAllProductAttr | 21 | //http://172.16.6.124:8088/platform/product/queryAllProductAttr |
22 | - //domain: 'http://172.16.6.146:8088/platform', //玛丽 | 22 | + // domain: 'http://172.16.6.146:8088/platform', //玛丽 |
23 | //domain:'http://172.16.6.157:8080/yohobuy-platform-web',//葛超 | 23 | //domain:'http://172.16.6.157:8080/yohobuy-platform-web',//葛超 |
24 | // domain: 'http://192.168.102.216:8086/platform', | 24 | // domain: 'http://192.168.102.216:8086/platform', |
25 | - domain: 'http://192.168.102.202:8088/platform', | 25 | + domain: 'http://192.168.102.202:8088/platform', |
26 | //domain: 'http://172.16.6.146:8088/platform', | 26 | //domain: 'http://172.16.6.146:8088/platform', |
27 | //domain:'http://172.16.6.120:8088/platform',//曹艳 | 27 | //domain:'http://172.16.6.120:8088/platform',//曹艳 |
28 | //domain:'http://172.16.6.231:8080/platform',//王伟 | 28 | //domain:'http://172.16.6.231:8080/platform',//王伟 |
@@ -89,7 +89,12 @@ module.exports = function(req, res, next) { | @@ -89,7 +89,12 @@ module.exports = function(req, res, next) { | ||
89 | author.validateAuthor(req.session.user.auth.pid,req.session.user.auth.role_id,path,function(data){ | 89 | author.validateAuthor(req.session.user.auth.pid,req.session.user.auth.role_id,path,function(data){ |
90 | if(data.code!=200){ | 90 | if(data.code!=200){ |
91 | res.status(403); | 91 | res.status(403); |
92 | - res.render('error/error_nolayout',{message:NO_AUTH,layout:false,cssfile:CSS_FILE}); | 92 | + if(!req.xhr){ |
93 | + res.render('error/error_nolayout',{message:NO_AUTH,layout:false,cssfile:CSS_FILE}); | ||
94 | + }else{ | ||
95 | + res.json({code:304,message:"没有权限!"}); | ||
96 | + } | ||
97 | + | ||
93 | return; | 98 | return; |
94 | } | 99 | } |
95 | nextRedirect(method,path); | 100 | nextRedirect(method,path); |
-
Please register or login to post a comment