fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by hf
Commit d34d68d24038699441620070d825cfa08b814944 2 parents e4eaaee5 2e8b8de1

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

Inline Side-by-side
Showing 2 changed files with 12 additions and 5 deletions
... ... @@ -277,13 +277,14 @@
<li class="activity-item">
<span class="activity-name">活动</span>
<h3 class="activity-content">
\{\{fit_outlet_promotion \}\}购outlet商品，满￥1999再享9折\}\}
\{\{#equalone has_other_promotion\}\}
\{\{#if fit_outlet_promotion \}\}购outlet商品，满￥1999再享9折
\{\{/if\}\}
\{\{#if has_other_promotion\}\}
<span class="mycart_i_down" title="更多" ></span>
\{\{/equalone\}\}
\{\{#equalone has_first_promotion\}\}
\{\{/if\}\}
\{\{#if has_first_promotion\}\}
\{\{first_promotions.promotion_title\}\}
\{\{/equalone\}\}
\{\{/if\}\}
</h3>
</li>
\{\{/if\}\}
... ...
... ... @@ -859,6 +859,11 @@
line-height: 14px;
font-size: 14px;
margin-bottom: 13px;
a {
color: #666;
outline: none;
text-decoration: none;
}
}
.goods-detail .style {
height: 14px;
... ... @@ -906,6 +911,7 @@
line-height: 14px;
height: 14px;
color: #3a3a3a;
font-size: 12px;
}
.gobuy-notempty-footer {
... ...