update files
Showing
13 changed files
with
278 additions
and
185 deletions
@@ -15,6 +15,7 @@ namespace Action; | @@ -15,6 +15,7 @@ namespace Action; | ||
15 | use Yaf\Controller_Abstract; | 15 | use Yaf\Controller_Abstract; |
16 | use Yaf\Dispatcher; | 16 | use Yaf\Dispatcher; |
17 | use Hood\Cache; | 17 | use Hood\Cache; |
18 | +use LibModels\Wap\Home\SideData; | ||
18 | 19 | ||
19 | class AbstractAction extends Controller_Abstract | 20 | class AbstractAction extends Controller_Abstract |
20 | { | 21 | { |
@@ -262,4 +263,77 @@ class AbstractAction extends Controller_Abstract | @@ -262,4 +263,77 @@ class AbstractAction extends Controller_Abstract | ||
262 | $this->_view->assign('footer', $footer); | 263 | $this->_view->assign('footer', $footer); |
263 | } | 264 | } |
264 | 265 | ||
266 | + /** | ||
267 | + * 设置侧边栏信息 | ||
268 | + * | ||
269 | + * @param string $guangChoosed 逛默认选中项 "all"表示全部,"boys":只看男生,"girls":只看女生 | ||
270 | + * @return void | ||
271 | + */ | ||
272 | + protected function setNavSide($guangChoosed = 'all') | ||
273 | + { | ||
274 | + $this->_view->assign('subNav', array( | ||
275 | + 0 => array( | ||
276 | + 'textCn' => '男生', | ||
277 | + 'textEn' => 'BOYS', | ||
278 | + 'styleClass' => 'boys', | ||
279 | + 'url' => '/boys.html', | ||
280 | + ), | ||
281 | + 1 => array( | ||
282 | + 'textCn' => '女生', | ||
283 | + 'textEn' => 'GIRLS', | ||
284 | + 'styleClass' => 'girls', | ||
285 | + 'url' => '/girls.html', | ||
286 | + ), | ||
287 | + 2 => array( | ||
288 | + 'textCn' => '潮童', | ||
289 | + 'textEn' => 'KIDS', | ||
290 | + 'styleClass' => 'kids', | ||
291 | + 'url' => '/kids.html', | ||
292 | + ), | ||
293 | + 3 => array( | ||
294 | + 'textCn' => '创意生活', | ||
295 | + 'textEn' => 'LIFE STYLE', | ||
296 | + 'styleClass' => 'life', | ||
297 | + 'url' => '/life.html', | ||
298 | + ), | ||
299 | + 4 => array( | ||
300 | + 'textCn' => '逛', | ||
301 | + 'textEn' => 'TRENDFINDER', | ||
302 | + 'styleClass' => 'guang', | ||
303 | + 'url' => '/guang.html', | ||
304 | + 'subNav' => array( | ||
305 | + 'list' => array( | ||
306 | + 0 => array( | ||
307 | + 'textCn' => '逛', | ||
308 | + 'textEn' => 'TrendFinder', | ||
309 | + 'back' => true, | ||
310 | + 'isSelect' => false, | ||
311 | + ), | ||
312 | + 1 => array( | ||
313 | + 'textCn' => '查看全部', | ||
314 | + 'textEn' => '', | ||
315 | + 'back' => false, | ||
316 | + 'isSelect' => ($guangChoosed === 'all') ? true : false, | ||
317 | + 'url' => '/guang/list/index?gender=1,2,3' | ||
318 | + ), | ||
319 | + 2 => array( | ||
320 | + 'textCn' => '只看男生', | ||
321 | + 'textEn' => 'Boys', | ||
322 | + 'back' => false, | ||
323 | + 'isSelect' => ($guangChoosed === 'boys') ? true : false, | ||
324 | + 'url' => '/guang/list/index?gender=1,3' | ||
325 | + ), | ||
326 | + 3 => array( | ||
327 | + 'textCn' => '只看女生', | ||
328 | + 'textEn' => 'Girls', | ||
329 | + 'back' => false, | ||
330 | + 'isSelect' => ($guangChoosed === 'girls') ? true : false, | ||
331 | + 'url' => '/guang/list/index?gender=2,3', | ||
332 | + ), | ||
333 | + ) | ||
334 | + ) | ||
335 | + ), | ||
336 | + )); | ||
337 | + } | ||
338 | + | ||
265 | } | 339 | } |
library/LibModels/Wap/Home/SideData.php
0 → 100644
1 | +<?php | ||
2 | + | ||
3 | +namespace LibModels\Wap\Home; | ||
4 | + | ||
5 | +use Api\Sign; | ||
6 | +use Api\Yohobuy; | ||
7 | + | ||
8 | +/** | ||
9 | + * 侧边栏的数据模型 | ||
10 | + * | ||
11 | + * @name SideData | ||
12 | + * @package LibModels/Wap/Home | ||
13 | + * @copyright yoho.inc | ||
14 | + * @version 1.0 (2015-10-13 17:42:27) | ||
15 | + * @author fei.hong <fei.hong@yoho.cn> | ||
16 | + */ | ||
17 | +class SideData | ||
18 | +{ | ||
19 | + const URI_LEFTNAV_ENTRANCE = 'operations/api/v5/entrance/getEntrance'; | ||
20 | + const URI_LEFTNAV_CATEGORY = 'operations/api/v5/category/getCategory'; | ||
21 | + | ||
22 | + /** | ||
23 | + * 左侧边栏的分类和图标数据 | ||
24 | + * | ||
25 | + * 备注:暂不使用,因很少变,获取后还需要再封装 | ||
26 | + * | ||
27 | + * @return array | ||
28 | + */ | ||
29 | + public static function leftNav() | ||
30 | + { | ||
31 | + $param = Yohobuy::param(); | ||
32 | + $param['client_type'] = 'iphone'; // 因安卓不返回icon的地址 | ||
33 | + $param['client_secret'] = Sign::getSign($param); | ||
34 | + $query = Yohobuy::httpBuildQuery('', $param); | ||
35 | + | ||
36 | + $urlList = array(); | ||
37 | + $urlList['getEntrance'] = Yohobuy::SERVICE_URL . self::URI_LEFTNAV_ENTRANCE . $query; | ||
38 | + $urlList['getCategory'] = Yohobuy::SERVICE_URL . self::URI_LEFTNAV_CATEGORY . $query; | ||
39 | + | ||
40 | + return Yohobuy::getMulti($urlList); | ||
41 | + | ||
42 | +// $param = Yohobuy::param(); | ||
43 | +// $param['client_secret'] = Sign::getSign($param); | ||
44 | +// | ||
45 | +// return Yohobuy::get(Yohobuy::SERVICE_URL . self::URI_LEFTNAV_CATEGORY, $param); | ||
46 | + } | ||
47 | + | ||
48 | +} |
@@ -1008,3 +1008,92 @@ | @@ -1008,3 +1008,92 @@ | ||
1008 | 172.16.6.248 - - [13/Oct/2015:21:31:27 +0800] "GET /css/index.css HTTP/1.1" 304 0 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | 1008 | 172.16.6.248 - - [13/Oct/2015:21:31:27 +0800] "GET /css/index.css HTTP/1.1" 304 0 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" |
1009 | 127.0.0.1 - - [13/Oct/2015:21:31:27 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | 1009 | 127.0.0.1 - - [13/Oct/2015:21:31:27 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" |
1010 | 127.0.0.1 - - [13/Oct/2015:21:31:37 +0800] "-" 400 0 "-" "-" | 1010 | 127.0.0.1 - - [13/Oct/2015:21:31:37 +0800] "-" 400 0 "-" "-" |
1011 | +172.16.6.158 - - [13/Oct/2015:21:34:53 +0800] "GET /css/index.css HTTP/1.1" 304 0 "http://m.dev.yohobuy.com/signin.html" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1012 | +172.16.6.158 - - [13/Oct/2015:21:34:59 +0800] "GET /css/index.css HTTP/1.1" 200 38490 "http://m.dev.yohobuy.com/signin.html" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1013 | +172.16.6.158 - - [13/Oct/2015:21:34:59 +0800] "GET /css/index.css HTTP/1.1" 200 38490 "http://m.dev.yohobuy.com/signin.html" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1014 | +172.16.6.158 - - [13/Oct/2015:21:34:59 +0800] "GET /img/passport/yoho.png?1444358578 HTTP/1.1" 200 1380 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1015 | +172.16.6.158 - - [13/Oct/2015:21:34:59 +0800] "GET /img/passport/alipay.png?1444358578 HTTP/1.1" 200 18880 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1016 | +172.16.6.158 - - [13/Oct/2015:21:34:59 +0800] "GET /img/passport/weibo.png?1444358578 HTTP/1.1" 200 19160 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1017 | +172.16.6.158 - - [13/Oct/2015:21:34:59 +0800] "GET /img/passport/qq.png?1444358578 HTTP/1.1" 200 18424 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1018 | +172.16.6.158 - - [13/Oct/2015:21:34:59 +0800] "GET /img/passport/info.png?1444358578 HTTP/1.1" 200 1356 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1019 | +172.16.6.158 - - [13/Oct/2015:21:35:18 +0800] "GET /css/index.css HTTP/1.1" 200 38490 "http://m.dev.yohobuy.com/signin.html" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1020 | +172.16.6.158 - - [13/Oct/2015:21:35:18 +0800] "GET /css/index.css HTTP/1.1" 200 38490 "http://m.dev.yohobuy.com/signin.html" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1021 | +172.16.6.158 - - [13/Oct/2015:21:35:18 +0800] "GET /img/passport/yoho.png?1444358578 HTTP/1.1" 200 1380 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1022 | +172.16.6.158 - - [13/Oct/2015:21:35:18 +0800] "GET /img/passport/alipay.png?1444358578 HTTP/1.1" 200 18880 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1023 | +172.16.6.158 - - [13/Oct/2015:21:35:18 +0800] "GET /img/passport/weibo.png?1444358578 HTTP/1.1" 200 19160 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1024 | +172.16.6.158 - - [13/Oct/2015:21:35:18 +0800] "GET /img/passport/qq.png?1444358578 HTTP/1.1" 200 18424 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1025 | +172.16.6.158 - - [13/Oct/2015:21:35:18 +0800] "GET /img/passport/info.png?1444358578 HTTP/1.1" 200 1356 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1026 | +172.16.6.158 - - [13/Oct/2015:21:35:18 +0800] "GET /css/index.css HTTP/1.1" 200 38490 "http://m.dev.yohobuy.com/signin.html" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1027 | +172.16.6.158 - - [13/Oct/2015:21:35:18 +0800] "GET /img/passport/yoho.png?1444358578 HTTP/1.1" 200 1380 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1028 | +172.16.6.158 - - [13/Oct/2015:21:35:18 +0800] "GET /img/passport/alipay.png?1444358578 HTTP/1.1" 200 18880 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1029 | +172.16.6.158 - - [13/Oct/2015:21:35:18 +0800] "GET /img/passport/weibo.png?1444358578 HTTP/1.1" 200 19160 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1030 | +172.16.6.158 - - [13/Oct/2015:21:35:18 +0800] "GET /img/passport/qq.png?1444358578 HTTP/1.1" 200 18424 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1031 | +172.16.6.158 - - [13/Oct/2015:21:35:18 +0800] "GET /img/passport/info.png?1444358578 HTTP/1.1" 200 1356 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1032 | +172.16.6.158 - - [13/Oct/2015:21:35:27 +0800] "GET /css/index.css HTTP/1.1" 200 38490 "http://m.dev.yohobuy.com/signin.html" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1033 | +172.16.6.158 - - [13/Oct/2015:21:35:27 +0800] "GET /css/index.css HTTP/1.1" 200 38490 "http://m.dev.yohobuy.com/signin.html" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1034 | +172.16.6.158 - - [13/Oct/2015:21:35:27 +0800] "GET /img/passport/yoho.png?1444358578 HTTP/1.1" 200 1380 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1035 | +172.16.6.158 - - [13/Oct/2015:21:35:27 +0800] "GET /img/passport/alipay.png?1444358578 HTTP/1.1" 200 18880 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1036 | +172.16.6.158 - - [13/Oct/2015:21:35:27 +0800] "GET /img/passport/weibo.png?1444358578 HTTP/1.1" 200 19160 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1037 | +172.16.6.158 - - [13/Oct/2015:21:35:27 +0800] "GET /img/passport/qq.png?1444358578 HTTP/1.1" 200 18424 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1038 | +172.16.6.158 - - [13/Oct/2015:21:35:27 +0800] "GET /img/passport/info.png?1444358578 HTTP/1.1" 200 1356 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1039 | +172.16.6.158 - - [13/Oct/2015:21:36:03 +0800] "GET /css/index.css HTTP/1.1" 304 0 "http://m.dev.yohobuy.com/signin.html" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1040 | +172.16.6.158 - - [13/Oct/2015:21:36:17 +0800] "-" 400 0 "-" "-" | ||
1041 | +172.16.6.158 - - [13/Oct/2015:21:36:17 +0800] "-" 400 0 "-" "-" | ||
1042 | +172.16.6.158 - - [13/Oct/2015:21:36:17 +0800] "-" 400 0 "-" "-" | ||
1043 | +172.16.6.158 - - [13/Oct/2015:21:36:17 +0800] "GET /css/index.css HTTP/1.1" 200 38490 "http://m.dev.yohobuy.com/signin.html" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1044 | +172.16.6.158 - - [13/Oct/2015:21:36:17 +0800] "GET /css/index.css HTTP/1.1" 200 38490 "http://m.dev.yohobuy.com/signin.html" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1045 | +172.16.6.158 - - [13/Oct/2015:21:36:18 +0800] "GET /css/index.css HTTP/1.1" 200 38490 "http://m.dev.yohobuy.com/signin.html" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1046 | +172.16.6.158 - - [13/Oct/2015:21:36:18 +0800] "GET /css/index.css HTTP/1.1" 200 38490 "http://m.dev.yohobuy.com/signin.html" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1047 | +172.16.6.158 - - [13/Oct/2015:21:36:18 +0800] "GET /img/passport/yoho.png?1444358578 HTTP/1.1" 200 1380 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1048 | +172.16.6.158 - - [13/Oct/2015:21:36:18 +0800] "GET /img/passport/weibo.png?1444358578 HTTP/1.1" 200 19160 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1049 | +172.16.6.158 - - [13/Oct/2015:21:36:18 +0800] "GET /img/passport/alipay.png?1444358578 HTTP/1.1" 200 18880 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1050 | +172.16.6.158 - - [13/Oct/2015:21:36:18 +0800] "GET /img/passport/qq.png?1444358578 HTTP/1.1" 200 18424 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1051 | +172.16.6.158 - - [13/Oct/2015:21:36:18 +0800] "GET /img/passport/info.png?1444358578 HTTP/1.1" 200 1356 "http://172.16.6.248:8088/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1052 | +172.16.6.158 - - [13/Oct/2015:21:37:28 +0800] "GET /css/index.css HTTP/1.1" 304 0 "http://m.dev.yohobuy.com/signin.html" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" | ||
1053 | +172.16.6.158 - - [13/Oct/2015:21:37:38 +0800] "-" 400 0 "-" "-" | ||
1054 | +172.16.6.158 - - [13/Oct/2015:21:37:38 +0800] "-" 400 0 "-" "-" | ||
1055 | +172.16.6.158 - - [13/Oct/2015:21:37:38 +0800] "-" 400 0 "-" "-" | ||
1056 | +172.16.6.158 - - [13/Oct/2015:21:37:38 +0800] "-" 400 0 "-" "-" | ||
1057 | +127.0.0.1 - - [13/Oct/2015:21:38:06 +0800] "GET /girls HTTP/1.1" 200 190 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1058 | +127.0.0.1 - - [13/Oct/2015:21:38:06 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1059 | +172.16.6.248 - - [13/Oct/2015:21:38:16 +0800] "-" 400 0 "-" "-" | ||
1060 | +127.0.0.1 - - [13/Oct/2015:21:38:26 +0800] "-" 400 0 "-" "-" | ||
1061 | +127.0.0.1 - - [13/Oct/2015:21:38:55 +0800] "GET /girls HTTP/1.1" 200 190 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36" | ||
1062 | +127.0.0.1 - - [13/Oct/2015:21:38:55 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36" | ||
1063 | +127.0.0.1 - - [13/Oct/2015:21:39:26 +0800] "GET /girls HTTP/1.1" 200 190 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36" | ||
1064 | +127.0.0.1 - - [13/Oct/2015:21:39:26 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36" | ||
1065 | +127.0.0.1 - - [13/Oct/2015:21:39:30 +0800] "GET /boys HTTP/1.1" 200 18209 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1066 | +172.16.6.248 - - [13/Oct/2015:21:39:30 +0800] "GET /css/index.css HTTP/1.1" 304 0 "http://m.dev.yohobuy.com/boys" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1067 | +127.0.0.1 - - [13/Oct/2015:21:39:30 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/boys" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1068 | +127.0.0.1 - - [13/Oct/2015:21:39:31 +0800] "GET /boys HTTP/1.1" 200 18209 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1069 | +172.16.6.248 - - [13/Oct/2015:21:39:31 +0800] "GET /css/index.css HTTP/1.1" 304 0 "http://m.dev.yohobuy.com/boys" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1070 | +127.0.0.1 - - [13/Oct/2015:21:39:31 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/boys" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1071 | +127.0.0.1 - - [13/Oct/2015:21:39:31 +0800] "GET /boys HTTP/1.1" 200 18209 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1072 | +172.16.6.248 - - [13/Oct/2015:21:39:31 +0800] "GET /css/index.css HTTP/1.1" 304 0 "http://m.dev.yohobuy.com/boys" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1073 | +127.0.0.1 - - [13/Oct/2015:21:39:32 +0800] "GET /boys HTTP/1.1" 200 18209 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1074 | +172.16.6.248 - - [13/Oct/2015:21:39:32 +0800] "GET /css/index.css HTTP/1.1" 304 0 "http://m.dev.yohobuy.com/boys" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1075 | +127.0.0.1 - - [13/Oct/2015:21:39:32 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/boys" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1076 | +127.0.0.1 - - [13/Oct/2015:21:39:32 +0800] "GET /boys HTTP/1.1" 200 18209 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1077 | +172.16.6.248 - - [13/Oct/2015:21:39:32 +0800] "GET /css/index.css HTTP/1.1" 304 0 "http://m.dev.yohobuy.com/boys" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1078 | +127.0.0.1 - - [13/Oct/2015:21:39:32 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/boys" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1079 | +127.0.0.1 - - [13/Oct/2015:21:40:14 +0800] "GET /boys HTTP/1.1" 200 18209 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1080 | +172.16.6.248 - - [13/Oct/2015:21:40:14 +0800] "GET /css/index.css HTTP/1.1" 304 0 "http://m.dev.yohobuy.com/boys" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1081 | +127.0.0.1 - - [13/Oct/2015:21:40:14 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/boys" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1082 | +127.0.0.1 - - [13/Oct/2015:21:43:39 +0800] "GET /girls HTTP/1.1" 200 190 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36" | ||
1083 | +127.0.0.1 - - [13/Oct/2015:21:43:39 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36" | ||
1084 | +127.0.0.1 - - [13/Oct/2015:21:43:40 +0800] "GET /girls HTTP/1.1" 200 190 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36" | ||
1085 | +127.0.0.1 - - [13/Oct/2015:21:43:40 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36" | ||
1086 | +127.0.0.1 - - [13/Oct/2015:21:43:40 +0800] "GET /girls HTTP/1.1" 200 190 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36" | ||
1087 | +127.0.0.1 - - [13/Oct/2015:21:43:40 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36" | ||
1088 | +127.0.0.1 - - [13/Oct/2015:21:43:40 +0800] "GET /girls HTTP/1.1" 200 190 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36" | ||
1089 | +127.0.0.1 - - [13/Oct/2015:21:43:40 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36" | ||
1090 | +127.0.0.1 - - [13/Oct/2015:21:43:40 +0800] "GET /girls HTTP/1.1" 200 190 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36" | ||
1091 | +127.0.0.1 - - [13/Oct/2015:21:43:40 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36" | ||
1092 | +172.16.6.248 - - [13/Oct/2015:21:43:59 +0800] "-" 400 0 "-" "-" | ||
1093 | +127.0.0.1 - - [13/Oct/2015:21:43:59 +0800] "-" 400 0 "-" "-" | ||
1094 | +127.0.0.1 - - [13/Oct/2015:21:44:19 +0800] "GET /girls HTTP/1.1" 200 10606 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36" | ||
1095 | +172.16.6.248 - - [13/Oct/2015:21:44:19 +0800] "GET /css/index.css HTTP/1.1" 304 0 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36" | ||
1096 | +127.0.0.1 - - [13/Oct/2015:21:44:19 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/girls" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36" | ||
1097 | +127.0.0.1 - - [13/Oct/2015:21:44:28 +0800] "GET /boys HTTP/1.1" 200 18209 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1098 | +172.16.6.248 - - [13/Oct/2015:21:44:28 +0800] "GET /css/index.css HTTP/1.1" 304 0 "http://m.dev.yohobuy.com/boys" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" | ||
1099 | +127.0.0.1 - - [13/Oct/2015:21:44:28 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/boys" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53" |
@@ -7,7 +7,7 @@ var $ = require('yoho.zepto'); | @@ -7,7 +7,7 @@ var $ = require('yoho.zepto'); | ||
7 | 7 | ||
8 | var $phoneNum = $('#phone-num'), | 8 | var $phoneNum = $('#phone-num'), |
9 | $countrySelect = $('#country-select'), | 9 | $countrySelect = $('#country-select'), |
10 | - $countryCode = $('#country-code'), | 10 | + $areaCode = $('#area-code'), |
11 | $btnNext = $('#btn-next'); | 11 | $btnNext = $('#btn-next'); |
12 | 12 | ||
13 | var api = require('../api'); | 13 | var api = require('../api'); |
@@ -29,23 +29,23 @@ $phoneNum.bind('input', function() { | @@ -29,23 +29,23 @@ $phoneNum.bind('input', function() { | ||
29 | }); | 29 | }); |
30 | 30 | ||
31 | $countrySelect.change(function() { | 31 | $countrySelect.change(function() { |
32 | - $countryCode.text($countrySelect.val()); | 32 | + $areaCode.text($countrySelect.val()); |
33 | }); | 33 | }); |
34 | 34 | ||
35 | $btnNext.on('touchstart', function() { | 35 | $btnNext.on('touchstart', function() { |
36 | var pn = trim($phoneNum.val()), | 36 | var pn = trim($phoneNum.val()), |
37 | - country = $countrySelect.val(); | 37 | + areaCode = $countrySelect.val(); |
38 | 38 | ||
39 | if ($btnNext.hasClass('disable')) { | 39 | if ($btnNext.hasClass('disable')) { |
40 | return; | 40 | return; |
41 | } | 41 | } |
42 | 42 | ||
43 | - if (api.phoneRegx[country].test(pn)) { | 43 | + if (api.phoneRegx[areaCode].test(pn)) { |
44 | $.ajax({ | 44 | $.ajax({ |
45 | url: '/passport/reg/verifymobile', | 45 | url: '/passport/reg/verifymobile', |
46 | type: 'POST', | 46 | type: 'POST', |
47 | data: { | 47 | data: { |
48 | - areaCode: country.split('+')[1], | 48 | + areaCode: areaCode.split('+')[1], |
49 | phoneNum: pn | 49 | phoneNum: pn |
50 | }, | 50 | }, |
51 | success: function(data) { | 51 | success: function(data) { |
@@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
4 | <div class="content"> | 4 | <div class="content"> |
5 | {{> passport/country_list}} | 5 | {{> passport/country_list}} |
6 | <div class="input-container phone-container row has-clear"> | 6 | <div class="input-container phone-container row has-clear"> |
7 | - <span id="country-code" class="country-code">{{countryCode}}</span> | 7 | + <span id="area-code" class="area-code">{{areaCode}}</span> |
8 | <input id="phone-num" class="input phone-num" type="text" placeholder="手机号"> | 8 | <input id="phone-num" class="input phone-num" type="text" placeholder="手机号"> |
9 | </div> | 9 | </div> |
10 | <span id="btn-next" class="btn btn-next disable row">下一步</span> | 10 | <span id="btn-next" class="btn btn-next disable row">下一步</span> |
@@ -10,6 +10,7 @@ class BoysController extends AbstractAction | @@ -10,6 +10,7 @@ class BoysController extends AbstractAction | ||
10 | 10 | ||
11 | public function indexAction() | 11 | public function indexAction() |
12 | { | 12 | { |
13 | + | ||
13 | $data = array( | 14 | $data = array( |
14 | 'headerDownload' => array( | 15 | 'headerDownload' => array( |
15 | 'img' => "http://img11.static.yhbimg.com/adpic/2015/02/28/18/01d83bfad41c8fca8fd1ad334216d7d733.jpg?imageView/2/w/640/h/480", | 16 | 'img' => "http://img11.static.yhbimg.com/adpic/2015/02/28/18/01d83bfad41c8fca8fd1ad334216d7d733.jpg?imageView/2/w/640/h/480", |
@@ -577,13 +578,5 @@ $data = array( | @@ -577,13 +578,5 @@ $data = array( | ||
577 | $this->_view->assign('title', '首页'); | 578 | $this->_view->assign('title', '首页'); |
578 | $this->_view->display('index', $data); | 579 | $this->_view->display('index', $data); |
579 | 580 | ||
580 | - // // 频道数据 | ||
581 | - // $channelData = Index=>=>getUserChannelData(0, '1,3', '201504091403001'); | ||
582 | - | ||
583 | - // echo '<pre>'; | ||
584 | - // print_r($channelData); | ||
585 | - | ||
586 | - // $this->_view->assign('title', 'YOHO!有货'); | ||
587 | - // $this->_view->display('boys', compact('channelData')); | ||
588 | } | 581 | } |
589 | } | 582 | } |
@@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
2 | 2 | ||
3 | use Action\AbstractAction; | 3 | use Action\AbstractAction; |
4 | use LibModels\Wap\Home\IndexData as Index; | 4 | use LibModels\Wap\Home\IndexData as Index; |
5 | + | ||
5 | /** | 6 | /** |
6 | * 女生首页 | 7 | * 女生首页 |
7 | */ | 8 | */ |
@@ -10,6 +11,9 @@ class GirlsController extends AbstractAction | @@ -10,6 +11,9 @@ class GirlsController extends AbstractAction | ||
10 | 11 | ||
11 | public function indexAction() | 12 | public function indexAction() |
12 | { | 13 | { |
14 | + // 显示侧边栏 | ||
15 | + $this->setNavSide(); | ||
16 | + | ||
13 | $data = array( | 17 | $data = array( |
14 | 'headerDownload' => array( | 18 | 'headerDownload' => array( |
15 | 'img' => 'http://img11.static.yhbimg.com/adpic/2015/02/28/18/01d83bfad41c8fca8fd1ad334216d7d733.jpg?imageView/2/w/640/h/480', | 19 | 'img' => 'http://img11.static.yhbimg.com/adpic/2015/02/28/18/01d83bfad41c8fca8fd1ad334216d7d733.jpg?imageView/2/w/640/h/480', |
@@ -71,11 +75,9 @@ class GirlsController extends AbstractAction | @@ -71,11 +75,9 @@ class GirlsController extends AbstractAction | ||
71 | 'url' => '', | 75 | 'url' => '', |
72 | 'isSelect' => true | 76 | 'isSelect' => true |
73 | ) | 77 | ) |
74 | - | ||
75 | ) | 78 | ) |
76 | ) | 79 | ) |
77 | ) | 80 | ) |
78 | - | ||
79 | ), | 81 | ), |
80 | 'content' => array( | 82 | 'content' => array( |
81 | 'bannerTop' => array( | 83 | 'bannerTop' => array( |
@@ -371,143 +373,20 @@ class GirlsController extends AbstractAction | @@ -371,143 +373,20 @@ class GirlsController extends AbstractAction | ||
371 | 'textCn' => '耳机' | 373 | 'textCn' => '耳机' |
372 | ) | 374 | ) |
373 | ) | 375 | ) |
374 | - ), | ||
375 | - | ||
376 | -'bannerCenter' => array( | ||
377 | - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg', | ||
378 | - 'url' => '' | ||
379 | - ), | ||
380 | - | ||
381 | - 'creativeLife' => array( | ||
382 | - 'name' => '创意生活', | ||
383 | - 'more' => '', | ||
384 | - 'url' => '', | ||
385 | - 'banner' => 'http://img10.static.yhbimg.com/yhb-img01/2015/07/09/18/0119ffceddb0819d36d74b408bd743b4a9.jpg?imageView/2/w/640/h/640', | ||
386 | - 'classify' => array( | ||
387 | - array( | ||
388 | - 'url' => '', | ||
389 | - 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/04/10/05/029bef1041343ea2e31dc0423f2f176589.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90', | ||
390 | - 'name' => '手表' | ||
391 | - ), array( | ||
392 | - 'url' => '', | ||
393 | - 'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/07/07/09/02271a775d17649860abec4387b4559e26.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90', | ||
394 | - 'name' => '烛台' | ||
395 | - ), array( | ||
396 | - 'url' => '', | ||
397 | - 'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/05/19/07/02a269d20ed44803eee33e255fe88d7873.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90', | ||
398 | - 'name' => '围巾' | ||
399 | - ), array( | ||
400 | - 'url' => '', | ||
401 | - 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/06/01/07/02fe94083352435ce53b5d90812cc5bdbd.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90', | ||
402 | - 'name' => '盘子' | ||
403 | - ), array( | ||
404 | - 'url' => '', | ||
405 | - 'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/07/08/07/028db8a2afbe4ecbf37bebc7e98e8e1e80.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90', | ||
406 | - 'name' => '耳机' | ||
407 | - ), array( | ||
408 | - 'url' => '', | ||
409 | - 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/04/22/02/02a1b688b6dafd786f391e0624aea1e93b.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90', | ||
410 | - 'name' => '生活' | ||
411 | - ) | ||
412 | ) | 376 | ) |
413 | - ), | ||
414 | - | 377 | + )); |
415 | 378 | ||
416 | -'plusStar' => array( | ||
417 | - 'name' => 'PLUS 全球优选', | ||
418 | - 'url' => '', | ||
419 | - 'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/07/13/15/014f7ba48071160053ac3b8f045b9fc264.jpg?imageView/2/w/640/h/640' | ||
420 | 379 | ||
421 | - ), | ||
422 | 380 | ||
423 | - 'bannerCenter' => array( | ||
424 | - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg', | ||
425 | - 'url' => '' | ||
426 | - ), | ||
427 | - | ||
428 | - 'plusStar' => array( | ||
429 | - 'name' => 'STAR 明星潮牌', | ||
430 | - 'url' => '', | ||
431 | - 'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/07/13/15/014f7ba48071160053ac3b8f045b9fc264.jpg?imageView/2/w/640/h/640' | ||
432 | - | ||
433 | - ), | ||
434 | - 'bannerCenter' => array( | ||
435 | - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg', | ||
436 | - 'url' => '' | ||
437 | - ), | ||
438 | - | ||
439 | -'maybeLike' => array( | ||
440 | - 'goods' => array( | ||
441 | - array( | ||
442 | - 'id' => 1, | ||
443 | - 'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/07/01ebfb219e22770ffb0c2c3a2cbb2b4bef.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90', | ||
444 | - 'name' => 'GAWS DIGI 丛林数码印花拼接卫衣', | ||
445 | - 'isLike' => false, | ||
446 | - 'price' => 1268, | ||
447 | - 'salePrice' => 589, | ||
448 | - 'isSale' => true, | ||
449 | - 'isFew' => true, | ||
450 | - 'isNew' => false, | ||
451 | - 'url' => '' | ||
452 | - ), array( | ||
453 | - 'id' => 2, | ||
454 | - 'thumb' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/03/08/023d70c59e81ccbfb39404487aaf642da2.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90', | ||
455 | - 'name' => 'CLOTtee 撞色连帽外套', | ||
456 | - 'isLike' => false, | ||
457 | - 'price' => 488, | ||
458 | - 'salePrice' => 139, | ||
459 | - 'isSale' => true, | ||
460 | - 'isFew' => true, | ||
461 | - 'isNew' => false, | ||
462 | - 'url' => '' | ||
463 | - ), array( | ||
464 | - 'id' => 3, | ||
465 | - 'thumb' => 'http://img12.static.yhbimg.com/goodsimg/2015/03/02/08/02e2d44125e95495e3152aa459fa6b9b0c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90', | ||
466 | - 'name' => 'HALFGIRL 插肩棒球服短裙套装', | ||
467 | - 'isLike' => true, | ||
468 | - 'price' => 478, | ||
469 | - 'salePrice' => 208, | ||
470 | - 'isSale' => true, | ||
471 | - 'isFew' => true, | ||
472 | - 'isNew' => false, | ||
473 | - 'url' => '' | ||
474 | - ), array( | ||
475 | - 'id' => 4, | ||
476 | - 'thumb' => 'http://img12.static.yhbimg.com/goodsimg/2015/03/03/08/022f25fbe177ee12803c522f04fcce06d0.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90', | ||
477 | - 'name' => '黄伟文Wyman X yohood联名商品YYYOHOOD连帽卫衣', | ||
478 | - 'isLike' => false, | ||
479 | - 'salePrice' => 148, | ||
480 | - 'isSale' => false, | ||
481 | - 'isFew' => false, | ||
482 | - 'isNew' => true, | ||
483 | - 'url' => '' | ||
484 | - ) | ||
485 | - ) | ||
486 | -), | ||
487 | - | ||
488 | -'bannerBottom' => array( | ||
489 | - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg', | ||
490 | - 'url' => '' | ||
491 | - ) | ||
492 | - | ||
493 | - | ||
494 | - | ||
495 | - | ||
496 | - | ||
497 | - ), | ||
498 | - | ||
499 | - ); | ||
500 | - | ||
501 | - $this->_view->assign('title', '首页'); | 381 | + $this->_view->assign('title', 'YOHO!有货'); |
502 | $this->_view->display('index', $data); | 382 | $this->_view->display('index', $data); |
503 | 383 | ||
504 | // // 频道数据 | 384 | // // 频道数据 |
505 | // $channelData = Index::getUserChannelData(0, '2,3', '201504091403002'); | 385 | // $channelData = Index::getUserChannelData(0, '2,3', '201504091403002'); |
506 | - | ||
507 | // echo '<pre>'; | 386 | // echo '<pre>'; |
508 | // print_r($channelData); | 387 | // print_r($channelData); |
509 | - | ||
510 | // $this->_view->assign('title', 'YOHO!有货'); | 388 | // $this->_view->assign('title', 'YOHO!有货'); |
511 | // $this->_view->display('girls', compact('channelData')); | 389 | // $this->_view->display('girls', compact('channelData')); |
512 | } | 390 | } |
391 | + | ||
513 | } | 392 | } |
1 | <?php | 1 | <?php |
2 | + | ||
2 | use Action\AbstractAction; | 3 | use Action\AbstractAction; |
3 | use LibModels\Wap\Home\IndexData; | 4 | use LibModels\Wap\Home\IndexData; |
4 | 5 | ||
@@ -16,23 +17,21 @@ class IndexController extends AbstractAction | @@ -16,23 +17,21 @@ class IndexController extends AbstractAction | ||
16 | // 启动滚动图 | 17 | // 启动滚动图 |
17 | $startBannerData = IndexData::getBannerStart(); | 18 | $startBannerData = IndexData::getBannerStart(); |
18 | $startBanner = array(); | 19 | $startBanner = array(); |
19 | - if($startBannerData['code'] == 200) | ||
20 | - { | ||
21 | - foreach ($startBannerData['data'] as $single) | ||
22 | - { | 20 | + if ($startBannerData['code'] == 200) { |
21 | + foreach ($startBannerData['data'] as $single) { | ||
23 | $startBanner = $single['data']; | 22 | $startBanner = $single['data']; |
24 | } | 23 | } |
25 | - | ||
26 | } | 24 | } |
27 | // 启动频道数据 | 25 | // 启动频道数据 |
28 | $homeChannels = IndexData::getHomeChannels(); | 26 | $homeChannels = IndexData::getHomeChannels(); |
29 | // 用户个人信息 | 27 | // 用户个人信息 |
30 | $userProfile = IndexData::getUserProfile(0); | 28 | $userProfile = IndexData::getUserProfile(0); |
31 | 29 | ||
32 | - /*echo '<pre>'; | ||
33 | - var_dump($homeChannels);exit;*/ | 30 | + /* echo '<pre>'; |
31 | + var_dump($homeChannels);exit; */ | ||
34 | 32 | ||
35 | $this->_view->assign('title', 'YOHO!有货'); | 33 | $this->_view->assign('title', 'YOHO!有货'); |
36 | $this->_view->display('index', compact('startBanner', 'homeChannels', 'userProfile')); | 34 | $this->_view->display('index', compact('startBanner', 'homeChannels', 'userProfile')); |
37 | } | 35 | } |
36 | + | ||
38 | } | 37 | } |
@@ -18,5 +18,8 @@ class KidsController extends AbstractAction | @@ -18,5 +18,8 @@ class KidsController extends AbstractAction | ||
18 | 18 | ||
19 | $this->_view->assign('title', 'YOHO!有货'); | 19 | $this->_view->assign('title', 'YOHO!有货'); |
20 | $this->_view->display('kids', compact('channelData')); | 20 | $this->_view->display('kids', compact('channelData')); |
21 | + | ||
22 | + // 显示侧边栏 | ||
23 | + $this->setNavSide(); | ||
21 | } | 24 | } |
22 | } | 25 | } |
@@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
2 | 2 | ||
3 | use Action\AbstractAction; | 3 | use Action\AbstractAction; |
4 | use LibModels\Wap\Home\IndexData as Index; | 4 | use LibModels\Wap\Home\IndexData as Index; |
5 | + | ||
5 | /** | 6 | /** |
6 | * 创意生活首页 | 7 | * 创意生活首页 |
7 | */ | 8 | */ |
@@ -10,7 +11,6 @@ class LifestyleController extends AbstractAction | @@ -10,7 +11,6 @@ class LifestyleController extends AbstractAction | ||
10 | 11 | ||
11 | public function indexAction() | 12 | public function indexAction() |
12 | { | 13 | { |
13 | - | ||
14 | // 频道数据 | 14 | // 频道数据 |
15 | $channelData = Index::getUserChannelData(0, '1,3', '9aa25f5133f011ec96c2045eb15ae425'); | 15 | $channelData = Index::getUserChannelData(0, '1,3', '9aa25f5133f011ec96c2045eb15ae425'); |
16 | 16 | ||
@@ -19,5 +19,9 @@ class LifestyleController extends AbstractAction | @@ -19,5 +19,9 @@ class LifestyleController extends AbstractAction | ||
19 | 19 | ||
20 | $this->_view->assign('title', 'YOHO!有货'); | 20 | $this->_view->assign('title', 'YOHO!有货'); |
21 | $this->_view->display('lifestyle', compact('channelData')); | 21 | $this->_view->display('lifestyle', compact('channelData')); |
22 | + | ||
23 | + // 显示侧边栏 | ||
24 | + $this->setNavSide(); | ||
22 | } | 25 | } |
26 | + | ||
23 | } | 27 | } |
@@ -51,7 +51,7 @@ class PlusstarController extends AbstractAction | @@ -51,7 +51,7 @@ class PlusstarController extends AbstractAction | ||
51 | // 情况2: 单张图 | 51 | // 情况2: 单张图 |
52 | elseif (isset($star['data'][0])) { | 52 | elseif (isset($star['data'][0])) { |
53 | $build['url'] = $star['data'][0]['url']; | 53 | $build['url'] = $star['data'][0]['url']; |
54 | - $build['img'] = $star['data'][0]['src']; | 54 | + $build['img'] = Helpers::getImageUrl($star['data'][0]['src'], 640, 310); |
55 | $data['ps']['star'][] = $build; | 55 | $data['ps']['star'][] = $build; |
56 | } | 56 | } |
57 | } | 57 | } |
@@ -76,8 +76,8 @@ class LoginController extends AbstractAction | @@ -76,8 +76,8 @@ class LoginController extends AbstractAction | ||
76 | /** | 76 | /** |
77 | * 登录操作 | 77 | * 登录操作 |
78 | * | 78 | * |
79 | - * @param string area 地区编号, 不需要+号 | ||
80 | - * @param string profile 账号(邮箱或手机号) | 79 | + * @param string areaCode 地区编号, 不需要+号 |
80 | + * @param string account 账号(邮箱或手机号) | ||
81 | * @param string password 密码 | 81 | * @param string password 密码 |
82 | * @return json | 82 | * @return json |
83 | */ | 83 | */ |
@@ -92,8 +92,8 @@ class LoginController extends AbstractAction | @@ -92,8 +92,8 @@ class LoginController extends AbstractAction | ||
92 | } | 92 | } |
93 | 93 | ||
94 | /* 判断参数是否传递 */ | 94 | /* 判断参数是否传递 */ |
95 | - $area = $this->post('area', '86'); | ||
96 | - $profile = $this->post('profile'); | 95 | + $area = $this->post('areaCode', '86'); |
96 | + $profile = $this->post('account'); | ||
97 | $password = $this->post('password'); | 97 | $password = $this->post('password'); |
98 | if (!is_numeric($area) || empty($profile) || empty($password)) { | 98 | if (!is_numeric($area) || empty($profile) || empty($password)) { |
99 | break; | 99 | break; |
@@ -109,6 +109,9 @@ class LoginController extends AbstractAction | @@ -109,6 +109,9 @@ class LoginController extends AbstractAction | ||
109 | 109 | ||
110 | /* 调用登录接口进行登录 */ | 110 | /* 调用登录接口进行登录 */ |
111 | $data = LoginData::signin($area, $profile, $password); | 111 | $data = LoginData::signin($area, $profile, $password); |
112 | + if ($data['code'] == 200) { | ||
113 | + $data['data'] = '/'; // @todo | ||
114 | + } | ||
112 | 115 | ||
113 | } while (false); | 116 | } while (false); |
114 | 117 |
@@ -22,6 +22,7 @@ class RegController extends AbstractAction | @@ -22,6 +22,7 @@ class RegController extends AbstractAction | ||
22 | $data['headerText'] = '注册'; | 22 | $data['headerText'] = '注册'; |
23 | $data['isPassportPage'] = true; | 23 | $data['isPassportPage'] = true; |
24 | $data['countrys'] = array(); | 24 | $data['countrys'] = array(); |
25 | + $data['areaCode'] = '+86'; | ||
25 | 26 | ||
26 | // 获取地区数据列表 | 27 | // 获取地区数据列表 |
27 | $area = RegData::getAreasData(); | 28 | $area = RegData::getAreasData(); |
@@ -52,15 +53,15 @@ class RegController extends AbstractAction | @@ -52,15 +53,15 @@ class RegController extends AbstractAction | ||
52 | /** | 53 | /** |
53 | * 验证码 | 54 | * 验证码 |
54 | * | 55 | * |
55 | - * @param string area 地区编号 | ||
56 | - * @param string mobile 手机号 | 56 | + * @param string areaCode 地区编号 |
57 | + * @param string phoneNum 手机号 | ||
57 | * @param string token 访问TOKEN凭证 | 58 | * @param string token 访问TOKEN凭证 |
58 | */ | 59 | */ |
59 | public function codeAction() | 60 | public function codeAction() |
60 | { | 61 | { |
61 | $token = $this->get('token'); | 62 | $token = $this->get('token'); |
62 | - $mobile = $this->get('mobile'); | ||
63 | - $area = $this->get('area', '86'); | 63 | + $mobile = $this->get('phoneNum'); |
64 | + $area = $this->get('areaCode', '86'); | ||
64 | 65 | ||
65 | // 判断是否允许访问, 不允许则跳转到错误页面 | 66 | // 判断是否允许访问, 不允许则跳转到错误页面 |
66 | if (!is_string($token) || !is_numeric($mobile) || !Helpers::verifyToken($mobile, $token)) { | 67 | if (!is_string($token) || !is_numeric($mobile) || !Helpers::verifyToken($mobile, $token)) { |
@@ -74,7 +75,7 @@ class RegController extends AbstractAction | @@ -74,7 +75,7 @@ class RegController extends AbstractAction | ||
74 | $data['backUrl'] = '/'; | 75 | $data['backUrl'] = '/'; |
75 | $data['headerText'] = '注册'; | 76 | $data['headerText'] = '注册'; |
76 | $data['isPassportPage'] = true; | 77 | $data['isPassportPage'] = true; |
77 | - $data['areaCode'] = $area; | 78 | + $data['areaCode'] = '+' . $area; |
78 | $data['phoneNum'] = $mobile; | 79 | $data['phoneNum'] = $mobile; |
79 | $data['token'] = $token; | 80 | $data['token'] = $token; |
80 | 81 | ||
@@ -84,15 +85,15 @@ class RegController extends AbstractAction | @@ -84,15 +85,15 @@ class RegController extends AbstractAction | ||
84 | /** | 85 | /** |
85 | * 填写密码页面 | 86 | * 填写密码页面 |
86 | * | 87 | * |
87 | - * @param string area 地区编号 | ||
88 | - * @param string mobile 手机号 | 88 | + * @param string areaCode 地区编号 |
89 | + * @param string phoneNum 手机号 | ||
89 | * @param string token 访问TOKEN凭证 | 90 | * @param string token 访问TOKEN凭证 |
90 | */ | 91 | */ |
91 | public function passwordAction() | 92 | public function passwordAction() |
92 | { | 93 | { |
93 | $token = $this->get('token'); | 94 | $token = $this->get('token'); |
94 | - $mobile = $this->get('mobile'); | ||
95 | - $area = $this->get('area', '86'); | 95 | + $mobile = $this->get('phoneNum'); |
96 | + $area = $this->get('areaCode', '86'); | ||
96 | 97 | ||
97 | // 判断是否允许访问, 不允许则跳转到错误页面 | 98 | // 判断是否允许访问, 不允许则跳转到错误页面 |
98 | if (!is_string($token) || !is_numeric($mobile) || !is_numeric($area) | 99 | if (!is_string($token) || !is_numeric($mobile) || !is_numeric($area) |
@@ -117,13 +118,13 @@ class RegController extends AbstractAction | @@ -117,13 +118,13 @@ class RegController extends AbstractAction | ||
117 | /** | 118 | /** |
118 | * 验证注册的手机号 | 119 | * 验证注册的手机号 |
119 | * | 120 | * |
120 | - * @param string area 地区编号,注意不需要+号 | ||
121 | - * @param string mobile 手机号 | 121 | + * @param string areaCode 地区编号,注意不需要+号 |
122 | + * @param string phoneNum 手机号 | ||
122 | * @return json | 123 | * @return json |
123 | */ | 124 | */ |
124 | public function verifymobileAction() | 125 | public function verifymobileAction() |
125 | { | 126 | { |
126 | - $data = array('code' => 400, 'message' => '参数不正确!', 'data' => ''); | 127 | + $data = array('code' => 400, 'message' => '手机号已存在', 'data' => ''); |
127 | 128 | ||
128 | do { | 129 | do { |
129 | /* 判断是不是AJAX请求 */ | 130 | /* 判断是不是AJAX请求 */ |
@@ -131,8 +132,8 @@ class RegController extends AbstractAction | @@ -131,8 +132,8 @@ class RegController extends AbstractAction | ||
131 | break; | 132 | break; |
132 | } | 133 | } |
133 | 134 | ||
134 | - $mobile = $this->post('mobile'); | ||
135 | - $area = $this->post('area', '86'); | 135 | + $mobile = $this->post('phoneNum'); |
136 | + $area = $this->post('areaCode', '86'); | ||
136 | /* 判断参数是否合法 */ | 137 | /* 判断参数是否合法 */ |
137 | if (!is_numeric($mobile) || !is_numeric($area)) { | 138 | if (!is_numeric($mobile) || !is_numeric($area)) { |
138 | break; | 139 | break; |
@@ -147,7 +148,7 @@ class RegController extends AbstractAction | @@ -147,7 +148,7 @@ class RegController extends AbstractAction | ||
147 | /* 返回跳转到验证页面的链接*/ | 148 | /* 返回跳转到验证页面的链接*/ |
148 | if ($data['code'] == 200) { | 149 | if ($data['code'] == 200) { |
149 | $token = Helpers::makeToken($mobile); | 150 | $token = Helpers::makeToken($mobile); |
150 | - $data['data'] = '/passport/reg/code?token='.$token.'&mobile='.$mobile.'&area='.$area; | 151 | + $data['data'] = '/passport/reg/code?token='.$token.'&phoneNum='.$mobile.'&areaCode='.$area; |
151 | } | 152 | } |
152 | 153 | ||
153 | } while (false); | 154 | } while (false); |
@@ -158,15 +159,15 @@ class RegController extends AbstractAction | @@ -158,15 +159,15 @@ class RegController extends AbstractAction | ||
158 | /** | 159 | /** |
159 | * 验证注册的识别码 | 160 | * 验证注册的识别码 |
160 | * | 161 | * |
161 | - * @param string area 地区编号,注意不需要+号 | ||
162 | - * @param string mobile 手机号 | 162 | + * @param string areaCode 地区编号,注意不需要+号 |
163 | + * @param string phoneNum 手机号 | ||
163 | * @param string token 访问TOKEN凭证 | 164 | * @param string token 访问TOKEN凭证 |
164 | * @param int code 验证码, 手机上收到的 | 165 | * @param int code 验证码, 手机上收到的 |
165 | * @return json | 166 | * @return json |
166 | */ | 167 | */ |
167 | public function verifycodeAction() | 168 | public function verifycodeAction() |
168 | { | 169 | { |
169 | - $data = array('code' => 400, 'message' => '参数不正确!', 'data' => ''); | 170 | + $data = array('code' => 400, 'message' => '验证码不正确', 'data' => ''); |
170 | 171 | ||
171 | do { | 172 | do { |
172 | /* 判断是不是AJAX请求 */ | 173 | /* 判断是不是AJAX请求 */ |
@@ -174,8 +175,8 @@ class RegController extends AbstractAction | @@ -174,8 +175,8 @@ class RegController extends AbstractAction | ||
174 | break; | 175 | break; |
175 | } | 176 | } |
176 | 177 | ||
177 | - $mobile = $this->post('mobile'); | ||
178 | - $area = $this->post('area'); | 178 | + $mobile = $this->post('phoneNum'); |
179 | + $area = $this->post('areaCode'); | ||
179 | $code = $this->post('code'); | 180 | $code = $this->post('code'); |
180 | /* 判断参数是否合法 */ | 181 | /* 判断参数是否合法 */ |
181 | if (!is_numeric($mobile) || !is_numeric($area) || !isset($code)) { | 182 | if (!is_numeric($mobile) || !is_numeric($area) || !isset($code)) { |
@@ -191,7 +192,7 @@ class RegController extends AbstractAction | @@ -191,7 +192,7 @@ class RegController extends AbstractAction | ||
191 | /* 返回跳转到设置密码的链接*/ | 192 | /* 返回跳转到设置密码的链接*/ |
192 | if ($data['code'] == 200) { | 193 | if ($data['code'] == 200) { |
193 | $token = Helpers::makeToken($mobile); | 194 | $token = Helpers::makeToken($mobile); |
194 | - $data['data'] = '/passport/reg/password?token='.$token.'&mobile='.$mobile.'&area='.$area; | 195 | + $data['data'] = '/passport/reg/password?token='.$token.'&phoneNum='.$mobile.'&areaCode='.$area; |
195 | } | 196 | } |
196 | 197 | ||
197 | } while (false); | 198 | } while (false); |
@@ -202,8 +203,8 @@ class RegController extends AbstractAction | @@ -202,8 +203,8 @@ class RegController extends AbstractAction | ||
202 | /** | 203 | /** |
203 | * 发送验证码 | 204 | * 发送验证码 |
204 | * | 205 | * |
205 | - * @param string area 地区编号,注意不需要+号 | ||
206 | - * @param string mobile 手机号 | 206 | + * @param string areaCode 地区编号,注意不需要+号 |
207 | + * @param string phoneNum 手机号 | ||
207 | * @return json | 208 | * @return json |
208 | */ | 209 | */ |
209 | public function sendcodeAction() | 210 | public function sendcodeAction() |
@@ -216,8 +217,8 @@ class RegController extends AbstractAction | @@ -216,8 +217,8 @@ class RegController extends AbstractAction | ||
216 | break; | 217 | break; |
217 | } | 218 | } |
218 | 219 | ||
219 | - $mobile = $this->post('mobile'); | ||
220 | - $area = $this->post('area', '86'); | 220 | + $mobile = $this->post('phoneNum'); |
221 | + $area = $this->post('areaCode', '86'); | ||
221 | /* 判断参数是否合法 */ | 222 | /* 判断参数是否合法 */ |
222 | if (!is_numeric($mobile) || !is_numeric($area)) { | 223 | if (!is_numeric($mobile) || !is_numeric($area)) { |
223 | break; | 224 | break; |
@@ -237,8 +238,8 @@ class RegController extends AbstractAction | @@ -237,8 +238,8 @@ class RegController extends AbstractAction | ||
237 | /** | 238 | /** |
238 | * 设置密码 | 239 | * 设置密码 |
239 | * | 240 | * |
240 | - * @param string area 地区编号,注意不需要+号 | ||
241 | - * @param string mobile 手机号 | 241 | + * @param string areaCode 地区编号,注意不需要+号 |
242 | + * @param string phoneNum 手机号 | ||
242 | * @param string token 访问TOKEN凭证 | 243 | * @param string token 访问TOKEN凭证 |
243 | * @param string password 用户设置的密码 | 244 | * @param string password 用户设置的密码 |
244 | * @return json | 245 | * @return json |
@@ -254,8 +255,8 @@ class RegController extends AbstractAction | @@ -254,8 +255,8 @@ class RegController extends AbstractAction | ||
254 | } | 255 | } |
255 | 256 | ||
256 | $token = $this->post('token'); | 257 | $token = $this->post('token'); |
257 | - $mobile = $this->post('mobile'); | ||
258 | - $area = $this->post('area'); | 258 | + $mobile = $this->post('phoneNum'); |
259 | + $area = $this->post('areaCode'); | ||
259 | $password = $this->post('password'); | 260 | $password = $this->post('password'); |
260 | /* 判断参数是否合法 */ | 261 | /* 判断参数是否合法 */ |
261 | if (!is_string($token) || !is_numeric($mobile) || !is_numeric($area) || !isset($password)) { | 262 | if (!is_string($token) || !is_numeric($mobile) || !is_numeric($area) || !isset($password)) { |
@@ -275,7 +276,7 @@ class RegController extends AbstractAction | @@ -275,7 +276,7 @@ class RegController extends AbstractAction | ||
275 | 276 | ||
276 | /* 返回跳转到来源页面 */ | 277 | /* 返回跳转到来源页面 */ |
277 | if ($data['code'] == 200) { | 278 | if ($data['code'] == 200) { |
278 | - $data['data'] = '/passport/reg/password?token='.$token.'&mobile='.$mobile.'&area='.$area; | 279 | + $data['data'] = '/'; |
279 | } | 280 | } |
280 | 281 | ||
281 | } while (false); | 282 | } while (false); |
-
Please register or login to post a comment