fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit a7303ccea040a8a61f2037c6f16f5595cbf19d1a 2 parents 7cafb48b 24870160

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

Inline Side-by-side
Showing 3 changed files with 4 additions and 26 deletions
@@ -789,7 +789,7 @@ class familyModel extends global.yoho.BaseModel { @@ -789,7 +789,7 @@ class familyModel extends global.yoho.BaseModel {
789 } 789 }
790 790
791 if (parseInt(val.exchangeEndTime, 10) !== 0 && parseInt(val.exchangeStartTime, 10) !== 0) { 791 if (parseInt(val.exchangeEndTime, 10) !== 0 && parseInt(val.exchangeStartTime, 10) !== 0) {
792 - if (parseInt(Date.now(), 10) > parseInt(val.exchangeEndTime, 10) || parseInt(Date.now(), 10) < parseInt(val.exchangeStartTime, 10)) { // eslint-disable-line 792 + if (parseInt(Date.now(), 10)/1000 > parseInt(val.exchangeEndTime, 10) || parseInt(Date.now(), 10)/1000 < parseInt(val.exchangeStartTime, 10)) { // eslint-disable-line
793 val.noStore = true; 793 val.noStore = true;
794 } 794 }
795 } 795 }
@@ -145,9 +145,7 @@ @@ -145,9 +145,7 @@
145 <script src="//cdn.yoho.cn/yohobuywap-node/{{version}}/libs.js?t={{startTime}}" crossorigin="anonymous"></script> 145 <script src="//cdn.yoho.cn/yohobuywap-node/{{version}}/libs.js?t={{startTime}}" crossorigin="anonymous"></script>
146 <script src="//cdn.yoho.cn/yohobuywap-node/{{version}}/{{module}}.{{page}}.js?t={{startTime}}" crossorigin="anonymous"></script> 146 <script src="//cdn.yoho.cn/yohobuywap-node/{{version}}/{{module}}.{{page}}.js?t={{startTime}}" crossorigin="anonymous"></script>
147 {{/if}} 147 {{/if}}
148 - {{#loadJs}}  
149 - <script src="{{src}}" crossorigin="anonymous"></script>  
150 - {{/loadJs}} 148 +
151 {{#unless devEnv}} 149 {{#unless devEnv}}
152 {{> analysis}} 150 {{> analysis}}
153 {{/unless}} 151 {{/unless}}
@@ -132,9 +132,6 @@ setTimeout(() => { @@ -132,9 +132,6 @@ setTimeout(() => {
132 } 132 }
133 133
134 if (productId && (goodsId || productSkn)) { 134 if (productId && (goodsId || productSkn)) {
135 - let $promotionYohoCoin = $('#placeholder-promotion-yohocoin');  
136 - let promotionYohoCoinT = require('product/detail/promotion-yoho-coin.hbs');  
137 -  
138 setTimeout(() => { 135 setTimeout(() => {
139 $.ajax({ 136 $.ajax({
140 type: 'GET', 137 type: 'GET',
@@ -153,23 +150,6 @@ setTimeout(() => { @@ -153,23 +150,6 @@ setTimeout(() => {
153 let regPro = /\/product\/pro_([\d]+)_([\d]+)/; 150 let regPro = /\/product\/pro_([\d]+)_([\d]+)/;
154 let regSeckill = /\/product\/seckill/; 151 let regSeckill = /\/product\/seckill/;
155 152
156 - $promotionYohoCoin.replaceWith(promotionYohoCoinT({  
157 - promYohoCoinText: data.promYohoCoinText  
158 - }));  
159 -  
160 - let $coinItem = $('#goodsDiscountYohoCoin');  
161 - let $coinIntroBox = $('.coin-intro-box');  
162 -  
163 - // 返有货币促销模块点击事件  
164 - $coinItem.on('click', function() {  
165 - $coinIntroBox.removeClass('hide');  
166 - });  
167 -  
168 - // 关闭有货币促销展示面板  
169 - $coinIntroBox.on('click', function() {  
170 - $coinIntroBox.addClass('hide');  
171 - });  
172 -  
173 // let regProSeckill = /\/product\/seckill\/pro_([\d]+)_([\d]+)/; 153 // let regProSeckill = /\/product\/seckill\/pro_([\d]+)_([\d]+)/;
174 let thisHref = window.location.href; 154 let thisHref = window.location.href;
175 let thisRefer = document.referrer; 155 let thisRefer = document.referrer;
@@ -325,7 +305,7 @@ setTimeout(() => { @@ -325,7 +305,7 @@ setTimeout(() => {
325 /* 305 /*
326 * 获取商品 相关数据： 1. 促销 2. feedback 3. 店铺, 并初始化 306 * 获取商品 相关数据： 1. 促销 2. feedback 3. 店铺, 并初始化
327 */ 307 */
328 -(function(skn, productId, brandId) { // eslint-disable-line 308 ++ (function(skn, productId, brandId) { // eslint-disable-line
329 // 模版: 促销, feedback, 店铺 309 // 模版: 促销, feedback, 店铺
330 let promotionT = require('product/detail/promotion.hbs'); 310 let promotionT = require('product/detail/promotion.hbs');
331 let feedbackT = require('product/detail/feedbacks.hbs'); 311 let feedbackT = require('product/detail/feedbacks.hbs');
@@ -386,7 +366,7 @@ setTimeout(() => { @@ -386,7 +366,7 @@ setTimeout(() => {
386 366
387 // goods-discount下拉按钮点击事件 367 // goods-discount下拉按钮点击事件
388 if ($goodsDiscount.length && $discountFolder.children().length > 0) { 368 if ($goodsDiscount.length && $discountFolder.children().length > 0) {
389 - $discountFirstItem.on('click', function() { 369 + $goodsDiscount.on('click', function() {
390 if ($discountFolder.is(':hidden')) { 370 if ($discountFolder.is(':hidden')) {
391 $discountFirstItem.removeClass('short-text'); 371 $discountFirstItem.removeClass('short-text');
392 $discountArrow.removeClass('icon-down').addClass('icon-up').html('&#xe608;'); 372 $discountArrow.removeClass('icon-down').addClass('icon-up').html('&#xe608;');