fe / YOHOBUYWAP · Commits

Go to a project

Authored by xiaowei
Commit 55f8faa26e9cc8b40dde0556410b573c8f5825e7 1 parent 77b61eec

PC重构登录-跳转问题修复

Inline Side-by-side
Showing 4 changed files with 45 additions and 52 deletions
@@ -46,7 +46,7 @@ class LoginData extends \LibModels\Wap\Passport\LoginData @@ -46,7 +46,7 @@ class LoginData extends \LibModels\Wap\Passport\LoginData
46 46
47 $param['client_secret'] = Sign::getSign($param); 47 $param['client_secret'] = Sign::getSign($param);
48 48
49 - return Yohobuy::get(Yohobuy::API_URL2, $param); 49 + return Yohobuy::get(Yohobuy::API_URL, $param);
50 } 50 }
51 51
52 } 52 }
@@ -38,20 +38,14 @@ class BrandsController extends WebAction @@ -38,20 +38,14 @@ class BrandsController extends WebAction
38 */ 38 */
39 public function brandinfoAction() 39 public function brandinfoAction()
40 { 40 {
41 - $result = array();  
42 -  
43 do { 41 do {
44 /* 判断是不是AJAX请求 */ 42 /* 判断是不是AJAX请求 */
45 if (!$this->isAjax()) { 43 if (!$this->isAjax()) {
46 break; 44 break;
47 } 45 }
48 - $brandId = $this->get('brandId',0);  
49 - $uid=$this->getUid(false);  
50 - $brandId=144;  
51 - BrandsModel::getBrandInfo($brandId, $uid);  
52 -  
53 -  
54 - 46 + $brandId = $this->get('brandId', 0);
  47 + $uid = $this->getUid(false);
  48 + $data = BrandsModel::getBrandInfo($brandId, $uid);
55 $result = array( 49 $result = array(
56 'code' => 200, 50 'code' => 200,
57 'brand' => $data 51 'brand' => $data
@@ -62,9 +56,10 @@ class BrandsController extends WebAction @@ -62,9 +56,10 @@ class BrandsController extends WebAction
62 $this->echoJson($result); 56 $this->echoJson($result);
63 } 57 }
64 58
65 - /**  
66 - * 品牌一览 59 + /*
  60 + * 品牌list
67 */ 61 */
  62 +
68 public function indexAction() 63 public function indexAction()
69 { 64 {
70 $headerdata = array( 65 $headerdata = array(
@@ -7,6 +7,7 @@ use Plugin\HelperSearch; @@ -7,6 +7,7 @@ use Plugin\HelperSearch;
7 use LibModels\Web\Product\BrandData; 7 use LibModels\Web\Product\BrandData;
8 use Index\HomeModel; 8 use Index\HomeModel;
9 use Product\SearchModel; 9 use Product\SearchModel;
  10 +use Plugin\Helpers;
10 11
11 /** 12 /**
12 * 品牌首页模板数据模型 13 * 品牌首页模板数据模型
@@ -108,32 +109,41 @@ class BrandsModel @@ -108,32 +109,41 @@ class BrandsModel
108 { 109 {
109 $switchParams = self::switchBrandParams($channel); 110 $switchParams = self::switchBrandParams($channel);
110 $brandTop = array(); 111 $brandTop = array();
111 - /*  
112 - * $item1 = array(  
113 - 'name' => '所有品牌',  
114 - 'src' => $imgsrc,  
115 - 'url' => ''  
116 - );  
117 - */  
118 $brandAds = array(); 112 $brandAds = array();
119 $brandList = array(); 113 $brandList = array();
120 $res = BrandData::getTopBanner($switchParams['brandCode'], $switchParams['channelType']); 114 $res = BrandData::getTopBanner($switchParams['brandCode'], $switchParams['channelType']);
  115 + //头部10个品牌图块
  116 + if (isset($res['brandTop'][1]['data']['list']) && $res['brandTop'][1]['data']['list']) {
  117 + foreach ($res['brandTop'][1]['data']['list'] as $tbk => $tbv) {
  118 + $imgUrlTmp = explode("?", $tbv['src']);
  119 + $urlTmp = explode("?", $tbv['url']);
  120 + $topBrandTmp = array(
  121 + 'name' => $tbv['name'],
  122 + 'src' => Helpers::getImageUrl($imgUrlTmp[0], 80, 50, 3),
  123 + 'url' => str_replace('m.', '', $urlTmp[0]),
  124 + );
  125 + $brandAds[$tbk] = $topBrandTmp;
  126 + }
  127 + }
  128 + //头部品牌图块
121 if (isset($res['brandTop'][0]['data']) && $res['brandTop'][0]['data']) { 129 if (isset($res['brandTop'][0]['data']) && $res['brandTop'][0]['data']) {
122 foreach ($res['brandTop'][0]['data'] as $tk => $tv) { 130 foreach ($res['brandTop'][0]['data'] as $tk => $tv) {
123 - $imgUrl = explode("?", $tv['src']); 131 + $imgUrlTmp = explode("?", $tv['src']);
  132 + $urlTmp = explode("?", $tv['url']);
124 $topTmp = array( 133 $topTmp = array(
125 'name' => $tv['title'], 134 'name' => $tv['title'],
126 - 'src' => $imgUrl[0],  
127 - 'url' => $tv['url'],  
128 - 'items' => array() 135 + 'src' => $imgUrlTmp[0],
  136 + 'url' => $urlTmp[0],
  137 + 'items' => $brandAds
129 ); 138 );
130 $brandTop[$tk] = $topTmp; 139 $brandTop[$tk] = $topTmp;
131 } 140 }
132 } 141 }
  142 + //品牌list
133 if (isset($res['brandList']['brands']) && $res['brandList']['brands']) { 143 if (isset($res['brandList']['brands']) && $res['brandList']['brands']) {
134 foreach ($res['brandList']['brands'] as $lk => $lv) { 144 foreach ($res['brandList']['brands'] as $lk => $lv) {
135 - if (isset($lv) && $lv) {  
136 $listTmp = array(); 145 $listTmp = array();
  146 + if (isset($lv) && $lv) {
137 foreach ($lv as $ltk => $ltv) { 147 foreach ($lv as $ltk => $ltv) {
138 $listTmp[$ltk] = array( 148 $listTmp[$ltk] = array(
139 'name' => $ltv['brand_name'], 149 'name' => $ltv['brand_name'],
@@ -158,33 +168,20 @@ class BrandsModel @@ -158,33 +168,20 @@ class BrandsModel
158 */ 168 */
159 public static function getBrandInfo($brandId, $uid) 169 public static function getBrandInfo($brandId, $uid)
160 { 170 {
161 - $imgsrc = 'http://img11.static.yhbimg.com/goodsimg/2015/10/19/10/01b312c3b7a7efebcd671e73495ff3e306.jpg'; 171 + $data = array();
  172 + $res = BrandData::getBrandIntro($brandId, $uid);
  173 + if (isset($res['data']) && $res['data']) {
  174 + $icoUrlTmp = explode("?", $res['data']['brand_ico']) ;
162 $data = array( 175 $data = array(
163 - 'key' => '1000011',  
164 - 'icon' => $imgsrc,  
165 - 'title' => '优显led触控台灯',  
166 - 'content' => '优显led触控台灯优显led触控台灯优显led触控台灯优显led触控台灯',  
167 - 'subtitle' => 'AAAAAA',  
168 - 'imgs' => array(  
169 - array(  
170 - 'src' => $imgsrc  
171 - ),  
172 - array(  
173 - 'src' => $imgsrc  
174 - ),  
175 - array(  
176 - 'src' => $imgsrc  
177 - )  
178 - ) 176 + 'key' => $res['data']['brand_id'],
  177 + 'icon' => $icoUrlTmp[0],
  178 + 'title' => $res['data']['brand_name'],
  179 + 'content' =>$res['data']['brand_intro'],
  180 + 'subtitle' => 'FEATURED ITEMS',
  181 + 'imgs' => array(),
179 ); 182 );
180 - $res = BrandData::getBrandIntro($brandId, $uid);  
181 -//if(isset($res['data']) && $res['data']){  
182 -// $data['key']=$brandId;  
183 -// $data['icon']=  
184 -//}  
185 - var_dump($res);  
186 - die();  
187 - 183 + }
  184 + return $data;
188 } 185 }
189 186
190 /* 187 /*
@@ -112,6 +112,7 @@ class LoginController extends WebAction @@ -112,6 +112,7 @@ class LoginController extends WebAction
112 /* 设置登录有效时间30分钟, 防机器刷 */ 112 /* 设置登录有效时间30分钟, 防机器刷 */
113 $expire = $this->getSession('_LOGIN_EXPIRE'); 113 $expire = $this->getSession('_LOGIN_EXPIRE');
114 if (empty($expire) || $expire < time()) { 114 if (empty($expire) || $expire < time()) {
  115 + $data = array('code' => 400, 'message' => '页面停留时间过长，请刷新页面', 'data' => '');
115 break; 116 break;
116 } 117 }
117 118
@@ -135,13 +136,13 @@ class LoginController extends WebAction @@ -135,13 +136,13 @@ class LoginController extends WebAction
135 } 136 }
136 137
137 $refer = $this->getCookie('refer'); 138 $refer = $this->getCookie('refer');
138 - if (empty($refer)) {  
139 - $refer = SITE_MAIN . '/?go=1'; 139 + if (empty($refer) || strstr($refer, 'signin.html') || strstr($refer, 'passport/login/index')) {
  140 + $refer = SITE_MAIN;
140 } 141 }
141 else { 142 else {
142 $refer = rawurldecode($refer); 143 $refer = rawurldecode($refer);
143 } 144 }
144 - $data['data']['session'] = Helpers::syncUserSession($data['data']['uid']); 145 + $data['data']['session'] = Helpers::syncUserSession($data['data']['uid'],$refer);
145 $data['data']['href'] = $refer; 146 $data['data']['href'] = $refer;
146 147
147 $token = Helpers::makeToken($data['data']['uid']); 148 $token = Helpers::makeToken($data['data']['uid']);