fe / YOHOBUYPC · Commits

Go to a project

Authored by 毕凯
Commit 48017d04dfeb881b17154c5cad230ee02eb71129 2 parents 082d740b b6fb1b40

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

Inline Side-by-side
Showing 5 changed files with 31 additions and 36 deletions
@@ -106,15 +106,13 @@ @@ -106,15 +106,13 @@
106 <span class="iconfont num">&#xe604;</span> 106 <span class="iconfont num">&#xe604;</span>
107 </a> 107 </a>
108 </div> 108 </div>
109 - {{!  
110 <div class="group-list"> 109 <div class="group-list">
111 - <a class="list-item" href="/help.html"> 110 + <a class="list-item" href="/home/help">
112 <span class="iconfont icon">&#xe639;</span> 111 <span class="iconfont icon">&#xe639;</span>
113 帮助 112 帮助
114 <span class="iconfont num">&#xe604;</span> 113 <span class="iconfont num">&#xe604;</span>
115 </a> 114 </a>
116 </div> 115 </div>
117 - }}  
118 116
119 {{> product/recommend-for-you}} 117 {{> product/recommend-for-you}}
120 {{> product/suspend-cart}} 118 {{> product/suspend-cart}}
@@ -849,32 +849,31 @@ class HomeController extends AbstractAction @@ -849,32 +849,31 @@ class HomeController extends AbstractAction
849 )); 849 ));
850 } 850 }
851 851
852 - /**  
853 - * 帮助中心列表页  
854 - */ 852 + /**
  853 + * 帮助中心列表页
  854 + */
855 public function helpAction() 855 public function helpAction()
856 - { 856 + {
857 $service = Home\HelpModel::serviceInfo(); 857 $service = Home\HelpModel::serviceInfo();
858 $this->setTitle('帮助中心'); 858 $this->setTitle('帮助中心');
859 $this->setNavHeader('帮助中心'); 859 $this->setNavHeader('帮助中心');
860 $data = array( 860 $data = array(
861 - 'iHelp' =>$service, 861 + 'iHelp' => $service,
862 ); 862 );
863 - $this->_view->display('i-help', $data); 863 + $this->_view->display('help', $data);
864 } 864 }
865 865
866 -  
867 /** 866 /**
868 * 帮助中心列表详细信息 867 * 帮助中心列表详细信息
869 */ 868 */
870 - public function helpDetailAction() 869 + public function helpDetailAction()
871 { 870 {
872 $caption = $this->get('caption', '帮助中心'); 871 $caption = $this->get('caption', '帮助中心');
873 $code = $this->get('code', 0); 872 $code = $this->get('code', 0);
874 if (empty($code)) { 873 if (empty($code)) {
875 $this->error(); 874 $this->error();
876 } 875 }
877 - 876 +
878 $this->setTitle($caption); 877 $this->setTitle($caption);
879 $this->setNavHeader($caption); 878 $this->setNavHeader($caption);
880 879
@@ -883,27 +882,24 @@ class HomeController extends AbstractAction @@ -883,27 +882,24 @@ class HomeController extends AbstractAction
883 )); 882 ));
884 } 883 }
885 884
886 -  
887 - /** 885 + /**
888 * YOHO币详情 新版 886 * YOHO币详情 新版
889 */ 887 */
890 public function currencyDetailAction() 888 public function currencyDetailAction()
891 { 889 {
  890 + // 审判跳转登录页
  891 + $this->auditJumpLogin();
  892 +
892 $this->setTitle('YOHO币'); 893 $this->setTitle('YOHO币');
893 $this->setNavHeader('YOHO币', true, false); 894 $this->setNavHeader('YOHO币', true, false);
894 895
895 - $data['money'] = '0';  
896 - $page = $this->post('page',1);  
897 - $size = $this->post('size', 20);  
898 - // $data = UserModel::getYohoCoinLists($this->_uid,$page,$size);  
899 - $data = UserModel::getYohoCoinLists(3965746,$page,$size); 896 + $data = UserModel::getYohoCoinLists($this->_uid, 0, 20);
900 $this->_view->display('currency-detail', array( 897 $this->_view->display('currency-detail', array(
901 'money' => $data['money'], 898 'money' => $data['money'],
902 'pageFooter' => true, 899 'pageFooter' => true,
903 'currencyDetail' => true, 900 'currencyDetail' => true,
904 'currencyDetailPage' => true 901 'currencyDetailPage' => true
905 )); 902 ));
906 -  
907 } 903 }
908 904
909 /** 905 /**
@@ -911,18 +907,18 @@ class HomeController extends AbstractAction @@ -911,18 +907,18 @@ class HomeController extends AbstractAction
911 */ 907 */
912 public function ajaxCurrencyDetailAction() 908 public function ajaxCurrencyDetailAction()
913 { 909 {
914 - $data['list'] = array();  
915 - $data['money'] = 0;  
916 - $page = $this->post('page',1);  
917 - $size = $this->post('size', 20);  
918 - $data = UserModel::getYohoCoinLists($this->_uid,$page,$size);  
919 - //$data = UserModel::getYohoCoinLists(3965746,$page,$size);  
920 - $this->_view->display('ajax-currency-detail', array(  
921 - 'currency' => $data['list'],  
922 - 'pageFooter' => true,  
923 - 'currencyDetailPage' => true  
924 - ));  
925 - 910 + if ($this->isAjax()) {
  911 + $uid = $this->getUid();
  912 + $page = $this->post('page', 1);
  913 + $data = UserModel::getYohoCoinLists($uid, $page, 20);
  914 + $this->_view->display('ajax-currency-detail', array(
  915 + 'currency' => $data['list'],
  916 + 'pageFooter' => true,
  917 + 'currencyDetailPage' => true
  918 + ));
  919 + } else {
  920 + echo ' ';
  921 + }
926 } 922 }
927 923
928 } 924 }
@@ -379,7 +379,7 @@ class UserModel @@ -379,7 +379,7 @@ class UserModel
379 public static function getYohoCoinLists($uid, $page, $limit) 379 public static function getYohoCoinLists($uid, $page, $limit)
380 { 380 {
381 $result = array(); 381 $result = array();
382 - 382 + $data['money'] = '0';
383 // 调用接口获取YOHO币 383 // 调用接口获取YOHO币
384 $yohoCoin = UserData::yohoCoinData($uid, $page, $limit, 'post'); 384 $yohoCoin = UserData::yohoCoinData($uid, $page, $limit, 'post');
385 // 处理YOHO币数据 385 // 处理YOHO币数据
@@ -396,6 +396,7 @@ class UserModel @@ -396,6 +396,7 @@ class UserModel
396 } 396 }
397 } 397 }
398 $data['list'] = $result; 398 $data['list'] = $result;
  399 +
399 return $data; 400 return $data;
400 } 401 }
401 402
@@ -187,7 +187,7 @@ class LoginController extends AbstractAction @@ -187,7 +187,7 @@ class LoginController extends AbstractAction
187 $isBind = $result['data']['is_bind']; 187 $isBind = $result['data']['is_bind'];
188 if ($isBind == 'N') 188 if ($isBind == 'N')
189 { 189 {
190 - $this->go(Helpers::url('/passport/bind/index',array('openId'=>$userId,'sourceType'=>'alipay','nickName'=>$realName))); 190 + $this->go(Helpers::url('/passport/bind/index',array('openId'=>$userId,'sourceType'=>'alipay','nickname'=>$realName)));
191 } 191 }
192 192
193 $refer = $this->getCookie('refer'); 193 $refer = $this->getCookie('refer');
@@ -226,7 +226,7 @@ class LoginController extends AbstractAction @@ -226,7 +226,7 @@ class LoginController extends AbstractAction
226 $isBind = $result['data']['is_bind']; 226 $isBind = $result['data']['is_bind'];
227 if ($isBind == 'N') 227 if ($isBind == 'N')
228 { 228 {
229 - $this->go(Helpers::url('/passport/bind/index',array('openId'=>$access['openid'],'sourceType'=>'qq','nickName'=>$partnerInfo['nickname']))); 229 + $this->go(Helpers::url('/passport/bind/index',array('openId'=>$access['openid'],'sourceType'=>'qq','nickname'=>$partnerInfo['nickname'])));
230 } 230 }
231 231
232 $refer = $this->getCookie('refer'); 232 $refer = $this->getCookie('refer');
@@ -270,7 +270,7 @@ class LoginController extends AbstractAction @@ -270,7 +270,7 @@ class LoginController extends AbstractAction
270 $isBind = $result['data']['is_bind']; 270 $isBind = $result['data']['is_bind'];
271 if ($isBind == 'N') 271 if ($isBind == 'N')
272 { 272 {
273 - $this->go(Helpers::url('/passport/bind/index',array('openId'=>$access['uid'],'sourceType'=>'sina','nickName'=>$partnerInfo['screen_name']))); 273 + $this->go(Helpers::url('/passport/bind/index',array('openId'=>$access['uid'],'sourceType'=>'sina','nickname'=>$partnerInfo['screen_name'])));
274 } 274 }
275 275
276 $refer = $this->getCookie('refer'); 276 $refer = $this->getCookie('refer');