Merge branch 'feature/coupon' into release/180420

@@ -3,7 +3,7 @@
         <div class="dialog-header">优惠券使用规则</div>
         <div class="dialog-header">优惠券使用规则</div>
         <div class="dialog-content">{{{couponPayRule}}}</div>
         <div class="dialog-content">{{{couponPayRule}}}</div>
         <div class="dialog-footer">
         <div class="dialog-footer">
-            <span class="dialog-center-btn tap-hightlight" id="conponDialogCancel">我知道了</span>
+            <span class="dialog-center-btn tap-hightlight" id="conponDialogCancel">知道了</span>
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>

-<div class="coupon-new-page">
+<div class="coupon-new-page cpage-padding284">
     {{#couponNumStr}}
     {{#couponNumStr}}
     <div class="filter-box">
     <div class="filter-box">
         <span class="filter-btn-box">
         <span class="filter-btn-box">

@@ -144,9 +144,7 @@ class SelectCouponController extends Page {
         let itemClicked = $(event.currentTarget);
         let itemClicked = $(event.currentTarget);
 
 
         // Tab 按钮状态
         // Tab 按钮状态
-        if (itemClicked.hasClass('active')) {
-            itemClicked.removeClass('active');
-        } else {
+        if (!itemClicked.hasClass('active')) {
             this.view.filterBtn.removeClass('active');
             this.view.filterBtn.removeClass('active');
             itemClicked.addClass('active');
             itemClicked.addClass('active');
         }
         }
@@ -170,7 +168,7 @@ class SelectCouponController extends Page {
         }
         }
 
 
         // Tip 控制
         // Tip 控制
-        if (this.closeCouponRuleTipbyUser === 'Y') {
+        if (this.closeCouponRuleTipbyUser === 'Y' || itemClicked.hasClass('invalid')) {
             this.view.tipBox.addClass('hide');
             this.view.tipBox.addClass('hide');
         } else {
         } else {
             if (itemClicked.data('num') === 0) {
             if (itemClicked.data('num') === 0) {

@@ -11,6 +11,7 @@ class ConponController extends Page {
         this.page = 1;
         this.page = 1;
 
 
         this.view = {
         this.view = {
+            page: $('.coupon-new-page'),
             filterBtn: $('.filter-btn'),
             filterBtn: $('.filter-btn'),
             filterItem: $('.filter-item'),
             filterItem: $('.filter-item'),
             showFilterBtn: $('.show-filter-btn'),
             showFilterBtn: $('.show-filter-btn'),
@@ -204,9 +205,11 @@ class ConponController extends Page {
 
 
         // 筛选框控制按钮状态、优惠券码兑换输入框状态管理
         // 筛选框控制按钮状态、优惠券码兑换输入框状态管理
         if (itemClicked.hasClass('no-used')) {
         if (itemClicked.hasClass('no-used')) {
+            this.view.page.addClass('cpage-padding284').removeClass('cpage-padding194');
             this.view.showFilterBtn.addClass('active');
             this.view.showFilterBtn.addClass('active');
             this.view.exchangeBox.removeClass('hide');
             this.view.exchangeBox.removeClass('hide');
         } else {
         } else {
+            this.view.page.addClass('cpage-padding194').removeClass('cpage-padding284');
             this.view.showFilterBtn.removeClass('icon-up').addClass('icon-down');
             this.view.showFilterBtn.removeClass('icon-up').addClass('icon-down');
             this.view.showFilterBtn.removeClass('active');
             this.view.showFilterBtn.removeClass('active');
             this.view.exchangeBox.addClass('hide');
             this.view.exchangeBox.addClass('hide');

@@ -887,4 +887,8 @@
     > .dialog-box > .dialog-content {
     > .dialog-box > .dialog-content {
         padding-top: 0;
         padding-top: 0;
     }
     }
+
+    > .dialog-box > .dialog-footer > .dialog-center-btn {
+        font-weight: 500;
+    }
 }
 }

@@ -186,6 +186,7 @@ body {
                 }
                 }
 
 
                 .info > .desc {
                 .info > .desc {
+                    width: 400px;
                     font-size: 20px;
                     font-size: 20px;
                     color: #444;
                     color: #444;
                     position: absolute;
                     position: absolute;

@@ -8,9 +8,15 @@ body {
     left: 0;
     left: 0;
 }
 }
 
 
-.coupon-new-page {
+.cpage-padding284 {
+    padding-top: 284px;
+}
+
+.cpage-padding194 {
     padding-top: 194px;
     padding-top: 194px;
+}
 
 
+.coupon-new-page {
     .filter-box {
     .filter-box {
         width: 100%;
         width: 100%;
         height: 88px;
         height: 88px;
@@ -21,7 +27,7 @@ body {
         position: fixed;
         position: fixed;
         top: 106px;
         top: 106px;
         left: 0;
         left: 0;
-        z-index: 2;
+        z-index: 3;
 
 
         .filter-btn-box {
         .filter-btn-box {
             flex: 1;
             flex: 1;
@@ -54,7 +60,7 @@ body {
         position: fixed;
         position: fixed;
         top: 192px;
         top: 192px;
         left: 0;
         left: 0;
-        z-index: 2;
+        z-index: 3;
 
 
         button {
         button {
             width: 150px;
             width: 150px;
@@ -77,6 +83,10 @@ body {
         height: 90px;
         height: 90px;
         padding: 16px 20px;
         padding: 16px 20px;
         background-color: #fff;
         background-color: #fff;
+        position: fixed;
+        top: 194px;
+        left: 0;
+        z-index: 2;
 
 
         input {
         input {
             width: 570px;
             width: 570px;