liuloulou / yohobuy-portal-fe2 · Commits

Go to a project

Authored by weiqingting
Commit 8551be01204756a4c13719620a2d4e7e35b231a2 1 parent 84a22d11

提交

Inline Side-by-side
Showing 4 changed files with 441 additions and 110 deletions
... ... @@ -17,7 +17,7 @@ module.exports = {
params.push(key + "=" + encodeURI(req.body[key]));
}
var url = yohoSearch + "/search.json?viewNum=" + size + "&" + params.join('&');
console.info(url);
console.info("搜索接口请求地址:"+url);
request({url: url}, function (error, response, body) {
if (error) {
return callback(null, {msg: "error", code: 500});
... ...
... ... @@ -4,10 +4,10 @@
<div>
<ul class="nav nav-pills">
<li>
<a class="hand active" href="javascript:void(0)" style="font-size: 14px;padding:20px;color: #428bca">货到付款</a>
<a class="tag" href="/goods/special/index" style="font-size: 14px;padding:20px;color: black">特殊商品</a>
</li>
<li>
<a class="tag" href="/goods/special/index" style="font-size: 14px;padding:20px;color: black">特殊商品</a>
<a class="hand active" href="javascript:void(0)" style="font-size: 14px;padding:20px;color: #428bca">货到付款</a>
</li>
</ul>
</div>
... ...
... ... @@ -449,38 +449,228 @@
<!--添加商品/商品组--选择标签界面模板-->
<script type="text/template" id="template_dialog_goodsgird">
<div class="rows">
<h4>1、搜索商品或标签</h4>
<nav>
<a class="hand select" href="javascript:void(0)" style="font-size: 14px;padding:20px;color: red">手动输入</a>
<a class="tag" href="javascript:void(0)" style="font-size: 14px;padding:20px;color: #000000">标签筛选</a>
</nav>
<div class="search-con1 form-group">
<div class="col-sm-3">
<input type="text" id="skns" class="form-control" placeholder="输入skn,多个skn以逗号分隔">
</div>
<div class="col-sm-2">
<a id="search" class="go-search btn btn-primary">搜索商品</a>
</div>
</div>
<div class="search-con2 form-group" hidden="hidden">
<div class="col-sm-3">
<input type="text" id="tags" class="form-control" placeholder="输入关键字搜索标签">
</div>
<div class="col-sm-1">
<span style="line-height: 300%;margin-left: 50px">或</span>
</div>
　
<div class="col-sm-3">
<input type="text" id="skns2" class="form-control" placeholder="输入skn搜索标签">
</div>
<div class="col-sm-1">
<a type="button" id="search-tag" class="go-search btn btn-primary">搜索标签</a>
</div>
</div>
<div class="tag-con" style="border: 1px solid rgb(0, 0, 0); padding: 10px; margin-top: 10px;" hidden="hidden">
<div class="sort" style="display: none">
[[layout tag-template]]
</div>
<div class="orther">
[[layout sorts-template]]
</div>
<p style="margin-top:40px;">
<a class="go-search tag-goods btn btn-primary" id="search2">搜索商品</a>
</p>
</div>
<div class="goods-list form-group" style="display: none">
<h4>2、选择商品</h4>
<div class="form-group">
<div class="panel-col2">
<input class="form-control" id="skns" placeholder="输入SKN(多个skn以逗号分隔)或产品名称"/>
<label class="col-sm-1" for="min-price">价格筛选：</label>
<div class="col-sm-2">
<input type="text" id="min-price" class="form-control">
</div>
<div class="panel-col">
<input type="number" id="beginPrice" name="begin_price" class="form-control"
placeholder="起始价" value="">
<div class="col-sm-1">
<span>---</span>
</div>
<div class="panel-col">
<input type="number" id="endPrice" name="end_price" class="form-control"
placeholder="结束价" value="">
<div class="col-sm-2">
<input type="text" id="max-price" class="form-control">
</div>
<div class="col-sm-1">
<input type="button" id="search" class="btn btn-primary mr5" value="搜索"/>
<a class="go-search price btn btn-primary" id="price-search">筛选</a>
</div>
</div>
<div class="form-group">
<div class="gird" id="goodsgird">
<div class="row">
<div class="form-group">
<div class="col-sm-12">
<i class="col-sm-1 fa fa-star" style="text-align: right"></i>
<p class="col-sm-10">请在搜索框内输入SKN(多个skn以逗号分隔)或产品名称，然后点击搜索按钮</p>
</div>
</div>
</div>
</div>
<div class="gird" id="goodsgird">
</div>
</div>
</script>
<script type="text/template" id="sorts-template">
<div class="row" style="margin-bottom: 40px" id="tabSelect">
<ul>
<li class="selectRow">
<dl>
<dt class="col-sm-1">颜色：</dt>
<dd class="form-inline col-sm-10 _show" data-index="0">
[[each colors as item index]]
[[if index < 5]]
<div class="form-group" >
<input type="checkbox" class="changeCheck" name="colorName" data-val="[[item.colorName?item.colorName:item.name]]" value="[[item.id]]">
<label>[[item.colorName?item.colorName:item.name]]</label>
</div>
[[else]]
<div class="form-group hide" >
<input type="checkbox" class="changeCheck" name="colorName" data-val="[[item.colorName?item.colorName:item.name]]" value="[[item.id]]">
<label>[[item.colorName?item.colorName:item.name]]</label>
</div>
[[/if]]
[[/each]]
</dd>
[[if colors.length>5]]
<dd class="col-sm-1 more" data-index="0"><a href="javasript:">更多</a></dd>
[[/if]]
<div class="clearfix"></div>
</dl>
</li>
</ul>
<ul>
<li class="selectRow">
<dl>
<dt class="col-sm-1">风格：</dt>
<dd class="form-inline col-sm-10 _show" data-index="0">
[[each styles as item index]]
[[if index < 5]]
<div class="form-group" >
<input type="checkbox" class="changeCheck" name="stylename" data-val="[[item.stylename?item.stylename:item.name]]" value="[[item.id]]">
<label>[[item.stylename?item.stylename:item.name]]</label>
</div>
[[else]]
<div class="form-group hide" >
<input type="checkbox" class="changeCheck" name="stylename" data-val="[[item.stylename?item.stylename:item.name]]" value="[[item.id]]">
<label>[[item.stylename?item.stylename:item.name]]</label>
</div>
[[/if]]
[[/each]]
</dd>
[[if styles.length>5]]
<dd class="col-sm-1 more" data-index="0"><a href="javasript:">更多</a></dd>
[[/if]]
<div class="clearfix"></div>
</dl>
</li>
</ul>
<ul>
<li class="selectRow">
<dl>
<dt class="col-sm-1">品类：</dt>
<dd class="form-inline col-sm-10 _show" data-index="0">
[[each sorts as item index]]
[[if index < 5]]
<div class="form-group" >
<input type="checkbox" class="changeCheck" name="sortName" data-val="[[item.sortName?item.sortName:item.name]]" value="[[item.id]]">
<label>[[item.sortName?item.sortName:item.name]]</label>
</div>
[[else]]
<div class="form-group hide" >
<input type="checkbox" class="changeCheck" name="sortName" data-val="[[item.sortName?item.sortName:item.name]]" value="[[item.id]]">
<label>[[item.sortName?item.sortName:item.name]]</label>
</div>
[[/if]]
[[/each]]
</dd>
[[if sorts.length>5]]
<dd class="col-sm-1 more" data-index="0"><a href="javasript:">更多</a></dd>
[[/if]]
<div class="clearfix"></div>
</dl>
</li>
</ul>
<ul>
<li class="selectRow">
<dl>
<dt class="col-sm-1">品牌</dt>
<dd class="form-inline col-sm-10 brandShow">
[[each brands1.items as item index]]
[[if index < 5]]
<div class="form-group">
<input type="checkbox" name="brand_name" class="changeCheck brandId_[[item.id]]" data-val="[[item.brand_name]]" value="[[item.id]]">
<label>[[item.brand_name]]</label>
</div>
[[/if]]
[[/each]]
</dd>
<dd class="col-sm-10 brandHide" style="display: none">
<div class="brandSearch form-group">
<span class="brand-all"><a>全部</a></span>
[[each brands as brand index]]
<span class="brand-index1"><a>[[brand.name]]</a></span>
[[/each]]
<span><input type="text" placeholder="搜索" id="brandsearch1"/></span>
<div class="clearfix"></div>
</div>
<div class="brandDetail form-inline" id="all">
[[each brands as item index]]
[[each item.items as _item _index]]
<div class="form-group" name="[[item.name]]">
<input type="checkbox" name="brand_name" class="changeCheck brandId_[[_item.id]]" data-val="[[_item.brand_name]]" value="[[_item.id]]">
<label>[[_item.brand_name]]</label>
</div>
[[/each]]
[[/each]]
</div>
</dd>
<dd class="col-sm-1 brandMore"><a href="javasript:">更多</a></dd>
<div class="clearfix"></div>
</dl>
</li>
</ul>
<ul>
<li class="selectRow">
<dl>
<dt class="col-sm-1">性别：</dt>
<dd class="form-inline col-sm-10 _show" data-index="0">
[[each genders as item index]]
[[if index < 5]]
<div class="form-group" >
<input type="checkbox" class="changeCheck" name="gendername" data-val="[[item.gendername?item.gendername:item.name]]" value="[[item.id]]">
<label>[[item.gendername?item.gendername:item.name]]</label>
</div>
[[else]]
<div class="form-group hide" >
<input type="checkbox" class="changeCheck" name="gendername" data-val="[[item.gendername?item.gendername:item.name]]" value="[[item.id]]">
<label>[[item.gendername?item.gendername:item.name]]</label>
</div>
[[/if]]
[[/each]]
</dd>
[[if genders.length>5]]
<dd class="col-sm-1 more" data-index="0"><a href="javasript:">更多</a></dd>
[[/if]]
<div class="clearfix"></div>
</dl>
</li>
</ul>
</div>
</script>
<script type="text/template" id="tag-template">
<div class="form-group">
<label style="width: 70px">已选标签：</label>
[[each sorts as sort index]]
[[each sort.list as _item _index]]
<span class="tag1"><span>[[_item.name]]</span><a href="#" title="Removing tag" name="[[sort.tagName]]" data-field="[[_item.id]]" data-val="[[index]]" data-index='[[_index]]'>x</a></span>
[[/each]]
[[/each]]
</div>
</script>
<!-- 推荐商品 -->
<script type="text/tempalte" id="template_dialog_remgoods">
... ... @@ -580,55 +770,5 @@
<option value="go.discountmarket">折扣专区</option>
<option value="go.discountmarketpro">折扣专区详情页</option>
</script>
<script type="text/template" id="sorts-template">
<div class="form-group">
颜色：
[[each colors as item index]]
<input type="checkbox" name="color" data-index="[[index]]" value="[[item.id]]">[[item.colorName]]
[[/each]]
<input type="hidden" id="colors1" for="checkbox">
</div>
<div class="form-group">
风格：
[[each styles as item index]]
<input type="checkbox" name="style" value="[[item.stylename]]">[[item.stylename]]
[[/each]]
<input type="hidden" for="checkbox" id="styles1">
</div>
<div class="form-group">
品类：
[[each types as item index]]
<input type="checkbox" name="type" value="[[item.id]]">[[item.sortName]]
[[/each]]
<input type="hidden" for="checkbox" id="types1">
</div>
<div class="form-group">
品牌：
[[each brands as item index]]
[[each item.items as _item _index]]
<input type="checkbox" name="brand" value="[[_item.id]]">[[_item.brand_name]]
[[/each]]
[[/each]]
<input type="hidden" for="checkbox" id="brands1">
</div>
<div class="form-group">
性别：
[[each genders as item index]]
<input type="checkbox" name="gender" value="[[item.id]]">[[item.gendername]]
[[/each]]
<input type="hidden" for="checkbox" id="genders1">
</div>
</script>
<script type="text/template" id="tag-template">
<div class="form-group">
所有标签：
[[each sorts as item index]]
<input type="checkbox" name="color" value="[[item.id]]">[[item.id]]
[[/each]]
<input type="hidden" id="sorts1" for="checkbox">
</div>
</script>
... ...
... ... @@ -187,7 +187,7 @@
</script>
<script type="text/template" id="template_dialog_goodsimgs">
[[each datas as data index]]
[[each datas as data index]]
<li class="cover-image-item image-list" data-index="2">
<div class="goods-img">
<a class="fileinput-button-icon" href="javascript:void(0);">
... ... @@ -199,40 +199,6 @@
[[/each]]
</script>
<!--添加商品/商品组--选择标签界面模板-->
<script type="text/template" id="template_dialog_goodsgird">
<div class="rows">
<div class="form-group">
<div class="panel-col2">
<input class="form-control" id="skns" placeholder="输入SKN(多个skn以逗号分隔)或产品名称" />
</div>
<div class="panel-col">
<input type="number" id="beginPrice" name="begin_price" class="form-control"
placeholder="起始价" value="" >
</div>
<div class="panel-col">
<input type="number" id="endPrice" name="end_price" class="form-control"
placeholder="结束价" value="" >
</div>
<div class="col-sm-1">
<input type="button" id="search" class="btn btn-primary mr5" value="搜索" />
</div>
</div>
<div class="form-group">
<div class="gird" id="goodsgird">
<div class="row">
<div class="form-group">
<div class="col-sm-12">
<i class="col-sm-1 fa fa-star" style="text-align: right"></i>
<p class="col-sm-10">请在搜索框内输入SKN(多个skn以逗号分隔)或产品名称，然后点击搜索按钮</p>
</div>
</div>
</div>
</div>
</div>
</div>
</script>
<!-- 推荐商品 -->
<script type="text/tempalte" id="template_dialog_remgoods">
<div class="rows" id="groupsgoods">
... ... @@ -292,4 +258,229 @@
</div>
</div>
</script>
<!--添加商品/商品组--选择标签界面模板-->
<script type="text/template" id="template_dialog_goodsgird">
<h4>1、搜索商品或标签</h4>
<nav>
<a class="hand select" href="javascript:void(0)" style="font-size: 14px;padding:20px;color: red">手动输入</a>
<a class="tag" href="javascript:void(0)" style="font-size: 14px;padding:20px;color: #000000">标签筛选</a>
</nav>
<div class="search-con1 form-group">
<div class="col-sm-3">
<input type="text" id="skns" class="form-control" placeholder="输入skn,多个skn以逗号分隔">
</div>
<div class="col-sm-2">
<a id="search" class="go-search btn btn-primary">搜索商品</a>
</div>
</div>
<div class="search-con2 form-group" hidden="hidden">
<div class="col-sm-3">
<input type="text" id="tags" class="form-control" placeholder="输入关键字搜索标签">
</div>
<div class="col-sm-1">
<span style="line-height: 300%;margin-left: 50px">或</span>
</div>
　
<div class="col-sm-3">
<input type="text" id="skns2" class="form-control" placeholder="输入skn搜索标签">
</div>
<div class="col-sm-1">
<a type="button" id="search-tag" class="go-search btn btn-primary">搜索标签</a>
</div>
</div>
<div class="tag-con" style="border: 1px solid rgb(0, 0, 0); padding: 10px; margin-top: 10px;" hidden="hidden">
<div class="sort" style="display: none">
[[layout tag-template]]
</div>
<div class="orther">
[[layout sorts-template]]
</div>
<p style="margin-top:40px;">
<a class="go-search tag-goods btn btn-primary" id="search2">搜索商品</a>
</p>
</div>
<div class="goods-list form-group" style="display: none">
<h4>2、选择商品</h4>
<div class="form-group">
<label class="col-sm-1" for="min-price">价格筛选：</label>
<div class="col-sm-2">
<input type="text" id="min-price" class="form-control">
</div>
<div class="col-sm-1">
<span>---</span>
</div>
<div class="col-sm-2">
<input type="text" id="max-price" class="form-control">
</div>
<div class="col-sm-1">
<a class="go-search price btn btn-primary" id="price-search">筛选</a>
</div>
</div>
<div class="gird" id="goodsgird">
</div>
</div>
</script>
<script type="text/template" id="sorts-template">
<div class="row" style="margin-bottom: 40px" id="tabSelect">
<ul>
<li class="selectRow">
<dl>
<dt class="col-sm-1">颜色：</dt>
<dd class="form-inline col-sm-10 _show" data-index="0">
[[each colors as item index]]
[[if index < 5]]
<div class="form-group" >
<input type="checkbox" class="changeCheck" name="colorName" data-val="[[item.colorName?item.colorName:item.name]]" value="[[item.id]]">
<label>[[item.colorName?item.colorName:item.name]]</label>
</div>
[[else]]
<div class="form-group hide" >
<input type="checkbox" class="changeCheck" name="colorName" data-val="[[item.colorName?item.colorName:item.name]]" value="[[item.id]]">
<label>[[item.colorName?item.colorName:item.name]]</label>
</div>
[[/if]]
[[/each]]
</dd>
[[if colors.length>5]]
<dd class="col-sm-1 more" data-index="0"><a href="javasript:">更多</a></dd>
[[/if]]
<div class="clearfix"></div>
</dl>
</li>
</ul>
<ul>
<li class="selectRow">
<dl>
<dt class="col-sm-1">风格：</dt>
<dd class="form-inline col-sm-10 _show" data-index="0">
[[each styles as item index]]
[[if index < 5]]
<div class="form-group" >
<input type="checkbox" class="changeCheck" name="stylename" data-val="[[item.stylename?item.stylename:item.name]]" value="[[item.id]]">
<label>[[item.stylename?item.stylename:item.name]]</label>
</div>
[[else]]
<div class="form-group hide" >
<input type="checkbox" class="changeCheck" name="stylename" data-val="[[item.stylename?item.stylename:item.name]]" value="[[item.id]]">
<label>[[item.stylename?item.stylename:item.name]]</label>
</div>
[[/if]]
[[/each]]
</dd>
[[if styles.length>5]]
<dd class="col-sm-1 more" data-index="0"><a href="javasript:">更多</a></dd>
[[/if]]
<div class="clearfix"></div>
</dl>
</li>
</ul>
<ul>
<li class="selectRow">
<dl>
<dt class="col-sm-1">品类：</dt>
<dd class="form-inline col-sm-10 _show" data-index="0">
[[each sorts as item index]]
[[if index < 5]]
<div class="form-group" >
<input type="checkbox" class="changeCheck" name="sortName" data-val="[[item.sortName?item.sortName:item.name]]" value="[[item.id]]">
<label>[[item.sortName?item.sortName:item.name]]</label>
</div>
[[else]]
<div class="form-group hide" >
<input type="checkbox" class="changeCheck" name="sortName" data-val="[[item.sortName?item.sortName:item.name]]" value="[[item.id]]">
<label>[[item.sortName?item.sortName:item.name]]</label>
</div>
[[/if]]
[[/each]]
</dd>
[[if sorts.length>5]]
<dd class="col-sm-1 more" data-index="0"><a href="javasript:">更多</a></dd>
[[/if]]
<div class="clearfix"></div>
</dl>
</li>
</ul>
<ul>
<li class="selectRow">
<dl>
<dt class="col-sm-1">品牌</dt>
<dd class="form-inline col-sm-10 brandShow">
[[each brands1.items as item index]]
[[if index < 5]]
<div class="form-group">
<input type="checkbox" name="brand_name" class="changeCheck brandId_[[item.id]]" data-val="[[item.brand_name]]" value="[[item.id]]">
<label>[[item.brand_name]]</label>
</div>
[[/if]]
[[/each]]
</dd>
<dd class="col-sm-10 brandHide" style="display: none">
<div class="brandSearch form-group">
<span class="brand-all"><a>全部</a></span>
[[each brands as brand index]]
<span class="brand-index1"><a>[[brand.name]]</a></span>
[[/each]]
<span><input type="text" placeholder="搜索" id="brandsearch1"/></span>
<div class="clearfix"></div>
</div>
<div class="brandDetail form-inline" id="all">
[[each brands as item index]]
[[each item.items as _item _index]]
<div class="form-group" name="[[item.name]]">
<input type="checkbox" name="brand_name" class="changeCheck brandId_[[_item.id]]" data-val="[[_item.brand_name]]" value="[[_item.id]]">
<label>[[_item.brand_name]]</label>
</div>
[[/each]]
[[/each]]
</div>
</dd>
<dd class="col-sm-1 brandMore"><a href="javasript:">更多</a></dd>
<div class="clearfix"></div>
</dl>
</li>
</ul>
<ul>
<li class="selectRow">
<dl>
<dt class="col-sm-1">性别：</dt>
<dd class="form-inline col-sm-10 _show" data-index="0">
[[each genders as item index]]
[[if index < 5]]
<div class="form-group" >
<input type="checkbox" class="changeCheck" name="gendername" data-val="[[item.gendername?item.gendername:item.name]]" value="[[item.id]]">
<label>[[item.gendername?item.gendername:item.name]]</label>
</div>
[[else]]
<div class="form-group hide" >
<input type="checkbox" class="changeCheck" name="gendername" data-val="[[item.gendername?item.gendername:item.name]]" value="[[item.id]]">
<label>[[item.gendername?item.gendername:item.name]]</label>
</div>
[[/if]]
[[/each]]
</dd>
[[if genders.length>5]]
<dd class="col-sm-1 more" data-index="0"><a href="javasript:">更多</a></dd>
[[/if]]
<div class="clearfix"></div>
</dl>
</li>
</ul>
</div>
</script>
<script type="text/template" id="tag-template">
<div class="form-group">
<label style="width: 70px">已选标签：</label>
[[each sorts as sort index]]
[[each sort.list as _item _index]]
<span class="tag1"><span>[[_item.name]]</span><a href="#" title="Removing tag" name="[[sort.tagName]]" data-field="[[_item.id]]" data-val="[[index]]" data-index='[[_index]]'>x</a></span>
[[/each]]
[[/each]]
</div>
</script>
\ No newline at end of file
... ...