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

@@ -266,7 +266,7 @@ const _relatedTag = (tags, isApp) => {
             if (value.url.indexOf('openby') >= 0) {
             if (value.url.indexOf('openby') >= 0) {
                 value.url = value.url;
                 value.url = value.url;
             } else {
             } else {
-                value.url = tagUrl + '&openby:yohobuy＝{"action":"go.h5","params":{"query":"' + value.name + '","type":0","title":"' + value.name + '","url":"http://guang.m.yohobuy.com/tags/index","islogin":"N"}}}';
+                value.url = tagUrl + '&openby:yohobuy＝{"action":"go.h5","params":{"query":"' + value.name + '","type":0,"title":"' + value.name + '","url":"http://guang.m.yohobuy.com/tags/index","islogin":"N"}}';
             }
             }
         }
         }
 
 

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Author: Targaryen
  * @Date: 2017-04-13 10:21:07
  * @Date: 2017-04-13 10:21:07
  * @Last Modified by: Targaryen
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-04-18 11:12:16
+ * @Last Modified time: 2017-04-20 18:33:48
  */
  */
 
 
 /* ********************
 /* ********************
@@ -37,7 +37,7 @@ const passwordResetPage = (req, res) => {
         page: 'reset',
         page: 'reset',
         pageStyle: 'passport-body',
         pageStyle: 'passport-body',
         title: '重置密码',
         title: '重置密码',
-        canSkip: passwordWeakObj.canSkip === 'Y' ? refer : false
+        canSkip: (passwordWeakObj && passwordWeakObj.canSkip === 'Y') ? refer : false
     });
     });
 };
 };
 
 

 {
 {
   "name": "m-yohobuy-node",
   "name": "m-yohobuy-node",
-  "version": "5.6.0",
+  "version": "5.6.1",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -124,7 +124,7 @@ $(window).on('seckill', function(event, detailData) {
                                 '</div>'
                                 '</div>'
                             );
                             );
                             $('.sold-out').hide();
                             $('.sold-out').hide();
-                            $('.cart-bar a:first').after('<a href="javascript:;" class="sold-out">即将开抢</a>');
+                            $('.cart-bar').append('<a href="javascript:;" class="sold-out">即将开抢</a>');
                             $('.addto-cart').hide();
                             $('.addto-cart').hide();
                             $('.cart-bar').show();
                             $('.cart-bar').show();
                             $('.current-price').show();
                             $('.current-price').show();
@@ -187,7 +187,7 @@ $(window).on('seckill', function(event, detailData) {
                             }
                             }
                             if (seckillNum === 0) {
                             if (seckillNum === 0) {
                                 $('.sold-out').hide();
                                 $('.sold-out').hide();
-                                $('.cart-bar a:first').append('<a href="javascript:;" class="sold-out">已售罄</a>');
+                                $('.cart-bar').append('<a href="javascript:;" class="sold-out">已售罄</a>');
                                 $('.addto-cart').hide();
                                 $('.addto-cart').hide();
                             }
                             }
                             $('.current-price').show();
                             $('.current-price').show();

@@ -19,6 +19,7 @@ loading.init($(document.body), {
 let seckillObj = {};
 let seckillObj = {};
 
 
 lazyload('img.lazy');
 lazyload('img.lazy');
+
 seckillObj = {
 seckillObj = {
     $container: null, // .seckill-list
     $container: null, // .seckill-list
 
 
@@ -417,12 +418,13 @@ seckillObj = {
                     }))
                     }))
                 );
                 );
 
 
+                lazyload('img.lazy');
+
                 if (result && result.activitys && result.activitys.length) {
                 if (result && result.activitys && result.activitys.length) {
                     window.diff = self.diff = Math.round((result.currentTime - Date.now()) / 1000);
                     window.diff = self.diff = Math.round((result.currentTime - Date.now()) / 1000);
                     return callback();
                     return callback();
                 }
                 }
 
 
-                lazyload('img.lazy');
                 window.rePosFooter();
                 window.rePosFooter();
 
 
             })
             })

@@ -204,8 +204,8 @@
     .service-cont .service-prob:before,
     .service-cont .service-prob:before,
     .service-cont .service-answer:before {
     .service-cont .service-answer:before {
         content: "";
         content: "";
-        width: 31px;
-        height: 31px;
+        width: 30.8px;
+        height: 30.8px;
         float: left;
         float: left;
         margin-right: 20px;
         margin-right: 20px;
         position: absolute;
         position: absolute;

@@ -24,10 +24,12 @@
 
 
     .item-img {
     .item-img {
         width: 152px;
         width: 152px;
+        height: 203px;
         margin-right: 30px;
         margin-right: 30px;
 
 
         img {
         img {
             width: 100%;
             width: 100%;
+            height: 100%;
         }
         }
     }
     }
 }
 }