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 @@ @@ -43,8 +43,8 @@
43 } 43 }
44 .new-festival-tag { 44 .new-festival-tag {
45 width: 90rem / $pxConvertRem; 45 width: 90rem / $pxConvertRem;
46 - background-color: #000;  
47 - color: #fff; 46 + background-color: #017df9;
  47 + color: #f7ed02;
48 } 48 }
49 .limit-tag { 49 .limit-tag {
50 width: 100rem / $pxConvertRem; 50 width: 100rem / $pxConvertRem;
@@ -166,8 +166,8 @@ $basicBtnC:#eb0313; @@ -166,8 +166,8 @@ $basicBtnC:#eb0313;
166 color: #fff; 166 color: #fff;
167 } 167 }
168 .new-festival-tag { 168 .new-festival-tag {
169 - background-color: #000;  
170 - color: #fff; 169 + background-color: #017df9;
  170 + color: #f7ed02;
171 } 171 }
172 .yohood-tag { 172 .yohood-tag {
173 background-color: #000; 173 background-color: #000;
@@ -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_yohood}} 15 {{# is_yohood}}
16 - <div class="good-tag yohood-tag">新品节</div> 16 + <div class="good-tag yohood-tag">跑男同款</div>
17 {{/ is_yohood}} 17 {{/ is_yohood}}
18 {{# is_limited}} 18 {{# is_limited}}
19 <p class="good-tag limit-tag">限量商品</p> 19 <p class="good-tag limit-tag">限量商品</p>
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <p class="good-tag sale-tag">SALE</p> 12 <p class="good-tag sale-tag">SALE</p>
13 {{/ is_discount}} 13 {{/ is_discount}}
14 {{# is_yohoood}} 14 {{# is_yohoood}}
15 - <p class="good-tag new-festival-tag">新品节</p> 15 + <p class="good-tag new-festival-tag">跑男同款</p>
16 {{/ is_yohoood}} 16 {{/ is_yohoood}}
17 {{# is_limited}} 17 {{# is_limited}}
18 <p class="good-tag limit-tag">限量商品</p> 18 <p class="good-tag limit-tag">限量商品</p>