Authored by 陶雨

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

Conflicts:
	server/views/pages/guang/contentEdit.html
@@ -582,7 +582,7 @@ var Button=[ @@ -582,7 +582,7 @@ var Button=[
582 }, 582 },
583 { 583 {
584 template_intro:"多标签图片", 584 template_intro:"多标签图片",
585 - dialog:"titleImage-template", 585 + dialog:"multiLabelImage-template",
586 template_name:"multiLabelImage", 586 template_name:"multiLabelImage",
587 data: { 587 data: {
588 "label_list":[ 588 "label_list":[
@@ -594,18 +594,20 @@ var Button=[ @@ -594,18 +594,20 @@ var Button=[
594 } 594 }
595 } 595 }
596 ], 596 ],
597 - "image":{ 597 + "image":[
  598 + {
598 "src": "", 599 "src": "",
599 "url": { 600 "url": {
600 "action": "", 601 "action": "",
601 "url": "" 602 "url": ""
602 } 603 }
603 } 604 }
  605 + ]
604 } 606 }
605 }, 607 },
606 { 608 {
607 template_intro:"搭配(2T-nF)", 609 template_intro:"搭配(2T-nF)",
608 - dialog:"titleImage-template", 610 + dialog:"matchImage-template",
609 template_name:"matchImage", 611 template_name:"matchImage",
610 data: { 612 data: {
611 "title": { 613 "title": {
@@ -96,15 +96,10 @@ $(document).on("click", ".del", function () {//删除 @@ -96,15 +96,10 @@ $(document).on("click", ".del", function () {//删除
96 common.util.__ajax({ 96 common.util.__ajax({
97 url: "/resource/content/delResContent", 97 url: "/resource/content/delResContent",
98 data: {id: Bll.contentDatas[index].id} 98 data: {id: Bll.contentDatas[index].id}
99 - }, function (res) {  
100 - //resources = res.data;  
101 - Bll.contentDatas.splice(index, 1);  
102 - Bll.__render("#add-content","template_content",{modules:Bll.contentDatas});  
103 - }, true);  
104 - } else { 99 + });
  100 + }
105 Bll.contentDatas.splice(index, 1); 101 Bll.contentDatas.splice(index, 1);
106 Bll.__render("#add-content","template_content",{modules:Bll.contentDatas}); 102 Bll.__render("#add-content","template_content",{modules:Bll.contentDatas});
107 - }  
108 }); 103 });
109 104
110 //$("#index_" + index).remove(); 105 //$("#index_" + index).remove();
@@ -129,3 +124,15 @@ $(document).on("change", ".observe", function() { @@ -129,3 +124,15 @@ $(document).on("change", ".observe", function() {
129 console.log(module); 124 console.log(module);
130 }); 125 });
131 }); 126 });
  127 +
  128 +$(document).on("click", '#matchImage-addOne', function() {
  129 + var length = Bll.module.contentData.data.list.length;//获得长度
  130 + Bll.module.contentData.data.list.push({
  131 + "src": "",
  132 + "url": {
  133 + "action": "",
  134 + "url": ""
  135 + }
  136 + });
  137 + Bll.__render("#add-content","template_content",{modules:Bll.contentDatas});
  138 +});
1 -<script type="text/template" id="focus-template"> 1 +<!-- 标题图片 -->
  2 +<script type="text/template" id="titleImage-template">
  3 + <div class="panel-body" id="titleImage-baseFrom">
  4 + <div class="form-group">
  5 + <label class="col-sm-2 control-label">标题:</label>
  6 + <div class="col-sm-4">
  7 + <input type="text" class="form-control observe" data-field="title" value="[[contentData.data.title]]" required="required">
  8 + </div>
  9 + <label class="col-sm-2 control-label">更多名称</label>
  10 + <div class="col-sm-4">
  11 + <input type="text" data-field="more_name" value="[[contentData.data.more_name]]" class="form-control observe">
  12 + </div>
  13 + </div>
  14 + <div class="form-group">
  15 + <label class="col-sm-2 control-label">跳转目的</label>
  16 + <div class="col-sm-4">
  17 + <select name="goTo" class="form-control observe" data-field="more_url.action" value="[[contentData.data.more_url.action]]" >
  18 + [[layout action_template]]
  19 + </select>
  20 + </div>
  21 + <label class="col-sm-2 control-label">跳转地址</label>
  22 + <div class="col-sm-4">
  23 + <input value="[[contentData.data.more_url.url]]" data-field="more_url.url" class="form-control observe" required="required" />
  24 + <p style="color:#999;margin-top: 5px;">注:链接中不能有英文单引号</p>
  25 + </div>
  26 + </div>
  27 + <div>
  28 + <table class="table table-hover table-bordered responsive dataTable no-footer">
  29 + <thead>
  30 + <tr>
  31 + <th>序号</th>
  32 + <th>资源位</th>
  33 + <th>选项</th>
  34 + </tr>
  35 + </thead>
  36 + <tbody>
  37 + <tr>
  38 + <td>1</td>
  39 + <td><input type="file" name="file" value="[[contentData.data.image.src]]" data-field="image.src" class="observe" required="required"/></td>
  40 + <td>
  41 + <div class="col-sm-12">
  42 + <select name="goTo" class="form-control observe" data-field="image.url.action" value="[[contentData.data.image.url.action]]" >
  43 + [[layout action_template]]
  44 + </select>
  45 + </div>
  46 + <div class="col-sm-12">
  47 + <input type="text" value="[[contentData.data.image.url.url]]" class="form-control observe" data-field="image.url.url" required="required" />
  48 + <p style="color:#999;margin-top: 5px;">注:链接中不能有英文单引号</p>
  49 + </div>
  50 + </td>
  51 + </tr>
  52 + </tbody>
  53 + </table>
  54 + </div>
  55 + </div>
  56 +</script>
  57 +<!--多标签图片-->
  58 +<script type="text/template" id="multiLabelImage-template">
  59 + <div class="panel-body" id="multiLabelImage-baseFrom">
  60 + <div class="form-group">
  61 + [[each contentData.data.label_list as item index]]
  62 + <label class="control-label">标签[[index+1]]:</label>
  63 + <input type="text" class="observe" value="[[item.title]]" data-field="label_list.[[index]].title" required="required" style="width: 100px">
  64 + <label class="control-label">跳转目的</label>
  65 + <select name="goTo" class="observe" value="[[item.url.action]]" data-field="label_list.[[index]].url.action" style="width: 120px" >
  66 + [[layout action_template]]
  67 + </select>
  68 + <label>跳转地址</label>
  69 + <input type="text" class="observe" value="[[item.url.url]]" data-field="label_list.[[index]].url.url" required="required" style="width: 120px" />
  70 + [[/each]]
  71 + </div>
  72 + <a href="JavaScript:;" id="multiLabelImage-addOne" class="btn btn-primary btn-xs">添加一个</a>
  73 + <div>
  74 + <table class="table table-hover table-bordered responsive dataTable no-footer">
  75 + <thead>
  76 + <tr>
  77 + <th>序号</th>
  78 + <th>资源位</th>
  79 + <th>选项</th>
  80 + </tr>
  81 + </thead>
  82 + <tbody>
  83 + [[each contentData.data.image as item index]]
  84 + <tr>
  85 + <td>[[index+1]]</td>
  86 + <td><input type="file" name="file" value="[[item.src]]" data-field="image.[[index]].src" class="observe" required="required"/></td>
  87 + <td>
  88 + <div class="col-sm-12">
  89 + <select name="goTo" class="form-control observe" data-field="image.[[index]].url.action" value="[[item.url.action]]" >
  90 + [[layout action_template]]
  91 + </select>
  92 + </div>
  93 + <div class="col-sm-12">
  94 + <input type="text" value="[[item.url.url]]" class="form-control observe" data-field="image.[[index]].url.url" required="required" />
  95 + <p style="color:#999;margin-top: 5px;">注:链接中不能有英文单引号</p>
  96 + </div>
  97 + </td>
  98 + </tr>
  99 + [[/each]]
  100 + </tbody>
  101 + </table>
  102 + </div>
  103 + </div>
  104 +</script>
  105 +<!--搭配(2T-nF)-->
  106 +<script type="text/template" id="matchImage-template">
  107 + <div class="panel-body" id="matchImage-baseFrom">
  108 + <div class="form-group">
  109 + <label class="col-sm-2 control-label">标题:</label>
  110 + <div class="col-sm-4">
  111 + <input type="text" class="form-control observe" data-field="title.name" value="[[contentData.data.title.name]]" required="required" >
  112 + </div>
  113 + <label class="col-sm-2 control-label">更多名称</label>
  114 + <div class="col-sm-4">
  115 + <input type="text" value="[[contentData.data.title.more_name]]" data-field="title.more_name" class="form-control observe" >
  116 + </div>
  117 + </div>
  118 + <div class="form-group">
  119 + <label class="col-sm-2 control-label">跳转目的</label>
  120 + <div class="col-sm-4">
  121 + <select name="goTo" class="form-control observe" value="[[contentData.data.title.more_url.action]]" data-field="title.more_url.action" >
  122 + [[layout action_template]]
  123 + </select>
  124 + </div>
  125 + <label class="col-sm-2 control-label">跳转地址</label>
  126 + <div class="col-sm-4">
  127 + <input value="[[contentData.data.title.more_url.url]]" class="form-control observe" required="required" data-field="title.more_url.url" />
  128 + <p style="color:#999;margin-top: 5px;">注:链接中不能有英文单引号</p>
  129 + </div>
  130 + </div>
  131 + <div>
  132 + <table class="table table-hover table-bordered responsive dataTable no-footer">
  133 + <thead>
  134 + <tr>
  135 + <th>序号</th>
  136 + <th>资源位</th>
  137 + <th>选项</th>
  138 + </tr>
  139 + </thead>
  140 + <tbody>
  141 + [[each contentData.data.top_image as item index]]
  142 + <tr>
  143 + <td>[[index+1]]</td>
  144 + <td><input type="file" name="file" value="[[item.src]]" data-field="top_image.[[index]].src" class="observe" required="required"/></td>
  145 + <td>
  146 + <div class="col-sm-12">
  147 + <select name="goTo" class="form-control observe" data-field="top_image.[[index]].url.action" value="[[item.url.action]]" >
  148 + [[layout action_template]]
  149 + </select>
  150 + </div>
  151 + <div class="col-sm-12">
  152 + <input type="text" value="[[item.url.url]]" class="form-control observe" data-field="top_image.[[index]].url.url" required="required" />
  153 + <p style="color:#999;margin-top: 5px;">注:链接中不能有英文单引号</p>
  154 + </div>
  155 + </td>
  156 + </tr>
  157 + [[/each]]
  158 + [[each contentData.data.list as item index]]
  159 + <tr>
  160 + <td>[[index+3]]</td>
  161 + <td><input type="file" name="file" value="[[item.src]]" data-field="list.[[index]].src" class="observe" required="required"/></td>
  162 + <td>
  163 + <div class="col-sm-12">
  164 + <select name="goTo" class="form-control observe" data-field="list.[[index]].url.action" value="[[item.url.action]]" >
  165 + [[layout action_template]]
  166 + </select>
  167 + </div>
  168 + <div class="col-sm-12">
  169 + <input type="text" value="[[item.url.url]]" class="form-control observe" data-field="list.[[index]].url.url" required="required" />
  170 + <p style="color:#999;margin-top: 5px;">注:链接中不能有英文单引号</p>
  171 + </div>
  172 + </td>
  173 + </tr>
  174 + [[/each]]
  175 + </tbody>
  176 + </table>
  177 + </div>
  178 + <a href="JavaScript:;" id="matchImage-addOne" class="btn btn-primary btn-xs">添加一个</a>
  179 + </div>
  180 +</script>
  181 +<!--推荐-->
  182 +<script type="text/template" id="recommendContent-template">
  183 + <div class="panel-body" id="recommendContent-baseFrom">
  184 + [[if contentData.data.title]]
  185 + [[if contentData.template_name != "recommendContentFive"]]
  186 + <div class="form-group">
  187 + <label class="col-sm-2 control-label">标题:</label>
  188 + <div class="col-sm-4">
  189 + <input type="text" class="form-control observe" value="[[contentData.data.title.name]]" required="required" data-field="title.name">
  190 + </div>
  191 + <label class="col-sm-2 control-label">更多名称</label>
  192 + <div class="col-sm-4">
  193 + <input type="text" value="[[contentData.data.title.more_name]]" class="form-control observe" data-field="title.more_name">
  194 + </div>
  195 + </div>
  196 + <div class="form-group">
  197 + <label class="col-sm-2 control-label">跳转目的</label>
  198 + <div class="col-sm-4">
  199 + <select name="goTo" class="form-control observe" value="[[contentData.data.title.more_url.action]]" data-field="title.more_url.action">
  200 + [[layout action_template]]
  201 + </select>
  202 + </div>
  203 + <label class="col-sm-2 control-label">跳转地址</label>
  204 + <div class="col-sm-4">
  205 + <input type="text" value="[[contentData.data.title.more_url.url]]" class="form-control observe" required="required" data-field="title.more_url.url"/>
  206 + <p style="color:#999;margin-top: 5px;">注:链接中不能有英文单引号</p>
  207 + </div>
  208 + </div>
  209 + [[/if]]
  210 + [[if contentData.template_name=="recommendContentFive"]]
  211 + <div class="form-group">
  212 + <label class="col-sm-2 control-label">标题:</label>
  213 + <div class="col-sm-4">
  214 + <input type="text" class="form-control observe" value="[[contentData.data.title.title]]" required="required" data-field="title.title">
  215 + </div>
  216 + <label class="col-sm-4 control-label">是否显示
  217 + <input type="checkbox" value="[[contentData.data.title.is_show]]" checked="[[contentData.data.title.is_show?'checked':'']]" class="observe" data-field="title.is_show">
  218 + </label>
  219 + </div>
  220 + [[/if]]
  221 + [[/if]]
  222 + <table class="table table-hover table-bordered responsive dataTable no-footer">
  223 + <thead>
  224 + <tr>
  225 + <th>序号</th>
  226 + <th>资源位</th>
  227 + <th>选项</th>
  228 + </tr>
  229 + </thead>
  230 + <tbody>
  231 + [[if contentData.data.big_image]]
  232 + [[each contentData.data.big_image as item index]]
  233 + <tr>
  234 + <td>[[index+1]]</td>
  235 + <td><input type="file" name="file" value="[[item.src]]" class="observe" data-field="contentData.data.big_image.[[index]].src"/></td>
  236 + <td>
  237 + <div class="col-sm-12">
  238 + <select name="goTo" class="form-control observe" value="[[item.url.action]]" data-field="contentData.data.big_image.[[index]].url.action">
  239 + [[layout action_template]]
  240 + </select>
  241 + </div>
  242 + <div class="col-sm-12">
  243 + <input value="[[item.url.url]]" class="form-control observe" required="required" data-field="contentData.data.big_image.[[index]].url.url"/>
  244 + <p style="color:#999;margin-top: 5px;">注:链接中不能有英文单引号</p>
  245 + </div>
  246 + </td>
  247 + </tr>
  248 + [[/each]]
  249 + [[/if]]
  250 + [[each contentData.data.list as item index]]
  251 + <tr>
  252 + <td>[[index+3]]</td>
  253 + <td><input type="file" name="file" value="[[item.src]]" class="observe" data-field="contentData.data.list.[[index]].src"/></td>
  254 + <td>
  255 + <div class="col-sm-12">
  256 + <select name="goTo" class="form-control observe" value="[[item.url.action]]" data-field="contentData.data.list.[[index]].url.action">
  257 + [[layout action_template]]
  258 + </select>
  259 + </div>
  260 + <div class="col-sm-12">
  261 + <input value="[[item.url.url]]" class="form-control observe" required="required" data-field="contentData.data.list.[[index]].url.url"/>
  262 + <p style="color:#999;margin-top: 5px;">注:链接中不能有英文单引号</p>
  263 + </div>
  264 + </td>
  265 + </tr>
  266 + [[/each]]
  267 + </tbody>
  268 + </table>
  269 + </div>
  270 +</script>
  271 +<script type="text/template" id="action_template">
  272 + <option value="">选择跳转目标</option>
  273 + <option value="go.brand">品牌列表页</option>
  274 + <option value="go.productDetail">商品详情页</option>
  275 + <option value="go.coupon">优惠券页</option>
  276 + <option value="go.fav">收藏列表页</option>
  277 + <option value="go.mine">我的页面</option>
  278 + <option value="go.list">列表或搜索页</option>
  279 + <option value="go.attention">关注页</option>
  280 + <option value="go.plus">plus</option>
  281 + <option value="go.star">star</option>
  282 + <option value="go.new">新品到着页</option>
  283 + <option value="go.sale">折扣页</option>
  284 + <option value="go.share">分享</option>
  285 + <option value="go.h5">h5网页</option>
  286 + <option value="go.weblogin">h5网页调用本地登录</option>
  287 + <option value="go.guangchannel">逛频道</option>
  288 + <option value="go.gender">男女首页</option>
  289 + <option value="go.activity">app活动页</option>
  290 + <option value="go.home">频道首页</option>
  291 + <option value="go.yohood">YOHOOD</option>
  292 + <option value="go.top100">热销排行</option>
  293 + <option value="go.activitytemplate">活动模板</option>
  294 + <option value="go.globalpurchase">全球购</option>
  295 + <option value="go.subchannel">二级频道</option>
  296 + <option value="go.guangchannel">逛频道或SHOW晒单页</option>
  297 + <option value="go.showgoods">去晒单</option>
  298 + <option value="go.limitpurchase">尖货频道</option>
  299 + <option value="go.vippro">会员商品</option>
  300 + <option value="go.shortsize">断码页</option>
  301 + <option value="go.discountmarket">折扣专区</option>
  302 + <option value="go.discountmarketpro">折扣专区详情页</option>
  303 + <option value="go.signin">签到页</option>
  304 + <option value="go.playvideo">视频播放</option>
  305 +</script>
2 306
  307 +<script type="text/template" id="noEdit-template">
  308 + <div>固定内容,暂时无法编辑!</div>
3 </script> 309 </script>
1 -[[else if module.template_name=='focus']] 1 +[[else if module.contentData.template_name=='focus']]
2 <div class="focus"> 2 <div class="focus">
3 <div class="focus-pic-list"> 3 <div class="focus-pic-list">
4 - <img src="[[module.data[0].src]]"> 4 + <img src="[[module.contentData.data[0].src]]">
5 </div> 5 </div>
6 </div> 6 </div>
7 -[[else if module.template_name=='appIconList']] 7 +[[else if module.contentData.template_name=='appIconList']]
8 <div class="app_icon_list"> 8 <div class="app_icon_list">
9 <ul class="icon-list clearfix"> 9 <ul class="icon-list clearfix">
10 - [[each module.data as item index]] 10 + [[each module.contentData.data as item index]]
11 <li style="width:75px; float:left;margin-left:5px;"><img src="[[item.src]]"></li> 11 <li style="width:75px; float:left;margin-left:5px;"><img src="[[item.src]]"></li>
12 [[/each]] 12 [[/each]]
13 </ul> 13 </ul>
14 </div> 14 </div>
15 -[[else if module.template_name=='recommendContentOne']] 15 +[[else if module.contentData.template_name=='recommendContentOne']]
16 <div class="recommend_content_one"> 16 <div class="recommend_content_one">
17 <div class="recommend-info"> 17 <div class="recommend-info">
18 - <p class="title">[[module.data.title.name]]<a class="more" href="#">[[module.data.title.more_name]]</a></p>  
19 - <p class="big-pic"><img src="[[module.data.big_image[0].src]]"></p> 18 + <p class="title">[[module.contentData.data.title.name]]<a class="more" href="#">[[module.contentData.data.title.more_name]]</a></p>
  19 + <p class="big-pic"><img src="[[module.contentData.data.big_image[0].src]]"></p>
20 <ul class="small-pic"> 20 <ul class="small-pic">
21 - [[each module.data.list as item index]] 21 + [[each module.contentData.data.list as item index]]
22 <li class="li_[[index]]"><img src="[[item.src]]"></li> 22 <li class="li_[[index]]"><img src="[[item.src]]"></li>
23 [[/each]] 23 [[/each]]
24 </ul> 24 </ul>
25 </div> 25 </div>
26 </div> 26 </div>
27 -[[else if module.template_name=='recommendContentTwo']] 27 +[[else if module.contentData.template_name=='recommendContentTwo']]
28 <div class="recommend_content_two"> 28 <div class="recommend_content_two">
29 <div class="recommend-info"> 29 <div class="recommend-info">
30 - <p class="title">[[module.data.title.name]]<a class="more" href="#">[[module.data.title.more_name]]</a></p>  
31 - <p class="big-pic"><img src="[[module.data.big_image[0].src]]"></p> 30 + <p class="title">[[module.contentData.data.title.name]]<a class="more" href="#">[[module.contentData.data.title.more_name]]</a></p>
  31 + <p class="big-pic"><img src="[[module.contentData.data.big_image[0].src]]"></p>
32 <ul class="small-pic"> 32 <ul class="small-pic">
33 - [[each module.data.list as item index]] 33 + [[each module.contentData.data.list as item index]]
34 <li class="li_[[index]]"><img src="[[item.src]]"></li> 34 <li class="li_[[index]]"><img src="[[item.src]]"></li>
35 [[/each]] 35 [[/each]]
36 </ul> 36 </ul>
37 </div> 37 </div>
38 </div> 38 </div>
39 -[[else if module.template_name=='singleNameImage']] 39 +[[else if module.contentData.template_name=='singleNameImage']]
40 <div class="single_name_image"> 40 <div class="single_name_image">
41 <div class="single-info"> 41 <div class="single-info">
42 - <span class="title" style="min-height:50px; display:block; border-radius:5px; border:1px solid #ccc; margin-top:10px;">[[module.data.title]]</span>  
43 - <img src="[[module.data.src]]" style="width:100%"> 42 + <span class="title" style="min-height:50px; display:block; border-radius:5px; border:1px solid #ccc; margin-top:10px;">[[module.contentData.data.title]]</span>
  43 + <img src="[[module.contentData.data.src]]" style="width:100%">
44 </div> 44 </div>
45 </div> 45 </div>
46 -[[else if module.template_name=='recommendContentThree']] 46 +[[else if module.contentData.template_name=='recommendContentThree']]
47 <div class="recommend_content_three"> 47 <div class="recommend_content_three">
48 <div class="recommend-info"> 48 <div class="recommend-info">
49 - <p class="big-pic"><img src="[[module.data.big_image[0].src]]"></p> 49 + <p class="big-pic"><img src="[[module.contentData.data.big_image[0].src]]"></p>
50 <ul class="small-pic"> 50 <ul class="small-pic">
51 - [[each module.data.list as item index]] 51 + [[each module.contentData.data.list as item index]]
52 <li class="li_[[index]]"><img src="[[item.src]]"></li> 52 <li class="li_[[index]]"><img src="[[item.src]]"></li>
53 [[/each]] 53 [[/each]]
54 </ul> 54 </ul>
55 </div> 55 </div>
56 </div> 56 </div>
57 -[[else if module.template_name=='recommendContentThree']] 57 +[[else if module.contentData.template_name=='recommendContentThree']]
58 <div class="recommend_content_three"> 58 <div class="recommend_content_three">
59 <div class="recommend-info"> 59 <div class="recommend-info">
60 - <p class="big-pic"><img src="[[module.data.big_image[0].src]]"></p> 60 + <p class="big-pic"><img src="[[module.contentData.data.big_image[0].src]]"></p>
61 <ul class="small-pic"> 61 <ul class="small-pic">
62 - [[each module.data.list as item index]] 62 + [[each module.contentData.data.list as item index]]
63 <li class="li_[[index]]"><img src="[[item.src]]"></li> 63 <li class="li_[[index]]"><img src="[[item.src]]"></li>
64 [[/each]] 64 [[/each]]
65 </ul> 65 </ul>
66 </div> 66 </div>
67 </div> 67 </div>
68 -[[else if module.template_name=='trendsetterCollocation']] 68 +[[else if module.contentData.template_name=='trendsetterCollocation']]
69 <div class="big-pic"> 69 <div class="big-pic">
70 <div class="list"> 70 <div class="list">
71 <img src="/js/source/plugins/trendsetter/trend.png" width="96%"> 71 <img src="/js/source/plugins/trendsetter/trend.png" width="96%">
72 </div> 72 </div>
73 </div> 73 </div>
74 -[[else if module.template_name=='trendgoodsTopic']] 74 +[[else if module.contentData.template_name=='trendgoodsTopic']]
75 <div class="big-pic"> 75 <div class="big-pic">
76 <div class="list"> 76 <div class="list">
77 <img src="/js/source/plugins/trendgoodsTopic/trend.png" width="96%"> 77 <img src="/js/source/plugins/trendgoodsTopic/trend.png" width="96%">
78 </div> 78 </div>
79 </div> 79 </div>
80 -[[else if module.template_name=='customBrands']] 80 +[[else if module.contentData.template_name=='customBrands']]
81 <div class="custom-pic"> 81 <div class="custom-pic">
82 - <div class="hot-brand-title">[[module.data.title]]</div> 82 + <div class="hot-brand-title">[[module.contentData.data.title]]</div>
83 <ul class="custom-pic clearfix"> 83 <ul class="custom-pic clearfix">
84 - [[each module.data.list as item index]] 84 + [[each module.contentData.data.list as item index]]
85 <li><img src="[[item.src]]" class="custom-pic-img" style="margin:2px;"></li> 85 <li><img src="[[item.src]]" class="custom-pic-img" style="margin:2px;"></li>
86 [[/each]] 86 [[/each]]
87 </ul> 87 </ul>
88 </div> 88 </div>
89 -[[else if module.template_name=='customBrands']] 89 +[[else if module.contentData.template_name=='customBrands']]
90 <div class="custom-pic"> 90 <div class="custom-pic">
91 - <div class="custom-brand-title">[[module.data.title.title]]</div> 91 + <div class="custom-brand-title">[[module.contentData.data.title.title]]</div>
92 <ul class="custom-pic clearfix"> 92 <ul class="custom-pic clearfix">
93 - [[each module.data.list as item index]] 93 + [[each module.contentData.data.list as item index]]
94 <li><img src="[[item.src]]" class="custom-pic-img" style="margin:2px;"></li> 94 <li><img src="[[item.src]]" class="custom-pic-img" style="margin:2px;"></li>
95 [[/each]] 95 [[/each]]
96 </ul> 96 </ul>
97 </div> 97 </div>
98 -[[else if module.template_name=='promotion']] 98 +[[else if module.contentData.template_name=='promotion']]
99 <div class="link"> 99 <div class="link">
100 <div class="list"><img src="/js/source/plugins/promotion/bigPic.jpg" width="96%/"></div> 100 <div class="list"><img src="/js/source/plugins/promotion/bigPic.jpg" width="96%/"></div>
101 </div> 101 </div>
102 -[[else if module.template_name=='carouselBanner']] 102 +[[else if module.contentData.template_name=='carouselBanner']]
103 <div class="focus"> 103 <div class="focus">
104 - <div class="focus-pic-list"><img src="[[module.data.list[0].src]]"></div> 104 + <div class="focus-pic-list"><img src="[[module.contentData.data.list[0].src]]"></div>
105 </div> 105 </div>
106 -[[else if module.template_name=='kidsBrands']] 106 +[[else if module.contentData.template_name=='kidsBrands']]
107 <div class="hot-brand-list"> 107 <div class="hot-brand-list">
108 <div class="hot-brand-title">kids推荐品牌</div> 108 <div class="hot-brand-title">kids推荐品牌</div>
109 <ul class="hot-brand-list"> 109 <ul class="hot-brand-list">
110 - [[each module.data.list as item index]] 110 + [[each module.contentData.data.list as item index]]
111 <li data-toggle="brands"><img src="[[item.src]]"></li> 111 <li data-toggle="brands"><img src="[[item.src]]"></li>
112 [[/each]] 112 [[/each]]
113 </ul> 113 </ul>
114 </div> 114 </div>
115 -[[else if module.template_name=='推荐(L1-RT1-RF2)']] 115 +[[else if module.contentData.template_name=='推荐(L1-RT1-RF2)']]
116 <div class="hot-brand-list"> 116 <div class="hot-brand-list">
117 </div> 117 </div>
118 -[[else if module.template_name=='addfloor']] 118 +[[else if module.contentData.template_name=='addfloor']]
119 <div class="app_icon_list"> 119 <div class="app_icon_list">
120 <ul class="icon-list clearfix"> 120 <ul class="icon-list clearfix">
121 - [[each module.data as item index]] 121 + [[each module.contentData.data as item index]]
122 <li style="width:75px; float:left;margin-left:5px;"><img src="[[item.src]]"></li> 122 <li style="width:75px; float:left;margin-left:5px;"><img src="[[item.src]]"></li>
123 [[/each]] 123 [[/each]]
124 </ul> 124 </ul>
125 </div> 125 </div>
126 -[[else if module.template_name=='recommendContentFive']] 126 +[[else if module.contentData.template_name=='recommendContentFive']]
127 <div class="recommend_content_five"> 127 <div class="recommend_content_five">
128 <div class="recommend-info"> 128 <div class="recommend-info">
129 - <span class="title" style="min-height:50px; display:block; border-radius:5px; border:1px solid #ccc; margin-top:10px;">[[module.data.title.title]]</span> 129 + <span class="title" style="min-height:50px; display:block; border-radius:5px; border:1px solid #ccc; margin-top:10px;">[[module.contentData.data.title.title]]</span>
130 <ul class="small-pic"> 130 <ul class="small-pic">
131 - [[each module.data.list as item index]] 131 + [[each module.contentData.data.list as item index]]
132 <li class="li_[[index]]"><img src="[[item.src]]"></li> 132 <li class="li_[[index]]"><img src="[[item.src]]"></li>
133 [[/each]] 133 [[/each]]
134 </ul> 134 </ul>
135 </div> 135 </div>
136 </div> 136 </div>
137 -[[else if module.template_name=='textNav']] 137 +[[else if module.contentData.template_name=='textNav']]
138 <div class="textNav"> 138 <div class="textNav">
139 <div class="list"><img src="/js/source/plugins/textNav/bigPic.jpg" width="96%/"></div> 139 <div class="list"><img src="/js/source/plugins/textNav/bigPic.jpg" width="96%/"></div>
140 </div> 140 </div>
141 -[[else if module.template_name=='imageList']] 141 +[[else if module.contentData.template_name=='imageList']]
142 <div class="custom-pic"> 142 <div class="custom-pic">
143 - <div class="hot-brand-title" style="margin:0px auto; text-align:center;">[[module.data.title.title]]</div>  
144 - <ul class="custom-pic clearfix image-list-box resource-row li[[12/module.data.title.column_num]]">  
145 - [[each module.data.list as item index]] 143 + <div class="hot-brand-title" style="margin:0px auto; text-align:center;">[[module.contentData.data.title.title]]</div>
  144 + <ul class="custom-pic clearfix image-list-box resource-row li[[12/module.contentData.data.title.column_num]]">
  145 + [[each module.contentData.data.list as item index]]
146 <li><img src="[[item.src]]"></li> 146 <li><img src="[[item.src]]"></li>
147 [[/each]] 147 [[/each]]
148 </ul> 148 </ul>
149 </div> 149 </div>
150 -[[else if module.template_name=='标题标签']] 150 +[[else if module.contentData.template_name=='标题标签']]
151 <div class="custom-pic"> 151 <div class="custom-pic">
152 152
153 </div> 153 </div>
154 -[[else if module.template_name=='编辑推荐']] 154 +[[else if module.contentData.template_name=='编辑推荐']]
155 <div class="custom-pic"> 155 <div class="custom-pic">
156 156
157 </div> 157 </div>
158 -[[else if module.template_name=='hotCategory']] 158 +[[else if module.contentData.template_name=='hotCategory']]
159 <div class="hotCategory"> 159 <div class="hotCategory">
160 <div class="hotCategory-info"><img src="/js/source/plugins/hotCategory/hotCategory.png" style="width:99%"></div> 160 <div class="hotCategory-info"><img src="/js/source/plugins/hotCategory/hotCategory.png" style="width:99%"></div>
161 </div> 161 </div>
162 -[[else if module.template_name=='debrisSlider']] 162 +[[else if module.contentData.template_name=='debrisSlider']]
163 <div class="debris_slider"> 163 <div class="debris_slider">
164 <div class="debris-info"> 164 <div class="debris-info">
165 <ul style="float:left;width:80px;"> 165 <ul style="float:left;width:80px;">
166 - [[each module.data.left as item index]] 166 + [[each module.contentData.data.left as item index]]
167 <li><img width="80px" height="76px" src="[[item.src]]"></li> 167 <li><img width="80px" height="76px" src="[[item.src]]"></li>
168 [[/each]] 168 [[/each]]
169 </ul> 169 </ul>
170 - <div style="float:left;width:160px;"><img width="160px" height="180px" src="[[module.data.big_image[0].src]]"></div> 170 + <div style="float:left;width:160px;"><img width="160px" height="180px" src="[[module.contentData.data.big_image[0].src]]"></div>
171 <ul style="float:left;width:80px;"> 171 <ul style="float:left;width:80px;">
172 - [[each module.data.right as item index]] 172 + [[each module.contentData.data.right as item index]]
173 <li><img width="80px" height="76px" src="[[item.src]]"></li> 173 <li><img width="80px" height="76px" src="[[item.src]]"></li>
174 [[/each]] 174 [[/each]]
175 </ul> 175 </ul>
176 </div> 176 </div>
177 </div> 177 </div>
178 -[[else if module.template_name=='newUserFloor']] 178 +[[else if module.contentData.template_name=='newUserFloor']]
179 <div class="new_user_floor"> 179 <div class="new_user_floor">
180 <div class="user_floor"> 180 <div class="user_floor">
181 - <p class="title">[[module.data.title.name]]<a class="more" href="#">[[module.data.title.more_name]]</a></p>  
182 - <p class="banner-pic"><img src="[[module.data.banner_image[0].src]]" width="96%"></p> 181 + <p class="title">[[module.contentData.data.title.name]]<a class="more" href="#">[[module.contentData.data.title.more_name]]</a></p>
  182 + <p class="banner-pic"><img src="[[module.contentData.data.banner_image[0].src]]" width="96%"></p>
183 </div> 183 </div>
184 </div> 184 </div>
185 -[[else if module.template_name=='imageGroup']] 185 +[[else if module.contentData.template_name=='imageGroup']]
186 <div class="custom-group-list"> 186 <div class="custom-group-list">
187 - <div class="hot-brand-title" style="margin:0px auto; text-align:center;">[[module.data.title]]</div>  
188 - <ul class="custom-pic clearfix image-list-box resource-row li[[12/module.data.title.column_num]]">  
189 - [[each module.data.list as item index]] 187 + <div class="hot-brand-title" style="margin:0px auto; text-align:center;">[[module.contentData.data.title]]</div>
  188 + <ul class="custom-pic clearfix image-list-box resource-row li[[12/module.contentData.data.title.column_num]]">
  189 + [[each module.contentData.data.list as item index]]
190 <li><img src="[[item.src]]"></li> 190 <li><img src="[[item.src]]"></li>
191 [[/each]] 191 [[/each]]
192 </ul> 192 </ul>
193 </div> 193 </div>
194 -[[else if module.template_name=='paramsGroup']] 194 +[[else if module.contentData.template_name=='paramsGroup']]
195 <div class="custom-group-list"> 195 <div class="custom-group-list">
196 <div class="image-group-box"><img src="/js/source/plugins/paramsGroup/params.jpg" style="height: 80px;"></div> 196 <div class="image-group-box"><img src="/js/source/plugins/paramsGroup/params.jpg" style="height: 80px;"></div>
197 </div> 197 </div>
198 -[[else if module.template_name=='自定义参数图片']] 198 +[[else if module.contentData.template_name=='自定义参数图片']]
199 <div class="custom-group-list"> 199 <div class="custom-group-list">
200 </div> 200 </div>
201 -[[else if module.template_name=='announcement']] 201 +[[else if module.contentData.template_name=='announcement']]
202 <div class="custom-group-list"> 202 <div class="custom-group-list">
203 <div class="image-group-box"><img src="/js/source/plugins/announcement/notice.jpg" style="height: 80px;"></div> 203 <div class="image-group-box"><img src="/js/source/plugins/announcement/notice.jpg" style="height: 80px;"></div>
204 </div> 204 </div>
205 -[[else if module.template_name=='titleImage']] 205 +[[else if module.contentData.template_name=='titleImage']]
206 <div class="editorTalk_content"> 206 <div class="editorTalk_content">
207 <div class="editor-info"> 207 <div class="editor-info">
208 - <span class="title" style="min-height:50px; display:block; border-radius:5px; border:1px solid #ccc; margin-top:10px;">[[module.data.title]]</span>  
209 - <img src="[[module.data.image.src]]" style="width:99%"> 208 + <span class="title" style="min-height:50px; display:block; border-radius:5px; border:1px solid #ccc; margin-top:10px;">[[module.contentData.data.title]]</span>
  209 + <img src="[[module.contentData.data.image.src]]" style="width:99%">
210 </div> 210 </div>
211 </div> 211 </div>
212 -[[else if module.template_name=='multiLabelImage']] 212 +[[else if module.contentData.template_name=='multiLabelImage']]
213 <div class="editorTalk_content"> 213 <div class="editorTalk_content">
214 <div class="editor-info"> 214 <div class="editor-info">
215 - [[each module.data.label_list as item index]] 215 + [[each module.contentData.data.label_list as item index]]
216 <span class="title">[[item.title]]</span> 216 <span class="title">[[item.title]]</span>
217 [[/each]] 217 [[/each]]
218 - <img src="[[module.data.image.src]]" style="width:99%"> 218 + <img src="[[module.contentData.data.image.src]]" style="width:99%">
219 </div> 219 </div>
220 </div> 220 </div>
221 -[[else if module.template_name=='matchImage']] 221 +[[else if module.contentData.template_name=='matchImage']]
222 <div class="match_image"> 222 <div class="match_image">
223 - <div class='row title'>[[module.data.title.name]]</div> 223 + <div class='row title'>[[module.contentData.data.title.name]]</div>
224 <div class='row'> 224 <div class='row'>
225 - [[each module.data.top_image as item index]] 225 + [[each module.contentData.data.top_image as item index]]
226 <div class='col-sm-6 matchImage'><img src="[[item.src]]"></div> 226 <div class='col-sm-6 matchImage'><img src="[[item.src]]"></div>
227 [[/each]] 227 [[/each]]
228 </div> 228 </div>
229 <div class='row'> 229 <div class='row'>
230 - [[each module.data.list as item index]] 230 + [[each module.contentData.data.list as item index]]
231 <div class='col-sm-6 matchImage'><img src="[[item.src]]"></div> 231 <div class='col-sm-6 matchImage'><img src="[[item.src]]"></div>
232 [[/each]] 232 [[/each]]
233 </div> 233 </div>