From 9b26f877e402ba77dfef775f33696df079386c93 Mon Sep 17 00:00:00 2001
From: 郭成尧 <chengyao.guo@yoho.cn>
Date: Tue, 10 Apr 2018 17:57:11 +0800
Subject: [PATCH] coupon-selected
---
apps/cart/controllers/order.js | 2 ++
apps/cart/views/action/select-coupons.hbs | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------
public/js/cart/select-coupons/controller.js | 4 +---
public/scss/cart/select-coupons.page.css | 21 ++++++++++++++++++++-
public/scss/layout/_common.css | 4 ++++
5 files changed, 107 insertions(+), 73 deletions(-)
diff --git a/apps/cart/controllers/order.js b/apps/cart/controllers/order.js
index aff35f0..61b9d70 100644
--- a/apps/cart/controllers/order.js
+++ b/apps/cart/controllers/order.js
@@ -20,6 +20,7 @@ const _couponProcess = conponData => {
let unusableCouponsList = _.get(conponData, 'unusable_coupon_catalogs.list', []);
let usableCouponNum = _.get(usableCouponsList, '[0].coupons.length', 0);
let unusableCouponNum = 0;
+ let couponPay = _.get(usableCouponsList, '[0].coupon_pay');
let headMsg = _.replace(_.get(conponData, 'usable_coupon_catalogs.head_msg', []), '\n', '<br>');
_.forEach(unusableCouponsList, listItem => {
@@ -33,6 +34,7 @@ const _couponProcess = conponData => {
unusableCouponNum,
usableCouponsList,
unusableCouponsList,
+ couponPay,
headMsg
};
};
diff --git a/apps/cart/views/action/select-coupons.hbs b/apps/cart/views/action/select-coupons.hbs
index d638247..6093c10 100644
--- a/apps/cart/views/action/select-coupons.hbs
+++ b/apps/cart/views/action/select-coupons.hbs
@@ -1,78 +1,89 @@
{{#result}}
-<div class="filter-box">
- <span class="filter-btn valid active">可用({{usableCouponNum}})</span>
- <span class="filter-btn invalid">不可用({{unusableCouponNum}})</span>
-</div>
-<div class="exchange-box">
- <input type="text" placeholder="请输入优惠券码">
- <button>兑换</button>
-</div>
-<div class="tip-box">
- <div class="tips">
- {{{headMsg}}}
+<section>
+ <div class="filter-box">
+ <span class="filter-btn valid active">可用({{usableCouponNum}})</span>
+ <span class="filter-btn invalid">不可用({{unusableCouponNum}})</span>
</div>
- <div class="tip-close">
- <span class="iconfont"></span>
+ <div class="exchange-box">
+ <input type="text" placeholder="请输入优惠券码">
+ <button>兑换</button>
</div>
-</div>
-<div class="coupon-list usable">
- {{#usableCouponsList}}
- {{#each ./coupons}}
- <div class="coupon" data-code="{{coupon_code}}">
- <div class="coupon-left">
- <p class="value">
- {{#isEqualOr coupon_type '1' '3' '6'}}¥{{/isEqualOr}}
- <span>{{coupon_value_str}}</span>
- </p>
- <p class="threshold">{{use_rule}}</p>
- </div>
- <div class="coupon-right">
- <div class="info">
- <p class="title">
- <span>[{{catalog_name}}]</span> {{coupon_name}}</p>
- <p class="time">{{coupon_validity}}</p>
+ <div class="tip-box">
+ <div class="tips">
+ {{{headMsg}}}
+ </div>
+ <div class="tip-close">
+ <span class="iconfont"></span>
+ </div>
+ </div>
+ <div class="coupon-list usable">
+ {{#usableCouponsList}}
+ {{#each ./coupons}}
+ <div class="coupon{{#isEqualOr is_selected_support 'N'}} no-support-selected{{/isEqualOr}}" data-code="{{coupon_code}}">
+ <div class="coupon-left">
+ <p class="value">
+ {{#isEqualOr coupon_type '1' '3' '6'}}¥{{/isEqualOr}}
+ <span>{{coupon_value_str}}</span>
+ </p>
+ <p class="threshold">{{use_rule}}</p>
</div>
- <div class="check">
- <span class="iconfont checkbox{{#isEqualOr selected 'Y'}} icon-cb-radio{{^}} icon-radio{{/isEqualOr}}"></span>
+ <div class="coupon-right">
+ <div class="info">
+ <p class="title">
+ <span>[{{catalog_name}}]</span> {{coupon_name}}</p>
+ <p class="time">{{coupon_validity}}</p>
+ {{#isEqualOr is_selected_support 'N'}}
+ <p class="desc">{{desc}}</p>
+ {{/isEqualOr}}
+ </div>
+ <div class="check">
+ {{#isEqualOr is_selected_support 'Y'}}
+ <span class="iconfont checkbox{{#isEqualOr selected 'Y'}} icon-cb-radio{{^}} icon-radio{{/isEqualOr}}"></span>
+ {{^}}
+ <span class="iconfont icon-point1"></span>
+ {{/isEqualOr}}
+ </div>
</div>
</div>
- </div>
- {{/each}}
- {{/ usableCouponsList}}
-</div>
-<div class="coupon-list unusable hide">
- {{#unusableCouponsList}}
- <div class="coupon-list-type">{{./name}}</div>
- {{#each ./coupons}}
- <div class="coupon">
- <div class="coupon-left">
- <p class="value">
- {{#isEqualOr coupon_type '1' '3' '6'}}¥{{/isEqualOr}}
- <span>{{coupon_value_str}}</span>
- </p>
- <p class="threshold">{{use_rule}}</p>
- </div>
- <div class="coupon-right">
- <div class="info">
- <p class="title">
- <span class="{{#isEqualOr coupon_type '1'}} type-activity{{/isEqualOr}}
- {{#isEqualOr coupon_type '5'}} type-freight{{/isEqualOr}}
- {{#isEqualOr coupon_type '6'}} type-shop{{/isEqualOr}}">[{{catalog_name}}]</span> {{coupon_name}}</p>
- <p class="time">{{coupon_validity}}</p>
+ {{/each}}
+ {{/ usableCouponsList}}
+ </div>
+ <div class="coupon-list unusable hide">
+ {{#unusableCouponsList}}
+ <div class="coupon-list-type">{{./name}}</div>
+ {{#each ./coupons}}
+ <div class="coupon">
+ <div class="coupon-left">
+ <p class="value">
+ {{#isEqualOr coupon_type '1' '3' '6'}}¥{{/isEqualOr}}
+ <span>{{coupon_value_str}}</span>
+ </p>
+ <p class="threshold">{{use_rule}}</p>
+ </div>
+ <div class="coupon-right">
+ <div class="info">
+ <p class="title">
+ <span class="{{#isEqualOr coupon_type '1'}} type-activity{{/isEqualOr}}
+ {{#isEqualOr coupon_type '5'}} type-freight{{/isEqualOr}}
+ {{#isEqualOr coupon_type '6'}} type-shop{{/isEqualOr}}">[{{catalog_name}}]</span> {{coupon_name}}</p>
+ <p class="time">{{coupon_validity}}</p>
+ </div>
</div>
</div>
- </div>
- {{/each}}
- {{/ unusableCouponsList}}
-</div>
-<div class="use-now">
- <div class="left-info">
- <p>已选择
- <span class="nums">5</span> 张，共优惠
- <span class="nums">415.00</span> 元</p>
- <p>待支付
- <span class="nums">499.00</span> 元</p>
+ {{/each}}
+ {{/ unusableCouponsList}}
+ </div>
+ <div class="use-now">
+ {{#couponPay}}
+ <div class="left-info">
+ <p>已选择
+ <span class="nums">{{coupon_count}}</span> 张，共优惠
+ <span class="nums">{{coupon_amount_str}}</span> 元</p>
+ <p>待支付
+ <span class="nums">{{to_pay_amount_str}}</span> 元</p>
+ </div>
+ {{/ couponPay}}
+ <button class="use-now-btn" id="useNowBtn">立即使用</button>
</div>
- <button class="use-now-btn" id="useNowBtn">立即使用</button>
-</div>
-{{/ result}}
+ {{/ result}}
+</section>
diff --git a/public/js/cart/select-coupons/controller.js b/public/js/cart/select-coupons/controller.js
index f99a941..af81c4d 100644
--- a/public/js/cart/select-coupons/controller.js
+++ b/public/js/cart/select-coupons/controller.js
@@ -62,9 +62,7 @@ class SelectCouponController extends Page {
* 使用优惠券
*/
useCoupon() {
- console.log('处理选中优惠券...');
- console.log('提交接口...');
- console.log('返回结算页...');
+ window.history.go(-1);
}
/**
diff --git a/public/scss/cart/select-coupons.page.css b/public/scss/cart/select-coupons.page.css
index ab56cfe..ea31e93 100644
--- a/public/scss/cart/select-coupons.page.css
+++ b/public/scss/cart/select-coupons.page.css
@@ -158,7 +158,12 @@ body {
}
.info > .time {
- margin-bottom: 26px;
+ margin-bottom: 8px;
+ }
+
+ .info > .desc {
+ font-size: 20px;
+ color: #444;
}
.check {
@@ -172,6 +177,20 @@ body {
font-size: 40px;
color: #444;
}
+
+ .check > .icon-point1 {
+ color: #b0b0b0;
+ }
+ }
+ }
+
+ .no-support-selected {
+ > .coupon-left > p {
+ color: #b0b0b0;
+ }
+
+ > .coupon-right .info > .title {
+ color: #b0b0b0;
}
}
}
diff --git a/public/scss/layout/_common.css b/public/scss/layout/_common.css
index 454b425..7454239 100644
--- a/public/scss/layout/_common.css
+++ b/public/scss/layout/_common.css
@@ -222,6 +222,10 @@ button {
content: "\e699";
}
+.icon-point1:before {
+ content: "\e60c";
+}
+
.wx-footer-c {
margin-top: 30px;
}
--
libgit2 0.24.0