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

@@ -243,7 +243,7 @@ var g = new common.grid({
                 var t = new Date(item.createTime * 1000);
                 var t = new Date(item.createTime * 1000);
                 var formatted = common.util.__dateFormat(t, "yyyy-MM-dd hh:mm:ss");
                 var formatted = common.util.__dateFormat(t, "yyyy-MM-dd hh:mm:ss");
                 html.push("<p>是</p>");
                 html.push("<p>是</p>");
-                html.push("<p>预售库存：" + item.productName + "</p>");
+                html.push("<p>预售库存：" + item.stock + "</p>");
                 html.push("<p>预计到货时间：" + formatted + "</p>");
                 html.push("<p>预计到货时间：" + formatted + "</p>");
             } else {
             } else {
                 var t = new Date(item.createTime * 1000);
                 var t = new Date(item.createTime * 1000);

@@ -120,9 +120,8 @@ $(document).on("click", "#saveAllInfo", function() {
 			res = res.data;
 			res = res.data;
 			if (res.code == '200') {
 			if (res.code == '200') {
 				e.$tip(res.message, function() {
 				e.$tip(res.message, function() {
-					//history.go(-1);
+					history.go(-1);
 				}, 'growl-success');
 				}, 'growl-success');
-
 			} else {
 			} else {
 				e.$tip(res.message);
 				e.$tip(res.message);
 			}
 			}

@@ -273,7 +273,7 @@ common.edit.ajaxfileupload(".fenmianfile", {
 			goodsList[$(this).data("index")].goodsImagesList = item;
 			goodsList[$(this).data("index")].goodsImagesList = item;
 			$(this).parents(".cover-image-item").before(common.util.__template2($("#fenmianImgTemp").html(), data));
 			$(this).parents(".cover-image-item").before(common.util.__template2($("#fenmianImgTemp").html(), data));
 		} else {
 		} else {
-			common.util.__tip(response.message);
+			common.util.__tip(response.message, 'warning');
 		}
 		}
 	}
 	}
 });
 });

@@ -16,7 +16,7 @@ var config = {
         // domain: 'http://172.16.6.240:8088/platform',
         // domain: 'http://172.16.6.240:8088/platform',
         // domain:'http://172.16.6.240:8088/platform',//王书生
         // domain:'http://172.16.6.240:8088/platform',//王书生
         // domain: 'http://172.16.6.252:9080',//陈超
         // domain: 'http://172.16.6.252:9080',//陈超
-        //domain:'http://172.16.6.227:8088/platform',//玛丽
+        //domain: 'http://172.16.6.227:8088/platform', //玛丽
         // domain: 'http://192.168.102.202:8088/platform',
         // domain: 'http://192.168.102.202:8088/platform',
         // domain:'http://172.16.9.8:8080/yohobuy-platform-web',//葛超
         // domain:'http://172.16.9.8:8080/yohobuy-platform-web',//葛超
         domain: 'http://192.168.102.202:8088/platform',
         domain: 'http://192.168.102.202:8088/platform',