Merge remote-tracking branch 'origin/release/5.1' into release/5.1

@@ -20,7 +20,7 @@ const shopList = (uid, tabName) => {
     }).then((result) => {
     }).then((result) => {
         if (result && result.code === 200) {
         if (result && result.code === 200) {
             _.forEach(result.data, function(data) {
             _.forEach(result.data, function(data) {
-                let href = 'https://m.yohobuy.com/product/index/brand?shop_id=' + data.shopsId + '&openby: yohobuy={"action":"go.shop","params":{"shop_id":"'
+                let href = '//m.yohobuy.com/product/index/brand?shop_id=' + data.shopsId + '&openby: yohobuy={"action":"go.shop","params":{"shop_id":"'
                 + data.shopsId + '","shop_template_type":"' + data.shopTemplateType + '","shop_name":"' + data.shopName + '"}}';
                 + data.shopsId + '","shop_template_type":"' + data.shopTemplateType + '","shop_name":"' + data.shopName + '"}}';
 
 
                 data.isFavorite = data.isFavorite === 'Y';
                 data.isFavorite = data.isFavorite === 'Y';

@@ -106,7 +106,7 @@ const favoriteBrand = (req, res, next) => {
     /* 判断参数是否有效 */
     /* 判断参数是否有效 */
     let id = req.body.id,
     let id = req.body.id,
         opt = req.body.opt || 'ok',
         opt = req.body.opt || 'ok',
-        uid = req.user.uid ||  (req.body.uid && crypto.decrypt(null, req.body.uid)) || req.cookies.appUid;
+        uid = req.user.uid || (req.body.uid && crypto.decrypt(null, req.body.uid)) || req.cookies.appUid;
 
 
     if (!stringProcess.isNumeric(id) || !stringProcess.isNumeric(uid)) {
     if (!stringProcess.isNumeric(id) || !stringProcess.isNumeric(uid)) {
 
 

@@ -76,7 +76,7 @@ const getDetailData = (req, res, next) => {
     let isWeixin = userAgent.includes('MicroMessenger'); // 标识是否是微信访问
     let isWeixin = userAgent.includes('MicroMessenger'); // 标识是否是微信访问
 
 
     if (req.yoho.isApp) {
     if (req.yoho.isApp) {
-       uid = crypto.encryption('', req.query.uid + '');
+        uid = crypto.encryption('', req.query.uid + '');
     } else {
     } else {
         uid = req.user.uid;
         uid = req.user.uid;
     }
     }

@@ -93,7 +93,7 @@ likeHammer.on('tap', function(e) {
     var opt = 'ok',
     var opt = 'ok',
         $this = $(e.target);
         $this = $(e.target);
 
 
-    //jumpToApp = 1表示APP未登录的情况，此时不发送ajax请求而由a链接直接跳转APP
+    // jumpToApp = 1表示APP未登录的情况，此时不发送ajax请求而由a链接直接跳转APP
     if (jumpToApp === '1') {
     if (jumpToApp === '1') {
         return false;
         return false;
     }
     }
@@ -113,7 +113,7 @@ likeHammer.on('tap', function(e) {
             uid: uid
             uid: uid
         },
         },
         success: function(data) {
         success: function(data) {
-            console.log(data)
+            console.log(data);
             if (data.code === 200) {
             if (data.code === 200) {
                 $this.toggleClass('like');
                 $this.toggleClass('like');
                 tip.show(data.message);
                 tip.show(data.message);

@@ -213,6 +213,7 @@ seckillObj = {
 
 
         if (focusElem.length) {
         if (focusElem.length) {
             history.go(0);
             history.go(0);
+
             // that.refreshProductList(
             // that.refreshProductList(
             //     focusElem.find('input.activityId').val(),
             //     focusElem.find('input.activityId').val(),
             //     focusElem.find('input.date').val()
             //     focusElem.find('input.date').val()

@@ -49,17 +49,21 @@
 
 
         .collect {
         .collect {
             float: right;
             float: right;
-            margin-right: 30px;
+            margin-right: 15px;
             line-height: 70px;
             line-height: 70px;
             height: 70px;
             height: 70px;
 
 
             .fans {
             .fans {
-                margin-right: 30px;
+                margin-right: 10px;
                 color: #666;
                 color: #666;
             }
             }
 
 
             .collect-btn {
             .collect-btn {
                 color: #b0b0b0;
                 color: #b0b0b0;
+                display: inline-block;
+                width: 50px;
+                font-size: 24px;
+                text-align: center;
             }
             }
 
 
             .already-collect {
             .already-collect {