tip-ctl

@@ -90,23 +90,11 @@ class CouponNew {
                 uid, type, filter, page
             });
             let couponsList = _.get(couponApi, 'data.couponList', []);
-            let showUsedTip = false;
-
-            if (couponsList && couponsList.length) {
-                if (type === 'use') {
-                    showUsedTip = '以上是近期已使用的优惠券';
-                }
-
-                if (type === 'overtime') {
-                    showUsedTip = '以上是近期已失效的优惠券';
-                }
-            }
 
             if (couponsList && couponsList.length) {
                 couponsList = _couponProcess(couponsList, type);
                 res.render('coupons/coupons', {
                     couponsList,
-                    showUsedTip,
                     layout: false
                 });
             } else {

 {{#couponsList}}
 {{> coupons/coupon}}
 {{/ couponsList}}
-{{#if showUsedTip}}
-<div class="used-tip">
-    <hr>
-    <span>{{showUsedTip}}</span>
-    <hr>
-</div>
-{{/if}}

@@ -28,6 +28,12 @@
         {{> coupons/coupon}}
         {{/ couponList}}
     </div>
+    <div class="used-tip hide">
+        <hr>
+        <span class="used">以上是近期已使用的优惠券</span>
+        <span class="invalid">以上是近期已失效的优惠券</span>
+        <hr>
+    </div>
     <div class="no-conpon-now{{#if couponList}} hide{{/if}}">
         <div class="icon-not"></div>
         <p>暂无优惠券</p>

@@ -118,11 +118,10 @@ class SelectCouponController extends Page {
                 tip.show(res.message);
             }
             if (res.code === 200) {
-                this.orderInfo('usable_usual_code', res.data.coupon_code);
                 tip.show('优惠券可用');
                 setTimeout(function() {
                     location.reload();
-                }, 500);
+                }, 100);
             }
         });
     }

@@ -18,7 +18,8 @@ class ConponController extends Page {
             couponSection: $('.coupon-section'),
             noConponNow: $('.no-conpon-now'),
             exchangeCouponBtn: $('#exchangeCouponBtn'),
-            couponCodeInput: $('input[name=couponCodeInput]')
+            couponCodeInput: $('input[name=couponCodeInput]'),
+            usedTip: $('.used-tip')
         };
 
         this.view.filterBtn.on('click', this.tabChange.bind(this));
@@ -180,10 +181,18 @@ class ConponController extends Page {
         // 筛选参数更改
         if (itemClicked.hasClass('no-used')) {
             this.couponType = 'notuse';
+            this.view.usedTip.addClass('hide');
+            this.view.usedTip.find('span').addClass('hide');
         } else if (itemClicked.hasClass('used')) {
             this.couponType = 'use';
+            this.view.usedTip.removeClass('hide');
+            this.view.usedTip.find('.used').removeClass('hide');
+            this.view.usedTip.find('.invalid').addClass('hide');
         } else if (itemClicked.hasClass('invalid')) {
             this.couponType = 'overtime';
+            this.view.usedTip.removeClass('hide');
+            this.view.usedTip.find('.invalid').removeClass('hide');
+            this.view.usedTip.find('.used').addClass('hide');
         } else {
             tip.show('未知券类型');
         }

@@ -324,7 +324,6 @@ body {
 
     .used-tip {
         display: flex;
-        margin-top: 40px;
 
         span {
             color: #b0b0b0;