Merge branch 'feature/coupon' into release/180420

@@ -238,7 +238,7 @@ class shoppingModel extends global.yoho.BaseModel {
         let param = {
             method: 'app.Shopping.countUsableCoupon',
             uid: params.uid,
-            delivery_way: params.delivery_way
+            delivery_way: params.delivery_way || 1
         };
 
         return this.get({data: param});

@@ -64,8 +64,10 @@
             <div class="coupon-list-type"><hr><span>{{./name}}</span><hr></div>
             {{/if}}
             {{#each ./coupons}}
-                <div class="coupon">
-                    <div class="coupon-left{{#isEqualOr catalog 200}} coupon-left-activity{{/isEqualOr}}{{#isEqualOr catalog 300}} coupon-left-freight{{/isEqualOr}}{{#isEqualOr catalog 100}} coupon-left-shop{{/isEqualOr}}">
+                <div class="coupon{{#isEqualOr catalog 200}} coupon-activity{{/isEqualOr}}
+                    {{#isEqualOr catalog 300}} coupon-freight{{/isEqualOr}}
+                    {{#isEqualOr catalog 100}} coupon-shop{{/isEqualOr}}">
+                    <div class="coupon-left">
                         <p class="value">
                             <span>{{coupon_value_str}}</span>
                         </p>
@@ -74,7 +76,7 @@
                     <div class="coupon-right">
                         <div class="info">
                             <p class="title">
-                                <span class="{{#isEqualOr catalog 200}} type-activity{{/isEqualOr}}{{#isEqualOr catalog 300}} type-freight{{/isEqualOr}}{{#isEqualOr catalog 100}} type-shop{{/isEqualOr}}">[{{catalog_name}}]</span> {{coupon_name}}</p>
+                                <span class="catalog-name">[{{catalog_name}}]</span> {{coupon_name}}</p>
                             <p class="time">{{coupon_validity}}</p>
                             <p class="desc unusable-desc">{{desc}}</p>
                         </div>