模板目录调整

@@ -41,7 +41,7 @@ const channelLogger = (err, res) => {
 const channelPage = (req, res, data) => {
     channelModel.getChannelDate({
         gender: data.gender,
-        uid: req.user.uid
+        uid: _.toString(req.user.uid)
     }).then(result => {
         res.render('channel', Object.assign(renderData, data, result));
     }).catch((err) => {

 {{# content}}
     {{! 头部banner}}
     {{#if focus}}
-        {{> channel/banner-top}}
+        {{> resources/banner-top}}
     {{/if}}
     {{! 图标入口}}
     {{#if appIconList}}
-        {{> channel/icons-enter}}
+        {{> resources/icons-enter}}
     {{/if}}
     {{! 中间banner}}
     {{#if singleImage}}
-        {{> channel/banner}}
+        {{> resources/banner}}
     {{/if}}
     {{! 两个小图}}
     {{#if smallPic}}
-        {{> channel/thumb-row}}
+        {{> resources/thumb-row}}
     {{/if}}
     {{! 热门品类}}
     {{#if recommendContentFive}}
-        {{> channel/hot-category}}
+        {{> resources/hot-category}}
     {{/if}}
     {{! 热门品牌}}
     {{#if appHotBrands}}
-        {{> channel/hot-brands-list}}
+        {{> resources/hot-brands-list}}
     {{/if}}
     {{! 热门品牌可滑动}}
     {{#if customBrands}}
-        {{> channel/hot-brands-swipe}}
+        {{> resources/hot-brands-swipe}}
     {{/if}}
     {{! 潮人搭配}}
     {{#if trendsetterCollocation}}
-        {{> channel/trendsetter-collocation}}
+        {{> resources/trendsetter-collocation}}
     {{/if}}
     {{! 潮流话题}}
     {{#if trendgoodsTopic}}
-        {{> channel/trend-topics}}
+        {{> resources/trend-topics}}
     {{/if}}
     {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装}}
     {{#if recommendContentOne}}
-        {{> channel/goods-category}}
+        {{> resources/goods-category}}
     {{/if}}
     {{! 新入住品牌/品味生活/创意生活}}
     {{#if recommendContentTwo}}
-       {{> channel/creative-life}}
+       {{> resources/creative-life}}
     {{/if}}
     {{! PLUS}}
     {{#if singleNameImage}}
-        {{> channel/plus-star}}
+        {{> resources/plus-star}}
     {{/if}}
     {{! 新人专享}}
     {{#if newUserFloor}}
-        {{> channel/fresh-only}}
+        {{> resources/fresh-only}}
     {{/if}}
-{{/ content}}
\ No newline at end of file
+{{/ content}}

 {{#content}}
     {{! 头部banner}}
     {{#if focus}}
-        {{> channel/banner-top}}
+        {{> resources/banner-top}}
     {{/if}}
     {{! 图标入口}}
     {{#if appIconList}}
-        {{> channel/icons-enter}}
+        {{> resources/icons-enter}}
     {{/if}}
     {{! 首页公告}}
     {{!--     {{#announcement}}
-        {{> channel/notice}}
+        {{> resources/notice}}
     {{/announcement}} --}}
     {{! 中间banner}}
     {{#if singleImage}}
-        {{> channel/banner}}
+        {{> resources/banner}}
     {{/if}}
     {{! 两个小图}}
     {{#if smallPic}}
-        {{> channel/thumb-row}}
+        {{> resources/thumb-row}}
     {{/if}}
     {{! 热门品类}}
     {{#if recommendContentFive}}
-        {{> channel/hot-category}}
+        {{> resources/hot-category}}
     {{/if}}
     {{! 热门品牌}}
     {{#if appHotBrands}}
-        {{> channel/hot-brands-list}}
+        {{> resources/hot-brands-list}}
     {{/if}}
     {{! 热门品牌可滑动}}
     {{#if customBrands}}
-        {{> channel/hot-brands-swipe}}
+        {{> resources/hot-brands-swipe}}
     {{/if}}
     {{! 潮人搭配}}
     {{#if trendsetterCollocation}}
-        {{> channel/trendsetter-collocation}}
+        {{> resources/trendsetter-collocation}}
     {{/if}}
     {{! 潮流话题}}
     {{#if trendgoodsTopic}}
-        {{> channel/trend-topics}}
+        {{> resources/trend-topics}}
     {{/if}}
     {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装}}
     {{#if recommendContentOne}}
-        {{> channel/goods-category}}
+        {{> resources/goods-category}}
     {{/if}}
     {{! 新入住品牌/品味生活/创意生活}}
     {{#if recommendContentTwo}}
-       {{> channel/creative-life}}
+       {{> resources/creative-life}}
     {{/if}}
     {{! PLUS}}
     {{#if singleNameImage}}
-        {{> channel/plus-star}}
+        {{> resources/plus-star}}
     {{/if}}
     {{! 新人专享}}
     {{#if newUserFloor}}
-        {{> channel/fresh-only}}
+        {{> resources/fresh-only}}
     {{/if}}
 {{/content}}

 {{#data}}
-    {{> channel/floor-header-more}}
+    {{> common/floor-header-more}}
     <div class="creative-life">
         {{# bigImage}}
             <a class="banner" href="{{url}}">

-{{> channel/floor-header}}
+{{> common/floor-header}}
 <ul class="fine-brands clearfix">
     {{# brands}}    
         <li class="brand">

 {{#data}}
-    {{> channel/floor-header-more}}
+    {{> common/floor-header-more}}
     <div class="fresh-only">
         {{# bannerImage}}
         <div class="fresh-swiper">

 {{#data}}
-    {{> channel/floor-header-more}}
+    {{> common/floor-header-more}}
     <div class="goods-category">
         {{# bigImage}}
             {{#if bigList}}

 {{#data}}
     <ul class="hot-brands clearfix">
-    {{> channel/floor-header}}
+    {{> common/floor-header}}
         {{# list}}    
             <li class="brand">
                 <a href="{{url}}">

 {{#data}}
     <div class="hot-brands">
-        {{> channel/floor-header}}
+        {{> common/floor-header}}
         <div class="brands-swiper">
             <ul class="brands-list swiper-wrapper clearfix">
                 {{# list}}

 {{#data}}
     <div class="hot-category">
-        {{> channel/floor-header}}
+        {{> common/floor-header}}
         
         {{# banner}}
         <a class="category-banner" href="{{url}}">

 {{#data}}
     <div class="plus-star">
-        {{> channel/floor-header}}
+        {{> common/floor-header}}
         <a href="{{url}}">
             <img class="lazy" data-original="{{image src 640 198}}">
         </a>

 {{#data}}
 	<div class="trend-topic-wrapper">
-		{{> channel/floor-header-more}}
+		{{> common/floor-header-more}}
 		<div class="trend-topic-content">
 			<div class="trend-topic-swiper">
 				<ul class="swiper-wrapper">

 {{#data}}
 	<div class="trend-coll-wrapper">
-		{{> channel/floor-header-more}}
+		{{> common/floor-header-more}}
 		<div class="trend-coll-content clearfix">
 			{{# article}}
 			<div class="lspan">