Authored by 郭成尧

ui-modified

@@ -55,7 +55,9 @@ @@ -55,7 +55,9 @@
55 </div> 55 </div>
56 <div class="coupon-list unusable hide"> 56 <div class="coupon-list unusable hide">
57 {{#unusableCouponsList}} 57 {{#unusableCouponsList}}
  58 + {{#if ./name}}
58 <div class="coupon-list-type"><hr><span>{{./name}}</span><hr></div> 59 <div class="coupon-list-type"><hr><span>{{./name}}</span><hr></div>
  60 + {{/if}}
59 {{#each ./coupons}} 61 {{#each ./coupons}}
60 <div class="coupon"> 62 <div class="coupon">
61 <div class="coupon-left{{#isEqualOr coupon_type '1' '3'}} coupon-left-activity{{/isEqualOr}}{{#isEqualOr coupon_type '5'}} coupon-left-freight{{/isEqualOr}}{{#isEqualOr coupon_type '6'}} coupon-left-shop{{/isEqualOr}}"> 63 <div class="coupon-left{{#isEqualOr coupon_type '1' '3'}} coupon-left-activity{{/isEqualOr}}{{#isEqualOr coupon_type '5'}} coupon-left-freight{{/isEqualOr}}{{#isEqualOr coupon_type '6'}} coupon-left-shop{{/isEqualOr}}">
1 -<div id="conponDialogWrapper" class="dialog-wrapper"> 1 +<div id="conponDialogWrapper" class="dialog-wrapper conpon-diaalog-wrapper">
2 <div class="dialog-box" style="top: 50%; margin-top: -119px;"> 2 <div class="dialog-box" style="top: 50%; margin-top: -119px;">
3 <div class="dialog-header">优惠券使用规则</div> 3 <div class="dialog-header">优惠券使用规则</div>
4 <div class="dialog-content">{{{couponPayRule}}}</div> 4 <div class="dialog-content">{{{couponPayRule}}}</div>
1 <section class="coupon-section" data-code="{{coupon_code}}" data-id="{{coupon_id}}"> 1 <section class="coupon-section" data-code="{{coupon_code}}" data-id="{{coupon_id}}">
2 <div class="coupon{{#isEqualOr is_overtime 'Y'}} coupon-overtime{{/isEqualOr}}{{#if is_used}} coupon-used{{/if}}"> 2 <div class="coupon{{#isEqualOr is_overtime 'Y'}} coupon-overtime{{/isEqualOr}}{{#if is_used}} coupon-used{{/if}}">
3 - <div class="coupon-left{{#unless usedOrOvertime}}{{#isEqualOr coupon_type '1' '3'}} coupon-left-activity{{/isEqualOr}}{{#isEqualOr coupon_type '5'}} coupon-left-freight{{/isEqualOr}}{{#isEqualOr coupon_type '6'}} coupon-left-shop{{/isEqualOr}}{{/unless}}"> 3 + <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}}">
4 <p class="value">{{#unlessor coupon_type '5'}}¥{{/unlessor}}<span>{{coupon_value_str}}</span></p> 4 <p class="value">{{#unlessor coupon_type '5'}}¥{{/unlessor}}<span>{{coupon_value_str}}</span></p>
5 {{#if use_rule}} 5 {{#if use_rule}}
6 <p class="threshold">{{use_rule}}</p> 6 <p class="threshold">{{use_rule}}</p>
@@ -357,7 +357,7 @@ function handleCoupons(params) { @@ -357,7 +357,7 @@ function handleCoupons(params) {
357 } 357 }
358 358
359 if (validCouponCount && couponData.coupon_count) { 359 if (validCouponCount && couponData.coupon_count) {
360 - showText = `可用${validCouponCount} 已推荐${couponData.coupon_count}张`; 360 + showText = `${validCouponCount}张可用 已推荐${couponData.coupon_count}张`;
361 priceText = `-${couponData.coupon_amount_str}`; 361 priceText = `-${couponData.coupon_amount_str}`;
362 } 362 }
363 363
@@ -389,8 +389,10 @@ const couponProcess = conponData => { @@ -389,8 +389,10 @@ const couponProcess = conponData => {
389 let unusableCouponNumStr = ''; 389 let unusableCouponNumStr = '';
390 390
391 _.forEach(unusableCouponsList, listItem => { 391 _.forEach(unusableCouponsList, listItem => {
392 - if (listItem.coupons) { 392 + if (listItem.coupons && listItem.coupons.length) {
393 unusableCouponNum += listItem.coupons.length; 393 unusableCouponNum += listItem.coupons.length;
  394 + } else {
  395 + listItem.name = '';
394 } 396 }
395 }); 397 });
396 398