Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6

@@ -27,7 +27,7 @@
 
 ### 硬件设备规划
 
-1. node服务器1台（8Core 16G RAM，如果考虑高可用，再加一台）
+1. node服务器1台（8Core 16G RAM，如果考虑高可用，再加一台）.
 
 
 

@@ -180,7 +180,7 @@ var g = new common.grid({
 	}, {
 		display: '售价',
 		render: function(item) {
-			var vip = item.isVIP ? ENUM.isVIP[item.isVIP] : '',
+			var vip = ENUM.isVIP[item.isVIP] ? ENUM.isVIP[item.isVIP] : '',
 				retailPrice = item.retailPrice ? item.retailPrice : '',
 				salesPrice = item.salesPrice ? item.salesPrice : '';
 			return '<p><strong>吊牌价：</strong>' + retailPrice + '</p>' +
@@ -196,13 +196,13 @@ var g = new common.grid({
 		render: function(item) {
 			var html = '';
 
-			if (item.ageLevel) {
+			if (ENUM.ageLevel[item.ageLevel]) {
 				html += ENUM.ageLevel[item.ageLevel];
 				if (item.gender) {
 					html += '/';
 				}
 			}
-			if (item.gender) {
+			if (ENUM.gender[item.gender]) {
 				html += ENUM.gender[item.gender]
 			}
 			return html;

@@ -45,7 +45,12 @@ GOLABDATA.on("LYaddInfo", function() {
 				}
 
 			});
-			return JSON.stringify(arr);
+			if (arr.length > 0) {
+				return JSON.stringify(arr);
+			} else {
+				return '';
+			}
+
 		}
 		option.debug = true;
 	});
@@ -70,6 +75,7 @@ $.ajax({
 		data.makeCrafts = productExtBo.makeCrafts;
 		data.salesPhrase = productExtBo.salesPhrase;
 		data.isHostsell = productExtBo.isHostsell;
+
 		$.each(data, function(key, value) {
 			if (value) {
 				data[key] = value;

@@ -97,7 +97,7 @@ var g = new common.grid({
 	}, {
 		display: "发表时间",
 		render: function(item) {
-			return common.util.__dateFormat(new Date(item.createTime), "yyyy-MM-dd hh:mm:ss");
+			return common.util.__dateFormat(new Date(item.createTime * 1000), "yyyy-MM-dd hh:mm:ss");
 		}
 	}, {
 		display: "操作",

@@ -27,7 +27,7 @@ a:focus {
     min-height: 60px;
     position: fixed;
     width: 100%;
-    z-index: 99999;
+    z-index: 1000;
 }
 
 .headerwrapper:after {

@@ -66,8 +66,8 @@ input[type=date], input[type=time], input[type=datetime-local], input[type=month
 }
 .poseditimg{
     position: relative;
-    width: 700px;
-    height: 600px;
+    width: 100%;
+    height: auto;
     img{
         display: block;
         width: 100%;
@@ -96,6 +96,10 @@ input[type=date], input[type=time], input[type=datetime-local], input[type=month
     top: 20%;
     z-index: 1000;
 
+    ul {
+        padding: 0;
+    }
+
     li {
         width: 150px;
         line-height: 40px;

@@ -5,51 +5,7 @@ exports.domain = require('../config/common.js').domain;
 //exports.domain = 'http://172.16.6.197:8080/yohobuy-platform-web'; //耿超
 
 //商品管理路由配置
-exports.res = [
-    /*{
-            //商品审核
-            route: '/supplier/baseaudit/index',
-            method: 'GET',
-            view: 'pages/goods/index',
-            data: {
-                bottons: '{"detail":true}',
-                gridurl: '/goods/review/getList',
-                searchStatus: [{
-                    name: "未审核",
-                    value: "100"
-                }, {
-                    name: "已通过",
-                    value: "200"
-                }, {
-                    name: "驳回",
-                    value: "300"
-                }],
-                searchJIT: true,
-                pageTitle: "商品审核"
-            },
-            src: '/goods/index'
-        }, {
-            route: '/goods/review/getList',
-            method: 'POST',
-            url: '/goods/review/getReviewList',
-            params: [{
-                name: 'skn',
-                type: 'String'
-            }, {
-                name: 'brandName',
-                type: 'String'
-            }, {
-                name: 'storeName',
-                type: 'String'
-            }, {
-                name: 'status',
-                type: 'String'
-            }, {
-                name: 'jit',
-                type: 'String'
-            }]
-        }, */
-    {
+exports.res = [{
         //网销信息 -> 网销信息页面渲染
         route: '/goods/netsale/index',
         method: 'GET',

-exports.domain = 'http://172.16.9.8:8080/yohobuy-platform-web';
+//exports.domain = 'http://172.16.9.8:8080/yohobuy-platform-web';
+exports.domain = require('../config/common.js').domain;
 exports.res = [{
     //网销信息 -> 逛关联
     route: '/goods/article/queryArticlesBySKN',

@@ -57,7 +57,7 @@ module.exports = function(proxyRoute) {
       logger.log('info','grayroute: request options: %j',options,{});
 
       //发起代理请求
-      if(req.headers['accept'].indexOf('text/html')>-1) { 
+      if(req.headers['accept'].indexOf('text/html')>-1||req.xhr) { 
         request(options,function(err,res,body) {
           if(err) {
             logger.log('error','grayroute: request error:',err);