From bca9775a1108e853eaa102396e9e2ca681286d25 Mon Sep 17 00:00:00 2001
From: hf <fei.hong@yoho.cn>
Date: Tue, 13 Oct 2015 21:32:18 +0800
Subject: [PATCH] do test login and register
---
yohobuy/m.yohobuy.com/application/controllers/Boys.php | 3 +++
yohobuy/m.yohobuy.com/application/controllers/Girls.php | 678 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
yohobuy/m.yohobuy.com/application/controllers/Index.php | 47 ++++++++++++++++++++++-------------------------
yohobuy/m.yohobuy.com/application/controllers/Kids.php | 3 +++
yohobuy/m.yohobuy.com/application/controllers/Lifestyle.php | 18 +++++++++++-------
yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Login.php | 3 +++
yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Reg.php | 9 +++++----
7 files changed, 384 insertions(+), 377 deletions(-)
diff --git a/yohobuy/m.yohobuy.com/application/controllers/Boys.php b/yohobuy/m.yohobuy.com/application/controllers/Boys.php
index ac39c3f..20b61d2 100644
--- a/yohobuy/m.yohobuy.com/application/controllers/Boys.php
+++ b/yohobuy/m.yohobuy.com/application/controllers/Boys.php
@@ -10,6 +10,9 @@ class BoysController extends AbstractAction
public function indexAction()
{
+ // 显示侧边栏
+ $this->setNavSide();
+
// 频道数据
$channelData = Index::getUserChannelData(0, '1,3', '201504091403001');
diff --git a/yohobuy/m.yohobuy.com/application/controllers/Girls.php b/yohobuy/m.yohobuy.com/application/controllers/Girls.php
index 111eaa4..b3e813b 100644
--- a/yohobuy/m.yohobuy.com/application/controllers/Girls.php
+++ b/yohobuy/m.yohobuy.com/application/controllers/Girls.php
@@ -2,6 +2,7 @@
use Action\AbstractAction;
use LibModels\Wap\Home\IndexData as Index;
+
/**
* 女生首页
*/
@@ -10,14 +11,17 @@ class GirlsController extends AbstractAction
public function indexAction()
{
- $data = array(
+ // 显示侧边栏
+ $this->setNavSide();
+
+ $data = array(
'headerDownload' => array(
'img' => 'http://img11.static.yhbimg.com/adpic/2015/02/28/18/01d83bfad41c8fca8fd1ad334216d7d733.jpg?imageView/2/w/640/h/480',
- 'url' => 'http://www.baidu.com'
+ 'url' => 'http://www.baidu.com'
),
'homeHeader' => array(
'bgColor' => '#FF88AE',
- 'searchUrl' => ''
+ 'searchUrl' => ''
),
'searchUrl' => '',
'sideNav' => array(
@@ -50,352 +54,344 @@ class GirlsController extends AbstractAction
'textEn' => 'TRENDFINDER',
'icon' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
'subNav' => array(
- 'list' => array(
- array(
- 'textCn' => '逛',
- 'textEn' => 'TrendFinder',
- 'back' => true,
- 'bgColor' => '#fd307f'
- ),
- array(
- 'textCn' => '查看全部',
- 'url' => ''
- ),
- array(
- 'textCn' => '只看男生',
- 'textEn' => 'Boys',
- 'url' => ''
- ),
- array(
- 'textCn' => '只看女生',
- 'textEn' => 'Girls',
- 'url' => '',
- 'isSelect' => true
- )
-
- )
- )
- )
-
- ),
- 'content' => array(
- 'bannerTop' => array(
- 'list' => array(
- array(
- 'url' => '',
- 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
- ),
- array(
- 'url' => '',
- 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
- ),
- array(
- 'url' => '',
- 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
- )
- )
- ),
- 'iconsEnter' => array(
- 'list' => array(
- array(
- 'url' => '',
- 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
- 'text' => '新品到着'
- ),
- array(
- 'url' => '',
- 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
- 'text' => '全球优选'
- ),
- array(
- 'url' => '',
- 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
- 'text' => '明星潮牌'
- ),
- array(
- 'url' => '',
- 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
- 'text' => '全部品类'
- ),
- array(
- 'url' => '',
- 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
- 'text' => '逛'
- ),
- array(
- 'url' => '',
- 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
- 'text' => '搭配指南'
- ),
- array(
- 'url' => '',
- 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
- 'text' => '潮品推荐'
- ),
- array(
- 'url' => '',
- 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
- 'text' => '折扣精选'
- )
- )
- ),
- 'hotCategory' => array(
- 'img' => 'http://img11.static.yhbimg.com/adpic/2015/02/28/18/01d83bfad41c8fca8fd1ad334216d7d733.jpg?imageView/2/w/640/h/480',
- 'url' => 'http://www.baidu.com',
- 'list' => array(
- array(
- 'textCn' => '打底衫',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
+ 'list' => array(
array(
- 'textCn' => '打底衫',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
+ 'textCn' => '逛',
+ 'textEn' => 'TrendFinder',
+ 'back' => true,
+ 'bgColor' => '#fd307f'
+ ),
array(
- 'textCn' => '打底衫',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
+ 'textCn' => '查看全部',
+ 'url' => ''
+ ),
array(
- 'textCn' => '打底衫',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
+ 'textCn' => '只看男生',
+ 'textEn' => 'Boys',
+ 'url' => ''
+ ),
array(
- 'textCn' => '打底衫',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'textCn' => '打底衫',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'textCn' => '打底衫',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'textCn' => '打底衫',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'textCn' => '打底衫',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- )
- )
- ),
- 'hotBrandsScroll' => array(
- 'name' => '热门品牌',
- 'list' => array(
- array(
- 'textCn' => 'Moussy',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'textCn' => 'Moussy',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'textCn' => 'Moussy',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'textCn' => 'Moussy',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'textCn' => 'Moussy',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'textCn' => 'Moussy',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'textCn' => 'Moussy',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'textCn' => 'Moussy',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'textCn' => 'Moussy',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- )
- )
- ),
- 'hotBrands' => array(
- 'name' => '热门品牌',
- 'more' => 'www.baidu.com',
- 'brands' => array(
- array(
- 'name' => 'Front Row Shop',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'name' => 'dress lab',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'name' => 'DEVIL NUT',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'name' => 'casselini',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'name' => 'haso',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
+ 'textCn' => '只看女生',
+ 'textEn' => 'Girls',
+ 'url' => '',
+ 'isSelect' => true
+ )
+ )
+ )
+ )
+ ),
+ 'content' => array(
+ 'bannerTop' => array(
+ 'list' => array(
+ array(
+ 'url' => '',
+ 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
+ ),
+ array(
+ 'url' => '',
+ 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
+ ),
+ array(
+ 'url' => '',
+ 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
+ )
+ )
+ ),
+ 'iconsEnter' => array(
+ 'list' => array(
+ array(
+ 'url' => '',
+ 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
+ 'text' => '新品到着'
+ ),
+ array(
+ 'url' => '',
+ 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
+ 'text' => '全球优选'
+ ),
+ array(
+ 'url' => '',
+ 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
+ 'text' => '明星潮牌'
+ ),
+ array(
+ 'url' => '',
+ 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
+ 'text' => '全部品类'
+ ),
+ array(
+ 'url' => '',
+ 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
+ 'text' => '逛'
+ ),
+ array(
+ 'url' => '',
+ 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
+ 'text' => '搭配指南'
+ ),
+ array(
+ 'url' => '',
+ 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
+ 'text' => '潮品推荐'
+ ),
+ array(
+ 'url' => '',
+ 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
+ 'text' => '折扣精选'
+ )
+ )
+ ),
+ 'hotCategory' => array(
+ 'img' => 'http://img11.static.yhbimg.com/adpic/2015/02/28/18/01d83bfad41c8fca8fd1ad334216d7d733.jpg?imageView/2/w/640/h/480',
+ 'url' => 'http://www.baidu.com',
+ 'list' => array(
+ array(
+ 'textCn' => '打底衫',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'textCn' => '打底衫',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'textCn' => '打底衫',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'textCn' => '打底衫',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'textCn' => '打底衫',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'textCn' => '打底衫',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'textCn' => '打底衫',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'textCn' => '打底衫',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'textCn' => '打底衫',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ )
+ )
+ ),
+ 'hotBrandsScroll' => array(
+ 'name' => '热门品牌',
+ 'list' => array(
+ array(
+ 'textCn' => 'Moussy',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'textCn' => 'Moussy',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'textCn' => 'Moussy',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'textCn' => 'Moussy',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'textCn' => 'Moussy',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'textCn' => 'Moussy',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'textCn' => 'Moussy',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'textCn' => 'Moussy',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'textCn' => 'Moussy',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ )
+ )
+ ),
+ 'hotBrands' => array(
+ 'name' => '热门品牌',
+ 'more' => 'www.baidu.com',
+ 'brands' => array(
+ array(
+ 'name' => 'Front Row Shop',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'name' => 'dress lab',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'name' => 'DEVIL NUT',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'name' => 'casselini',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'name' => 'haso',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'name' => 'EVISU',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ )
+ )
+ ),
+ 'trendColloaction' => array(
+ 'name' => '潮人 ▪ 搭配',
+ 'more' => '',
+ 'leftspan' => array(
+ 'url' => '',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg'
+ ),
+ 'rightspan' => array(
+ 'url' => '',
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg'
+ ),
+ 'recommendlist' => array(
+ array(
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ ),
+ array(
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => ''
+ )
+ )
+ ),
+ 'trendTopics' => array(
+ 'name' => '潮品 ▪ 话题',
+ 'more' => '',
+ 'list' => array(
+ array(
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => '',
+ 'title' => '现代裁剪',
+ 'time' => '2月13日 12:34'
+ ),
+ array(
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => '',
+ 'title' => '现代裁剪',
+ 'time' => '2月13日 12:34'
+ ),
+ array(
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => '',
+ 'title' => '现代裁剪',
+ 'time' => '2月13日 12:34'
+ )
+ )
+ ),
+ 'goodsCategory' => array(
+ 'name' => '经典裤装',
+ 'more' => '',
+ 'banner' => array(
+ 'list' => array(
array(
- 'name' => 'EVISU',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- )
- )
- ),
- 'trendColloaction' => array(
- 'name' => '潮人 ▪ 搭配',
- 'more' => '',
- 'leftspan' => array(
- 'url' => '',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg'
- ),
- 'rightspan' => array(
- 'url' => '',
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg'
- ),
- 'recommendlist' => array(
- array(
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- ),
- array(
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- )
- )
- ),
- 'trendTopics' => array(
- 'name' => '潮品 ▪ 话题',
- 'more' => '',
- 'list' => array(
- array(
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => '',
- 'title' => '现代裁剪',
- 'time' => '2月13日 12:34'
- ),
- array(
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => '',
- 'title' => '现代裁剪',
- 'time' => '2月13日 12:34'
- ),
- array(
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => '',
- 'title' => '现代裁剪',
- 'time' => '2月13日 12:34'
- )
- )
- ),
- 'goodsCategory' => array(
- 'name' => '经典裤装',
- 'more' => '',
- 'banner' => array(
- 'list' => array(
- array(
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => ''
- )
- )
- ),
- 'list' => array(
- array(
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => '',
- 'textCn' => '手表'
- ),
- array(
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => '',
- 'textCn' => '烛台'
- ),
- array(
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => '',
- 'textCn' => '围巾'
- ),
- array(
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => '',
- 'textCn' => '盘子'
- ),
- array(
- 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
- 'url' => '',
- 'textCn' => '耳机'
- )
- )
- )
-
-
-
-
-
- ),
+ 'url' => ''
+ )
+ )
+ ),
+ 'list' => array(
+ array(
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => '',
+ 'textCn' => '手表'
+ ),
+ array(
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => '',
+ 'textCn' => '烛台'
+ ),
+ array(
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => '',
+ 'textCn' => '围巾'
+ ),
+ array(
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => '',
+ 'textCn' => '盘子'
+ ),
+ array(
+ 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
+ 'url' => '',
+ 'textCn' => '耳机'
+ )
+ )
+ )
+ ));
- // 频道数据
- $channelData = Index::getUserChannelData(0, '2,3', '201504091403002');
+ // 频道数据
+ $channelData = Index::getUserChannelData(0, '2,3', '201504091403002');
- echo '<pre>';
- print_r($channelData);
-
- $this->_view->assign('title', 'YOHO!有货');
- $this->_view->display('index', $data);
+ echo '<pre>';
+ print_r($channelData);
- // // 频道数据
- // $channelData = Index::getUserChannelData(0, '2,3', '201504091403002');
+ $this->_view->assign('title', 'YOHO!有货');
+ $this->_view->display('index', $data);
- // echo '<pre>';
- // print_r($channelData);
-
- // $this->_view->assign('title', 'YOHO!有货');
- // $this->_view->display('girls', compact('channelData'));
+ // // 频道数据
+ // $channelData = Index::getUserChannelData(0, '2,3', '201504091403002');
+ // echo '<pre>';
+ // print_r($channelData);
+ // $this->_view->assign('title', 'YOHO!有货');
+ // $this->_view->display('girls', compact('channelData'));
}
-}
\ No newline at end of file
+
+}
diff --git a/yohobuy/m.yohobuy.com/application/controllers/Index.php b/yohobuy/m.yohobuy.com/application/controllers/Index.php
index f54d425..7eb6943 100644
--- a/yohobuy/m.yohobuy.com/application/controllers/Index.php
+++ b/yohobuy/m.yohobuy.com/application/controllers/Index.php
@@ -1,4 +1,5 @@
<?php
+
use Action\AbstractAction;
use LibModels\Wap\Home\IndexData;
@@ -8,33 +9,29 @@ use LibModels\Wap\Home\IndexData;
class IndexController extends AbstractAction
{
- /**
- * 启动首页频道选择
- */
+ /**
+ * 启动首页频道选择
+ */
public function indexAction()
{
- // 启动滚动图
- $startBannerData = IndexData::getBannerStart();
- $startBanner = array();
- if($startBannerData['code'] == 200)
- {
- foreach ($startBannerData['data'] as $single)
- {
- $startBanner = $single['data'];
- }
-
- }
- // 启动频道数据
- $homeChannels = IndexData::getHomeChannels();
- // 用户个人信息
- $userProfile = IndexData::getUserProfile(0);
+ // 启动滚动图
+ $startBannerData = IndexData::getBannerStart();
+ $startBanner = array();
+ if ($startBannerData['code'] == 200) {
+ foreach ($startBannerData['data'] as $single) {
+ $startBanner = $single['data'];
+ }
+ }
+ // 启动频道数据
+ $homeChannels = IndexData::getHomeChannels();
+ // 用户个人信息
+ $userProfile = IndexData::getUserProfile(0);
- /*echo '<pre>';
- var_dump($homeChannels);exit;*/
+ /* echo '<pre>';
+ var_dump($homeChannels);exit; */
- $this->_view->assign('title', 'YOHO!有货');
- $this->_view->display('index', compact('startBanner', 'homeChannels', 'userProfile'));
-
- $this->setNavSide();
+ $this->_view->assign('title', 'YOHO!有货');
+ $this->_view->display('index', compact('startBanner', 'homeChannels', 'userProfile'));
}
-}
\ No newline at end of file
+
+}
diff --git a/yohobuy/m.yohobuy.com/application/controllers/Kids.php b/yohobuy/m.yohobuy.com/application/controllers/Kids.php
index cab67ed..cbe210b 100644
--- a/yohobuy/m.yohobuy.com/application/controllers/Kids.php
+++ b/yohobuy/m.yohobuy.com/application/controllers/Kids.php
@@ -18,5 +18,8 @@ class KidsController extends AbstractAction
$this->_view->assign('title', 'YOHO!有货');
$this->_view->display('kids', compact('channelData'));
+
+ // 显示侧边栏
+ $this->setNavSide();
}
}
\ No newline at end of file
diff --git a/yohobuy/m.yohobuy.com/application/controllers/Lifestyle.php b/yohobuy/m.yohobuy.com/application/controllers/Lifestyle.php
index 6f82f3a..ca78c10 100644
--- a/yohobuy/m.yohobuy.com/application/controllers/Lifestyle.php
+++ b/yohobuy/m.yohobuy.com/application/controllers/Lifestyle.php
@@ -2,6 +2,7 @@
use Action\AbstractAction;
use LibModels\Wap\Home\IndexData as Index;
+
/**
* 创意生活首页
*/
@@ -10,14 +11,17 @@ class LifestyleController extends AbstractAction
public function indexAction()
{
+ // 频道数据
+ $channelData = Index::getUserChannelData(0, '1,3', '9aa25f5133f011ec96c2045eb15ae425');
- // 频道数据
- $channelData = Index::getUserChannelData(0, '1,3', '9aa25f5133f011ec96c2045eb15ae425');
+ echo '<pre>';
+ print_r($channelData);
- echo '<pre>';
- print_r($channelData);
+ $this->_view->assign('title', 'YOHO!有货');
+ $this->_view->display('lifestyle', compact('channelData'));
- $this->_view->assign('title', 'YOHO!有货');
- $this->_view->display('lifestyle', compact('channelData'));
+ // 显示侧边栏
+ $this->setNavSide();
}
-}
\ No newline at end of file
+
+}
diff --git a/yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Login.php b/yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Login.php
index f2dbf7c..5350b85 100644
--- a/yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Login.php
+++ b/yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Login.php
@@ -109,6 +109,9 @@ class LoginController extends AbstractAction
/* 调用登录接口进行登录 */
$data = LoginData::signin($area, $profile, $password);
+ if ($data['code'] == 200) {
+ $data['data'] = '/'; // @todo
+ }
} while (false);
diff --git a/yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Reg.php b/yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Reg.php
index cc9a4ab..8f64184 100644
--- a/yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Reg.php
+++ b/yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Reg.php
@@ -22,6 +22,7 @@ class RegController extends AbstractAction
$data['headerText'] = '注册';
$data['isPassportPage'] = true;
$data['countrys'] = array();
+ $data['areaCode'] = '+86';
// 获取地区数据列表
$area = RegData::getAreasData();
@@ -74,7 +75,7 @@ class RegController extends AbstractAction
$data['backUrl'] = '/';
$data['headerText'] = '注册';
$data['isPassportPage'] = true;
- $data['areaCode'] = $area;
+ $data['areaCode'] = '+' . $area;
$data['phoneNum'] = $mobile;
$data['token'] = $token;
@@ -123,7 +124,7 @@ class RegController extends AbstractAction
*/
public function verifymobileAction()
{
- $data = array('code' => 400, 'message' => '参数不正确!', 'data' => '');
+ $data = array('code' => 400, 'message' => '手机号已存在', 'data' => '');
do {
/* 判断是不是AJAX请求 */
@@ -166,7 +167,7 @@ class RegController extends AbstractAction
*/
public function verifycodeAction()
{
- $data = array('code' => 400, 'message' => '参数不正确!', 'data' => '');
+ $data = array('code' => 400, 'message' => '验证码不正确', 'data' => '');
do {
/* 判断是不是AJAX请求 */
@@ -275,7 +276,7 @@ class RegController extends AbstractAction
/* 返回跳转到来源页面 */
if ($data['code'] == 200) {
- $data['data'] = '/passport/reg/password?token='.$token.'&phoneNum='.$mobile.'&areaCode='.$area;
+ $data['data'] = '/';
}
} while (false);
--
libgit2 0.24.0