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

@@ -95,6 +95,7 @@ var util = {
         return result;
         return result;
     },
     },
     __template2: function(str, source) {
     __template2: function(str, source) {
+        // console.log(str);
         var script = [];
         var script = [];
         script.push('var each=function(obj,fn){');
         script.push('var each=function(obj,fn){');
         script.push('            var that=this;');
         script.push('            var that=this;');
@@ -136,7 +137,7 @@ var util = {
             } else if (/^else$/.test(trim)) {
             } else if (/^else$/.test(trim)) {
                 return trim.replace(/else/, '}else{');
                 return trim.replace(/else/, '}else{');
             } else{
             } else{
-                return code;
+                return "result.push("+code+")";
             }
             }
         }
         }
         // var PARAMS={};
         // var PARAMS={};
@@ -198,10 +199,11 @@ var util = {
 
 
 
 
         var result=header + code.join('\n')+"return result.join('');";
         var result=header + code.join('\n')+"return result.join('');";
-        // console.log(result);
+
+        console.log(result);
 
 
         var fn = new Function(script.join('')+result);
         var fn = new Function(script.join('')+result);
-        return fn.call(null,source);
+        return fn.call(source);
     },
     },
     __input: function(id) {
     __input: function(id) {
         return !!~$.trim($('#' + id).val()) ? $('#' + id).val() : ""
         return !!~$.trim($('#' + id).val()) ? $('#' + id).val() : ""

@@ -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');
 		}
 		}
 	}
 	}
 });
 });

@@ -55,7 +55,6 @@ e.on("validate", function() {
     if (+num > 100000 || +num < 1) {
     if (+num > 100000 || +num < 1) {
         return "数量（范围：1-100000）";
         return "数量（范围：1-100000）";
     }
     }
-
     return true;
     return true;
 });
 });
 e.on("validate", function() {
 e.on("validate", function() {
@@ -63,7 +62,6 @@ e.on("validate", function() {
     if (skn.length > 8) {
     if (skn.length > 8) {
         return "skn长度不能超过8位";
         return "skn长度不能超过8位";
     }
     }
-
     return true;
     return true;
 });
 });
 
 
@@ -79,7 +77,9 @@ e.on("validate", function() {
 e.init();
 e.init();
 
 
 var submit = function(callback) {
 var submit = function(callback) {
+
     e.submit($("#basicForm").attr("action"), function(option) {
     e.submit($("#basicForm").attr("action"), function(option) {
+        $("#save_brand").addClass('disabled');
         option.success = function(res) {
         option.success = function(res) {
             res = res.data;
             res = res.data;
             if (res.code == "200") {
             if (res.code == "200") {
@@ -88,8 +88,9 @@ var submit = function(callback) {
                 }, 'growl-success');
                 }, 'growl-success');
             } else {
             } else {
                 e.$tip(res.message);
                 e.$tip(res.message);
-            };
                 $("#save_brand").removeClass('disabled');
                 $("#save_brand").removeClass('disabled');
+            };
+
             return false;
             return false;
         };
         };
         option.error = function(res) {
         option.error = function(res) {
@@ -103,7 +104,7 @@ var submit = function(callback) {
 
 
 
 
 $("#save_brand").click(function() {
 $("#save_brand").click(function() {
-    $(this).addClass('disabled');
+
     submit(function(data) {
     submit(function(data) {
         //  限购码状态0：待审核 1：审核通过 2：驳回 3：过期 4:作废
         //  限购码状态0：待审核 1：审核通过 2：驳回 3：过期 4:作废
         if (+data.status == 1) {
         if (+data.status == 1) {

@@ -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',