Authored by 郝肖肖

代码检查

@@ -139,7 +139,7 @@ const formatCartGoods = (cartGoods, isAdvanceCart, inValid, isOffShelves, analys @@ -139,7 +139,7 @@ const formatCartGoods = (cartGoods, isAdvanceCart, inValid, isOffShelves, analys
139 productPrice: transPrice(it.last_vip_price), // self::transPrice($value['real_price']); 139 productPrice: transPrice(it.last_vip_price), // self::transPrice($value['real_price']);
140 productNum: Number(it.buy_number), 140 productNum: Number(it.buy_number),
141 storageNum: Number(it.storage_number), 141 storageNum: Number(it.storage_number),
142 - isSoldOut: parseInt(it.storage_number, 10) === 0 || parseInt(it.off_shelves, 10) === 1,// 已售罄 142 + isSoldOut: parseInt(it.storage_number, 10) === 0 || parseInt(it.off_shelves, 10) === 1, // 已售罄
143 isVipPrice: it.sales_price !== it.last_vip_price && it.discount_tag === 'V', 143 isVipPrice: it.sales_price !== it.last_vip_price && it.discount_tag === 'V',
144 isStuPrice: it.sales_price !== it.last_vip_price && it.discount_tag === 'S', 144 isStuPrice: it.sales_price !== it.last_vip_price && it.discount_tag === 'S',
145 yohoIcon: Number(it.get_yoho_coin) || 0, 145 yohoIcon: Number(it.get_yoho_coin) || 0,
@@ -534,6 +534,7 @@ const formatPromotionPools = (pools, selectedGiftsList, isAdvance, analysis) => @@ -534,6 +534,7 @@ const formatPromotionPools = (pools, selectedGiftsList, isAdvance, analysis) =>
534 return pool; 534 return pool;
535 }); 535 });
536 }; 536 };
  537 +
537 // 失效处理 538 // 失效处理
538 const formatSoldOutPools = (pools, selectedGiftsList, isAdvance, analysis) => { 539 const formatSoldOutPools = (pools, selectedGiftsList, isAdvance, analysis) => {
539 return _.map(pools, p => { 540 return _.map(pools, p => {
@@ -417,7 +417,7 @@ Cart = { @@ -417,7 +417,7 @@ Cart = {
417 capi.cartItemNumChg($.extend(countJSON, { 417 capi.cartItemNumChg($.extend(countJSON, {
418 sku: $item.data('id'), 418 sku: $item.data('id'),
419 batch_no: $item.data('batch-no'), 419 batch_no: $item.data('batch-no'),
420 - activity_id: $item.data('pool-id'), 420 + activity_id: $item.data('pool-id')
421 })); 421 }));
422 422
423 if (!$btn.hasClass('cart-item-checked')) { 423 if (!$btn.hasClass('cart-item-checked')) {
@@ -100,7 +100,7 @@ ColorPanelAction = { @@ -100,7 +100,7 @@ ColorPanelAction = {
100 selected: 'Y', 100 selected: 'Y',
101 new_product_sku: newSku, 101 new_product_sku: newSku,
102 old_product_sku: oldSku 102 old_product_sku: oldSku
103 - } 103 + };
104 104
105 // 套餐编辑尺码 105 // 套餐编辑尺码
106 if (poolId) { 106 if (poolId) {
@@ -91,9 +91,9 @@ $('.phoneapp').mouseenter(function() { @@ -91,9 +91,9 @@ $('.phoneapp').mouseenter(function() {
91 }); 91 });
92 92
93 $('.we-chat').mouseenter(function() { 93 $('.we-chat').mouseenter(function() {
94 - _hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']); 94 + window._html && window._hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']);
95 }).click(function() { 95 }).click(function() {
96 - _hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']); 96 + window._html && window._hmt.push(['_trackEvent', '二维码', '头部手机版', '', '']);
97 }); 97 });
98 98
99 // handlebars模板 99 // handlebars模板
1 var $ = require('yoho-jquery'), 1 var $ = require('yoho-jquery'),
2 - dialog = require('../common/dialog'),  
3 - Alert = dialog.Alert; 2 + dialog = require('../common/dialog');
4 3
5 var payPage = {}; 4 var payPage = {};
6 var $btnby = $('input.btnby'), 5 var $btnby = $('input.btnby'),
@@ -10,6 +9,7 @@ var $btnby = $('input.btnby'), @@ -10,6 +9,7 @@ var $btnby = $('input.btnby'),
10 orderCode = $btnby.data('order'), 9 orderCode = $btnby.data('order'),
11 amount = $btnby.data('amount'), 10 amount = $btnby.data('amount'),
12 $formGo = $('.form-go'), 11 $formGo = $('.form-go'),
  12 + Alert = dialog.Alert,
13 C_ID; 13 C_ID;
14 14
15 require('../simple-header'); 15 require('../simple-header');