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

@@ -273,7 +273,7 @@
             \{\{/need_pay_gifts\}\}
         </ul>
         <ul class="activity-list">
-            \{{#equalone has_promotion\}\}
+            \{{#if has_promotion\}\}
             <li class="activity-item">
                 <span class="activity-name">活动</span>
                 <h3 class="activity-content">
@@ -286,13 +286,13 @@
                     \{\{/equalone\}\}
                 </h3>
             </li>
-            \{\{/equalone\}\}
-            \{\{#equalone fit_free_shipping \}\}
+            \{\{/if\}\}
+            \{\{#if fit_free_shipping \}\}
             <li  class="activity-item">
                 <span class="activity-name">免运费</span>
                 <h3 class="activity-content">全场满 ￥499免运费</h3>
             </li>
-            \{\{/equalone\}\}
+            \{\{/if\}\}
         </ul>
     </div>
     <div class="gobuy-notempty-footer">
@@ -317,7 +317,7 @@
                     <span class="has">\{\{vip.curYearCost\}\}</span>
                     <span class="total">\{\{vip.nextVipInfo.needCost\}\}</span>
                 </div>
-                <p class="\{\{#equalzero it.vip.curYearCostPer\}\}integrate\{\{/equalzero\}\}" style="width: \{\{vip.curYearCostPer\}\}%;"></p>
+                <p class="\{\{#unless vip.curYearCostPer\}\}integrate\{\{/unless\}\}" style="width: \{\{vip.curYearCostPer\}\}%;"></p>
             </div>
             <span class="cardcate float-left">\{\{vip.nextVipInfo.title\}\}</span>
         </div>
@@ -360,5 +360,6 @@
       </div>
     </script>
 </div>
+<input id="api-domain" type="hidden" value="{{apiDomain}}">
 {{/headerdata}}
 

@@ -8,7 +8,7 @@ var handlebars = require('yoho.handlebars');
 var json2 = require('json2');
 var vipInfoCombine = null; //用户信息编译模板
 var loginInfoCombine = null; //登录信息编译模板
-var apiDomain = 'http://test.open.yohobuy.com/'; //获取数据的地址http://api.open.yohobuy.com
+var apiDomain = $('#api-domain').val(); //获取数据的地址
 var cartTpl = ''; //购物车模板
 /**
  * 搜寻的时候过滤非法字符（+-/:等非法字符单独出现）
@@ -65,6 +65,8 @@ var bannerMap = {
 };
 var cookieMap = {};
 
+$('#api-domain').remove(); //删除信息表单
+
 function getSource(column, postition, event) {
     try {
         dataLayer.push({