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

@@ -102,6 +102,15 @@ var util = {
         return result;
     },
     __template2: function(str, source) {
+
+        function __layout(str){
+            return str.replace(/\[\[\s*layout\s*([^\]]*)\]\]/m,function($0,$1){
+                return __layout(document.getElementById($1).innerHTML);
+            });
+        }
+        str=__layout(str);
+        
+
         var source=$.extend(true,{},source);
         // console.log(str);
         var script = [];
@@ -152,12 +161,13 @@ var util = {
                     return trim+";";
                 }else if(/^JSON\.[^\(]+\([^\)*]\)$/.test(trim)){
                     return trim+";";
-                }else if(/^layout\s+/.test(trim)){
-                    // var items=/^layout\s+(\w*)/.exec(trim);
-                    var items=trim.split(/\s+/g);
-                    items[2]=source[items[2]]||source;
-                    return "result.push('"+util.__template2(document.getElementById(items[1]).innerHTML,items[2]).replace(/\n/g,'')+ "')";
                 }
+                // else if(/^layout\s+/.test(trim)){
+                //     // var items=/^layout\s+(\w*)/.exec(trim);
+                //     var items=trim.split(/\s+/g);
+                //     items[2]=source[items[2]]||source;
+                //     return "result.push('"+util.__template2(document.getElementById(items[1]).innerHTML,items[2]).replace(/\n/g,'')+ "')";
+                // }
                 else {
                     return "result.push(" + code + ")";
                 }

@@ -429,7 +429,7 @@ var goodsgird = new common.grid({
 					item.images_url = common.util.__joinImg("goodsimg", item.images_url);
 				}
 				else {
-					item.images_url = "";
+					item.images_url =common.util.__joinImg("goodsimg",  item.default_images);
 				}
 				return "<img width=120 height=60 src='" + item.images_url + "?imageView/2/w/100/h/100'/>";
 			}
@@ -524,9 +524,17 @@ $(document).on("click", ".goodsSelectBtn", function () {
 });
 //删除图片按钮
 $(document).on("click", ".removepic", function() {
-	Bll.module.contentData.data.splice($(this).data("index"), 1);
-	$("#goodspic").html(common.util.__template2($("#template_dialog_goodsimgs").html(), {
-		datas: Bll.module.contentData.data
+	var $parent=$(this).parents("ul.imagegroup");
+	var i=$parent.data("i");
+	var isg=typeof i==="number"?true:false;
+	if(isg){
+		Bll.module.contentData.data[i].list.splice($(this).data("index"), 1);
+	}else{
+		Bll.module.contentData.data.splice($(this).data("index"), 1);
+	}
+	
+	$parent.html(common.util.__template2($("#template_dialog_goodsimgs").html(), {
+		datas: isg?Bll.module.contentData.data[i].list:Bll.module.contentData.data
 	}));
 });
 
@@ -772,3 +780,4 @@ $(document).on("mouseover",".dragItem",function(){
 $(document).on("mouseleave",".dragItem",function(){
 	new common.drag("#add-content").destroy();
 });
+

@@ -409,7 +409,7 @@
     <div class="rows">
         <div class="form-group">
             <div class="col-sm-12">
-                <ul class="cover-image-list col-sm-10" id="goodspic">
+                <ul class="cover-image-list col-sm-10 imagegroup" id="goodspic">
                     [[each contentData.data as item index]]    
                         <li class="cover-image-item image-list" data-index="2">
                             <div class="goods-img">
@@ -474,28 +474,7 @@
 <!-- 推荐商品 -->
 <script type="text/tempalte" id="template_dialog_remgoods">
     <div class="rows" id="groupsgoods">
-        [[each contentData.data as items i]]
-            <div class="form-group">
-            <div class="col-sm-10">
-                <ul class="cover-image-list col-sm-10" id="goodspic-0">
-                    [[each items.list as item index]]    
-                        <li class="cover-image-item image-list" data-index="2">
-                            <div class="goods-img">
-                                <a class="fileinput-button-icon" href="javascript:void(0);">
-                                    <img src="[[item.src]]">
-                                </a>
-                                <i class="remove-item-btn removepic glyphicon glyphicon-remove-circle" data-index="[[index]]"></i>
-                            </div>
-                        </li>
-                    [[/each]]
-                </ul>
-            </div>
-             <div class="col-sm-2">
-                <button class="btn btn-info goodsSelectBtn" type="button" data-index="[[i]]">选择标签</button>
-            </div>
-        </div>
-        [[/each]]
-
+        [[layout template_dialog_remgoodsgroup]]
     </div>
     <div class="rows">
      <div class="form-group">
@@ -510,7 +489,7 @@
      [[each contentData.data as items i]]
         <div class="form-group">
         <div class="col-sm-10">
-            <ul class="cover-image-list col-sm-10" id="goodspic-0">
+            <ul class="cover-image-list col-sm-10 imagegroup" data-i="[[i]]">
                 [[each items.list as item index]]    
                     <li class="cover-image-item image-list" data-index="2">
                         <div class="goods-img">