增加赠品页面

@@ -43,7 +43,7 @@
         background: #a1ce4e;
         background: #a1ce4e;
 
 
         &:before {
         &:before {
-            content: '赠品';
+            content: '加价购';
             display: block;
             display: block;
             font-size: 12px;
             font-size: 12px;
             line-height: 25rem / $pxConvertRem;
             line-height: 25rem / $pxConvertRem;
@@ -56,6 +56,7 @@
     }
     }
 
 
     .name {
     .name {
+        margin-bottom: 20rem / $pxConvertRem;
         width: 440rem / $pxConvertRem;
         width: 440rem / $pxConvertRem;
         font-size: 28rem / $pxConvertRem;
         font-size: 28rem / $pxConvertRem;
     }
     }
@@ -114,7 +115,7 @@
         background: #f8f8f8;
         background: #f8f8f8;
     }
     }
 
 
-    .advance-block .tag {
+    .gift-block .tag {
         background: #eb76aa;
         background: #eb76aa;
         &:before {
         &:before {
             content: '加价购';
             content: '加价购';

@@ -11,7 +11,12 @@
         {{/ advanceBuy}}
         {{/ advanceBuy}}
     {{else}}
     {{else}}
         {{# freebie}}
         {{# freebie}}
-            {{> cart/gift-advance-good}}
+            <div class="advance-block gift-block" data-promotion-id="{{promotionId}}">
+                <p class="title">{{title}}</p>
+                {{#goods}}
+                    {{> cart/gift-advance-good}}
+                {{/goods}}
+            </div>
         {{/ freebie}}
         {{/ freebie}}
     {{/if}}
     {{/if}}
 
 

@@ -7,11 +7,13 @@
         <p class="name row">{{name}}</p>
         <p class="name row">{{name}}</p>
         <p class="row">
         <p class="row">
             <span class="price">
             <span class="price">
-                ¥{{price}}
+                ¥{{#if price}}{{price}}{{else}}{{marketPrice}}{{/if}}
             </span>
             </span>
+            {{#if price}}
             <span class="price market-price">
             <span class="price market-price">
                 ¥{{marketPrice}}
                 ¥{{marketPrice}}
             </span>
             </span>
+            {{/if}}
             <span class="count">
             <span class="count">
                 ×{{count}}
                 ×{{count}}
             </span>
             </span>