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

# Conflicts:
#	client/js/sourceManage/resourceContentManage.js

@@ -6,7 +6,7 @@ var Button=[
 		template_name:"text"
 	},
 	{
-		template_intro:"一张大图",
+		template_intro:"一张图",
 		dialog:"template_dialog_grid",
 		template_name:"singleImage",
 		data:[{
@@ -17,7 +17,7 @@ var Button=[
 	    }]
 	},
 	{
-		template_intro:"两张小图",
+		template_intro:"添加小图",
 		dialog:"template_dialog_grid",
 		template_name:"smallPic",
 		data:[{
@@ -33,6 +33,21 @@ var Button=[
 	    }]
 	},
 	{
+		template_intro:"焦点图",
+		template_name:"focus",
+		dialog:"",
+		data:[
+			{
+				"src": "",
+				"alt": "",
+				"url": {},
+				"bgColor": "",
+				"imgId": ""
+			}
+		],
+		focus_type:""
+	},
+	{
 		template_intro:"添加商品",
 		dialog:"template_dialog_goods",
 		template_name:"goods",
@@ -61,13 +76,490 @@ var Button=[
 		]
 	},
 	{
+		"template_name": "appIconList",
+		"template_intro": "图标",
+		dialog:"icon-template",
+		"data": [
+			{
+				"url": {
+					"action": "",
+					"url": ""
+				},
+				"alt": "",
+				"src": "",
+				"imgId": ""
+			}
+		]
+	},
+	{
+		template_intro:"推荐(1T-1L-4R)",
+		template_name:"recommendContentOne",
+		dialog:"recommendContent-template",
+		"data": {
+			"title": {
+				"name": "",
+				"more_name": "",
+				"more_url": {
+					"action": "",
+					"url": ""
+				}
+			},
+			"big_image": [
+				{
+					"src": "",
+					"url": {
+						"action": "",
+						"url": ""
+					},
+					"title": ""
+				}
+			],
+			"list": [
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				}
+			]
+		}
+	},
+	{
+		template_intro:"推荐(1T-6F)",
+		template_name:"recommendContentTwo",
+		dialog:"recommendContent-template",
+		"data": {
+			"title": {
+				"name": "",
+				"more_name": "",
+				"more_url": {
+					"action": "",
+					"url": ""
+				}
+			},
+			"big_image": [
+				{
+					"src": "",
+					"url": {
+						"action": "",
+						"url": ""
+					},
+					"title": ""
+				}
+			],
+			"list": [
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				}
+			]
+		}
+	},
+	{
+		"template_name": "singleNameImage",
+		"template_intro": "标题广告",
+		dialog:"",
+		"data": {
+			"title": "",
+			"src": "",
+			"url": {
+				action:"",
+				url:""
+			},
+			"alt": ""
+		}
+	},
+	{
+		template_intro:"推荐(1T-12F)",
+		template_name:"recommendContentThree",
+		dialog:"recommendContent-template",
+		"data": {
+			"big_image": [
+				{
+					"src": "",
+					"url": {
+						"action": "",
+						"url": ""
+					},
+					"title": ""
+				}
+			],
+			"list": [
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				}
+			]
+		}
+	},
+	{
+		template_intro:"潮人搭配",
+		template_name:"trendsetterCollocation",
+		dialog:"noEdit-template",
+		data: {}
+	},
+	{
+		template_intro:"潮品话题",
+		template_name:"trendgoodsTopic",
+		dialog:"noEdit-template",
+		data: {}
+	},
+	{
 		template_intro:"一个连接",
 		dialog:"template_dialog_link",
 		template_name:"link",
 		data:[
 			{"url":{"action":"","url":""}}
 		]
-	}
+	},
+	{
+		template_intro:"添加促销",
+		dialog:"",
+		template_name:"promotion",
+		data: {
+			"promotionId": ""
+		}
+	},
+	{
+		template_intro:"添加楼层",
+		dialog:"icon-template",
+		template_name:"addfloor",
+		data: [
+			{
+				"url": {},
+				"alt": "",
+				"altEn": "",
+				"src": "",
+				"imgId": ""
+			}
+		]
+	},
+	{
+		template_intro:"推荐(标题 + 12张图)",
+		dialog:"recommendContent-template",
+		template_name:"recommendContentFive",
+		data: {
+			"title": {
+				"title": "",
+				"is_show": 0
+			},
+			"list": [
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				},
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				}
+			]
+		}
+	},
+	{
+		template_intro:"新人专享",
+		dialog:"newUserFloor-template",
+		template_name:"newUserFloor",
+		data: {
+			"title": {
+				"name": "",
+				"more_name": "",
+				"more_url": {
+					"action": "",
+					"url": ""
+				},
+				"active_id": ""
+			},
+			"banner_image": [
+				{
+					"src": "",
+					"url": {
+						"action": "",
+						"url": ""
+					},
+					"title": ""
+				}
+			]
+		}
+	},
+	{
+		template_intro:"图片广告",
+		dialog:"imageGroup-template",
+		template_name:"imageGroup",
+		data: {
+			"title": "",
+			"more": "",
+			"more_url": "",
+			"show_num": "",
+			"image_style": "",
+			"T1F2": true,
+			"list": [
+				{
+					"src": "",
+					"title": "",
+					"url": {
+						"action": "",
+						"url": ""
+					}
+				}
+			]
+		}
+	},
+	{
+		template_intro:"站内公告",
+		dialog:"noEdit-template",
+		template_name:"announcement",
+		data: {}
+	},
 ];
 
 module.exports = Button;

@@ -72,19 +72,10 @@ console.log(Bll.contentData);
 /*第三部解析楼层*/
 Bll.__render("#add-content","template_content",{modules:Bll.contentData});
 
+
 /*第四部操作按钮*/
 $(document).on("click", ".add_btn", function() {
     var item = Button[$(this).data("index")];
     Bll.module = $.extend(true, {}, item);
     Bll.toast(-1, Bll.module);
 });
-
-
-
-
-
-
-
-
-
-

@@ -132,7 +132,7 @@
             <label class="col-sm-2 control-label">链接:</label>
             <div class="col-sm-7">
 
-                <input type="text" name="url" id="url" value=[[url]] class="form-control" placeholder="请输入内容链接" readonly="true" required> 
+                <input type="text" name="url" id="url" value=[[url]] class="form-control" placeholder="请输入内容链接" readonly="true" required>
                 <p style="color:#999">注：链接中不能有英文单引号</p>
             </div>
             <div class="col-sm-1">
@@ -306,7 +306,7 @@
         
         </ul>
     </div>
-    
+
     [[/if]]
         <div class="actions-box">
             <div class="actions-wrap">

+[[else if module.template_name=='focus']]
+<div class="focus">
+    <div class="focus-pic-list">
+        <img src="[[module.data[0].src]]">
+    </div>
+</div>
+[[else if module.template_name=='appIconList']]
+<div class="app_icon_list">
+    <ul class="icon-list clearfix">
+        [[each module.data as item index]]
+        <li style="width:75px; float:left;margin-left:5px;"><img src="[[item.src]]"></li>
+        [[/each]]
+    </ul>
+</div>
+[[else if module.template_name=='recommendContentOne']]
+<div class="recommend_content_one">
+    <div class="recommend-info">
+        <p class="title">[[module.data.title.name]]<a class="more" href="#">[[module.data.title.more_name]]</a></p>
+        <p class="big-pic"><img src="[[module.data.big_image[0].src]]"></p>
+        <ul class="small-pic">
+            [[each module.data.list as item index]]
+            <li class="li_[[index]]"><img src="[[item.src]]"></li>
+            [[/each]]
+        </ul>
+    </div>
+</div>
+[[else if module.template_name=='recommendContentTwo']]
+<div class="recommend_content_two">
+    <div class="recommend-info">
+        <p class="title">[[module.data.title.name]]<a class="more" href="#">[[module.data.title.more_name]]</a></p>
+        <p class="big-pic"><img src="[[module.data.big_image[0].src]]"></p>
+        <ul class="small-pic">
+            [[each module.data.list as item index]]
+            <li class="li_[[index]]"><img src="[[item.src]]"></li>
+            [[/each]]
+        </ul>
+    </div>
+</div>
+[[else if module.template_name=='singleNameImage']]
+<div class="single_name_image">
+    <div class="single-info">
+        <span class="title" style="min-height:50px; display:block; border-radius:5px; border:1px solid #ccc; margin-top:10px;">[[module.data.title]]</span>
+        <img src="[[module.data.src]]" style="width:100%">
+    </div>
+</div>
+[[else if module.template_name=='recommendContentThree']]
+<div class="recommend_content_three">
+    <div class="recommend-info">
+        <p class="big-pic"><img src="[[module.data.big_image[0].src]]"></p>
+        <ul class="small-pic">
+            [[each module.data.list as item index]]
+            <li class="li_[[index]]"><img src="[[item.src]]"></li>
+            [[/each]]
+        </ul>
+    </div>
+</div>
+[[else if module.template_name=='recommendContentThree']]
+<div class="recommend_content_three">
+    <div class="recommend-info">
+        <p class="big-pic"><img src="[[module.data.big_image[0].src]]"></p>
+        <ul class="small-pic">
+            [[each module.data.list as item index]]
+            <li class="li_[[index]]"><img src="[[item.src]]"></li>
+            [[/each]]
+        </ul>
+    </div>
+</div>
+[[else if module.template_name=='trendsetterCollocation']]
+<div class="big-pic">
+    <div class="list">
+        <img src="/js/source/plugins/trendsetter/trend.png" width="96%">
+    </div>
+</div>
+[[else if module.template_name=='trendgoodsTopic']]
+<div class="big-pic">
+    <div class="list">
+        <img src="/js/source/plugins/trendgoodsTopic/trend.png" width="96%">
+    </div>
+</div>
+[[else if module.template_name=='customBrands']]
+<div class="custom-pic">
+    <div class="hot-brand-title">[[module.data.title]]</div>
+    <ul class="custom-pic clearfix">
+        [[each module.data.list as item index]]
+        <li><img src="[[item.src]]" class="custom-pic-img" style="margin:2px;"></li>
+        [[/each]]
+    </ul>
+</div>
+[[else if module.template_name=='customBrands']]
+<div class="custom-pic">
+    <div class="custom-brand-title">[[module.data.title.title]]</div>
+    <ul class="custom-pic clearfix">
+        [[each module.data.list as item index]]
+        <li><img src="[[item.src]]" class="custom-pic-img" style="margin:2px;"></li>
+        [[/each]]
+    </ul>
+</div>
+[[else if module.template_name=='promotion']]
+<div class="link">
+    <div class="list"><img src="/js/source/plugins/promotion/bigPic.jpg" width="96%/"></div>
+</div>
+[[else if module.template_name=='carouselBanner']]
+<div class="focus">
+    <div class="focus-pic-list"><img src="[[module.data.list[0].src]]"></div>
+</div>
+[[else if module.template_name=='kidsBrands']]
+<div class="hot-brand-list">
+    <div class="hot-brand-title">kids推荐品牌</div>
+    <ul class="hot-brand-list">
+        [[each module.data.list as item index]]
+        <li data-toggle="brands"><img src="[[item.src]]"></li>
+        [[/each]]
+    </ul>
+</div>
+[[else if module.template_name=='推荐(L1-RT1-RF2)']]
+<div class="hot-brand-list">
+</div>
+[[else if module.template_name=='addfloor']]
+<div class="app_icon_list">
+    <ul class="icon-list clearfix">
+        [[each module.data as item index]]
+        <li style="width:75px; float:left;margin-left:5px;"><img src="[[item.src]]"></li>
+        [[/each]]
+    </ul>
+</div>
+[[else if module.template_name=='recommendContentFive']]
+<div class="recommend_content_five">
+    <div class="recommend-info">
+        <span class="title" style="min-height:50px; display:block; border-radius:5px; border:1px solid #ccc; margin-top:10px;">[[module.data.title.title]]</span>
+        <ul class="small-pic">
+            [[each module.data.list as item index]]
+            <li class="li_[[index]]"><img src="[[item.src]]"></li>
+            [[/each]]
+        </ul>
+    </div>
+</div>
+[[else if module.template_name=='textNav']]
+<div class="textNav">
+    <div class="list"><img src="/js/source/plugins/textNav/bigPic.jpg" width="96%/"></div>
+</div>
+[[else if module.template_name=='imageList']]
+<div class="custom-pic">
+    <div class="hot-brand-title" style="margin:0px auto; text-align:center;">[[module.data.title.title]]</div>
+    <ul class="custom-pic clearfix image-list-box resource-row li[[12/module.data.title.column_num]]">
+        [[each module.data.list as item index]]
+        <li><img src="[[item.src]]"></li>
+        [[/each]]
+    </ul>
+</div>
+[[else if module.template_name=='标题标签']]
+<div class="custom-pic">
+
+</div>
+[[else if module.template_name=='编辑推荐']]
+<div class="custom-pic">
+
+</div>
+[[else if module.template_name=='hotCategory']]
+<div class="hotCategory">
+    <div class="hotCategory-info"><img src="/js/source/plugins/hotCategory/hotCategory.png" style="width:99%"></div>
+</div>
+[[else if module.template_name=='debrisSlider']]
+<div class="debris_slider">
+    <div class="debris-info">
+        <ul style="float:left;width:80px;">
+            [[each module.data.left as item index]]
+            <li><img width="80px" height="76px" src="[[item.src]]"></li>
+            [[/each]]
+        </ul>
+        <div style="float:left;width:160px;"><img width="160px" height="180px" src="[[module.data.big_image[0].src]]"></div>
+        <ul style="float:left;width:80px;">
+            [[each module.data.right as item index]]
+            <li><img width="80px" height="76px" src="[[item.src]]"></li>
+            [[/each]]
+        </ul>
+    </div>
+</div>
+[[else if module.template_name=='newUserFloor']]
+<div class="new_user_floor">
+    <div class="user_floor">
+        <p class="title">[[module.data.title.name]]<a class="more" href="#">[[module.data.title.more_name]]</a></p>
+        <p class="banner-pic"><img src="[[module.data.banner_image[0].src]]" width="96%"></p>
+    </div>
+</div>
+[[else if module.template_name=='imageGroup']]
+<div class="custom-group-list">
+    <div class="hot-brand-title" style="margin:0px auto; text-align:center;">[[module.data.title]]</div>
+    <ul class="custom-pic clearfix image-list-box resource-row li[[12/module.data.title.column_num]]">
+        [[each module.data.list as item index]]
+        <li><img src="[[item.src]]"></li>
+        [[/each]]
+    </ul>
+</div>
+[[else if module.template_name=='paramsGroup']]
+<div class="custom-group-list">
+    <div class="image-group-box"><img src="/js/source/plugins/paramsGroup/params.jpg" style="height: 80px;"></div>
+</div>
+[[else if module.template_name=='自定义参数图片']]
+<div class="custom-group-list">
+</div>
+[[else if module.template_name=='announcement']]
+<div class="custom-group-list">
+    <div class="image-group-box"><img src="/js/source/plugins/announcement/notice.jpg" style="height: 80px;"></div>
+</div>
+[[else if module.template_name=='titleImage']]
+<div class="editorTalk_content">
+    <div class="editor-info">
+        <span class="title" style="min-height:50px; display:block; border-radius:5px; border:1px solid #ccc; margin-top:10px;">[[module.data.title]]</span>
+        <img src="[[module.data.image.src]]" style="width:99%">
+    </div>
+</div>
+[[else if module.template_name=='multiLabelImage']]
+<div class="editorTalk_content">
+    <div class="editor-info">
+        [[each module.data.label_list as item index]]
+        <span class="title">[[item.title]]</span>
+        [[/each]]
+        <img src="[[module.data.image.src]]" style="width:99%">
+    </div>
+</div>
+[[else if module.template_name=='matchImage']]
+<div class="match_image">
+    <div class='row title'>[[module.data.title.name]]</div>
+    <div class='row'>
+        [[each module.data.top_image as item index]]
+        <div class='col-sm-6 matchImage'><img src="[[item.src]]"></div>
+        [[/each]]
+    </div>
+    <div class='row'>
+        [[each module.data.list as item index]]
+        <div class='col-sm-6 matchImage'><img src="[[item.src]]"></div>
+        [[/each]]
+    </div>
+</div>
\ No newline at end of file

@@ -46,6 +46,7 @@
         
         </ul>
     </div>
+        {{> resource/taoyu2}}
     [[/if]]
         <div class="actions-box">
             <div class="actions-wrap">