Merge branch 'feature/giftcard' into release/6.1

郭成尧
Commit 526b5590ef7ffe2308926364fe0ec0e18cbb2747 2 parents d9dbf0a3 4a351564
Showing 2 changed files with 2 additions and 1 deletions
doraemon/views/partial/header.hbs
public/scss/cart/select-giftcard.page.css
--- a/doraemon/views/partial/header.hbs
View file @526b559
+++ b/doraemon/views/partial/header.hbs
View file @526b559
@@ -54,7 +54,7 @@
         <span class="invoice-btn">{{.}}</span>
     {{/invoiceNotice}}
     {{#useGiftCard}}
-        <span class="nav-rule-right">使用规则 <i class="iconfont">&#xe699;</i></a>
+        <a href="/service/qaDetail?keyword=%E7%A4%BC%E5%93%81%E5%8D%A1&sonId=286" class="nav-rule-right">使用规则 <i class="iconfont">&#xe699;</i></a>
     {{/useGiftCard}}
 </header>
 {{#if saleNav.list}}
--- a/public/scss/cart/select-giftcard.page.css
View file @526b559
+++ b/public/scss/cart/select-giftcard.page.css
View file @526b559
@@ -10,6 +10,7 @@ $title-font-color: #fff;
 .nav-rule-right {
     float: right;
     margin-right: 30px;
+    color: #fff;
 }
 .select-giftcard-page {