Merge branch 'develop' into 'develop'

Develop

See merge request !47

@@ -136,15 +136,18 @@
 
 
             a {
             a {
                 float: right;
                 float: right;
+                width: 100%;
             }
             }
         }
         }
 
 
         .count {
         .count {
             color: #f00;
             color: #f00;
+            float: right;
         }
         }
 
 
         .icon-right-arrow {
         .icon-right-arrow {
             color: #8f8f8f;
             color: #8f8f8f;
+            float: right;
         }
         }
     }
     }
     .activity{
     .activity{
@@ -196,8 +199,8 @@
         }
         }
 
 
         p {
         p {
-            float: left;
-            margin-left: 50rem / $pxConvertRem;
+            float: right;
+            margin-right: 32rem / $pxConvertRem;
             font-size: 26rem / $pxConvertRem;
             font-size: 26rem / $pxConvertRem;
 
 
             span {
             span {
@@ -205,11 +208,14 @@
                 height: 40rem / $pxConvertRem;
                 height: 40rem / $pxConvertRem;
                 line-height: 40rem / $pxConvertRem;
                 line-height: 40rem / $pxConvertRem;
                 color: #d0253b;
                 color: #d0253b;
+                font-weight: bold;
             }
             }
 
 
             .tip {
             .tip {
                 color: #666;
                 color: #666;
                 font-size: 22rem / $pxConvertRem;
                 font-size: 22rem / $pxConvertRem;
+                text-align: right;
+                font-weight:normal;
             }
             }
         }
         }
 
 

@@ -13,21 +13,22 @@
     <ul class="freebie-and-advance-buy">
     <ul class="freebie-and-advance-buy">
         {{# freebie}}
         {{# freebie}}
             <li class="freebie">
             <li class="freebie">
+                <a href="/cart/index/gift">
                 <span class="iconfont">&#xe620;</span>
                 <span class="iconfont">&#xe620;</span>
                 赠品
                 赠品
-                <a href="/cart/index/gift">
-                    <span class="count">{{count}}</span>
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
+                    <span class="count">{{count}}</span>
                 </a>
                 </a>
             </li>
             </li>
         {{/ freebie}}
         {{/ freebie}}
         {{#if advanceBuy}}
         {{#if advanceBuy}}
             <li class="advance-buy">
             <li class="advance-buy">
+            <a href="/cart/index/advanceBuy">
                 <span class="iconfont">&#xe61b;</span>
                 <span class="iconfont">&#xe61b;</span>
                 加价购
                 加价购
-                <a href="">
                     <span class="count">{{advanceBuyCount}}</span>
                     <span class="count">{{advanceBuyCount}}</span>
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
+                    <span class="count">{{advanceBuyCount}}</span>
                 </a>
                 </a>
             </li>
             </li>
         {{/if}}
         {{/if}}
@@ -59,13 +60,13 @@
     {{^}}
     {{^}}
     <span class="checkbox icon-checkbox iconfont"></span>
     <span class="checkbox icon-checkbox iconfont"></span>
     {{/if}}
     {{/if}}
+    <a class="btn-balance">
+        结算
+    </a>
     <p>
     <p>
         <span id="good-total">
         <span id="good-total">
             总计:¥{{sumPrice}} ({{count}}件)
             总计:¥{{sumPrice}} ({{count}}件)
         </span>
         </span>
         <span class="tip">(不含运费)</span>
         <span class="tip">(不含运费)</span>
     </p>
     </p>
-    <a class="btn-balance">
-        结算
-    </a>
 </div>
 </div>