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

@@ -106,15 +106,13 @@
                 <span class="iconfont num">&#xe604;</span>
             </a>
         </div>
-        {{!
         <div class="group-list">
-            <a class="list-item" href="/help.html">
+            <a class="list-item" href="/home/help">
                 <span class="iconfont icon">&#xe639;</span>
                 帮助
                 <span class="iconfont num">&#xe604;</span>
             </a>
         </div>
-        }}
 
         {{> product/recommend-for-you}}
         {{> product/suspend-cart}}

@@ -849,32 +849,31 @@ class HomeController extends AbstractAction
         ));
     }
 
-   /**
-    * 帮助中心列表页
-    */
+    /**
+     * 帮助中心列表页
+     */
     public function helpAction()
-    {   
+    {
         $service = Home\HelpModel::serviceInfo();
         $this->setTitle('帮助中心');
         $this->setNavHeader('帮助中心');
         $data = array(
-            'iHelp' =>$service,
+            'iHelp' => $service,
         );
-        $this->_view->display('i-help', $data);
+        $this->_view->display('help', $data);
     }
 
-
     /**
      * 帮助中心列表详细信息
      */
-    public function helpDetailAction() 
+    public function helpDetailAction()
     {
         $caption = $this->get('caption', '帮助中心');
         $code = $this->get('code', 0);
         if (empty($code)) {
             $this->error();
         }
-        
+
         $this->setTitle($caption);
         $this->setNavHeader($caption);
 
@@ -883,27 +882,24 @@ class HomeController extends AbstractAction
         ));
     }
 
-  
-     /**
+    /**
      * YOHO币详情 新版
      */
     public function currencyDetailAction()
     {
+        // 审判跳转登录页
+        $this->auditJumpLogin();
+
         $this->setTitle('YOHO币');
         $this->setNavHeader('YOHO币', true, false);
 
-        $data['money'] = '0';
-        $page = $this->post('page',1);
-        $size = $this->post('size', 20);
-        // $data = UserModel::getYohoCoinLists($this->_uid,$page,$size);
-        $data = UserModel::getYohoCoinLists(3965746,$page,$size);
+        $data = UserModel::getYohoCoinLists($this->_uid, 0, 20);
         $this->_view->display('currency-detail', array(
             'money' => $data['money'],
             'pageFooter' => true,
             'currencyDetail' => true,
             'currencyDetailPage' => true
         ));
-
     }
 
     /**
@@ -911,18 +907,18 @@ class HomeController extends AbstractAction
      */
     public function ajaxCurrencyDetailAction()
     {
-        $data['list'] = array();
-        $data['money'] = 0;
-        $page = $this->post('page',1);
-        $size = $this->post('size', 20);
-        $data = UserModel::getYohoCoinLists($this->_uid,$page,$size);
-        //$data = UserModel::getYohoCoinLists(3965746,$page,$size);
-        $this->_view->display('ajax-currency-detail', array(
-            'currency' => $data['list'],
-            'pageFooter' => true,
-            'currencyDetailPage' => true
-        ));
-
+        if ($this->isAjax()) {
+            $uid = $this->getUid();
+            $page = $this->post('page', 1);
+            $data = UserModel::getYohoCoinLists($uid, $page, 20);
+            $this->_view->display('ajax-currency-detail', array(
+                'currency' => $data['list'],
+                'pageFooter' => true,
+                'currencyDetailPage' => true
+            ));
+        } else {
+            echo ' ';
+        }
     }
 
 }

@@ -379,7 +379,7 @@ class UserModel
     public static function getYohoCoinLists($uid, $page, $limit)
     {
         $result = array();
-
+        $data['money'] = '0';
         // 调用接口获取YOHO币
         $yohoCoin = UserData::yohoCoinData($uid, $page, $limit, 'post');
         // 处理YOHO币数据
@@ -396,6 +396,7 @@ class UserModel
             }
         }
         $data['list'] = $result;
+        
         return $data;
     }
 

@@ -187,7 +187,7 @@ class LoginController extends AbstractAction
         $isBind = $result['data']['is_bind'];
         if ($isBind == 'N')
         {
-            $this->go(Helpers::url('/passport/bind/index',array('openId'=>$userId,'sourceType'=>'alipay','nickName'=>$realName)));
+            $this->go(Helpers::url('/passport/bind/index',array('openId'=>$userId,'sourceType'=>'alipay','nickname'=>$realName)));
         }
 
         $refer = $this->getCookie('refer');
@@ -226,7 +226,7 @@ class LoginController extends AbstractAction
         $isBind = $result['data']['is_bind'];
         if ($isBind == 'N')
         {
-            $this->go(Helpers::url('/passport/bind/index',array('openId'=>$access['openid'],'sourceType'=>'qq','nickName'=>$partnerInfo['nickname'])));
+            $this->go(Helpers::url('/passport/bind/index',array('openId'=>$access['openid'],'sourceType'=>'qq','nickname'=>$partnerInfo['nickname'])));
         }
 
         $refer = $this->getCookie('refer');
@@ -270,7 +270,7 @@ class LoginController extends AbstractAction
         $isBind = $result['data']['is_bind'];
         if ($isBind == 'N')
         {
-            $this->go(Helpers::url('/passport/bind/index',array('openId'=>$access['uid'],'sourceType'=>'sina','nickName'=>$partnerInfo['screen_name'])));
+            $this->go(Helpers::url('/passport/bind/index',array('openId'=>$access['uid'],'sourceType'=>'sina','nickname'=>$partnerInfo['screen_name'])));
         }
         
         $refer = $this->getCookie('refer');