Merge branch 'release/4.6' of http://git.yoho.cn/fe/yohobuywap-node into release/4.6

@@ -12,7 +12,7 @@
                 <ul class="clearfix swiper-wrapper">
                 <ul class="clearfix swiper-wrapper">
                     {{# starAvatar}}
                     {{# starAvatar}}
                         <li class="swiper-slide">
                         <li class="swiper-slide">
-                            <a class="rank-avatar" href='{{url}}' data-avatar="{{image cover 180 180}}"></a>
+                            <a href='{{url}}'><img src="{{image cover 180 180}}" /></a>
                         </li>
                         </li>
                     {{/ starAvatar}}
                     {{/ starAvatar}}
                 </ul>
                 </ul>

@@ -32,6 +32,7 @@ exports.notFound = () => {
  */
  */
 exports.serverError = () => {
 exports.serverError = () => {
     return (err, req, res, next) => {
     return (err, req, res, next) => {
+        logger.error(err);
         if (!res.headersSent) {
         if (!res.headersSent) {
             if (req.xhr) {
             if (req.xhr) {
                 return res.status(500).json({
                 return res.status(500).json({
@@ -40,7 +41,6 @@ exports.serverError = () => {
                 });
                 });
             }
             }
 
 
-            logger.error(err);
             return res.render('error/500', {
             return res.render('error/500', {
                 err: err,
                 err: err,
                 module: 'common',
                 module: 'common',

@@ -255,10 +255,6 @@ getIndexHtml = function() {
                 $avatarClone.remove();
                 $avatarClone.remove();
             }
             }
 
 
-            $('.avatar li').each(function() {
-                setAvatar($(this).find('span'));
-            });
-
             $starMain.before($('.avatar-swiper').clone().addClass('avatar-clone').hide());
             $starMain.before($('.avatar-swiper').clone().addClass('avatar-clone').hide());
 
 
             $avatarClone = $('.avatar-clone');
             $avatarClone = $('.avatar-clone');

@@ -11,7 +11,6 @@
         li {
         li {
             float: left;
             float: left;
             width: 100%;
             width: 100%;
-            margin-top: 30px;
             background: #000;
             background: #000;
 
 
             .cont-area {
             .cont-area {

@@ -9,7 +9,6 @@
             width: 100%;
             width: 100%;
             float: left;
             float: left;
             background: #000;
             background: #000;
-            margin-top: 30px;
 
 
             img {
             img {
                 width: 100%;
                 width: 100%;

@@ -139,7 +139,7 @@
             width: 110px;
             width: 110px;
             height: 110px;
             height: 110px;
             margin-top: 34px;
             margin-top: 34px;
-            background: #282828;
+            background: #000;
 
 
             span {
             span {
                 display: block;
                 display: block;