api-change-nav-tip

@@ -344,7 +344,9 @@ exports.selectGiftcard = (req, res, next) => {
             module: 'cart',
             module: 'cart',
             page: 'select-giftcard',
             page: 'select-giftcard',
             title: '礼品卡',
             title: '礼品卡',
-            pageHeader: headerData,
+            pageHeader: _.assign(headerData, {
+                useGiftCard: true
+            }),
             pageFooter: false,
             pageFooter: false,
             localCss: true,
             localCss: true,
             width750: true,
             width750: true,

 <div class="yoho-page select-giftcard-page">
 <div class="yoho-page select-giftcard-page">
     {{# usable_giftCards}}
     {{# usable_giftCards}}
-    <div class="giftcard" data-code={{code}}>
+    <div class="giftcard" data-code={{cardCode}}>
         <div class="card-title clearfix">
         <div class="card-title clearfix">
             <div class="balance pull-left">
             <div class="balance pull-left">
                 <label>余额</label>
                 <label>余额</label>
-                <i> ￥</i><span>{{balance}}</span>
+                <i> ￥</i><span>{{remainAmount}}</span>
             </div>
             </div>
             <div class="logo pull-right">
             <div class="logo pull-right">
                 <i class="iconfont">&#xe60e;</i>
                 <i class="iconfont">&#xe60e;</i>
@@ -15,15 +15,15 @@
             <div class="content pull-left">
             <div class="content pull-left">
                 <div class="content-li clearfix">
                 <div class="content-li clearfix">
                     <div class="left-label pull-left">面值</div>
                     <div class="left-label pull-left">面值</div>
-                    <div class="pull-left">¥{{value}}</div>
+                    <div class="pull-left">¥{{amount}}</div>
                 </div>
                 </div>
                 <div class="content-li clearfix">
                 <div class="content-li clearfix">
                     <div class="left-label pull-left">卡号</div>
                     <div class="left-label pull-left">卡号</div>
-                    <div class="pull-left">12345678909765</div>
+                    <div class="pull-left">{{cardCode}}</div>
                 </div>
                 </div>
                 <div class="content-li clearfix">
                 <div class="content-li clearfix">
                     <div class="left-label pull-left">有效期</div>
                     <div class="left-label pull-left">有效期</div>
-                    <div class="pull-left">{{validity}} <span class="tip">(即将过期)</span></div>
+                    <div class="pull-left">{{validity}}{{#if willExpireDesc}} <span class="tip">(即将过期)</span>{{/if}}</div>
                 </div>
                 </div>
             </div>
             </div>
             <div class="checkbox pull-right">
             <div class="checkbox pull-right">

@@ -47,14 +47,15 @@
     {{#myReward}}
     {{#myReward}}
     <a href="/activity/my-reward" class="nav-home my-reward">我的奖励</a>
     <a href="/activity/my-reward" class="nav-home my-reward">我的奖励</a>
     {{/myReward}}
     {{/myReward}}
-
     {{#save}}
     {{#save}}
     <span class="nav-home save">保存</span>
     <span class="nav-home save">保存</span>
     {{/save}}
     {{/save}}
-
     {{#invoiceNotice}}
     {{#invoiceNotice}}
         <span class="invoice-btn">{{.}}</span>
         <span class="invoice-btn">{{.}}</span>
     {{/invoiceNotice}}
     {{/invoiceNotice}}
+    {{#useGiftCard}}
+        <span class="nav-rule-right">使用规则 <i class="iconfont">&#xe699;</i></a>
+    {{/useGiftCard}}
 </header>
 </header>
 {{#if saleNav.list}}
 {{#if saleNav.list}}
 <div class="sale-nav-select">
 <div class="sale-nav-select">

@@ -7,6 +7,11 @@
 $title-bg-color: #d0021b;
 $title-bg-color: #d0021b;
 $title-font-color: #fff;
 $title-font-color: #fff;
 
 
+.nav-rule-right {
+    float: right;
+    margin-right: 30px;
+}
+
 .select-giftcard-page {
 .select-giftcard-page {
     @extend padding-30;
     @extend padding-30;