fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit 97af2eaf5b06e1f73a3a32d2d38b8ff96d752a02 2 parents 809aa9fd db233bb5

Merge branch 'feature/coupon' into release/180420

Inline Side-by-side
Showing 3 changed files with 8 additions and 8 deletions
... ... @@ -21,9 +21,9 @@
{{#each ./coupons}}
<div class="coupon{{#isEqualOr is_selected_support 'N'}} no-support-selected{{/isEqualOr}}" data-code="{{coupon_code}}">
<div class="coupon-left{{#isEqualOr is_selected_support 'Y'}}
{{#isEqualOr coupon_type '1' '3' '8'}} coupon-left-activity{{/isEqualOr}}
{{#isEqualOr coupon_type '5'}} coupon-left-freight{{/isEqualOr}}
{{#isEqualOr coupon_type '6'}} coupon-left-shop{{/isEqualOr}}
{{#isEqualOr catalog 200}} coupon-left-activity{{/isEqualOr}}
{{#isEqualOr catalog 300}} coupon-left-freight{{/isEqualOr}}
{{#isEqualOr catalog 100}} coupon-left-shop{{/isEqualOr}}
{{/isEqualOr}}">
<p class="value">
<span>{{coupon_value_str}}</span>
... ... @@ -59,7 +59,7 @@
{{/if}}
{{#each ./coupons}}
<div class="coupon">
<div class="coupon-left{{#isEqualOr coupon_type '1' '3' '8'}} coupon-left-activity{{/isEqualOr}}{{#isEqualOr coupon_type '5'}} coupon-left-freight{{/isEqualOr}}{{#isEqualOr coupon_type '6'}} coupon-left-shop{{/isEqualOr}}">
<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}}">
<p class="value">
<span>{{coupon_value_str}}</span>
</p>
... ... @@ -68,7 +68,7 @@
<div class="coupon-right">
<div class="info">
<p class="title">
<span class="{{#isEqualOr coupon_type '1' '3' '8'}} type-activity{{/isEqualOr}}{{#isEqualOr coupon_type '5'}} type-freight{{/isEqualOr}}{{#isEqualOr coupon_type '6'}} type-shop{{/isEqualOr}}">[{{catalog_name}}]</span> {{coupon_name}}</p>
<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>
<p class="time">{{coupon_validity}}</p>
<p class="desc unusable-desc">{{desc}}</p>
</div>
... ...
<section class="coupon-section" data-code="{{coupon_code}}" data-id="{{coupon_id}}">
<div class="coupon{{#isEqualOr is_overtime 'Y'}} coupon-overtime{{/isEqualOr}}{{#if is_used}} coupon-used{{/if}}">
<div class="coupon-left{{#unless usedOrOvertime}}{{#isEqualOr coupon_type '1' '3' '8'}} coupon-left-activity{{/isEqualOr}}{{#isEqualOr coupon_type '5'}} coupon-left-freight{{/isEqualOr}}{{#isEqualOr coupon_type '6'}} coupon-left-shop{{/isEqualOr}}{{/unless}}">
<div class="coupon-left{{#unless usedOrOvertime}}{{#isEqualOr catalog 200}} coupon-left-activity{{/isEqualOr}}{{#isEqualOr catalog 300}} coupon-left-freight{{/isEqualOr}}{{#isEqualOr catalog 100}} coupon-left-shop{{/isEqualOr}}{{/unless}}">
<p class="value"><span>{{coupon_value_str}}</span></p>
{{#if use_rule}}
<p class="threshold">{{use_rule}}</p>
... ... @@ -8,7 +8,7 @@
</div>
<div class="coupon-right">
<p class="title">
<span class="{{#isEqualOr coupon_type '1' '3'}}type-activity{{/isEqualOr}}{{#isEqualOr coupon_type '5'}}type-freight{{/isEqualOr}}{{#isEqualOr coupon_type '6'}}type-shop{{/isEqualOr}}">[{{catalog_name}}]</span> {{coupon_name}}</p>
<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>
<p class="time">{{coupon_validity}}</p>
{{#if notes}}
<p>
... ...
... ... @@ -301,7 +301,7 @@ $yohoPage.on('touchstart', '.tap-hightlight', function() {
$(this).removeClass('highlight');
});
$('.nav-home').on('touchstart', function(e) {
$('.new-nav-home').on('touchstart', function(e) {
$('.homebuttom').toggleClass('hide');
e.preventDefault();
e.stopPropagation();
... ...