Merge branch 'feature/detailFix' into develop
Showing
4 changed files
with
16 additions
and
7 deletions
@@ -114,6 +114,10 @@ $basicBtnC:#eb0313; | @@ -114,6 +114,10 @@ $basicBtnC:#eb0313; | ||
114 | background-color: #000; | 114 | background-color: #000; |
115 | color: #fff; | 115 | color: #fff; |
116 | } | 116 | } |
117 | + .yohood-tag { | ||
118 | + background-color: #000; | ||
119 | + color: #fff; | ||
120 | + } | ||
117 | .limit-tag { | 121 | .limit-tag { |
118 | border: 1px solid #000; | 122 | border: 1px solid #000; |
119 | background-color: #fff; | 123 | background-color: #fff; |
@@ -131,7 +135,7 @@ $basicBtnC:#eb0313; | @@ -131,7 +135,7 @@ $basicBtnC:#eb0313; | ||
131 | // overflow: hidden; | 135 | // overflow: hidden; |
132 | } | 136 | } |
133 | .banner-top-single{ | 137 | .banner-top-single{ |
134 | - height:pxToRem(600px); | 138 | + |
135 | width: pxToRem(448px); | 139 | width: pxToRem(448px); |
136 | margin:pxToRem(30px) pxToRem(72px); | 140 | margin:pxToRem(30px) pxToRem(72px); |
137 | overflow: hidden; | 141 | overflow: hidden; |
@@ -130,9 +130,10 @@ | @@ -130,9 +130,10 @@ | ||
130 | div { | 130 | div { |
131 | text-align: center; | 131 | text-align: center; |
132 | &.cell { | 132 | &.cell { |
133 | + line-height: pxToRem(53px); | ||
133 | font-size: pxToRem(24px); | 134 | font-size: pxToRem(24px); |
134 | background-color: $tableCellC; | 135 | background-color: $tableCellC; |
135 | - padding: pxToRem(15px) pxToRem(40px); | 136 | + padding: 0 pxToRem(40px); |
136 | border: 1px solid #fff; | 137 | border: 1px solid #fff; |
137 | } | 138 | } |
138 | } | 139 | } |
@@ -143,14 +144,15 @@ | @@ -143,14 +144,15 @@ | ||
143 | #reference-swiper-container { | 144 | #reference-swiper-container { |
144 | .first-group { | 145 | .first-group { |
145 | width: pxToRem(70px); | 146 | width: pxToRem(70px); |
146 | - margin-top: pxToRem(66px); | 147 | + margin-top: pxToRem(55px); |
148 | + div{ | ||
149 | + height: pxToRem(55px); | ||
147 | .avatar { | 150 | .avatar { |
148 | - // line-height: pxToRem(40px); | ||
149 | display: inline-block; | 151 | display: inline-block; |
150 | width: pxToRem(40px); | 152 | width: pxToRem(40px); |
151 | border-radius: 50%; | 153 | border-radius: 50%; |
152 | - height: pxToRem(40px); | ||
153 | - margin: pxToRem(12px) 0; | 154 | + margin-top:pxToRem(7px); |
155 | + } | ||
154 | } | 156 | } |
155 | } | 157 | } |
156 | } | 158 | } |
@@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
13 | <p class="good-tag sale-tag">SALE</p> | 13 | <p class="good-tag sale-tag">SALE</p> |
14 | {{/ is_discount}} | 14 | {{/ is_discount}} |
15 | {{# is_yohoood}} | 15 | {{# is_yohoood}} |
16 | - <div class="good-tag yohood-tag"></div> | 16 | + <div class="good-tag yohood-tag">新品节</div> |
17 | {{/ is_yohoood}} | 17 | {{/ is_yohoood}} |
18 | {{# is_limited}} | 18 | {{# is_limited}} |
19 | <p class="good-tag limit-tag">限量商品</p> | 19 | <p class="good-tag limit-tag">限量商品</p> |
@@ -113,6 +113,7 @@ | @@ -113,6 +113,7 @@ | ||
113 | {{/ enterStore}} | 113 | {{/ enterStore}} |
114 | 114 | ||
115 | <div id="productDesc"> </div> | 115 | <div id="productDesc"> </div> |
116 | + <!-- {{> product/product-description}} --> | ||
116 | {{> product/recommend-for-you}} | 117 | {{> product/recommend-for-you}} |
117 | 118 | ||
118 | {{#cartInfo}} | 119 | {{#cartInfo}} |
@@ -72,7 +72,9 @@ | @@ -72,7 +72,9 @@ | ||
72 | {{#params}} | 72 | {{#params}} |
73 | {{#if @first}} | 73 | {{#if @first}} |
74 | {{else}} | 74 | {{else}} |
75 | + <div> | ||
75 | <img class="avatar lazy" data-original="{{param}}" alt=""> | 76 | <img class="avatar lazy" data-original="{{param}}" alt=""> |
77 | + </div> | ||
76 | {{/if}} | 78 | {{/if}} |
77 | {{/params}} | 79 | {{/params}} |
78 | </div> | 80 | </div> |
-
Please register or login to post a comment