fe / yohobuy-node · Commits

Go to a project

Authored by 周少峰
Commit 56cf18faf5c8b8cd188eca3795154238b48a4e3c 2 parents 1a81a9cb 57af55df

Merge branch 'hotfix/material' into gray

Inline Side-by-side
Showing 4 changed files with 27 additions and 11 deletions
'use strict';
const Model = require('../models/material');
const searchHandler = require('../../product/models/search-handler');
const index = (req, res, next) => {
let uid = req.user.uid;
let params = {
limit: req.query.limit || 50,
page: req.query.page || 1
}
Model.canLogin(uid).then(canLogin => {
if (canLogin === 'N') {
return next();
} else {
Model.getList({
page: 1,
maxSortId: 0,
middleSortId: 0,
smallSortId: 0
Model.getRecommendProductList({
page: params.page
}).then(result => {
if (result && result.code === 200) {
res.render('material', Object.assign({
module: '3party',
page: 'material',
layout: false
}, result.product_list));
layout: false,
footPager: Object.assign(searchHandler.handlePagerData(result.data.total, params), {tip: false})
}, result.data));
} else {
return next();
}
... ... @@ -42,7 +45,7 @@ const getCategory = (req, res, next) => {
};
const getList = (req, res, next) => {
Model.getList(req.query).then(result => {
Model.getRecommendProductList(req.query).then(result => {
res.send(result);
}).catch(next);
};
... ...
... ... @@ -33,6 +33,12 @@ const getList = (params) => {
});
};
const getRecommendProductList = (params) => {
return platformApi.get('/platform/product/material/getRecommendProductList', params, {
code: 200
});
};
const getRecommendlist = () => {
return platformApi.get('/platform/product/material/getRecommendlist', {
page: 1
... ... @@ -46,5 +52,6 @@ module.exports = {
newBrandList,
getCategory,
getList,
getRecommendlist
getRecommendlist,
getRecommendProductList
};
... ...
... ... @@ -25,7 +25,7 @@
<body>
<div class="product-material">
<h1><i class="logo"></i>商品素材列表页</h1>
<div class="line">
{{!-- <div class="line">
<label>品牌：</label>
<input id="brand" type="text" readonly="readonly">
<label for="" style="margin-left: 10px;">首次上架开始时间：</label>
... ... @@ -41,9 +41,10 @@
<select name="" id="category-3" class="sel"><option value="">--请选择--</option></select>
<div class="search-recommend-btn">自动推荐</div>
<div class="search-btn">搜索</div>
</div>
</div> --}}
<div class="table-data">
{{> tbl}}
{{> common/foot-pager}}
</div>
<div class="mask"></div>
</div>
... ...
... ... @@ -54,6 +54,11 @@
vertical-align: middle;
}
.foot-pager {
padding: 20px 70px;
border-top: none;
}
/* 品牌 */
#brand {
position: relative;
... ...