fe / yohobuywap-node · Commits

Go to a project

Authored by 陈峰
Commit a097ec62614b6c702d687eade56717156ce9adf6 2 parents 8407d2f7 45a5427d

Merge branch 'release/5.4' into 'grey' 

Release/5.4-to-gray



See merge request !186
Inline Side-by-side
Showing 2 changed files with 12 additions and 7 deletions
1 {{!-- 商品列表中的 品牌上新--}} 1 {{!-- 商品列表中的 品牌上新--}}
2 <div class="good-info brand-info" data-type="hot-shop" data-brand="{{brand_id}}" data-shop="{{shop_id}}"> 2 <div class="good-info brand-info" data-type="hot-shop" data-brand="{{brand_id}}" data-shop="{{shop_id}}">
3 - <img src="{{image shop_logo 240 100}}" alt="{{shop_name}}">  
4 - <h5 class="bname">{{shop_name}}</h5>  
5 - <p class="summary">上新<span class="red">{{new_product_num}}</span>件&nbsp;&nbsp;<span class="red">{{favorite_num}}</span>人收藏</p>  
6 - <a href="//m.yohobuy.com/product/index/brand?domain={{shop_domain}}" class="entry">进入店铺</a> 3 + <div class="brand-info-box">
  4 + <img src="{{image shop_logo 240 100}}" alt="{{shop_name}}">
  5 + <h5 class="bname">{{shop_name}}</h5>
  6 + <p class="summary">上新<span class="red">{{new_product_num}}</span>件&nbsp;&nbsp;<span class="red">{{favorite_num}}</span>人收藏</p>
  7 + <a href="//m.yohobuy.com/product/index/brand?domain={{shop_domain}}" class="entry">进入店铺</a>
  8 + </div>
7 </div> 9 </div>
1 .brand-info { 1 .brand-info {
2 - padding-top: 55px; 2 + padding-top: 28px;
3 padding-bottom: 55px; 3 padding-bottom: 55px;
4 - background-color: #f5f5f5;  
5 text-align: center; 4 text-align: center;
6 - margin-top: 38px !important; 5 +
  6 + .brand-info-box {
  7 + background-color: #f5f5f5;
  8 + height: 480px;
  9 + }
7 10
8 img { 11 img {
9 width: 141px; 12 width: 141px;