Merge branch 'feature/giftCart' into release/6.1

@@ -252,8 +252,8 @@
                     </dd>
                 {{/if}}
 
-                <dt id="use-gift-card"><span class="locker-switch"></span>使用礼品卡<span class="can-use-tip"></span></dt>
-                <dd class="gift-card-box">
+                <dt id="use-gift-card" class="hide"><span class="locker-switch"></span>使用礼品卡<span class="can-use-tip"></span></dt>
+                <dd class="gift-card-box hide">
                     <table>
                         <thead>
                             <tr>

@@ -101,8 +101,8 @@
 
             </dl>
 
-            <dt id="use-gift-card"><span class="locker-switch"></span>使用礼品卡<span class="can-use-tip"></span></dt>
-            <dd class="gift-card-box">
+            <dt id="use-gift-card"  class="hide"><span class="locker-switch"></span>使用礼品卡<span class="can-use-tip"></span></dt>
+            <dd class="gift-card-box hide">
                 <table>
                     <thead>
                         <tr>

@@ -6,8 +6,8 @@
                 <td class="text-right validity-time">有效期：{{dateStr}}{{#if willExpire}}（{{willExpire}}）{{/if}}</td>
             </tr>
             <tr>
-                <td class="text-left">面值：{{amount}} </td>
-                <td colspan="2">余额：{{remainAmount}}</td>
+                <td class="text-left">面值：{{round amount 2}} </td>
+                <td colspan="2">余额：{{round remainAmount 2}}</td>
             </tr>
     </table>
     <div class="me-gift-info-table">
@@ -32,15 +32,15 @@
                     <div>{{orderCode}}</div>
                     {{#isEqual type 1}}
                         <div class="consume">消费</div>
-                        <div class="consume">-{{../changeAmount}}</div>
+                        <div class="consume">-{{round ../changeAmount 2}}</div>
                     {{/isEqual}}
                     {{#isEqual type 2}}
                         <div class="refund">退款</div>
-                        <div class="refund">+{{../changeAmount}}</div>
+                        <div class="refund">+{{round ../changeAmount 2}}</div>
                     {{/isEqual}}
                     {{#isEqual type 3}}
                         <div class="refund">退款</div>
-                        <div class="refund">+{{../changeAmount}}</div>
+                        <div class="refund">+{{round ../changeAmount 2}}</div>
                     {{/isEqual}}
                 </div>
             {{/giftCardConsumeInfoBOList}}

@@ -709,6 +709,7 @@ giftCard = {
         }).then(function(data) {
             if (data.code === 200) {
                 if (data.data && data.data.usable_giftCards && data.data.usable_giftCards.length) {
+                    that.$el.removeClass('hide').next().removeClass('hide');
                     $('.can-use-tip', that.$el).text('（' + data.data.usable_giftCards.length + '张可用）');
                 }
 

@@ -164,6 +164,7 @@ giftCard = {
         }).then(function(data) {
             if (data.code === 200) {
                 if (data.data && data.data.usable_giftCards && data.data.usable_giftCards.length) {
+                    that.$el.removeClass('hide').next().removeClass('hide');
                     $('.can-use-tip', that.$el).text('（' + data.data.usable_giftCards.length + '张可用）');
                 }