Showing
24 changed files
with
39 additions
and
39 deletions
| @@ -41,7 +41,7 @@ const channelLogger = (err, res) => { | @@ -41,7 +41,7 @@ const channelLogger = (err, res) => { | ||
| 41 | const channelPage = (req, res, data) => { | 41 | const channelPage = (req, res, data) => { |
| 42 | channelModel.getChannelDate({ | 42 | channelModel.getChannelDate({ |
| 43 | gender: data.gender, | 43 | gender: data.gender, |
| 44 | - uid: req.user.uid | 44 | + uid: _.toString(req.user.uid) |
| 45 | }).then(result => { | 45 | }).then(result => { |
| 46 | res.render('channel', Object.assign(renderData, data, result)); | 46 | res.render('channel', Object.assign(renderData, data, result)); |
| 47 | }).catch((err) => { | 47 | }).catch((err) => { |
| 1 | {{# content}} | 1 | {{# content}} |
| 2 | {{! 头部banner}} | 2 | {{! 头部banner}} |
| 3 | {{#if focus}} | 3 | {{#if focus}} |
| 4 | - {{> channel/banner-top}} | 4 | + {{> resources/banner-top}} |
| 5 | {{/if}} | 5 | {{/if}} |
| 6 | {{! 图标入口}} | 6 | {{! 图标入口}} |
| 7 | {{#if appIconList}} | 7 | {{#if appIconList}} |
| 8 | - {{> channel/icons-enter}} | 8 | + {{> resources/icons-enter}} |
| 9 | {{/if}} | 9 | {{/if}} |
| 10 | {{! 中间banner}} | 10 | {{! 中间banner}} |
| 11 | {{#if singleImage}} | 11 | {{#if singleImage}} |
| 12 | - {{> channel/banner}} | 12 | + {{> resources/banner}} |
| 13 | {{/if}} | 13 | {{/if}} |
| 14 | {{! 两个小图}} | 14 | {{! 两个小图}} |
| 15 | {{#if smallPic}} | 15 | {{#if smallPic}} |
| 16 | - {{> channel/thumb-row}} | 16 | + {{> resources/thumb-row}} |
| 17 | {{/if}} | 17 | {{/if}} |
| 18 | {{! 热门品类}} | 18 | {{! 热门品类}} |
| 19 | {{#if recommendContentFive}} | 19 | {{#if recommendContentFive}} |
| 20 | - {{> channel/hot-category}} | 20 | + {{> resources/hot-category}} |
| 21 | {{/if}} | 21 | {{/if}} |
| 22 | {{! 热门品牌}} | 22 | {{! 热门品牌}} |
| 23 | {{#if appHotBrands}} | 23 | {{#if appHotBrands}} |
| 24 | - {{> channel/hot-brands-list}} | 24 | + {{> resources/hot-brands-list}} |
| 25 | {{/if}} | 25 | {{/if}} |
| 26 | {{! 热门品牌可滑动}} | 26 | {{! 热门品牌可滑动}} |
| 27 | {{#if customBrands}} | 27 | {{#if customBrands}} |
| 28 | - {{> channel/hot-brands-swipe}} | 28 | + {{> resources/hot-brands-swipe}} |
| 29 | {{/if}} | 29 | {{/if}} |
| 30 | {{! 潮人搭配}} | 30 | {{! 潮人搭配}} |
| 31 | {{#if trendsetterCollocation}} | 31 | {{#if trendsetterCollocation}} |
| 32 | - {{> channel/trendsetter-collocation}} | 32 | + {{> resources/trendsetter-collocation}} |
| 33 | {{/if}} | 33 | {{/if}} |
| 34 | {{! 潮流话题}} | 34 | {{! 潮流话题}} |
| 35 | {{#if trendgoodsTopic}} | 35 | {{#if trendgoodsTopic}} |
| 36 | - {{> channel/trend-topics}} | 36 | + {{> resources/trend-topics}} |
| 37 | {{/if}} | 37 | {{/if}} |
| 38 | {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装}} | 38 | {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装}} |
| 39 | {{#if recommendContentOne}} | 39 | {{#if recommendContentOne}} |
| 40 | - {{> channel/goods-category}} | 40 | + {{> resources/goods-category}} |
| 41 | {{/if}} | 41 | {{/if}} |
| 42 | {{! 新入住品牌/品味生活/创意生活}} | 42 | {{! 新入住品牌/品味生活/创意生活}} |
| 43 | {{#if recommendContentTwo}} | 43 | {{#if recommendContentTwo}} |
| 44 | - {{> channel/creative-life}} | 44 | + {{> resources/creative-life}} |
| 45 | {{/if}} | 45 | {{/if}} |
| 46 | {{! PLUS}} | 46 | {{! PLUS}} |
| 47 | {{#if singleNameImage}} | 47 | {{#if singleNameImage}} |
| 48 | - {{> channel/plus-star}} | 48 | + {{> resources/plus-star}} |
| 49 | {{/if}} | 49 | {{/if}} |
| 50 | {{! 新人专享}} | 50 | {{! 新人专享}} |
| 51 | {{#if newUserFloor}} | 51 | {{#if newUserFloor}} |
| 52 | - {{> channel/fresh-only}} | 52 | + {{> resources/fresh-only}} |
| 53 | {{/if}} | 53 | {{/if}} |
| 54 | -{{/ content}} | ||
| 54 | +{{/ content}} |
| 1 | {{#content}} | 1 | {{#content}} |
| 2 | {{! 头部banner}} | 2 | {{! 头部banner}} |
| 3 | {{#if focus}} | 3 | {{#if focus}} |
| 4 | - {{> channel/banner-top}} | 4 | + {{> resources/banner-top}} |
| 5 | {{/if}} | 5 | {{/if}} |
| 6 | {{! 图标入口}} | 6 | {{! 图标入口}} |
| 7 | {{#if appIconList}} | 7 | {{#if appIconList}} |
| 8 | - {{> channel/icons-enter}} | 8 | + {{> resources/icons-enter}} |
| 9 | {{/if}} | 9 | {{/if}} |
| 10 | {{! 首页公告}} | 10 | {{! 首页公告}} |
| 11 | {{!-- {{#announcement}} | 11 | {{!-- {{#announcement}} |
| 12 | - {{> channel/notice}} | 12 | + {{> resources/notice}} |
| 13 | {{/announcement}} --}} | 13 | {{/announcement}} --}} |
| 14 | {{! 中间banner}} | 14 | {{! 中间banner}} |
| 15 | {{#if singleImage}} | 15 | {{#if singleImage}} |
| 16 | - {{> channel/banner}} | 16 | + {{> resources/banner}} |
| 17 | {{/if}} | 17 | {{/if}} |
| 18 | {{! 两个小图}} | 18 | {{! 两个小图}} |
| 19 | {{#if smallPic}} | 19 | {{#if smallPic}} |
| 20 | - {{> channel/thumb-row}} | 20 | + {{> resources/thumb-row}} |
| 21 | {{/if}} | 21 | {{/if}} |
| 22 | {{! 热门品类}} | 22 | {{! 热门品类}} |
| 23 | {{#if recommendContentFive}} | 23 | {{#if recommendContentFive}} |
| 24 | - {{> channel/hot-category}} | 24 | + {{> resources/hot-category}} |
| 25 | {{/if}} | 25 | {{/if}} |
| 26 | {{! 热门品牌}} | 26 | {{! 热门品牌}} |
| 27 | {{#if appHotBrands}} | 27 | {{#if appHotBrands}} |
| 28 | - {{> channel/hot-brands-list}} | 28 | + {{> resources/hot-brands-list}} |
| 29 | {{/if}} | 29 | {{/if}} |
| 30 | {{! 热门品牌可滑动}} | 30 | {{! 热门品牌可滑动}} |
| 31 | {{#if customBrands}} | 31 | {{#if customBrands}} |
| 32 | - {{> channel/hot-brands-swipe}} | 32 | + {{> resources/hot-brands-swipe}} |
| 33 | {{/if}} | 33 | {{/if}} |
| 34 | {{! 潮人搭配}} | 34 | {{! 潮人搭配}} |
| 35 | {{#if trendsetterCollocation}} | 35 | {{#if trendsetterCollocation}} |
| 36 | - {{> channel/trendsetter-collocation}} | 36 | + {{> resources/trendsetter-collocation}} |
| 37 | {{/if}} | 37 | {{/if}} |
| 38 | {{! 潮流话题}} | 38 | {{! 潮流话题}} |
| 39 | {{#if trendgoodsTopic}} | 39 | {{#if trendgoodsTopic}} |
| 40 | - {{> channel/trend-topics}} | 40 | + {{> resources/trend-topics}} |
| 41 | {{/if}} | 41 | {{/if}} |
| 42 | {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装}} | 42 | {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装}} |
| 43 | {{#if recommendContentOne}} | 43 | {{#if recommendContentOne}} |
| 44 | - {{> channel/goods-category}} | 44 | + {{> resources/goods-category}} |
| 45 | {{/if}} | 45 | {{/if}} |
| 46 | {{! 新入住品牌/品味生活/创意生活}} | 46 | {{! 新入住品牌/品味生活/创意生活}} |
| 47 | {{#if recommendContentTwo}} | 47 | {{#if recommendContentTwo}} |
| 48 | - {{> channel/creative-life}} | 48 | + {{> resources/creative-life}} |
| 49 | {{/if}} | 49 | {{/if}} |
| 50 | {{! PLUS}} | 50 | {{! PLUS}} |
| 51 | {{#if singleNameImage}} | 51 | {{#if singleNameImage}} |
| 52 | - {{> channel/plus-star}} | 52 | + {{> resources/plus-star}} |
| 53 | {{/if}} | 53 | {{/if}} |
| 54 | {{! 新人专享}} | 54 | {{! 新人专享}} |
| 55 | {{#if newUserFloor}} | 55 | {{#if newUserFloor}} |
| 56 | - {{> channel/fresh-only}} | 56 | + {{> resources/fresh-only}} |
| 57 | {{/if}} | 57 | {{/if}} |
| 58 | {{/content}} | 58 | {{/content}} |
apps/channel/views/partial/channel/floor-header.hbs
→
doraemon/views/partial/common/floor-header.hbs
| 1 | {{#data}} | 1 | {{#data}} |
| 2 | <div class="hot-brands"> | 2 | <div class="hot-brands"> |
| 3 | - {{> channel/floor-header}} | 3 | + {{> common/floor-header}} |
| 4 | <div class="brands-swiper"> | 4 | <div class="brands-swiper"> |
| 5 | <ul class="brands-list swiper-wrapper clearfix"> | 5 | <ul class="brands-list swiper-wrapper clearfix"> |
| 6 | {{# list}} | 6 | {{# list}} |
| 1 | {{#data}} | 1 | {{#data}} |
| 2 | <div class="plus-star"> | 2 | <div class="plus-star"> |
| 3 | - {{> channel/floor-header}} | 3 | + {{> common/floor-header}} |
| 4 | <a href="{{url}}"> | 4 | <a href="{{url}}"> |
| 5 | <img class="lazy" data-original="{{image src 640 198}}"> | 5 | <img class="lazy" data-original="{{image src 640 198}}"> |
| 6 | </a> | 6 | </a> |
| 1 | {{#data}} | 1 | {{#data}} |
| 2 | <div class="trend-topic-wrapper"> | 2 | <div class="trend-topic-wrapper"> |
| 3 | - {{> channel/floor-header-more}} | 3 | + {{> common/floor-header-more}} |
| 4 | <div class="trend-topic-content"> | 4 | <div class="trend-topic-content"> |
| 5 | <div class="trend-topic-swiper"> | 5 | <div class="trend-topic-swiper"> |
| 6 | <ul class="swiper-wrapper"> | 6 | <ul class="swiper-wrapper"> |
| 1 | {{#data}} | 1 | {{#data}} |
| 2 | <div class="trend-coll-wrapper"> | 2 | <div class="trend-coll-wrapper"> |
| 3 | - {{> channel/floor-header-more}} | 3 | + {{> common/floor-header-more}} |
| 4 | <div class="trend-coll-content clearfix"> | 4 | <div class="trend-coll-content clearfix"> |
| 5 | {{# article}} | 5 | {{# article}} |
| 6 | <div class="lspan"> | 6 | <div class="lspan"> |
-
Please register or login to post a comment