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

@@ -304,7 +304,7 @@
     </script>
     </script>
     <script type="text/html" id="tmpl-my-login-new">
     <script type="text/html" id="tmpl-my-login-new">
       <div class="myyoho-info-header clearfix">
       <div class="myyoho-info-header clearfix">
-        <div class="myyoho-photo" ><img src="\{\{headimg it.head_ico\}\}" alt="" data-url =""></div>
+        <div class="myyoho-photo" ><img src="\{\{headerimg it.head_ico\}\}" alt="" data-url =""></div>
         <h3 class="user-email"><a href="http://www.yohobuy.com/home?t=\{\{random\}\}">\{\{profile_name\}\}</a></h3>
         <h3 class="user-email"><a href="http://www.yohobuy.com/home?t=\{\{random\}\}">\{\{profile_name\}\}</a></h3>
         <h3 class="user-level">
         <h3 class="user-level">
             VIP:
             VIP:

@@ -294,13 +294,14 @@ handlebars.registerHelper('timestamp', function() {
  * @return {[type]}          [description]
  * @return {[type]}          [description]
  */
  */
 handlebars.registerHelper('headerimg', function(headerimg) {
 handlebars.registerHelper('headerimg', function(headerimg) {
-    
-    if(headerimg ===''){
-        return 'http://img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100';
-    }else{
+
+    if (headerimg === '') {
+        return 'http://img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif' +
+            '?imageView/2/w/100/h/100';
+    } else {
         return headerimg;
         return headerimg;
     }
     }
-    
+
 });
 });
 /**
 /**
  * 判断等级为3的helper
  * 判断等级为3的helper
@@ -1488,4 +1489,4 @@ function init() {
     actionCover(); //初次登录弹框
     actionCover(); //初次登录弹框
     actionAddKeyWords(); //增加关键字
     actionAddKeyWords(); //增加关键字
 }
 }
-init();
+init();