fe / YOHOBUYPC · Commits

Go to a project

Authored by xuqi
Commit cba11d192b67fa1382702d93304d7c1cc569c512 2 parents 8814e340 5b468159

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

Inline Side-by-side
Showing 10 changed files with 142 additions and 226 deletions
... ... @@ -63,10 +63,10 @@
<div id="retrive-pwd-mask" class="mask"></div>
<ul id="retrive-pwd-ways" class="retrive-pwd-ways">
<li>
<a href=/phoneback.html>通过手机找回密码</a>
<a href=/passport/back/mobile>通过手机找回密码</a>
</li>
<li>
<a href=/emailback.html>通过邮箱找回密码</a>
<a href=/passport/back/email>通过邮箱找回密码</a>
</li>
<li id="cancel-retrive">
取消
... ...
... ... @@ -62,7 +62,8 @@ class BackData
$param['re-input'] = $pwd;
$param['code'] = $code;
return Yohobuy::post(Yohobuy::YOHOBUY_URL.'passport/back/update', $param);
// 默认返回的不是json类型数据，是html
return Yohobuy::post(Yohobuy::YOHOBUY_URL.'passport/back/update', $param, true);
}
... ...
... ... @@ -264,36 +264,4 @@ class FloorProcess
return array('plusStar'=>$data['data']);
}
/**
* 也许喜欢数据处理方法
* @param array $data 也许喜欢数据
* @param $type 类型 默认1:男首页 2:女首页 3:kids 4:lifestyle
* @return array 处理之后的也许喜欢数据
*/
private static function maybeLike($data, $type)
{
$result = array('goods'=>array());
foreach ($data as $one) {
$product = array();
$product['id'] = $one['brand_id'];
$product['thumb'] = Helpers::getImageUrl($one['default_images'], 235, 314, 1);
$product['price'] = $one['market_price'];
$product['salePrice'] = $one['sales_price'];
// 处理tags
$product['tags'] = array();
foreach ($one['tags'] as $val) {
$product['tags'][$val] = 1;
}
$product['is_soon_sold_out'] = $one['is_soon_sold_out'];
$product['name'] = $one['product_name'];
$product['url'] = $one['product_skn'];
$result['goods'][] = $product;
}
return $result;
}
}
... ...
... ... @@ -18,26 +18,61 @@ class NewSaleProcess
public static function newSaleData($focus, $products)
{
$result = array(
'headerBanner' => self::bannerData($focus)
'headerBanner' => self::bannerData($focus),
'goodsContainer' => array()
);
$list = array('list'=>array());
foreach($products as $single)
{
// 处理Tabs
$noTab = true;
if(isset($single['tabs']) && $noTab)
{
$list['tabs'] = array();
foreach ($single['tabs'] as $one)
$result['tabs'] = array();
foreach ($single['tabs'] as $key => $one)
{
$list['tabs'][] = $one;
$tabItem = array();
$tabItem['title'] = $one;
if($key === 1)
{
$tabItem['focus'] = true;
}
$result['tabs'][] = $tabItem;
}
$noTab = false;
}
$list['list'][] = $single['product_list'];
// 处理商品
$productsLi = array('goods'=>array());
if(isset($single['product_list']))
{
foreach ($single['product_list'] as $value)
{
$productsLi['goods'][] = Helpers::formatProduct($value);
}
}
// 对于第一个productsLi添加show字段
if(count($result['goodsContainer']) === 0)
{
$productsLi['show'] = true;
}
$result['goodsContainer'][] = $productsLi;
}
return $result;
}
public static function selectData($data)
{
$result = array('goods'=>array());
if($data['code'] === 200)
{
foreach ($data['data']['product_list'] as $val) {
$result['goods'][] = Helpers::formatProduct($val);
}
}
$result['listNav'] = $list;
return $result;
}
... ...
... ... @@ -50,7 +50,7 @@ $btnNext.on('touchstart', function() {
},
success: function(data) {
if (data.code === 200) {
location.href = '/passport/back/code';
location.href = data.data;
} else {
showErrTip(data.message);
}
... ...
{{# goods}}
{{> good}}
{{/ goods}}
\ No newline at end of file
... ...
... ... @@ -14,22 +14,34 @@ class IndexController extends AbstractAction
*/
public function indexAction()
{
// 启动滚动图
$startBannerData = IndexData::getBannerStart();
$startBanner = array();
if ($startBannerData['code'] == 200) {
foreach ($startBannerData['data'] as $single) {
$startBanner = $single['data'];
}
}
// 用户个人信息
$userProfile = IndexData::getUserProfile(0);
/* echo '<pre>';
var_dump($homeChannels);exit; */
$data = array(
'channels' => array(
array(
'name' => '男生',
'name_en' => 'BOYS',
'url' => '/boys'
),
array(
'name' => '男生',
'name_en' => 'BOYS',
'url' => '/boys'
),
array(
'name' => '男生',
'name_en' => 'BOYS',
'url' => '/boys'
),
array(
'name' => '男生',
'name_en' => 'BOYS',
'url' => '/boys'
),
)
);
$this->_view->assign('title', 'YOHO!有货');
$this->_view->display('index', compact('startBanner', 'userProfile'));
$this->_view->display('index', $data);
}
}
... ...
... ... @@ -62,8 +62,8 @@ class BackController extends AbstractAction
{
$email = $this->get('email', '');
// 获取到邮箱域名
$pattern = "/^([0-9A-Za-z\\-_\\.]+)@([0-9a-z]+\\.[a-z]{2,3}(\\.[a-z]{2})?)$/i";
$domain_name = 'http://mail.'.preg_replace( $pattern ,"$2", $email );
list($name, $domain) = explode('@', $email);
$domain_name = 'http://' . (($domain == 'gmail.com') ? 'mail.google.com' : 'mail.' . $domain);
$data = array(
'backUrl' => '/passport/back/email',
... ... @@ -92,7 +92,14 @@ class BackController extends AbstractAction
$data = BackData::modifyPasswordByEmail($pwd, $code);
$this->echoJson($data);// 前端不需要判断结果
$result = array('code'=>200);
if(strpos($data, 'history.back') !== false)
{
$result['code'] = 400;
$result['message'] = '修改失败';
}
$this->echoJson($result);// 前端不需要判断结果
}
}
... ... @@ -131,7 +138,7 @@ class BackController extends AbstractAction
'isPassportPage' => true,
'backMobile' => true,
'countrys' => $areas,
'countryCode' => '+86'
'areaCode' => '+86'
);
$this->_view->assign('title', 'YOHO!有货');
... ...
... ... @@ -29,8 +29,8 @@ class LoginController extends AbstractAction
'weiboLoginUrl' => '/passport/login/sina', // 注册的URL链接
'qqLoginUrl' => '/passport/login/qq', // 注册的URL链接
'interationalUrl' => '/login.html', // 国际号登录的URL链接
'phoneRetriveUrl' => '/phoneback.html', // 通过手机号找回密码的URL链接
'emailRetriveUrl' => '/emailback.html', // 通过邮箱找回密码的URL链接
'phoneRetriveUrl' => '/passport/back/mobile', // 通过手机号找回密码的URL链接
'emailRetriveUrl' => '/passport/back/email', // 通过邮箱找回密码的URL链接
);
// 生成HTML(signin.html)
... ...
... ... @@ -2,7 +2,7 @@
use Action\AbstractAction;
use LibModels\wap\Product\NewsaleData as Newsale;
use Plugin\Helpers;
use Plugin\DataProcess\NewSaleProcess;
/**
* 新品到着
*/
... ... @@ -10,7 +10,13 @@ class NewsaleController extends AbstractAction
{
public function indexAction()
{
/*$this->_view->assign('title', '新品到着');
$data = array(
'newArrival' => true,
'header' => array(
'title' => '新品到着'
)
);
// 新品到着顶部焦点图
$focusData = Newsale::getNewsaleFocus('a7989369aa86681c678bc40f171b8f1d');
... ... @@ -18,22 +24,18 @@ class NewsaleController extends AbstractAction
$focus = array();
if($focusData['code'] == 200)
{
foreach ($focusData['data'] as $single)
{
foreach ($single['data'] as $val) {
$val['src'] = Helpers::getImageUrl($val['src'], 375, 667, 1);
$focus[] = $val;
}
}
$focus = $focusData['data'];
}
// 批量获取新品到着商品数据
$products = Newsale::getNewProducts('1,3', 1, 60);
var_dump($focus);
// 添加商品数据
$data += NewSaleProcess::newSaleData($focus, $products);
$this->_view->display('new', compact('focus', 'products'));*/
/*echo '<pre>';
print_r($data);exit;*/
$data = array(
/*$data = array(
'headerBanner' => array(
'list' => array(
array(
... ... @@ -220,22 +222,21 @@ class NewsaleController extends AbstractAction
)
)
);
);*/
$this->_view->assign('title', '新品到着');
$this->_view->display('new', $data);
}
/**
* Ajax方式筛选新品到着、折扣专区商品
*
* @return array 根据指定条件筛选之后的商品
*/
public function selectNewAction()
{
if($this->isAjax())
public function selectNewSaleAction()
{
/*if($this->isAjax())
{*/
$gender = $this->get('gender', '1,3');
$brand = $this->get('brand', null);
$sort = $this->get('sort', null);
... ... @@ -250,52 +251,28 @@ class NewsaleController extends AbstractAction
$data = Newsale::selectNewSaleProducts($gender, $brand, $sort, $color, $size, $price, $p_d, $channel, $dayLimit, $limit, $page);
$this->returnJson(200, '获取成功', $data);
}
}
$result = NewSaleProcess::selectData($data);
$this->_view->display('product', $result);
// $this->returnJson(200, '获取成功', $data);
// }
}
/**
* 折扣专区
*/
public function discountAction()
{
$data = array(
'headerBanner' => array(
'url' => '',
'img' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480'
),
'tabs' => array(
array(
'title' => '1-3折',
'focus' => true
),
array(
'title' => '4-6折'
),
array(
'title' => '7-9折'
),
array(
'title' => 'ALL'
)
/*$data = array(
'header' => array(
'title' => 'SALE'
),
'goodsContainer' => array(
array(
'show' => 'true',
'goods' => array(
array(
'id' => '',
'thumb' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
'isLike' => false,
'price' => 1268,
'salePrice' => 589,
'isSale' => true,
'isFew' => true,
'isNew' => false,
'url' => ''
),
array(
'id' => '',
'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
'isLike' => false,
... ... @@ -329,105 +306,10 @@ class NewsaleController extends AbstractAction
'isFew' => true,
'isNew' => false,
'url' => ''
)
)
),
array(
'goods' => array(
array(
'id' => '',
'thumb' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
'isLike' => false,
'price' => 1268,
'salePrice' => 589,
'isSale' => true,
'isFew' => true,
'isNew' => false,
'url' => ''
),
array(
'id' => '',
'thumb' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
'isLike' => false,
'price' => 1268,
'salePrice' => 589,
'isSale' => true,
'isFew' => true,
'isNew' => false,
'url' => ''
),
array(
'id' => '',
'thumb' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
'isLike' => false,
'price' => 1268,
'salePrice' => 589,
'isSale' => true,
'isFew' => true,
'isNew' => false,
'url' => ''
),
array(
'id' => '',
'thumb' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
'isLike' => false,
'price' => 1268,
'salePrice' => 589,
'isSale' => true,
'isFew' => true,
'isNew' => false,
'url' => ''
)
)
),
array(
'goods' => array(
array(
'id' => '',
'thumb' => 'http://img11.static.yhbimg.com/yhb-img01/2015/09/17/09/015e14c53a41c7adf0bd039f6493b5a700.jpg?imageView/2/w/140/h/140',
'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
'isLike' => false,
'price' => 1268,
'salePrice' => 589,
'isSale' => true,
'isFew' => true,
'isNew' => false,
'url' => ''
),
array(
'id' => '',
'thumb' => 'http://img11.static.yhbimg.com/yhb-img01/2015/09/17/09/015e14c53a41c7adf0bd039f6493b5a700.jpg?imageView/2/w/140/h/140',
'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
'isLike' => false,
'price' => 1268,
'salePrice' => 589,
'isSale' => true,
'isFew' => true,
'isNew' => false,
'url' => ''
),
array(
'id' => '',
'thumb' => 'http://img11.static.yhbimg.com/yhb-img01/2015/09/17/09/015e14c53a41c7adf0bd039f6493b5a700.jpg?imageView/2/w/140/h/140',
'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
'isLike' => false,
'price' => 1268,
'salePrice' => 589,
'isSale' => true,
'isFew' => true,
'isNew' => false,
'url' => ''
),
array(
'id' => '',
'thumb' => 'http://img11.static.yhbimg.com/yhb-img01/2015/09/17/09/015e14c53a41c7adf0bd039f6493b5a700.jpg?imageView/2/w/140/h/140',
'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
'isLike' => false,
'price' => 1268,
... ... @@ -437,37 +319,45 @@ class NewsaleController extends AbstractAction
'isNew' => false,
'url' => ''
)
)
)
);*/
$data = array(
'discount' => true,
'header' => array(
'title' => 'SALE'
)
);
/*$this->_view->assign('title', '折扣专区');
// 折扣专区顶部焦点图
$focusData = Newsale::getNewsaleFocus('e9c9be32d72e2906d404a72ee24cb523');
// 处理返回的数据
$focus = array();
if($focusData['code'] == 200)
{
foreach ($focusData['data'] as $single)
{
foreach ($single['data'] as $val) {
$val['src'] = Helpers::getImageUrl($val['src'], 375, 667, 1);
$focus[] = $val;
}
}
$focus = $focusData['data'];
}
// 折扣专区商品数据
$products = Newsale::getNewProducts('1,3', 1, 60);
var_dump($products);
$products = Newsale::getSaleProducts('1,3', 1);
// 更新tabs
$tabs = array();
foreach (array_keys($products) as $key => $value) {
$tabItem = array();
$tabItem['title'] = $value;
if($key === 0)
{
$tabItem['focus'] = true;
}
$tabs[] = $tabItem;
}
$data += array('tabs' => $tabs);
// 添加商品数据
$data += NewSaleProcess::newSaleData($focus, $products);
$this->_view->display('new', compact('focus', 'products'));*/
echo '<pre>';
print_r($data);exit;
$this->_view->assign('title', '折扣专区');
$this->_view->display('sale', $data);
... ...