Merge branch 'develop' into feature/sale

@@ -44,7 +44,7 @@ const channelPage = (req, res, data) => {
         gender: data.gender,
         gender: data.gender,
         uid: _.toString(req.user.uid)
         uid: _.toString(req.user.uid)
     }).then(result => {
     }).then(result => {
-        res.render('channel', Object.assign(renderData, data, result));
+        res.render('channel', Object.assign({}, renderData, data, result));
     }).catch((err) => {
     }).catch((err) => {
         channelLogger(err, res);
         channelLogger(err, res);
     });
     });
@@ -107,7 +107,7 @@ exports.kids = (req, res) => {
     channelPage(req, res, {
     channelPage(req, res, {
         gender: 'kids',
         gender: 'kids',
         title: '潮童首页',
         title: '潮童首页',
-        boysHomePage: true
+        kidsHomePage: true
     });
     });
 };
 };
 
 

 <div class="mobile-container">
 <div class="mobile-container">
-    <div class="mobile-wrap boys-wrap yoho-page">
+    <div class="mobile-wrap {{#if boysHomePage}}boys-wrap{{/if}} {{#if girlsHomePage}}girls-wrap{{/if}} {{#if kidsHomePage}}kids-wrap{{/if}} {{#if lifestyleHomePage}}lifestyle-wrap{{/if}} yoho-page">
         {{! 首页header}}
         {{! 首页header}}
         {{#homeHeader}}
         {{#homeHeader}}
            {{> channel/home-header}}
            {{> channel/home-header}}
@@ -16,7 +16,7 @@
         {{! 你可能喜欢}}
         {{! 你可能喜欢}}
         {{#if lifestyleHomePage}}
         {{#if lifestyleHomePage}}
             {{> channel/maybe-like-lifestyle}}
             {{> channel/maybe-like-lifestyle}}
-        {{else}}           
+        {{else}}
             {{> channel/maybe-like}}
             {{> channel/maybe-like}}
         {{/if}}
         {{/if}}