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

@@ -54,7 +54,7 @@ class BuyNowController {
 
         // 是否需要重新计算
         let needReComputer = orderInfo && !_.isEmpty(orderInfo) &&
-            (orderInfo.yohoCoin || orderInfo.coupon_code);
+            (orderInfo.yohoCoin || orderInfo.coupon_code || orderInfo.gift_card_code);
         let computerPromise = null;
 
         if (needReComputer) {

@@ -37,7 +37,7 @@ class cartModel extends global.yoho.BaseModel {
 
         // 是否需要重新计算
         let needReComputer = orderInfoCookie && !_.isEmpty(orderInfoCookie) &&
-            (orderInfoCookie.yohoCoin || orderInfoCookie.user_check_coupon === 'Y');
+            (orderInfoCookie.yohoCoin || orderInfoCookie.user_check_coupon === 'Y' || orderInfoCookie.gift_card_code);
 
         if (needReComputer) {
             orderInfoCookie.paymentType = orderInfoCookie.paymentType ? orderInfoCookie.paymentType : '';

@@ -65,7 +65,7 @@
             font-size: 22px;
             line-height: 48px;
             display: flex;
-            align-items: center;
+            align-items: flex-start;
             font-weight: 300;
 
             .icon-tan {