fe / YOHOBUYWAP · Commits

Go to a project

Authored by Rock Zhang
Commit 2c45610347e6a76efc58a3e3f69fd5d1a909de84 2 parents 2a30e14c 4f143711

Merge branch 'feature/wap4.3' of git.dev.yoho.cn:web/yohobuy into feature/wap4.3 

Conflicts:
	static/dist/myohobuy/1.3.17/index-debug.js
Inline Side-by-side
Showing 5 changed files with 6 additions and 6 deletions
This diff could not be displayed because it is too large.
... ... @@ -43,8 +43,8 @@
}
.new-festival-tag {
width: 90rem / $pxConvertRem;
background-color: #000;
color: #fff;
background-color: #017df9;
color: #f7ed02;
}
.limit-tag {
width: 100rem / $pxConvertRem;
... ...
... ... @@ -166,8 +166,8 @@ $basicBtnC:#eb0313;
color: #fff;
}
.new-festival-tag {
background-color: #000;
color: #fff;
background-color: #017df9;
color: #f7ed02;
}
.yohood-tag {
background-color: #000;
... ...
... ... @@ -13,7 +13,7 @@
<p class="good-tag sale-tag">SALE</p>
{{/ is_discount}}
{{# is_yohood}}
<div class="good-tag yohood-tag">新品节</div>
<div class="good-tag yohood-tag">跑男同款</div>
{{/ is_yohood}}
{{# is_limited}}
<p class="good-tag limit-tag">限量商品</p>
... ...
... ... @@ -12,7 +12,7 @@
<p class="good-tag sale-tag">SALE</p>
{{/ is_discount}}
{{# is_yohoood}}
<p class="good-tag new-festival-tag">新品节</p>
<p class="good-tag new-festival-tag">跑男同款</p>
{{/ is_yohoood}}
{{# is_limited}}
<p class="good-tag limit-tag">限量商品</p>
... ...