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

@@ -789,7 +789,7 @@ class familyModel extends global.yoho.BaseModel {
                     }
 
                     if (parseInt(val.exchangeEndTime, 10) !== 0 && parseInt(val.exchangeStartTime, 10) !== 0) {
-                        if (parseInt(Date.now(), 10) > parseInt(val.exchangeEndTime, 10) || parseInt(Date.now(), 10) < parseInt(val.exchangeStartTime, 10)) { // eslint-disable-line
+                        if (parseInt(Date.now(), 10)/1000 > parseInt(val.exchangeEndTime, 10) || parseInt(Date.now(), 10)/1000 < parseInt(val.exchangeStartTime, 10)) { // eslint-disable-line
                             val.noStore = true;
                         }
                     }

@@ -145,9 +145,7 @@
             <script src="//cdn.yoho.cn/yohobuywap-node/{{version}}/libs.js?t={{startTime}}" crossorigin="anonymous"></script>
             <script src="//cdn.yoho.cn/yohobuywap-node/{{version}}/{{module}}.{{page}}.js?t={{startTime}}" crossorigin="anonymous"></script>
         {{/if}}
-        {{#loadJs}}
-        <script src="{{src}}" crossorigin="anonymous"></script>
-        {{/loadJs}}
+ 
         {{#unless devEnv}}
         {{> analysis}}
         {{/unless}}

@@ -132,9 +132,6 @@ setTimeout(() => {
     }
 
     if (productId && (goodsId || productSkn)) {
-        let $promotionYohoCoin = $('#placeholder-promotion-yohocoin');
-        let promotionYohoCoinT = require('product/detail/promotion-yoho-coin.hbs');
-
         setTimeout(() => {
             $.ajax({
                 type: 'GET',
@@ -153,23 +150,6 @@ setTimeout(() => {
                     let regPro = /\/product\/pro_([\d]+)_([\d]+)/;
                     let regSeckill = /\/product\/seckill/;
 
-                    $promotionYohoCoin.replaceWith(promotionYohoCoinT({
-                        promYohoCoinText: data.promYohoCoinText
-                    }));
-
-                    let $coinItem = $('#goodsDiscountYohoCoin');
-                    let $coinIntroBox = $('.coin-intro-box');
-
-                    // 返有货币促销模块点击事件
-                    $coinItem.on('click', function() {
-                        $coinIntroBox.removeClass('hide');
-                    });
-
-                    // 关闭有货币促销展示面板
-                    $coinIntroBox.on('click', function() {
-                        $coinIntroBox.addClass('hide');
-                    });
-
                     // let regProSeckill = /\/product\/seckill\/pro_([\d]+)_([\d]+)/;
                     let thisHref = window.location.href;
                     let thisRefer = document.referrer;
@@ -325,7 +305,7 @@ setTimeout(() => {
 /*
  *   获取商品 相关数据： 1. 促销 2. feedback 3. 店铺, 并初始化
  */
-(function(skn, productId, brandId) { // eslint-disable-line
++ (function(skn, productId, brandId) { // eslint-disable-line
     // 模版: 促销, feedback, 店铺
     let promotionT = require('product/detail/promotion.hbs');
     let feedbackT = require('product/detail/feedbacks.hbs');
@@ -386,7 +366,7 @@ setTimeout(() => {
 
         // goods-discount下拉按钮点击事件
         if ($goodsDiscount.length && $discountFolder.children().length > 0) {
-            $discountFirstItem.on('click', function() {
+            $goodsDiscount.on('click', function() {
                 if ($discountFolder.is(':hidden')) {
                     $discountFirstItem.removeClass('short-text');
                     $discountArrow.removeClass('icon-down').addClass('icon-up').html('');