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

@@ -20,11 +20,15 @@ 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 = '//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 + '"}}';
+                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.isFavorite = data.isFavorite === 'Y';
                 data.isFavorite = data.isFavorite === 'Y';
 
 
+                if (parseInt(data.collectionNum) > 10000) {
+                    data.collectionNum = (data.collectionNum / 10000).toFixed(1) + ' w';
+                }
+
                 data.href = href;
                 data.href = href;
             });
             });
             return result.data;
             return result.data;

@@ -17,7 +17,7 @@
             </div>
             </div>
 
 
             <div class="info-content">
             <div class="info-content">
-                <img class="lazy content" data-original="{{image bannerUrl 690 175}}"></img>
+                <img class="lazy content" data-original="{{image bannerUrl 690 235}}"></img>
             </div>
             </div>
         </a>
         </a>
     </div>
     </div>

@@ -294,7 +294,7 @@ scrollFn = debounce(function() {
 }, 200);
 }, 200);
 
 
 $(function() {
 $(function() {
-    isApp = (window.queryString.app_version || window.queryString.appVersion) ? true : false;
+    isApp = window.queryString.app_version || window.queryString.appVersion;
 
 
     if (isApp) {
     if (isApp) {
         speckParamApp = {
         speckParamApp = {
@@ -307,7 +307,7 @@ $(function() {
     // 男:1，女:2，潮童:3，创意生活:4
     // 男:1，女:2，潮童:3，创意生活:4
     speckParamApp.CID = window.queryString.yh_channel || window._ChannelVary[window.cookie('_Channel')] || 1;
     speckParamApp.CID = window.queryString.yh_channel || window._ChannelVary[window.cookie('_Channel')] || 1;
 
 
-    if (!(window.queryString.app_version || window.queryString.appVersion)) {
+    if (!isApp) {
         $('.tab-nav').css({
         $('.tab-nav').css({
             position: 'relative'
             position: 'relative'
         });
         });

@@ -57,7 +57,7 @@ seckillObj = {
             $(elem).find('.tick.hour').text(hour < 0 ? '00' : (hour < 10 ? ('0' + hour) : hour));
             $(elem).find('.tick.hour').text(hour < 0 ? '00' : (hour < 10 ? ('0' + hour) : hour));
             $(elem).find('.tick.minute').text(minute < 0 ? '00' : (minute < 10 ? ('0' + minute) : minute));
             $(elem).find('.tick.minute').text(minute < 0 ? '00' : (minute < 10 ? ('0' + minute) : minute));
             $(elem).find('.tick.second').text(second < 0 ? '00' : (second < 10 ? ('0' + second) : second));
             $(elem).find('.tick.second').text(second < 0 ? '00' : (second < 10 ? ('0' + second) : second));
-            if (offsetTime <= 0) { // 结束倒计时刷新状态
+            if (offsetTime <= 1) { // 结束倒计时刷新状态
                 window.location.reload();
                 window.location.reload();
             } else {
             } else {
                 $el.currentTick = setTimeout(function() {
                 $el.currentTick = setTimeout(function() {

@@ -56,13 +56,14 @@
             .fans {
             .fans {
                 margin-right: 10px;
                 margin-right: 10px;
                 color: #666;
                 color: #666;
+                font-size: 22px;
             }
             }
 
 
             .collect-btn {
             .collect-btn {
                 color: #b0b0b0;
                 color: #b0b0b0;
                 display: inline-block;
                 display: inline-block;
                 width: 50px;
                 width: 50px;
-                font-size: 24px;
+                font-size: 26px;
                 text-align: center;
                 text-align: center;
             }
             }
 
 
@@ -109,19 +110,17 @@
             .giving {
             .giving {
                 width: 170px;
                 width: 170px;
                 color: #b0b0b0;
                 color: #b0b0b0;
-                position: relative;
-                top: -10px;
+                font-size: 22px;
             }
             }
         }
         }
 
 
         .info-content {
         .info-content {
             height: 235px;
             height: 235px;
-            padding: 30px;
             border-top: 1px solid #e0e0e0;
             border-top: 1px solid #e0e0e0;
 
 
             .content {
             .content {
                 width: 690px;
                 width: 690px;
-                height: 175px;
+                height: 233px;
             }
             }
         }
         }
     }
     }

@@ -153,7 +153,7 @@ function tranformPayment(data, orderInfo) {
 
 
     // 有货币
     // 有货币
     result.yohoCoin = data.yoho_coin;
     result.yohoCoin = data.yoho_coin;
-    result.useYohoCoin = false; //data.use_yoho_coin;
+    result.useYohoCoin = false; // data.use_yoho_coin;
 
 
     // 发票
     // 发票
     if (data.invoices) {
     if (data.invoices) {