fe / yohobuywap-node · Commits

Go to a project

Authored by 毕凯
Commit cadf56bb1f3b0194b003682bd98fae24639287a6 2 parents 781214dc fb1f4844

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 3 additions and 3 deletions
@@ -54,7 +54,7 @@ class BuyNowController { @@ -54,7 +54,7 @@ class BuyNowController {
54 54
55 // 是否需要重新计算 55 // 是否需要重新计算
56 let needReComputer = orderInfo && !_.isEmpty(orderInfo) && 56 let needReComputer = orderInfo && !_.isEmpty(orderInfo) &&
57 - (orderInfo.yohoCoin || orderInfo.coupon_code); 57 + (orderInfo.yohoCoin || orderInfo.coupon_code || orderInfo.gift_card_code);
58 let computerPromise = null; 58 let computerPromise = null;
59 59
60 if (needReComputer) { 60 if (needReComputer) {
@@ -37,7 +37,7 @@ class cartModel extends global.yoho.BaseModel { @@ -37,7 +37,7 @@ class cartModel extends global.yoho.BaseModel {
37 37
38 // 是否需要重新计算 38 // 是否需要重新计算
39 let needReComputer = orderInfoCookie && !_.isEmpty(orderInfoCookie) && 39 let needReComputer = orderInfoCookie && !_.isEmpty(orderInfoCookie) &&
40 - (orderInfoCookie.yohoCoin || orderInfoCookie.user_check_coupon === 'Y'); 40 + (orderInfoCookie.yohoCoin || orderInfoCookie.user_check_coupon === 'Y' || orderInfoCookie.gift_card_code);
41 41
42 if (needReComputer) { 42 if (needReComputer) {
43 orderInfoCookie.paymentType = orderInfoCookie.paymentType ? orderInfoCookie.paymentType : ''; 43 orderInfoCookie.paymentType = orderInfoCookie.paymentType ? orderInfoCookie.paymentType : '';
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 font-size: 22px; 65 font-size: 22px;
66 line-height: 48px; 66 line-height: 48px;
67 display: flex; 67 display: flex;
68 - align-items: center; 68 + align-items: flex-start;
69 font-weight: 300; 69 font-weight: 300;
70 70
71 .icon-tan { 71 .icon-tan {