liuloulou / yohobuy-portal-fe2 · Commits

Go to a project

Authored by weiqingting
Commit 2daed8261613f693f9afbd6341522e4cfda0e253 1 parent 88f8b75a

提交

Inline Side-by-side
Showing 12 changed files with 35 additions and 55 deletions
{
"name": "yohobuy-portal-fe",
"version": "4.7.1",
"version": "4.7.2",
"description": "Construction of the presentation layer solution is based on express, handlebars",
"main": "app.js",
"scripts": {
... ...
... ... @@ -9,7 +9,8 @@ module.exports = function (app) {
//列表页
app.get("/operations/terms/index", "searchWords.SearchWords.Index",function(){
this.$extend={
filter: true
moduleName:'搜索词管理',
pageName:'品牌热搜词'
}
});
... ... @@ -27,8 +28,7 @@ module.exports = function (app) {
app.get("/hotSearchBrand/index", "searchWords.HotBrand.Index",function(){
this.$extend={
moduleName:'搜索词管理',
pageName:'品牌热搜词',
filter: true
pageName:'品牌热搜词'
}
});
... ...
{"name":"yohobuy-portal-fe","version":"4.7.1","description":"Construction of the presentation layer solution is based on express, handlebars","main":"app.js","scripts":{"code":"set NODE_ENV=coding&& gulp start","build":"set NODE_ENV=production && gulp && gulp mvc","server":"set NODE_ENV=server&& gulp start"},"dependencies":{"art-template":"^3.0.3","async":"^2.0.0-rc.3","body-parser":"^1.15.0","connect-multiparty":"^2.0.0","connect-redis":"^3.0.2","cookie-parser":"^1.4.1","express":"^4.13.4","express-session":"^1.13.0","lodash":"^4.11.1","md5":"^2.1.0","mkdirp":"^0.5.1","request":"^2.72.0","winston":"^2.2.0","glob":"^7.0.3"}}
\ No newline at end of file
{"name":"yohobuy-portal-fe","version":"4.7.2","description":"Construction of the presentation layer solution is based on express, handlebars","main":"app.js","scripts":{"code":"set NODE_ENV=coding&& gulp start","build":"set NODE_ENV=production && gulp && gulp mvc","server":"set NODE_ENV=server&& gulp start"},"dependencies":{"art-template":"^3.0.3","async":"^2.0.0-rc.3","body-parser":"^1.15.0","connect-multiparty":"^2.0.0","connect-redis":"^3.0.2","cookie-parser":"^1.4.1","express":"^4.13.4","express-session":"^1.13.0","lodash":"^4.11.1","md5":"^2.1.0","mkdirp":"^0.5.1","request":"^2.72.0","winston":"^2.2.0","glob":"^7.0.3"}}
\ No newline at end of file
... ...
... ... @@ -4,17 +4,10 @@
<div>
<ul class="nav nav-pills" style="margin-bottom: 10px">
<li>
<<<<<<< HEAD
<a class="tag" href="/goods/special/index" style="font-size: 14px;padding:20px;color: black">特殊商品</a>
</li>
<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:10px">特殊商品</a>
</li>
<li class="active">
<a class="hand" href="javascript:void(0)" style="font-size: 14px;padding:10px">货到付款</a>
>>>>>>> yohobuy_portak_dev_v4.8_20160620
</li>
</ul>
... ...
<%include '../../common/__ui/header'%>
<%include '../../common/__partail/ListHeader'%>
<div class="contentpanel">
<div class="panel panel-default" style="...">
<div class="panel-heading">
<a id="addHotBrand" class="btn btn-primary">添加</a>
<div class="panel-body" style="padding-bottom: 0">
<a id="addHotBrand" class="btn btn-success"><i class="fa fa-plus"></i> 添加品牌热搜词</a>
</div>
<div class="panel-body">
<div class="row">
... ...
<%include '../../common/__ui/header'%>
<div class="pageheader">
<div class="media">
<div class="pageicon pull-left">
<i class="fa fa-th-list"></i>
</div>
<div class="media-body">
<%include '../../common/__partail/ListHeader'%>
</div>
</div>
</div>
<div class="contentpanel">
<div class="panel panel-default" style="...">
<div class="panel-heading">
<a id="filter-add" class="btn btn-primary">添加</a>
<div class="panel-body" style="padding-bottom: 0">
<a id="filter-add" class="btn btn-success"><i class="fa fa-plus"></i> 添加词汇</a>
</div>
<div class="panel-body" id="filter">
<div class="row">
... ... @@ -40,23 +32,21 @@
</select>
</div>
</div>
<div class="panel-col2">
<div class="panel-col">
<input type="text" id="starttime-filter" class="form-control panel-input hasDatepicker"
jsaction="time:end:endtime-filter" name="start_time" placeholder="开始时间" value="">
</div>
<div class="panel-col2">
<div class="panel-col">
<input type="text" id="endtime-filter" class="form-control panel-input hasDatepicker"
jsaction="time:start:starttime-filter" name="end_time" placeholder="结束时间" value="">
</div>
<div class="panel-col2">
<div class="panel-col">
<a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
</div>
</div>
</div>
</div>
<div id="search-words-list" class="search-words">
</div>
<div id="search-words-list" class="search-words"></div>
</div>
<script type="text/template" id="template">
... ... @@ -65,11 +55,9 @@
<li><a href="">搜索词管理</a></li>
<li id="header-item">[[name1]]</li>
</ul>
<div>
<div style="width: 30%;float: left;">
<h4 id="header-title">[[name2]]</h4>
<div style="padding-left: 0; font-family: 'Microsoft YaHei'">
<h4 id="header-title" style="line-height: 30px;font-size: 24px;margin-top: 2px">[[name2]]</h4>
</div>
</div>
</script>
... ...
... ... @@ -4,7 +4,7 @@
<div class="contentpanel">
<div class="panel panel-default" style="...">
<div class="panel-heading">
<div class="panel-body" style="padding-bottom: 0">
<a class="btn btn-success " href="/meterManage/meterSize/add" id="add-sizeInfo"><i class="fa fa-plus"></i> 添加测量数据</a>
</div>
<div class="panel-body">
... ... @@ -37,10 +37,9 @@
<input type="text" id="endTime" jsaction="time:start:startTime" class="form-control panel-input hasDatepicker" name="end_time" placeholder="结束时间"/>
</div>
<div class="panel-col">
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
<a id="filter-all" href="/meterManage/meterSize/index" class="btn btn-info">全部</a>
</div>
</div>
</div>
</div>
... ...
... ... @@ -4,8 +4,8 @@
<div class="contentpanel">
<div class="panel panel-default" style="...">
<div class="panel-heading">
<a class="btn btn-success " id="add-content"><i class="fa fa-plus"></i> 添加</a>
<div class="panel-body" style="padding-bottom: 0">
<a class="btn btn-success " id="add-content"><i class="fa fa-plus"></i> 添加拍摄模特</a>
</div>
<div class="panel-body">
<div class="row">
... ... @@ -25,8 +25,10 @@
<option value="1">启用</option>
</select>
</div>
<a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
<a id="filter-all" href="/shotManage/model/index" class="btn btn-info">全部</a>
<div class="panel-col">
<a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
<a id="filter-all" href="/shotManage/model/index" class="btn btn-info">全部</a>
</div>
</div>
</div>
</div>
... ...
... ... @@ -4,8 +4,8 @@
<div class="contentpanel">
<div class="panel panel-default" style="...">
<div class="panel-heading">
<a id="upload-btn" href="javascript:;" class="btn btn-success">上传图片</a>
<div class="panel-body" style="padding-bottom: 0">
<a id="upload-btn" href="javascript:;" class="btn btn-success"><span class="glyphicon glyphicon-arrow-up"></span> 上传产品图片</a>
</div>
<div class="panel-body">
<div class="row">
... ...
... ... @@ -4,8 +4,8 @@
<div class="contentpanel">
<div class="panel panel-default" style="...">
<div class="panel-heading">
<a class="btn btn-success " id="add-content"><i class="fa fa-plus"></i> 添加</a>
<div class="panel-body" style="padding-bottom: 0">
<a class="btn btn-success " id="add-content"><i class="fa fa-plus"></i> 添加拍摄要求</a>
</div>
<div class="panel-body">
<div class="row">
... ... @@ -22,7 +22,9 @@
<option value="7">背景类型</option>
</select>
</div>
<a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
<div class="panel-col">
<a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
</div>
</div>
</div>
</div>
... ... @@ -53,6 +55,5 @@
<input type="text" value="[[name]]" class="form-control observe" data-field="name" id="name" placeholder="名称" required="required"/>
</div>
</div>
</div>
</script>
... ...
... ... @@ -4,9 +4,8 @@
<div class="contentpanel">
<div class="panel panel-default" style="...">
<div class="panel-heading">
<a class="btn btn-success " id="add-content" href="/meterManage/tryInfo/batch"><i class="fa fa-plus"></i>
上传excel文件</a>
<div class="panel-body" style="padding-bottom: 0">
<a class="btn btn-success " id="add-content" href="/meterManage/tryInfo/batch"><span class="glyphicon glyphicon-arrow-up"></span> 上传excel文件</a>
</div>
<div class="panel-body">
<div class="row">
... ... @@ -26,7 +25,6 @@
<a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
<a id="filter-all" href="/meterManage/tryInfo/index" class="btn btn-info">全部</a>
</div>
</div>
</div>
</div>
... ...
... ... @@ -4,8 +4,8 @@
<div class="contentpanel">
<div class="panel panel-default" style="...">
<div class="panel-heading">
<a class="btn btn-success " id="add-content"><i class="fa fa-plus"></i> 添加</a>
<div class="panel-body" style="padding-bottom: 0">
<a class="btn btn-success " id="add-content"><i class="fa fa-plus"></i> 添加试穿模特</a>
</div>
<div class="panel-body">
<div class="row">
... ...