fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by weiqingting
Commit 4e6553841a61ce9a6bd120d88bba8a9f273551cc 1 parent df751805

提交

Inline Side-by-side
Showing 6 changed files with 65 additions and 15 deletions
... ... @@ -506,7 +506,7 @@
</script>
<!--LBK-->
<script type="text/template" id="imageList-template2">
<script type="text/template" id="blkBrand-template">
<div class="form-group">
<div class="col-sm-12">
<label>标题：</label>
... ... @@ -520,7 +520,7 @@
<input style="width:60px;" type="text" data-field="number" class="observe number form-control input-form" value="[[contentData.data.number]]"> 张图片
</div>
</div>
<p><input type="button" name="select-pic" class="btn btn-info btn-xs addBtn" value="添加图片" style="margin:10px;" data-event="imageList.list"></p>
<p><input type="button" name="select-pic" class="btn btn-info btn-xs addBtn" value="添加图片" style="margin:10px;" data-event="blkBrand.list"></p>
[[if contentData.data.list.length]]
<ul class="draggable" data-array="data.list">
[[each contentData.data.list as item index]]
... ... @@ -565,7 +565,7 @@
</script>
<!-- 9-1 标题标签 -->
<script type="text/template" id="title-template2">
<script type="text/template" id="titleFloor-template">
<div class="rows">
<div class="form-group ">
<div class="col-sm-6">
... ...
... ... @@ -996,12 +996,12 @@ var Button = [
template_intro: "blkBrand",
__title:"blk品牌单品管理",
template_name: "blkBrand",
dialog: "imageList-template2",
dialog: "blkBrand-template",
data: {
"title": "",
"is_show_name": "N",
"number": "",
"list": [
title: "",
is_show_name: "N",
number: "",
list: [
{src:"",url:{action:"",url:""},productName:"",productDesc:""}
]
}
... ... @@ -1011,7 +1011,7 @@ var Button = [
template_name: "titleFloor",
template_intro: "标题楼层",
__title:"标题楼层",
dialog: "title-template2",
dialog: "titleFloor-template",
data: {
title: {
name: "",
... ...
... ... @@ -258,6 +258,15 @@ var addObj = {
},
discountActivity_list:{
"id":""
},
blkBrand_list:{
src:"",
url:{
action:"",
url:""
},
productName:"",
productDesc:""
}
};
... ...
... ... @@ -381,6 +381,7 @@ $(document).on("click", ".addBtn", function () {
Bll.renderDialog(arr[0] + "-template");
});
/*删除行*/
$(document).on("click", ".delBtn", function () {
var arr = $(this).data("event").split(".");
... ...
... ... @@ -93,7 +93,6 @@ module.exports = {
req.session.user = userInfo;
if (cookie && cookie.length > 0) {
req.session.gray = cookie[0];
console.log("req.session.gray",cookie);
result = { code: 200, message: "登录成功" };
}
return callback(null, result);
... ...
... ... @@ -44,12 +44,24 @@
</div>
[[else if module.contentData.template_name=='blkBrand']]
<div class="form-group">
[[each module.contentData.data as items i]]
[[each module.contentData.data.list as item i]]
[[if i<=2]]
<div class="col-sm-3">
[[items.title]]
<img src="[[item.src]]" title="[[item.productName]]">
</div>
<div class="col-sm-3">
[[item.productName]]
</div>
[[/if]]
[[/each]]
</div>
[[else if module.contentData.template_name=='titleFloor']]
<div class="col-sm-12">
<div class="wordText">
<span>[[module.contentData.data.title.name]]</span>
<div style="float: right;">[[module.contentData.data.title.more_name]]</div>
</div>
</div>
<%include 'taoyu2'%>
[[/if]]
<div class="actions-box">
... ... @@ -494,7 +506,7 @@
</script>
<!--LBK-->
<script type="text/template" id="imageList-template2">
<script type="text/template" id="blkBrand-template">
<div class="form-group">
<div class="col-sm-12">
<label>标题：</label>
... ... @@ -508,7 +520,7 @@
<input style="width:60px;" type="text" data-field="number" class="observe number form-control input-form" value="[[contentData.data.number]]"> 张图片
</div>
</div>
<p><input type="button" name="select-pic" class="btn btn-info btn-xs addBtn" value="添加图片" style="margin:10px;" data-event="imageList.list"></p>
<p><input type="button" name="select-pic" class="btn btn-info btn-xs addBtn" value="添加图片" style="margin:10px;" data-event="blkBrand.list"></p>
[[if contentData.data.list.length]]
<ul class="draggable" data-array="data.list">
[[each contentData.data.list as item index]]
... ... @@ -542,7 +554,7 @@
</div>
</div>
</td>
<td><button class="btn btn-danger btn-sm delBtn" data-event="imageList.list" type="button" data-index="[[index]]">删除</button></td>
<td><button class="btn btn-danger btn-sm delBtn" data-event="list" type="button" data-index="[[index]]">删除</button></td>
</tr>
</tbody>
</table>
... ... @@ -552,3 +564,32 @@
[[/if]]
</script>
<!-- 9-1 标题标签 -->
<script type="text/template" id="titleFloor-template">
<div class="rows">
<div class="form-group ">
<div class="col-sm-6">
<label>标题名称</label>&emsp;&emsp;
<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" placeholder="更多名称" value="[[contentData.data.title.more_name]]" data-field="title.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.title.more_url.action]]" data-field="title.more_url.action">
[[layout action_template]]
</select>
</div>
<div class="col-sm-6">
<label>链接</label>&emsp;&emsp;&emsp;&emsp;
<input value="[[contentData.data.title.more_url.url]]" class="form-control observe input-form" data-field="title.more_url.url" placeholder="url"/>
<p style="color:#999;margin-top: 5px;">注：链接中不能有英文单引号</p>
</div>
</div>
</div>
</script>
... ...