Merge branch 'dev' into next

2020-09-18 22:01:02 +08:00
parent e4798138cb d9e24286d2
commit cc8b76c86d
12 changed files with 75 additions and 63 deletions
@@ -1,4 +1,4 @@
-import { createNamespace } from '../utils';
+import { isDef, createNamespace } from '../utils';
 import Cell from '../cell';

 const [createComponent, bem, t] = createNamespace('coupon-cell');
@@ -8,7 +8,14 @@ function formatValue(props) {
  const coupon = coupons[+chosenCoupon];

  if (coupon) {
-    const value = coupon.value || coupon.denominations || 0;
+    let value = 0;
+
+    if (isDef(coupon.value)) {
+      ({ value } = coupon);
+    } else if (isDef(coupon.denominations)) {
+      value = coupon.denominations;
+    }
+
    return `-${currency} ${(value / 100).toFixed(2)}`;
  }