Merge branch 'develop' into 'develop'
Develop 1：加价购商品添加原价 See merge request !60
Showing
4 changed files
with
14 additions
and
15 deletions
| @@ -5,15 +5,6 @@ | @@ -5,15 +5,6 @@ | ||
| 5 | margin-left: 34rem / $pxConvertRem; | 5 | margin-left: 34rem / $pxConvertRem; |
| 6 | height: 160rem / $pxConvertRem; | 6 | height: 160rem / $pxConvertRem; |
| 7 | border-bottom: 1px solid #e0e0e0; | 7 | border-bottom: 1px solid #e0e0e0; |
| 8 | - | ||
| 9 | - &:last-child { | ||
| 10 | - border-bottom: none; | ||
| 11 | - } | ||
| 12 | - } | ||
| 13 | - | ||
| 14 | - | ||
| 15 | - .advance-block .gift-advance-good:last-child { | ||
| 16 | - border-bottom: none; | ||
| 17 | } | 8 | } |
| 18 | 9 | ||
| 19 | .advance-block:last-child .gift-advance-good:last-child { | 10 | .advance-block:last-child .gift-advance-good:last-child { |
| @@ -111,6 +111,11 @@ | @@ -111,6 +111,11 @@ | ||
| 111 | .price { | 111 | .price { |
| 112 | font-size: 0.6rem; | 112 | font-size: 0.6rem; |
| 113 | color: $cartRed; | 113 | color: $cartRed; |
| 114 | + display: inline; | ||
| 115 | + .sale-price{ | ||
| 116 | + color: #b0b0b0; | ||
| 117 | + text-decoration: line-through; | ||
| 118 | + } | ||
| 114 | } | 119 | } |
| 115 | 120 | ||
| 116 | .count { | 121 | .count { |
| @@ -140,10 +140,11 @@ | @@ -140,10 +140,11 @@ | ||
| 140 | 140 | ||
| 141 | > li { | 141 | > li { |
| 142 | box-sizing: border-box; | 142 | box-sizing: border-box; |
| 143 | - height: 90rem / $pxConvertRem; | ||
| 144 | - line-height: 90rem / $pxConvertRem; | 143 | + height: 80rem / $pxConvertRem; |
| 144 | + line-height: 80rem / $pxConvertRem; | ||
| 145 | margin-bottom: 10rem / $pxConvertRem; | 145 | margin-bottom: 10rem / $pxConvertRem; |
| 146 | padding: 0 20rem / $pxConvertRem; | 146 | padding: 0 20rem / $pxConvertRem; |
| 147 | + background: #f1f1f1; | ||
| 147 | 148 | ||
| 148 | &:last-child { | 149 | &:last-child { |
| 149 | margin-bottom: 0; | 150 | margin-bottom: 0; |
| @@ -41,10 +41,12 @@ | @@ -41,10 +41,12 @@ | ||
| 41 | </p> | 41 | </p> |
| 42 | </div> | 42 | </div> |
| 43 | <p class="row"> | 43 | <p class="row"> |
| 44 | - <span class="price"> | ||
| 45 | - ¥{{price}} | ||
| 46 | - </span> | ||
| 47 | - | 44 | + <p class="price"> |
| 45 | + <span class="market-price">¥{{price}}</span> | ||
| 46 | + {{#if isAdvanceBuy}} | ||
| 47 | + <span class="sale-price">¥{{salesPrice}}</span> | ||
| 48 | + {{/if}} | ||
| 49 | + </p> | ||
| 48 | {{#if isVipPrice}} | 50 | {{#if isVipPrice}} |
| 49 | <span class="vip"> | 51 | <span class="vip"> |
| 50 | VIP | 52 | VIP |
-
Please register or login to post a comment