fe / yohobuy-node · Commits

Go to a project

Authored by 郝肖肖
Commit 1e4a1b038accaf958322aa7598ba0cdc2b08e031 2 parents a0941b8e a93286de

Merge branch 'feature/giftCart' into release/6.1

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
... ... @@ -28,7 +28,7 @@
{{#if giftCardConsumeInfoBOList}}
{{# giftCardConsumeInfoBOList}}
<div class="me-gift-tr">
<div>{{dateFormat 'YYYY-MM-DD HH:mm' createTime}}</div>
<div>{{dateFormat 'YYYY-MM-DD HH:mm:ss' createTime}}</div>
<div>{{orderCode}}</div>
{{#isEqual type 1}}
<div class="consume">消费</div>
... ...
... ... @@ -24,8 +24,8 @@
<div>{{cardCode}}</div>
<div>{{amount}}</div>
<div>{{remainAmount}}</div>
<div>{{dateFormat 'YYYY-MM-DD HH:mm' activateTime}}</div>
<div>{{dateFormat 'YYYY-MM-DD HH:mm' endTime}}</div>
<div>{{dateFormat 'YYYY-MM-DD' activateTime}}</div>
<div>{{dateFormat 'YYYY-MM-DD' endTime}}</div>
<div class="info-list">消费明细</div>
</div>
{{/giftData.data}}
... ...