Merge branch 'release/qqtest' of http://git.dev.yoho.cn/platform/yohobuy-portal-…

…fe into release/qqtest

@@ -11,7 +11,8 @@ var ENUM = {
 	ageLevel: {
 		1: '成人',
 		2: '大童',
-		3: '小童'
+		3: '小童',
+		'2|3':"大小童"
 	},
 	status: {
 		'8': '待上架',

@@ -49,7 +49,7 @@ var AgeLevelEnum = {
         1: "成人",
         2: "大童",
         3: "小童",
-        "": "未知年龄"
+        "2|3": "大小童"
     }
 }
 
@@ -171,7 +171,7 @@ var t = new common.tab({
     }, {
         name: "all",
         display: "全部商品({all})",
-        value: '2,3,4,5,6,7'
+        value: '1,2,3,4,5,6,7'
     }]
 }).init(ENUM.tips);
 
@@ -192,7 +192,7 @@ var g = new common.grid({
             middleSortId: tabTree.selected.length > 1 ? tabTree.selected[1].id : "", // 二级类目
             smallSortId: tabTree.selected.length > 2 ? tabTree.selected[2].id : "", // 三级类目
             size: common.util.__input("size"),
-            productStatusStr: t.value ? t.value : '2,3,4,5,6,7'
+            productStatusStr: t.value ? t.value : '1,2,3,4,5,6,7'
 
         };
     },

@@ -19,7 +19,7 @@ var config = {
         // domain:'http://172.16.6.141:9090/',//   赵琪
         // domain: 'http://172.16.6.214:8088/platform',//陈超
         //http://172.16.6.124:8088/platform/product/queryAllProductAttr
-        //domain: 'http://172.16.6.146:8088/platform', //玛丽
+        // domain: 'http://172.16.6.146:8088/platform', //玛丽
         //domain:'http://172.16.6.157:8080/yohobuy-platform-web',//葛超
         // domain: 'http://192.168.102.216:8086/platform',
         domain: 'http://192.168.102.202:8088/platform',

@@ -89,7 +89,12 @@ module.exports = function(req, res, next) {
             author.validateAuthor(req.session.user.auth.pid,req.session.user.auth.role_id,path,function(data){
                 if(data.code!=200){
                     res.status(403);
+                    if(!req.xhr){
                         res.render('error/error_nolayout',{message:NO_AUTH,layout:false,cssfile:CSS_FILE});
+                    }else{
+                        res.json({code:304,message:"没有权限！"});
+                    }
+                    
                     return;
                 }
                 nextRedirect(method,path);