fe / yohobuy-portal-fe · Commits

Go to a project

Authored by 陶雨
Commit a053ee9b3700dddb76653783feb3dceaf3c5e755 1 parent b8b73e99

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

Conflicts:
	server/views/pages/guang/contentEdit.html
Inline Side-by-side
Showing 1 changed file with 63 additions and 6 deletions
... ... @@ -232,15 +232,15 @@
[[each contentData.data.big_image as item index]]
<tr>
<td>[[index+1]]</td>
<td><input type="file" name="file" value="[[item.src]]" class="observe" data-field="contentData.data.big_image.[[index]].src"/></td>
<td><input type="file" name="file" value="[[item.src]]" class="observe" data-field="big_image.[[index]].src"/></td>
<td>
<div class="col-sm-12">
<select name="goTo" class="form-control observe" value="[[item.url.action]]" data-field="contentData.data.big_image.[[index]].url.action">
<select name="goTo" class="form-control observe" value="[[item.url.action]]" data-field="big_image.[[index]].url.action">
[[layout action_template]]
</select>
</div>
<div class="col-sm-12">
<input value="[[item.url.url]]" class="form-control observe" required="required" data-field="contentData.data.big_image.[[index]].url.url"/>
<input value="[[item.url.url]]" class="form-control observe" required="required" data-field="big_image.[[index]].url.url"/>
<p style="color:#999;margin-top: 5px;">注：链接中不能有英文单引号</p>
</div>
</td>
... ... @@ -250,15 +250,15 @@
[[each contentData.data.list as item index]]
<tr>
<td>[[index+3]]</td>
<td><input type="file" name="file" value="[[item.src]]" class="observe" data-field="contentData.data.list.[[index]].src"/></td>
<td><input type="file" name="file" value="[[item.src]]" class="observe" data-field="list.[[index]].src"/></td>
<td>
<div class="col-sm-12">
<select name="goTo" class="form-control observe" value="[[item.url.action]]" data-field="contentData.data.list.[[index]].url.action">
<select name="goTo" class="form-control observe" value="[[item.url.action]]" data-field="list.[[index]].url.action">
[[layout action_template]]
</select>
</div>
<div class="col-sm-12">
<input value="[[item.url.url]]" class="form-control observe" required="required" data-field="contentData.data.list.[[index]].url.url"/>
<input value="[[item.url.url]]" class="form-control observe" required="required" data-field="list.[[index]].url.url"/>
<p style="color:#999;margin-top: 5px;">注：链接中不能有英文单引号</p>
</div>
</td>
... ... @@ -268,6 +268,63 @@
</table>
</div>
</script>
<!--图片广告-->
<script type="text/template" id="imageGroup-template">
<div class="panel-body" id="imageGroup-baseFrom">
<p>标题设置：<input name="title" type="text" class="observe" value="[[contentData.data.title]]" data-field="title" required>更多设置：<input type="text" class="observe" style="width:120px;" value="[[contentData.data.more]]" data-field="more"></p>
<p>
更多链接 : <input type="text" value="[[contentData.data.more_url]]" class="observe" required="required" data-field="more_url" />
</p>
<p>样式设置：
<select name="image_style" data-element="imageGroup" value="[[contentData.data.image_style]]" data-field="image_style" class="observe">
<option value="default">默认(一张图片)</option>
<option value="T1F2">T1+F2</option>
<option value="L1R2">L1+R2</option>
<option value="imageList" selected="">图片列表</option>
</select>
每行显示数量：
<select name="show_num" value="[[show_num]]" data-element="imageGroup" data-field="image_style" class="observe">
<option value="0">一行显示</option>
<option value="1">一行一个</option>
<option value="2">一行两个</option>
<option value="4">一行四个</option>
<option value="6" selected="">一行六个</option>
</select> <font color="#999">注：只有图片列表是选择才会有效</font></p>
<div id="imageGroup-bottom">
<table class="table table-hover table-bordered responsive dataTable no-footer">
<thead>
<tr>
<th>序号</th>
<th>资源位</th>
<th>选项</th>
</tr>
</thead>
<tbody>
[[each data.list as item index]]
<tr>
<td>[[index+1]]</td>
<td><input type="file" name="file" value="[[item.src]]" class="recommendContent-observe" data-rows="[[__index]]" data-index="[[index]]" data-observe="list-src" /></td>
<td>
<div class="col-sm-12">
<select name="goTo" class="form-control recommendContent-observe" value="[[item.url.action]]" data-rows="[[__index]]" data-index="[[index]]" data-observe="list-action" >
[[layout action_template]]
</select>
</div>
<div class="col-sm-12">
<input value="[[item.url.url]]" class="form-control recommendContent-observe" required="required" data-rows="[[__index]]" data-index="[[index]]" data-observe="list-url" />
</div>
<div class="col-sm-12">
<input placeholder="图片描述" value="[[item.url.title]]" class="form-control recommendContent-observe" required="required" data-rows="[[__index]]" data-index="[[index]]" data-observe="list-url" />
</div>
</td>
</tr>
[[/each]]
</tbody>
</table>
</div>
</div>
</script>
<!--select选项-->
<script type="text/template" id="action_template">
<option value="">选择跳转目标</option>
<option value="go.brand">品牌列表页</option>
... ...