Merge branch 'feature/coupon' into release/180420

@@ -100,7 +100,7 @@ exports.orderEnsure = (req, res, next) => {
             }
             }
         }
         }
 
 
-        if (!orderInfo.coupon_code && autoSelectCouponCodeStr) {
+        if (orderInfo.user_check_coupon !== 'Y' && autoSelectCouponCodeStr) {
             orderInfo.coupon_code = autoSelectCouponCodeStr;
             orderInfo.coupon_code = autoSelectCouponCodeStr;
             res.cookie('order-info', JSON.stringify(orderInfo), actCkOpthn);
             res.cookie('order-info', JSON.stringify(orderInfo), actCkOpthn);
         }
         }

@@ -37,7 +37,7 @@ class cartModel extends global.yoho.BaseModel {
 
 
         // 是否需要重新计算
         // 是否需要重新计算
         let needReComputer = orderInfoCookie && !_.isEmpty(orderInfoCookie) &&
         let needReComputer = orderInfoCookie && !_.isEmpty(orderInfoCookie) &&
-            (orderInfoCookie.yohoCoin || orderInfoCookie.coupon_code);
+            (orderInfoCookie.yohoCoin || orderInfoCookie.user_check_coupon === 'Y');
 
 
         if (needReComputer) {
         if (needReComputer) {
             orderInfoCookie.paymentType = orderInfoCookie.paymentType ? orderInfoCookie.paymentType : '';
             orderInfoCookie.paymentType = orderInfoCookie.paymentType ? orderInfoCookie.paymentType : '';
@@ -114,7 +114,8 @@ class cartModel extends global.yoho.BaseModel {
                     coupon: paymentProcess.handleCoupons({
                     coupon: paymentProcess.handleCoupons({
                         paymentApiCouponData,
                         paymentApiCouponData,
                         validCouponCount: validCouponCount,
                         validCouponCount: validCouponCount,
-                        orderComputeCouponPay: orderCompute.coupon_pay
+                        orderComputeCouponPay: orderCompute.coupon_pay,
+                        userCheckCoupon: orderInfoCookie.user_check_coupon === 'Y'
                     }),
                     }),
                     giftCards: paymentProcess.handleGiftCards({
                     giftCards: paymentProcess.handleGiftCards({
                         validGiftCardCount: validGiftCardCount,
                         validGiftCardCount: validGiftCardCount,

@@ -47,7 +47,9 @@
                             {{/isEqualOr}}
                             {{/isEqualOr}}
                         </div>
                         </div>
                     </div>
                     </div>
+                    {{#isEqualOr is_overdue_soon 'Y'}}
                     <span class="top-tip"></span>
                     <span class="top-tip"></span>
+                    {{/isEqualOr}}
                 </div>
                 </div>
             {{/each}}
             {{/each}}
             {{/ usableCouponsList}}
             {{/ usableCouponsList}}
@@ -102,7 +104,7 @@
                 <span class="nums">{{to_pay_amount_str}}</span> 元</p>
                 <span class="nums">{{to_pay_amount_str}}</span> 元</p>
         </div>
         </div>
         {{/ couponPay}}
         {{/ couponPay}}
-        <button class="use-now-btn" id="useNowBtn">立即使用</button>
+        <button class="use-now-btn" id="useNowBtn">确认</button>
     </div>
     </div>
     {{/ result}}
     {{/ result}}
 </section>
 </section>

@@ -18,7 +18,6 @@ class qrcodeModel extends global.yoho.BaseModel {
             order_code: id,
             order_code: id,
             uid: uid
             uid: uid
         }}).then(result => {
         }}).then(result => {
-            console.log(result);
             if (result && result.code === 200) {
             if (result && result.code === 200) {
                 return result.data;
                 return result.data;
             } else {
             } else {

@@ -144,8 +144,6 @@ class SelectCouponController extends Page {
     tabChange(event) {
     tabChange(event) {
         let itemClicked = $(event.currentTarget);
         let itemClicked = $(event.currentTarget);
 
 
-        console.log(this.view.useNowBox);
-
         if (itemClicked.hasClass('active')) {
         if (itemClicked.hasClass('active')) {
             itemClicked.removeClass('active');
             itemClicked.removeClass('active');
         } else {
         } else {
@@ -184,7 +182,9 @@ class SelectCouponController extends Page {
         let theCoupon = $(e.delegateTarget);
         let theCoupon = $(e.delegateTarget);
         let theCouponData = theCoupon.data();
         let theCouponData = theCoupon.data();
 
 
-        console.log(theCouponData.code);
+        if (!this.orderInfo('user_check_coupon')) {
+            this.orderInfo('user_check_coupon', 'Y');
+        }
 
 
         if (theCouponCheck.hasClass('icon-cb-radio')) {
         if (theCouponCheck.hasClass('icon-cb-radio')) {
             this.selectCouponCodes.splice($.inArray(theCouponData.code, this.selectCouponCodes), 1);
             this.selectCouponCodes.splice($.inArray(theCouponData.code, this.selectCouponCodes), 1);

@@ -270,14 +270,14 @@ body {
         z-index: 3;
         z-index: 3;
 
 
         .left-info {
         .left-info {
-            width: 490px;
+            width: 510px;
             height: 100px;
             height: 100px;
             float: left;
             float: left;
             padding-right: 20px;
             padding-right: 20px;
         }
         }
 
 
         .use-now-btn {
         .use-now-btn {
-            width: 260px;
+            width: 240px;
             height: 100px;
             height: 100px;
             background-color: #d0021b;
             background-color: #d0021b;
             color: #fff;
             color: #fff;

@@ -348,6 +348,7 @@ function handleCoupons(params) {
     let showText = '';
     let showText = '';
     let priceText = '';
     let priceText = '';
 
 
+    // 重新计算过后取重新计算的值
     if (!_.isEmpty(orderComputeCouponPay)) {
     if (!_.isEmpty(orderComputeCouponPay)) {
         couponData = orderComputeCouponPay;
         couponData = orderComputeCouponPay;
     }
     }
@@ -365,11 +366,15 @@ function handleCoupons(params) {
         showText = `${validCouponCount}张可用，未使用`;
         showText = `${validCouponCount}张可用，未使用`;
     }
     }
 
 
-    if (!_.isEmpty(orderComputeCouponPay)) {
+    if (!_.isEmpty(orderComputeCouponPay) && couponData.coupon_count) {
         showText = `已选${couponData.coupon_count}张`;
         showText = `已选${couponData.coupon_count}张`;
         priceText = `-￥${couponData.coupon_amount_str}`;
         priceText = `-￥${couponData.coupon_amount_str}`;
     }
     }
 
 
+    if (!_.isEmpty(orderComputeCouponPay) && !couponData.coupon_count) {
+        showText = `${validCouponCount}张可用，未使用`;
+    }
+
     return {
     return {
         showText, priceText, couponCode
         showText, priceText, couponCode
     };
     };