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

@@ -277,14 +277,14 @@
             <li class="activity-item">
             <li class="activity-item">
                 <span class="activity-name">活动</span>
                 <span class="activity-name">活动</span>
                 <h3 class="activity-content">
                 <h3 class="activity-content">
-                    \{\{#equalone fit_outlet_promotion \}\}购outlet商品，满￥1999再享9折
-                    \{\{/equalone\}\}
-                    \{\{#equalone has_other_promotion\}\}
+                    \{\{#if fit_outlet_promotion \}\}购outlet商品，满￥1999再享9折
+                    \{\{/if\}\}
+                    \{\{#if has_other_promotion\}\}
                         <span class="mycart_i_down" title="更多" ></span>
                         <span class="mycart_i_down" title="更多" ></span>
-                    \{\{/equalone\}\}
-                    \{\{#equalone has_first_promotion\}\}
+                    \{\{/if\}\}
+                    \{\{#if has_first_promotion\}\}
                         \{\{first_promotions.promotion_title\}\}
                         \{\{first_promotions.promotion_title\}\}
-                    \{\{/equalone\}\}
+                    \{\{/if\}\}
                 </h3>
                 </h3>
             </li>
             </li>
             \{\{/if\}\}
             \{\{/if\}\}