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

弹框优化



See merge request !978

@@ -17,7 +17,10 @@
     <div class="list-3">
         {{# coupons}}
         <div class="list-item">
-            <div class="amount" data-couponid="{{couponId}}">￥{{couponAmount}}</div>
+            <div class="amount" data-couponid="{{couponId}}">
+                ￥{{couponAmount}}
+                <div class="limit">满￥{{useLimit}}使用</div>
+            </div>
             <a href="//m.yohobuy.com/product/shop?shop_id={{shopsId}}">
                 <div class="shop">
                     <div class="logo"{{#if shopLogo}} style="background-image:url({{image2 shopLogo w=105 h=42 q=60}})"{{/if}}></div>

@@ -28,6 +28,9 @@ class CouponList extends Page {
     }
 
     hideDia() {
+        if (this.selector.$dia.hasClass('refresh')) {
+            window.location.href = window.location.href;
+        }
         this.selector.$dia.removeClass().addClass('dia-c dia hide');
         this.selector.$diaC.hide();
     }
@@ -86,6 +89,9 @@ class CouponList extends Page {
     }
 
     dia(num) {
+        if (num === 2) {
+            this.selector.$dia.addClass('refresh');
+        }
         this.selector.$dia.addClass(`dia-${num}`);
         this.selector.$diaC.show();
     }

@@ -125,6 +125,12 @@
                 text-align: center;
                 margin: 14px auto 0;
                 font-weight: bold;
+
+                .limit {
+                    font-size: 12px;
+                    line-height: 12px;
+                    font-weight: normal;
+                }
             }
 
             .shop {