fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by wangwei
Commit 7b97fb511f62c504c4cd0e08750ee9d6acede5c5 2 parents 43349966 85021394

Merge branch 'dev5.2' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into dev5.2 

# Conflicts:
#	code/apps/resource/views/__partail/taoyu.html
Inline Side-by-side
Showing 4 changed files with 151 additions and 7 deletions
... ... @@ -1031,13 +1031,23 @@
<!--新人专享-->
<script type="text/template" id="newUserFloor-template">
<div class="form-group">
<div class="col-sm-6">
<div class="col-sm-4">
<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" required>
</div>
<div class="col-sm-6">
<div class="col-sm-2">
<label>更多名称</label>&emsp;&emsp;
<input type="text" placeholder="更多名称" value="[[contentData.data.title.more_name]]" style="width:100px;" class="observe form-control input-form" data-field="title.more_name">
<input type="text" placeholder="" value="[[contentData.data.title.more_name]]" style="width:57px;" class="observe form-control input-form" data-field="title.more_name">
</div>
<div class="col-sm-3">
<label style="line-height: 40px; float: left; padding-right: 30px;">添加皮肤</label>&emsp;&emsp;
<div style="float: left;">
<input type="file" name="file" value="[[contentData.data.background?contentData.data.background.src:'']]" class="observe" data-field="background.src"/>
</div>
</div>
<div class="col-sm-3">
<label>背景色</label>&emsp;
<input type="text" placeholder="#FFFFFF" value="[[contentData.data.background?contentData.data.background.color:'']]" style="width:100px;" class="observe form-control input-form" data-field="background.color">
</div>
</div>
<div class="form-group">
... ... @@ -1092,6 +1102,80 @@
</ul>
</div>
</script>
<!-- 人气单品 -->
<script type="text/template" id="popularSingleProduct-template">
<div class="form-group">
<div class="col-sm-4">
<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" required>
</div>
<div class="col-sm-2">
<label>更多名称</label>&emsp;&emsp;
<input type="text" placeholder="" value="[[contentData.data.title.more_name]]" style="width:57px;" class="observe form-control input-form" data-field="title.more_name">
</div>
<div class="col-sm-3">
<label style="line-height: 40px; float: left; padding-right: 30px;">添加皮肤</label>&emsp;&emsp;
<div style="float: left;">
<input type="file" name="file" value="[[contentData.data.background?contentData.data.background.src:'']]" class="observe" data-field="background.src"/>
</div>
</div>
<div class="col-sm-3">
<label>背景色</label>&emsp;
<input type="text" placeholder="#FFFFFF" value="[[contentData.data.background?contentData.data.background.color:'']]" style="width:100px;" class="observe form-control input-form" data-field="background.color">
</div>
</div>
<div class="form-group">
<div class="col-sm-12">
<label>更多链接</label>&emsp;&emsp;
<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" data-field="title.more_url.url"/>
</div>
</div>
<div class="form-group">
<div class="col-sm-10">
<label>活动ID</label>&emsp;&emsp;&emsp;
<input type="text" placeholder="活动id" class="observe form-control input-form" value="[[contentData.data.title.active_id]]" data-field="title.active_id">
</div>
</div>
<p><input type="button" class="btn btn-info btn-xs addBtn" value="添加banner" style="margin:10px;" data-event="popularSingleProduct.banner_image"></p>
<div id="popularSingleProduct-bottom">
<ul class="draggable" data-array="data.banner_image">
[[each contentData.data.banner_image as item index]]
<li>
<table class="table table-hover table-bordered responsive dataTable no-footer">
<tbody>
<tr>
<td align="center">[[index+1]]</td>
<td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="banner_image.[[index]].src"/></td>
<td>
<div class="form-group">
<div class="col-sm-10">
<select name="goTo" class="form-control observe" value="[[item.url.action]]" data-field="banner_image.[[index]].url.action">
[[layout action_template]]
</select>
</div>
</div>
<div class="form-group">
<div class="col-sm-10">
<input type="text" placeholder="url" value="[[item.url.url]]" class="form-control observe" required="required" data-field="banner_image.[[index]].url.url"/>
</div>
</div>
<div class="form-group">
<div class="col-sm-10">
<input type="text" placeholder="图片描述" value="[[item.title]]" class="form-control observe" data-field="banner_image.[[index]].title"/>
</div>
</div>
</td>
</tr>
</tbody>
</table>
</li>
[[/each]]
</ul>
</div>
</script>
<!--有序焦点-->
<script type="text/template" id="debrisSlider-template">
<div class="panel-body" id="debrisSlider-baseFrom">
... ...
... ... @@ -277,8 +277,25 @@
<div class="user_floor">
<p class="title">[[module.contentData.data.title.name]]<a class="more" href="#">[[module.contentData.data.title.more_name]]</a>
</p>
<p class="banner-pic"><img src="[[module.contentData.data.banner_image[0].src]]" width="96%"></p>
<p class="banner-pic">
<img src="[[module.contentData.data.banner_image[0].src]]" width="96%">
[[if module.contentData.data.background]]
<img src="[[module.contentData.data.background.src]]" width="96%">
[[/if]]
</p>
</div>
</div>
[[else if module.contentData.template_name=='popularSingleProduct']]
<div class="popular_single_product">
<div class="single_floor">
<p class="title">[[module.contentData.data.title.name]]<a class="more" href="#">[[module.contentData.data.title.more_name]]</a>
</p>
<p class="banner-pic">
<img src="[[module.contentData.data.banner_image[0].src]]" width="96%">
[[if module.contentData.data.background]]
<img src="[[module.contentData.data.background.src]]" width="96%">
[[/if]]
</p>
</div>
</div>
[[else if module.contentData.template_name=='imageGroup']]
... ... @@ -451,4 +468,4 @@
</div>
</div>
</div>
</div>
\ No newline at end of file
</div>
... ...
... ... @@ -596,6 +596,41 @@ var Button = [
template_name: "newUserFloor",
dialog: "newUserFloor-template",
data: {
"background": {
"src":"",
"color":""
},
"title": {
"name": "",
"more_name": "",
"more_url": {
"action": "",
"url": ""
},
"active_id": ""
},
"banner_image": [
{
"src": "",
"url": {
"action": "",
"url": ""
},
"title": ""
}
]
}
},
{
button_name: "人气单品",
template_intro: "人气单品",
template_name: "popularSingleProduct",
dialog: "popularSingleProduct-template",
data: {
"background": {
"src":"",
"color":""
},
"title": {
"name": "",
"more_name": "",
... ...
... ... @@ -78,6 +78,14 @@ var addObj = {
},
"title": ""
},
popularSingleProduct_banner_image: {// 人气单品->banner
"src": "",
"url": {
"action": "",
"url": ""
},
"title": ""
},
debrisSlider_left: {//有序焦点->左边的图
"src": "",
"url": {
... ... @@ -307,4 +315,4 @@ var addObj = {
}
};
module.exports = addObj;
\ No newline at end of file
module.exports = addObj;
... ...