Merge branch 'feature/coupon' into 'release/6.0'

no-requirement-view



See merge request !755

@@ -299,7 +299,7 @@ class BuyNowController {
             title: '选择优惠券',
             title: '选择优惠券',
             selectCouponPage: true,
             selectCouponPage: true,
             pageHeader: headerData,
             pageHeader: headerData,
-            pageFooter: true,
+            pageFooter: false,
             localCss: true
             localCss: true
         });
         });
     }
     }

@@ -4,7 +4,6 @@
         <div class="coupon-content">
         <div class="coupon-content">
             <div class="content-left pull-left">
             <div class="content-left pull-left">
                 <div class="value">{{ couponValue }}</div>
                 <div class="value">{{ couponValue }}</div>
-                <div class="requirement">使用条件</div>
             </div>
             </div>
             <div class="content-middle pull-left">{{ couponValidity}}</div>
             <div class="content-middle pull-left">{{ couponValidity}}</div>
             <div class="content-right pull-left">
             <div class="content-right pull-left">
@@ -19,7 +18,6 @@
         <div class="coupon-content">
         <div class="coupon-content">
             <div class="content-left pull-left">
             <div class="content-left pull-left">
                 <div class="value">{{ couponValue }}</div>
                 <div class="value">{{ couponValue }}</div>
-                <div class="requirement">使用条件</div>
             </div>
             </div>
             <div class="content-middle pull-left">{{ couponValidity}}</div>
             <div class="content-middle pull-left">{{ couponValidity}}</div>
             <div class="content-right pull-left">
             <div class="content-right pull-left">

@@ -118,14 +118,9 @@ $fontSizeSmall: 16px;
 
 
                 .content-left > .value {
                 .content-left > .value {
                     width: 100%;
                     width: 100%;
+                    height: 76px;
                     text-align: center;
                     text-align: center;
-                    font-size: 48px;
-                    color: $fontColor;
-                }
-
-                .content-left > .requirement {
-                    text-align: center;
-                    font-size: $fontSizeSmall;
+                    font-size: 52px;
                     color: $fontColor;
                     color: $fontColor;
                 }
                 }