diff --git a/src/coupon-list/README.md b/src/coupon-list/README.md index eda4e90ae..cba07621c 100644 --- a/src/coupon-list/README.md +++ b/src/coupon-list/README.md @@ -75,14 +75,14 @@ export default { ### CouponCell Props -| Attribute | Description | Type | Default | -| --- | --- | --- | --- | -| title | Cell title | _string_ | `Coupon` | -| chosen-coupon | Index of chosen coupon | _number \| string_ | `-1` | -| coupons | Coupon list | _Coupon[]_ | `[]` | -| editable | Cell editable | _boolean_ | `true` | -| border | Whether to show innner border | _boolean_ | `true` | -| currency | Currency symbol | _string_ | `¥` | +| Attribute | Description | Type | Default | +| ------------- | ---------------------------- | ------------------ | -------- | +| title | Cell title | _string_ | `Coupon` | +| chosen-coupon | Index of chosen coupon | _number \| string_ | `-1` | +| coupons | Coupon list | _Coupon[]_ | `[]` | +| editable | Cell editable | _boolean_ | `true` | +| border | Whether to show inner border | _boolean_ | `true` | +| currency | Currency symbol | _string_ | `¥` | ### CouponList Props @@ -114,19 +114,19 @@ export default { ### Data Structure of Coupon -| Key | Description | Type | -| ----------- | ----------------------------------- | -------- | -| id | Id | _string_ | -| name | Name | _string_ | -| condition | Condition | _string_ | -| startAt | Start time (Timestmap, unit millisecond) | _number_ | -| endAt | End time (Timestmap, unit millisecond) | _number_ | -| description | Description | _string_ | -| reason | Unavailable reason | _string_ | -| value | Value | _number_ | -| valueDesc | Value Text | _string_ | -| unitDesc | Unit Text | _string_ | -| customValidPeriod | custom valid period | _string_ | +| Key | Description | Type | +| ----------------- | ---------------------------------------- | -------- | +| id | Id | _string_ | +| name | Name | _string_ | +| condition | Condition | _string_ | +| startAt | Start time (Timestamp, unit millisecond) | _number_ | +| endAt | End time (Timestamp, unit millisecond) | _number_ | +| description | Description | _string_ | +| reason | Unavailable reason | _string_ | +| value | Value | _number_ | +| valueDesc | Value Text | _string_ | +| unitDesc | Unit Text | _string_ | +| customValidPeriod | custom valid period | _string_ | ### Less Variables diff --git a/src/coupon-list/README.zh-CN.md b/src/coupon-list/README.zh-CN.md index c49464e2d..b704f34ca 100644 --- a/src/coupon-list/README.zh-CN.md +++ b/src/coupon-list/README.zh-CN.md @@ -116,19 +116,19 @@ export default { ### Coupon 数据结构 -| 键名 | 说明 | 类型 | -| ----------- | ------------------------------- | -------- | -| id | 优惠券 id | _string_ | -| name | 优惠券名称 | _string_ | -| condition | 满减条件 | _string_ | -| startAt | 卡有效开始时间 (时间戳, 单位毫秒) | _number_ | -| endAt | 卡失效日期 (时间戳, 单位毫秒) | _number_ | -| description | 描述信息,优惠券可用时展示 | _string_ | -| reason | 不可用原因,优惠券不可用时展示 | _string_ | -| value | 折扣券优惠金额,单位分 | _number_ | -| valueDesc | 折扣券优惠金额文案 | _string_ | -| unitDesc | 单位文案 | _string_ | -| customValidPeriod | 自定义有效时间文案 | _string_ | +| 键名 | 说明 | 类型 | +| ----------------- | --------------------------------- | -------- | +| id | 优惠券 id | _string_ | +| name | 优惠券名称 | _string_ | +| condition | 满减条件 | _string_ | +| startAt | 卡有效开始时间 (时间戳, 单位毫秒) | _number_ | +| endAt | 卡失效日期 (时间戳, 单位毫秒) | _number_ | +| description | 描述信息,优惠券可用时展示 | _string_ | +| reason | 不可用原因,优惠券不可用时展示 | _string_ | +| value | 折扣券优惠金额,单位分 | _number_ | +| valueDesc | 折扣券优惠金额文案 | _string_ | +| unitDesc | 单位文案 | _string_ | +| customValidPeriod | 自定义有效时间文案 | _string_ | ### 样式变量 diff --git a/src/coupon-list/demo/index.vue b/src/coupon-list/demo/index.vue index edaafa4a5..06574e12c 100644 --- a/src/coupon-list/demo/index.vue +++ b/src/coupon-list/demo/index.vue @@ -11,7 +11,7 @@ v-model="showList" round position="bottom" - style="height: 90%; padding-top: 4px;" + style="height: 90%; padding-top: 4px" > = 1000000000000) { - return dateToString(new Date(timeStamp * 1), 'datetime'); +function formatTimeStamp(timeStamp) { + // compatible when the timestamp is seconds + if (timeStamp < 10 ** 12) { + return timeStamp * 1000; } - return dateToString(new Date(timeStamp * 1000)); + return timeStamp; +} + +function getDate(timeStamp) { + const date = new Date(formatTimeStamp(timeStamp)); + return `${date.getFullYear()}.${padZero(date.getMonth() + 1)}.${padZero( + date.getDate() + )}`; } function formatDiscount(discount) { @@ -36,7 +44,7 @@ export default createComponent({ computed: { validPeriod() { const { startAt, endAt, customValidPeriod } = this.coupon; - return customValidPeriod ? customValidPeriod : `${getDate(startAt)} - ${getDate(endAt)}`; + return customValidPeriod || `${getDate(startAt)} - ${getDate(endAt)}`; }, faceAmount() {