fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit e09ecf04309c1a1b0dd668e3ed743fd60dbb4f91 2 parents 97a2af2e b13d90a7 master ... feature/feature_v4.5_20160525 feature/feature_v4.6_20160525 yohobuy_portal_dev_v4.4_20160525 yohobuy_portal_dev_v4.5_20160601 yohobuy_portal_dev_v4.6_20160601 yohobuy_portal_dev_v4.7_20160616 4.4.0_20160531 4.3.6_20160517 4.3.3_20160512 4.3.2_20160511 yohobuy_portal_dev_v4.6_20160622

Merge branch 'release/release' into release/pre

Inline Side-by-side
Showing 2 changed files with 89 additions and 62 deletions
... ... @@ -69,7 +69,34 @@
<input type="hidden" id="is_show_name_brand" value="[[contentData.data.is_show_name]]" for="radio"/>
</div>
</div>
<div class="form-group">
<table class="table table-hover table-bordered responsive dataTable no-footer">
<tbody>
<tr>
<td>
<input type="file" name="file" value="[[contentData.data.image.src]]" class="observe" data-field="image.src"/>
</td>
<td>
<div class="form-group ">
<select name="goTo" class="form-control observe" value="[[contentData.data.image.url.action]]" data-field="image.url.action">
[[layout action_template]]
</select>
</div>
<div class="form-group ">
<input value="[[contentData.data.image.url.url]]" class="form-control observe"
data-field="image.url.url" placeholder="图片链接"/>
<p style="color:#999;margin-top: 5px;">链接中不能有英文单引号</p>
</div>
<div class="form-group ">
<input value="[[contentData.data.image.alt]]" class="form-control observe"
data-field="image.alt" placeholder="图片描述"/>
</div>
</td>
</tr>
</tbody>
</table>
</div>
[[/if]]
[[if contentData.template_name=='customBrands']]
... ... @@ -96,7 +123,7 @@
<div class="form-group">
<div class="col-sm-6">
<label>标题</label>&emsp;&emsp;&emsp;&emsp;
<input class="form-control observe input-form" type="text" value="[[contentData.data.params.title]]" data-field="params.title" placeholder="请输入标题" prompt="标题">
<input class="form-control observe input-form" required type="text" value="[[contentData.data.params.title]]" data-field="params.title" placeholder="请输入标题" prompt="标题">
</div>
</div>
<div class="form-group">
... ... @@ -127,7 +154,7 @@
</div>
<div class="col-sm-6">
<label>链接</label>&emsp;&emsp;&emsp;&emsp;
<input value="[[contentData.data.params.more_url.url]]" class="form-control observe input-form" required="required"
<input placeholder="url" value="[[contentData.data.params.more_url.url]]" class="form-control observe input-form"
data-field="params.more_url.url"/>
<br>&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;
<label style="color:#999;margin-top: 5px;">注：链接中不能有英文单引号</label>
... ... @@ -214,23 +241,23 @@
<div class="form-group ">
<div class="col-sm-6">
<label>标题名称</label>&emsp;&emsp;
<input class="form-control observe input-form" type="text" value="[[contentData.data.title_name]]" data-field="title_name">
<input class="form-control observe input-form" placeholder="标题名称" type="text" value="[[contentData.data.title_name]]" data-field="title_name" required>
</div>
<div class="col-sm-6">
<label>更多名称</label>&emsp;&emsp;
<input class="form-control observe input-form" type="text" value="[[contentData.data.more_name]]" data-field="more_name">
<input class="form-control observe input-form" type="text" placeholder="更多名称" value="[[contentData.data.more_name]]" data-field="more_name">
</div>
</div>
<div class="form-group ">
<div class="col-sm-6">
<label>跳转目的</label>&emsp;&emsp;
<select name="goTo" class="form-control observe input-form" value="[[contentData.data.more_link.action]]" data-field="more_link.action">
[[layout action_template]]
</select>
<label>跳转目的</label>&emsp;&emsp;
<select name="goTo" class="form-control observe input-form" value="[[contentData.data.more_link.action]]" data-field="more_link.action">
[[layout action_template]]
</select>
</div>
<div class="col-sm-6">
<label>链接</label>&emsp;&emsp;&emsp;&emsp;
<input value="[[contentData.data.more_link.url]]" class="form-control observe input-form" required="required" data-field="more_link.url"/>
<input value="[[contentData.data.more_link.url]]" class="form-control observe input-form" data-field="more_link.url" placeholder="url"/>
<p style="color:#999;margin-top: 5px;">注：链接中不能有英文单引号</p>
</div>
</div>
... ...
... ... @@ -20,7 +20,7 @@
</div>
<div class="col-sm-6">
<label>跳转地址</label>&emsp;&emsp;
<input value="[[contentData.data.more_url.url]]" placeholder="url" data-field="more_url.url" class="form-control observe input-form" required="required" />
<input value="[[contentData.data.more_url.url]]" placeholder="url" data-field="more_url.url" class="form-control observe input-form" />
<br>&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;<label style="color:#999;margin-top: 5px;">注：链接中不能有英文单引号</label>
</div>
</div>
... ... @@ -69,7 +69,7 @@
[[layout action_template]]
</select>
<label>跳转地址</label>
<input type="text" class="observe" placeholder="跳转地址" value="[[item.url.url]]" data-field="label.[[index]].url.url" required="required" style="width: 120px" /><br>
<input type="text" class="observe" placeholder="跳转地址" value="[[item.url.url]]" data-field="label.[[index]].url.url" style="width: 120px" /><br>
[[/each]]
</div>
<a href="JavaScript:;" class="btn btn-primary btn-xs addBtn" data-event="multiLabelImage.label">添加标签</a>
... ... @@ -131,7 +131,7 @@
</div>
<div class="col-sm-6">
<label>跳转地址</label>&emsp;&emsp;
<input value="[[contentData.data.title.more_url.url]]" placeholder="url" class="form-control observe input-form" data-field="title.more_url.url" />
<input value="[[contentData.data.title.more_url.url]]" placeholder="url" class="form-control observe input-form" required="required" data-field="title.more_url.url" />
<br>&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;<label style="color:#999;margin-top: 5px;">注：链接中不能有英文单引号</label>
</div>
</div>
... ... @@ -215,7 +215,7 @@
</div>
<div class="col-sm-6">
<label>跳转地址</label>&emsp;&emsp;
<input type="text" placeholder="url" value="[[contentData.data.title.more_url.url]]" class="form-control observe input-form" required="required" data-field="title.more_url.url"/>
<input type="text" placeholder="url" value="[[contentData.data.title.more_url.url]]" class="form-control observe input-form" data-field="title.more_url.url"/>
<br>&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;<label style="color:#999;margin-top: 5px;">注：链接中不能有英文单引号</label>
</div>
</div>
... ... @@ -309,7 +309,7 @@
</div>
<div class="col-sm-6">
<label>跳转地址</label>&emsp;&emsp;
<input type="text" placeholder="url" value="[[contentData.data.title.more_url.url]]" class="form-control observe input-form" required="required" data-field="title.more_url.url"/>
<input type="text" placeholder="url" value="[[contentData.data.title.more_url.url]]" class="form-control observe input-form" data-field="title.more_url.url"/>
<br>&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;<label style="color:#999;margin-top: 5px;">注：链接中不能有英文单引号</label>
</div>
</div>
... ... @@ -547,7 +547,7 @@
<div class="form-group">
<div class="col-sm-10">
<label>标题</label>&emsp;&emsp;&emsp;
<input type="text" placeholder="标题" class="form-control observe input-form" value="[[contentData.data.title.title]]" required="required" data-field="title.title">
<input type="text" placeholder="标题" class="form-control observe input-form" value="[[contentData.data.title.title]]" required="required" data-field="title.title">
<label>&emsp;&emsp;
是否显示<input type="checkbox" name="is_show" value="1" id="recommendContentFive-is_show" [[contentData.data.title.is_show==1?'checked':'']]>
</label>
... ... @@ -602,7 +602,7 @@
<div class="form-group">
<div class="col-sm-6">
<label>更多链接</label>
<input type="text" placeholder="更多链接" value="[[contentData.data.more_url]]" class="observe form-control input-form" required="required" data-field="more_url" />
<input type="text" placeholder="更多链接" value="[[contentData.data.more_url]]" class="observe form-control input-form" data-field="more_url" />
</div>
</div>
<div class="form-group">
... ... @@ -629,29 +629,29 @@
<li>
<table class="table table-hover table-bordered responsive dataTable no-footer">
<tbody>
<tr>
<td>[[index+1]]</td>
<td><input type="file" name="file" value="[[item.src]]" data-field="list.[[index]].src" class="observe"/></td>
<td>
<div class="form-group">
<div class="col-sm-10">
<select name="goTo" class="form-control observe" value="[[item.url.action]]" data-field="list.[[index]].url.action">
[[layout action_template]]
</select>
</div>
<tr>
<td>[[index+1]]</td>
<td><input type="file" name="file" value="[[item.src]]" data-field="list.[[index]].src" class="observe"/></td>
<td>
<div class="form-group">
<div class="col-sm-10">
<select name="goTo" class="form-control observe" value="[[item.url.action]]" data-field="list.[[index]].url.action">
[[layout action_template]]
</select>
</div>
<div class="form-group">
<div class="col-sm-10">
<input value="[[item.url.url]]" placeholder="url" class="form-control observe" required="required" data-field="list.[[index]].url.url"/>
</div>
</div>
<div class="form-group">
<div class="col-sm-10">
<input value="[[item.url.url]]" placeholder="url" class="form-control observe" required="required" data-field="list.[[index]].url.url"/>
</div>
<div class="form-group">
<div class="col-sm-10">
<input placeholder="图片描述" value="[[item.title]]" data-field="list.[[index]].title" class="form-control observe" />
</div>
</div>
<div class="form-group">
<div class="col-sm-10">
<input placeholder="图片描述" value="[[item.title]]" data-field="list.[[index]].title" class="form-control observe" />
</div>
</td>
</tr>
</div>
</td>
</tr>
</tbody>
</table>
</li>
... ... @@ -674,7 +674,7 @@
<div class="form-group">
<div class="col-sm-12">
<label>跳转地址</label>&emsp;&emsp;
<input type="text" placeholder="url" value="[[contentData.data.more_url.url]]" class="form-control observe input-form" required="required" data-field="more_url.url"/>
<input type="text" placeholder="url" value="[[contentData.data.more_url.url]]" class="form-control observe input-form" data-field="more_url.url"/>
<br>&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;<label style="color:#999;margin-top: 5px;">注：链接中不能有英文单引号</label>
</div>
</div>
... ... @@ -703,7 +703,7 @@
<div class="form-group">
<div class="col-sm-6">
<label>标题</label>&emsp;&emsp;&emsp;&emsp;
<input type="text" placeholder="标题" value="[[contentData.data.title.name]]" class="observe form-control input-form" data-field="title.name">
<input type="text" placeholder="标题" value="[[contentData.data.title.name]]" class="observe form-control input-form" data-field="title.name" required>
</div>
<div class="col-sm-6">
<label>更多名称</label>&emsp;&emsp;
... ... @@ -716,7 +716,7 @@
<select name="goTo" class="observe form-control input-form" value="[[contentData.data.title.more_url.action]]" data-field="title.more_url.action">
[[layout action_template]]
</select>
<input type="text" placeholder="更多链接" value="[[contentData.data.title.more_url.url]]" class="observe form-control input-form" required="required" data-field="title.more_url.url"/>
<input type="text" placeholder="更多链接" value="[[contentData.data.title.more_url.url]]" class="observe form-control input-form" data-field="title.more_url.url"/>
</div>
</div>
<div class="form-group">
... ... @@ -772,29 +772,29 @@
<li>
<table class="table table-hover table-bordered responsive dataTable no-footer">
<tbody>
<tr>
<td>[[index+1]]</td>
<td><input type="file" name="file" value="[[item.src]]" class="observe" data-field="left.[[index]].src"/></td>
<td>
<div class="form-group">
<div class="col-sm-10">
<select name="goTo" class="observe form-control" value="[[item.url.action]]" data-field="left.[[index]].url.action">
[[layout action_template]]
</select>
</div>
<tr>
<td>[[index+1]]</td>
<td><input type="file" name="file" value="[[item.src]]" class="observe" data-field="left.[[index]].src"/></td>
<td>
<div class="form-group">
<div class="col-sm-10">
<select name="goTo" class="observe form-control" value="[[item.url.action]]" data-field="left.[[index]].url.action">
[[layout action_template]]
</select>
</div>
<div class="form-group">
<div class="col-sm-10">
<input placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="left.[[index]].url.url"/>
</div>
</div>
<div class="form-group">
<div class="col-sm-10">
<input placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="left.[[index]].url.url"/>
</div>
<div class="form-group">
<div class="col-sm-10">
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" data-field="left.[[index]].title"/>
</div>
</div>
<div class="form-group">
<div class="col-sm-10">
<input placeholder="图片描述" value="[[item.title]]" class="observe form-control" data-field="left.[[index]].title"/>
</div>
</td>
</tr>
</div>
</td>
</tr>
</tbody>
</table>
</li>
... ... @@ -940,7 +940,7 @@
[[layout action_template]]
</select>
<label>跳转url</label>&emsp;&emsp;&emsp;
<input type="text" value="[[contentData.data.title.more_url.url]]" placeholder="url" class="observe form-control input-form" required="required" data-field="title.more_url.url"/>
<input type="text" value="[[contentData.data.title.more_url.url]]" placeholder="url" class="observe form-control input-form" data-field="title.more_url.url"/>
</div>
</div>
<p><input type="button" name="select-pic" class="btn btn-info btn-xs addBtn" value="添加左上图片" style="margin:10px;" data-event="hotCategory.blocks"></p>
... ... @@ -1152,7 +1152,7 @@
<div class="form-group">
<label class="control-label col-sm-2">添加标题：</label>
<div class="col-sm-4">
<input type="text" placeholder="标题" class=" form-control observe" value="[[contentData.data.title]]" data-field="title">
<input type="text" placeholder="标题" class=" form-control observe" value="[[contentData.data.title]]" data-field="title">
</div>
</div>
<table class="table table-hover table-bordered responsive dataTable no-footer">
... ...