Merge branch 'feature/group-buy' into 'release/313'

拼团商品详情页优化



See merge request !1709

@@ -134,8 +134,8 @@
         <div id="productDesc" {{#if limit}}class="limit"{{/if}}> </div>
         <div id="productDesc" {{#if limit}}class="limit"{{/if}}> </div>
 
 
         <div class="bottom">
         <div class="bottom">
-            <div class="count-down">
                 {{#ifcond storage_sum '&&' activityIdDetail.currentTime}}
                 {{#ifcond storage_sum '&&' activityIdDetail.currentTime}}
+                <div class="count-down">
                     <div data-current="{{activityIdDetail.currentTime}}"
                     <div data-current="{{activityIdDetail.currentTime}}"
                          data-begin="{{activityIdDetail.beginTime}}"
                          data-begin="{{activityIdDetail.beginTime}}"
                          data-end="{{activityIdDetail.endTime}}"
                          data-end="{{activityIdDetail.endTime}}"
@@ -147,8 +147,8 @@
                         <span class="number" id="minutes"></span>分
                         <span class="number" id="minutes"></span>分
                         <span class="number" id="seconds"></span>秒
                         <span class="number" id="seconds"></span>秒
                     </div>
                     </div>
-                {{/ifcond}}
                 </div>
                 </div>
+                {{/ifcond}}
             {{#unless groupNo}}
             {{#unless groupNo}}
                 <a href="/activity/group" class='shoppint-cart-icon'>
                 <a href="/activity/group" class='shoppint-cart-icon'>
                     <img src="//img10.static.yhbimg.com/yhb-img01/2019/02/21/01/016b3f1cbc1b946fa0acbb1523f6386435.png"
                     <img src="//img10.static.yhbimg.com/yhb-img01/2019/02/21/01/016b3f1cbc1b946fa0acbb1523f6386435.png"

@@ -76,7 +76,7 @@
             <a href="../group/list?activityId={{activityId}}" class="status-btn">查看更多拼团活动</a>
             <a href="../group/list?activityId={{activityId}}" class="status-btn">查看更多拼团活动</a>
             {{/ifcond}}
             {{/ifcond}}
 
 
-            <a class="tip" href="https://m.yohobuy.com/activity/feature/1555.html">支付开团-支付参团-凑齐人数发货-凑不齐退款 玩法介绍》</a>
+            <a class="tip" href="https://m.yohobuy.com/activity/feature/1555.html?nodownload=1">支付开团-支付参团-凑齐人数发货-凑不齐退款 玩法介绍》</a>
         </div>
         </div>
     </div>
     </div>
     {{#if bannerResource}}
     {{#if bannerResource}}

@@ -287,7 +287,9 @@ class Detail extends Page {
         let formatCollagePrice = document.getElementById('collagePrice').value;
         let formatCollagePrice = document.getElementById('collagePrice').value;
 
 
         this.getProductData(productSkn);
         this.getProductData(productSkn);
+        if (buynow) {
             buynow.onclick = this.joinGroup.bind(this);
             buynow.onclick = this.joinGroup.bind(this);
+        }
 
 
         let title = `【包邮】${formatCollagePrice}抢${goodsName}`;
         let title = `【包邮】${formatCollagePrice}抢${goodsName}`;
 
 
@@ -306,6 +308,8 @@ class Detail extends Page {
                 isShowPop.style.display = 'none';
                 isShowPop.style.display = 'none';
             }, 10000);
             }, 10000);
         }
         }
+
+        if (selfBuyDom) {
             if (groupNo) {
             if (groupNo) {
                 selfBuyDom.onclick = function() {
                 selfBuyDom.onclick = function() {
                     window.location.href = '/activity/group/detail?activityId=' + activityId + '&productSkn=' + productSkn;
                     window.location.href = '/activity/group/detail?activityId=' + activityId + '&productSkn=' + productSkn;
@@ -316,6 +320,7 @@ class Detail extends Page {
                 };
                 };
             }
             }
         }
         }
+    }
 
 
     joinGroup() {
     joinGroup() {
         let chosePanel = require('js/activity/group/chose-panel');
         let chosePanel = require('js/activity/group/chose-panel');

@@ -673,3 +673,7 @@
         display: none !important;
         display: none !important;
     }
     }
 }
 }
+
+.yoho-footer {
+    margin-bottom: 100px;
+}