Authored by 毕凯

显示加价购标签

@@ -161,11 +161,18 @@ @@ -161,11 +161,18 @@
161 color: #fff; 161 color: #fff;
162 text-align: center; 162 text-align: center;
163 font-size: 12px; 163 font-size: 12px;
  164 +
  165 + &:before {
  166 + display: block;
  167 + line-height: 1;
  168 + @include transform(scale(0.833));
  169 + }
164 } 170 }
165 171
166 .gift-tag { 172 .gift-tag {
167 height: 25rem / $pxConvertRem; 173 height: 25rem / $pxConvertRem;
168 background: #a1ce4e; 174 background: #a1ce4e;
  175 +
169 &:before { 176 &:before {
170 content: '赠品'; 177 content: '赠品';
171 } 178 }
@@ -174,6 +181,7 @@ @@ -174,6 +181,7 @@
174 .advance-buy-tag { 181 .advance-buy-tag {
175 height: 25rem / $pxConvertRem; 182 height: 25rem / $pxConvertRem;
176 background: #eb76aa; 183 background: #eb76aa;
  184 +
177 &:before { 185 &:before {
178 content: '加价购'; 186 content: '加价购';
179 } 187 }
@@ -228,4 +236,4 @@ @@ -228,4 +236,4 @@
228 .appear-date { 236 .appear-date {
229 color: #f00; 237 color: #f00;
230 } 238 }
231 -}  
  239 +}
@@ -426,9 +426,9 @@ class CartModel @@ -426,9 +426,9 @@ class CartModel
426 426
427 //gift=>是否赠品,advanceBuy=>是否加价购; 427 //gift=>是否赠品,advanceBuy=>是否加价购;
428 if ($single['goods_type'] == 'gift' && !isset($single['isAdvanceBuy'])) { 428 if ($single['goods_type'] == 'gift' && !isset($single['isAdvanceBuy'])) {
429 - $oneGoods['isGift'] = true; 429 + $oneGoods['gift'] = true;
430 } elseif ($single['goods_type'] == 'price_gift') { 430 } elseif ($single['goods_type'] == 'price_gift') {
431 - $oneGoods['isAdvanceBuy'] = true; 431 + $oneGoods['advanceBuy'] = true;
432 } 432 }
433 433
434 $result['goods'][] = $oneGoods; 434 $result['goods'][] = $oneGoods;