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

@@ -3,5 +3,12 @@
  * @author: bikai<kai.bi@yoho.cn>
  * @author: bikai<kai.bi@yoho.cn>
  * @date: 2015/11/12
  * @date: 2015/11/12
  */
  */
+var $ = require('jquery');
+var $userAvatar = $('.user-avatar');
+var myImage = new Image();
 
 
-require('../product/recommend-for-you.js');
+require('../product/recommend-for-you.js');
+myImage.src = $userAvatar.attr('src');
+myImage.onerror = function() {
+    $userAvatar.attr('src', 'http://static.dev.yohobuy.com/img/me/index/user-avatar.png');
+};

+/**
+ * 个人信息
+ * @author: bikai<kai.bi@yoho.cn>
+ * @date: 2015/11/19
+ */
+var $ = require('jquery');
+var $userAvatar = $('.user-avatar');
+var myImage = new Image();
+
+myImage.src = $userAvatar.attr('src');
+myImage.onerror = function() {
+    $userAvatar.attr('src', 'http://static.dev.yohobuy.com/img/me/index/user-avatar.png');
+};

 {{> layout/header}}
 {{> layout/header}}
     <div class="personal-details">
     <div class="personal-details">
         <ul>
         <ul>
-            <li><span>头像</span><span><i class="head-portrait"><img src="{{ head_ico }}"></i></span></li>
+            <li><span>头像</span><span><i class="head-portrait"><img class="user-avatar" src="{{ head_ico }}"></i></span></li>
             <li><span>昵称</span><span>{{ username }}</span></li>
             <li><span>昵称</span><span>{{ username }}</span></li>
             <li><span>性别</span><span>{{ gender }}</span></li>
             <li><span>性别</span><span>{{ gender }}</span></li>
             <li><span>生日</span><span>{{ birthday }}</span></li>
             <li><span>生日</span><span>{{ birthday }}</span></li>

@@ -253,4 +253,9 @@
 <script>
 <script>
     seajs.use('js/me/my-guang');
     seajs.use('js/me/my-guang');
 </script>
 </script>
+{{/if}}
+{{#if personalDetailsPage}}
+<script>
+    seajs.use('js/me/personal-details');
+</script>
 {{/if}}
 {{/if}}

@@ -132,6 +132,7 @@ class HomeController extends AbstractAction
         // $uid = $this->getUid();
         // $uid = $this->getUid();
         $uid = 967016;
         $uid = 967016;
         $data = \Index\UserModel::getUserProfileData($uid);
         $data = \Index\UserModel::getUserProfileData($uid);
+        $data['personalDetailsPage'] = true;
         $data['pageFooter'] = true;
         $data['pageFooter'] = true;
         $this->_view->display('personal-details', $data);
         $this->_view->display('personal-details', $data);
     }
     }