fe / yohoblk-wap · Commits

Go to a project

Authored by 郭成尧
Commit 190fa70ef7be6c469b670f9198377565df105fc8 2 parents f6234f70 254f0c35

Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

Inline Side-by-side
Showing 5 changed files with 15 additions and 2 deletions
... ... @@ -113,6 +113,10 @@ body {
background: rgba(0, 0, 0, 0.2);
color: $white;
text-align: center;
&.price-gift {
background: #eb76aa;
}
}
img {
... ...
... ... @@ -78,6 +78,10 @@ $white: #fff;
background: rgba(0, 0, 0, 0.2);
color: $white;
text-align: center;
&.price-gift {
background: #eb76aa;
}
}
img {
... ...
... ... @@ -16,7 +16,8 @@
<li class="goods-info" v-for="product in order.orderGoods">
<div class="img-box">
<img v-bind:src="product.goodsImage | resize 49 65">
<!--<label>赠品</label>-->
<label v-if="product.goodsType === 'gift'">赠品</label>
<label class="price-gift" v-if="product.goodsType === 'price_gift'">加价购</label>
</div>
<div class="goods-detail">
<p class="name">{{product.productName}}</p>
... ...
... ... @@ -9,7 +9,9 @@
<div class="order-goods" >
<div class="goods-info" v-for="goods in order.orderGoods">
<div class="img-box">
<img v-bind:src="goods.goodsImage | resize 49 65" alt="{{goods.productName}}">
<img v-bind:src="goods.goodsImage | resize 49 65">
<label v-if="goods.goodsType === 'gift'">赠品</label>
<label class="price-gift" v-if="goods.goodsType === 'price_gift'">加价购</label>
</div>
<div class="goods-detail">
<p class="name">{{goods.productName}}</p>
... ...
... ... @@ -13,6 +13,8 @@
<div class="goods-info" v-for="product in order.goods">
<div class="img-box">
<img v-bind:src="product.goodsImage | resize 49 65">
<label v-if="product.goodsType === 'gift'">赠品</label>
<label class="price-gift" v-if="product.goodsType === 'price_gift'">加价购</label>
</div>
<div class="goods-detail">
<p class="name">{{product.productName}}</p>
... ...