Authored by 赵彪

Merge branch 'develop' into 'develop'

Develop

See merge request !47
@@ -136,15 +136,18 @@ @@ -136,15 +136,18 @@
136 136
137 a { 137 a {
138 float: right; 138 float: right;
  139 + width: 100%;
139 } 140 }
140 } 141 }
141 142
142 .count { 143 .count {
143 color: #f00; 144 color: #f00;
  145 + float: right;
144 } 146 }
145 147
146 .icon-right-arrow { 148 .icon-right-arrow {
147 color: #8f8f8f; 149 color: #8f8f8f;
  150 + float: right;
148 } 151 }
149 } 152 }
150 .activity{ 153 .activity{
@@ -196,8 +199,8 @@ @@ -196,8 +199,8 @@
196 } 199 }
197 200
198 p { 201 p {
199 - float: left;  
200 - margin-left: 50rem / $pxConvertRem; 202 + float: right;
  203 + margin-right: 32rem / $pxConvertRem;
201 font-size: 26rem / $pxConvertRem; 204 font-size: 26rem / $pxConvertRem;
202 205
203 span { 206 span {
@@ -205,11 +208,14 @@ @@ -205,11 +208,14 @@
205 height: 40rem / $pxConvertRem; 208 height: 40rem / $pxConvertRem;
206 line-height: 40rem / $pxConvertRem; 209 line-height: 40rem / $pxConvertRem;
207 color: #d0253b; 210 color: #d0253b;
  211 + font-weight: bold;
208 } 212 }
209 213
210 .tip { 214 .tip {
211 color: #666; 215 color: #666;
212 font-size: 22rem / $pxConvertRem; 216 font-size: 22rem / $pxConvertRem;
  217 + text-align: right;
  218 + font-weight:normal;
213 } 219 }
214 } 220 }
215 221
@@ -13,21 +13,22 @@ @@ -13,21 +13,22 @@
13 <ul class="freebie-and-advance-buy"> 13 <ul class="freebie-and-advance-buy">
14 {{# freebie}} 14 {{# freebie}}
15 <li class="freebie"> 15 <li class="freebie">
  16 + <a href="/cart/index/gift">
16 <span class="iconfont">&#xe620;</span> 17 <span class="iconfont">&#xe620;</span>
17 赠品 18 赠品
18 - <a href="/cart/index/gift">  
19 - <span class="count">{{count}}</span>  
20 <span class="iconfont icon-right-arrow">&#xe614;</span> 19 <span class="iconfont icon-right-arrow">&#xe614;</span>
  20 + <span class="count">{{count}}</span>
21 </a> 21 </a>
22 </li> 22 </li>
23 {{/ freebie}} 23 {{/ freebie}}
24 {{#if advanceBuy}} 24 {{#if advanceBuy}}
25 <li class="advance-buy"> 25 <li class="advance-buy">
  26 + <a href="/cart/index/advanceBuy">
26 <span class="iconfont">&#xe61b;</span> 27 <span class="iconfont">&#xe61b;</span>
27 加价购 28 加价购
28 - <a href="">  
29 <span class="count">{{advanceBuyCount}}</span> 29 <span class="count">{{advanceBuyCount}}</span>
30 <span class="iconfont icon-right-arrow">&#xe614;</span> 30 <span class="iconfont icon-right-arrow">&#xe614;</span>
  31 + <span class="count">{{advanceBuyCount}}</span>
31 </a> 32 </a>
32 </li> 33 </li>
33 {{/if}} 34 {{/if}}
@@ -59,13 +60,13 @@ @@ -59,13 +60,13 @@
59 {{^}} 60 {{^}}
60 <span class="checkbox icon-checkbox iconfont"></span> 61 <span class="checkbox icon-checkbox iconfont"></span>
61 {{/if}} 62 {{/if}}
  63 + <a class="btn-balance">
  64 + 结算
  65 + </a>
62 <p> 66 <p>
63 <span id="good-total"> 67 <span id="good-total">
64 总计:¥{{sumPrice}} ({{count}}件) 68 总计:¥{{sumPrice}} ({{count}}件)
65 </span> 69 </span>
66 <span class="tip">(不含运费)</span> 70 <span class="tip">(不含运费)</span>
67 </p> 71 </p>
68 - <a class="btn-balance">  
69 - 结算  
70 - </a>  
71 </div> 72 </div>