fe / YOHOBUYWAP · Commits

Go to a project

Authored by 阿达
Commit e2c757037cec017426aecc0f38ea4f940d41de4d 2 parents 27a8baa7 b501013e

Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuywap into release/4.4

Inline Side-by-side
Showing 4 changed files with 18 additions and 262 deletions
... ... @@ -43,7 +43,7 @@ class ShopProcess
private static function shopInfo($data)
{
self::$shopData['logoImg'] = Images::getImageUrl($data['data']['shop_logo'], 500, 500, 'shopLogo');
self::$shopData['storeName'] = $data['data']['shop_name'];
self::$shopData['storeName'] = $data['data']['is_favorite'] == 'Y' ? $data['data']['shop_name'] : '';
//用户是否收藏店铺
self::$shopData['collect'] = $data['data']['is_favorite'] == 'Y' ? true : false;
//店铺id
... ... @@ -145,11 +145,11 @@ class ShopProcess
*/
private static function largeSlideImg($data)
{
if (empty($data[0]['data'])) {
return;
}
foreach ($data[0]['data'] as $slide) {
self::$shopData['bannerTop']['list'][] = array('url' => $slide['url'], 'img' => $slide['src']);
foreach ($data as $slide) {
if (empty($slide['data'][0])) {
continue;
}
self::$shopData['bannerTop']['list'][] = array('url' => $slide['data'][0]['url'], 'img' => $slide['data'][0]['src']);
}
}
/**
... ... @@ -175,13 +175,18 @@ class ShopProcess
private static function hotProducts_APP($data)
{
foreach ($data as $val) {
self::$shopData['hotList'][] = array(
$goods = array(
'url' => Helpers::getUrlBySkc($val['productId'], $val['goodsId'], $val['cnAlphabet']),
'img' => Helpers::getImageUrl($val['src'], 235, 314),
'productName' => $val['productName'],
'salesPrice' => '￥'.$val['salesPrice'],
'presentPrice' => '￥'.$val['salesPrice']
);
if (!empty(self::$appVersion)) {
$goods['url'] .= '?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":' . $productData['product_skn'] . '}}';
}
self::$shopData['hotList'][] = $goods;
}
}
... ...
... ... @@ -37,8 +37,8 @@
<ul id="nav" class="nav">
<li class="active color buriedpoint" tab="home-page">首页</li>
<li tab="new-arrival buriedpoint">上新</li>
<li tab="popularity buriedpoint">人气</li>
<li tab="new-arrival" class="buriedpoint">上新</li>
<li tab="popularity" class="buriedpoint">人气</li>
<li class="all-goods buriedpoint">
<a href="{{allGoods}}">全部商品</a>
</li>
... ... @@ -119,8 +119,8 @@
{{/unless}}
<ul id="pos-nav" class="nav hide">
<li class="active color buriedpoint" tab="home-page">首页</li>
<li tab="new-arrival buriedpoint">上新</li>
<li tab="popularity buriedpoint">人气</li>
<li tab="new-arrival" class="buriedpoint">上新</li>
<li tab="popularity" class="buriedpoint">人气</li>
<li class="all-goods buriedpoint">
<a href="{{allGoods}}">全部商品</a>
</li>
... ...
... ... @@ -208,6 +208,7 @@ class SearchController extends AbstractAction
*/
public function searchAction()
{
error_reporting(0);
$data = array();
do {
... ... @@ -236,7 +237,7 @@ class SearchController extends AbstractAction
'page' => FILTER_VALIDATE_INT,), false);
if(!empty($condition['shop_id'])){
$condition['shop'] = empty($condition['shop_id']);
$condition['shop'] = $condition['shop_id'];
}
// 转义分类
if (isset($condition['sort'])) {
... ...
<?php
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
use Action\AbstractAction;
class ShopController extends AbstractAction
{
/**
* 店铺品牌首页
*
* @return mixed
*/
public function indexAction()
{
$data = array(
'branerImg' => 'http://img12.static.yhbimg.com/yhb-img01/2016/04/18/05/026e96d1b403d28407650c7228bb4ca405.jpg?imageView2/2/w/640/h/200',
'goodList' => 'http://www.baidu.com',
'brands' => false,
'multiList' => array(
array(
'url' => '',
'img' => 'http://img12.static.yhbimg.com/yhb-img01/2016/04/18/05/026b9aee5b7d2ec33e8db877c3d87b3386.jpg?imageView2/2/w/640/h/403',
'brandName' => '123re34456556900'
),
array(
'url' => '',
'img' => 'http://img12.static.yhbimg.com/yhb-img01/2016/04/18/05/026b9aee5b7d2ec33e8db877c3d87b3386.jpg?imageView2/2/w/640/h/403',
'brandName' => '123re344565'
),
array(
'url' => '',
'img' => 'http://img12.static.yhbimg.com/yhb-img01/2016/04/18/05/026b9aee5b7d2ec33e8db877c3d87b3386.jpg?imageView2/2/w/640/h/403',
'brandName' => '123re344565'
)
),
'bannerTop' => array(
'list' => array(
array(
'url' => '',
'img' => 'http://img12.static.yhbimg.com/yhb-img01/2016/01/19/11/02039485d87cc1b100b883244cf386e62d.jpg?imageView/2/w/640/h/200',
),
array(
'url' => '',
'img' => 'http://img12.static.yhbimg.com/yhb-img01/2016/01/19/11/02039485d87cc1b100b883244cf386e62d.jpg?imageView/2/w/640/h/200',
),
)
),
'spring' => array(
array(
'url' => '',
'springType' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/29/08/01ea96f5fd2ea8ef99d37d00f39d8e57f0.jpg?imageView/2/w/275/h/160'
),
array(
'url' => '',
'springType' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/29/08/019c44dcf0a93e9f3afe2fbec0d1961046.jpg?imageView/2/w/275/h/160'
)
),
'hotCategory' => array(
'name' => '热门品类',
'list' => array(
array(
'url' => 'http://img12.static.yhbimg.com/yhb-img01/2016/04/15/02/0295b83dc3bcef5bd59f339841f9ee92d1.jpg?imageView2/2/w/640/h/403',
'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/29/08/019c44dcf0a93e9f3afe2fbec0d1961046.jpg?imageView/2/w/275/h/160',
),
array(
'url' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/29/08/019c44dcf0a93e9f3afe2fbec0d1961046.jpg?imageView/2/w/275/h/160',
'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/29/08/019c44dcf0a93e9f3afe2fbec0d1961046.jpg?imageView/2/w/275/h/160',
),
array(
'url' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/29/08/019c44dcf0a93e9f3afe2fbec0d1961046.jpg?imageView/2/w/275/h/160',
'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/29/08/019c44dcf0a93e9f3afe2fbec0d1961046.jpg?imageView/2/w/275/h/160',
),
array(
'url' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/29/08/019c44dcf0a93e9f3afe2fbec0d1961046.jpg?imageView/2/w/275/h/160',
'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/29/08/019c44dcf0a93e9f3afe2fbec0d1961046.jpg?imageView/2/w/275/h/160',
),
array(
'url' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/29/08/019c44dcf0a93e9f3afe2fbec0d1961046.jpg?imageView/2/w/275/h/160',
'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/29/08/019c44dcf0a93e9f3afe2fbec0d1961046.jpg?imageView/2/w/275/h/160',
),
array(
'url' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/29/08/019c44dcf0a93e9f3afe2fbec0d1961046.jpg?imageView/2/w/275/h/160',
'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/29/08/019c44dcf0a93e9f3afe2fbec0d1961046.jpg?imageView/2/w/275/h/160',
),
array(
'url' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/29/08/019c44dcf0a93e9f3afe2fbec0d1961046.jpg?imageView/2/w/275/h/160',
'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/29/08/019c44dcf0a93e9f3afe2fbec0d1961046.jpg?imageView/2/w/275/h/160',
),
array(
'url' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/29/08/019c44dcf0a93e9f3afe2fbec0d1961046.jpg?imageView/2/w/275/h/160',
'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/29/08/019c44dcf0a93e9f3afe2fbec0d1961046.jpg?imageView/2/w/275/h/160',
)
)
),
'hotList' => array(
array(
'url' => '',
'listUrl' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/07/07/0147c904336407bb9f4008bfda7920b9bd.jpg?imageMogr2/thumbnail/276x366/extent/276x366/background/d2hpdGU=/position/center/quality/80',
'originalPrice' => '￥599.00',
'presentPrice' => '￥399.00'
),
array(
'url' => '',
'listUrl' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/07/07/0147c904336407bb9f4008bfda7920b9bd.jpg?imageMogr2/thumbnail/276x366/extent/276x366/background/d2hpdGU=/position/center/quality/80',
'originalPrice' => '￥599',
'presentPrice' => '￥399'
),
array(
'url' => '',
'listUrl' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/07/07/0147c904336407bb9f4008bfda7920b9bd.jpg?imageMogr2/thumbnail/276x366/extent/276x366/background/d2hpdGU=/position/center/quality/80',
'originalPrice' => '￥599',
'presentPrice' => '￥399'
),
array(
'url' => '',
'listUrl' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/07/07/0147c904336407bb9f4008bfda7920b9bd.jpg?imageMogr2/thumbnail/276x366/extent/276x366/background/d2hpdGU=/position/center/quality/80',
'originalPrice' => '￥599',
'presentPrice' => '￥399'
),
array(
'url' => '',
'listUrl' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/07/07/0147c904336407bb9f4008bfda7920b9bd.jpg?imageMogr2/thumbnail/276x366/extent/276x366/background/d2hpdGU=/position/center/quality/80',
'originalPrice' => '￥599.00',
'presentPrice' => '￥399.00'
),
array(
'url' => '',
'listUrl' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/07/07/0147c904336407bb9f4008bfda7920b9bd.jpg?imageMogr2/thumbnail/276x366/extent/276x366/background/d2hpdGU=/position/center/quality/80',
'originalPrice' => '￥599',
'presentPrice' => '￥399'
),
array(
'url' => '',
'listUrl' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/07/07/0147c904336407bb9f4008bfda7920b9bd.jpg?imageMogr2/thumbnail/276x366/extent/276x366/background/d2hpdGU=/position/center/quality/80',
'originalPrice' => '￥599',
'presentPrice' => '￥399'
),
array(
'url' => '',
'listUrl' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/07/07/0147c904336407bb9f4008bfda7920b9bd.jpg?imageMogr2/thumbnail/276x366/extent/276x366/background/d2hpdGU=/position/center/quality/80',
'originalPrice' => '￥599',
'presentPrice' => '￥399'
)
),
'goods' => array(
array(
'url' => 'http://m.yohobuy.com/product/pro_320421_412063/SYSTAGYuanLingWeiYiSYSA601HC09.html',
'thumb' => 'http://img10.static.yhbimg.com/goodsimg/2015/12/07/09/01ced0e2ed6a4f2a6d95be70cd0a6c5a56.jpg?imageView/2/w/235/h/314',
'name' => 'NEFF ONE OF US RAGLAN L/S 男款森林风连帽卫衣',
'salePrice' => '759.00',
'price' => '799.00',
'tags' => array(
'is_new' => false,
'is_advance' => true,
'is_discount' => false,
'is_yohoood' => false,
'is_limited' => false
),
'is_soon_sold_out' => false
),
array(
'url' => 'http://m.yohobuy.com/product/pro_320421_412063/SYSTAGYuanLingWeiYiSYSA601HC09.html',
'thumb' => 'http://img10.static.yhbimg.com/goodsimg/2015/12/07/09/01ced0e2ed6a4f2a6d95be70cd0a6c5a56.jpg?imageView/2/w/235/h/314',
'name' => 'NEFF ONE OF US RAGLAN L/S 男款森林风连帽卫衣',
'salePrice' => '759.00',
'price' => '799.00',
'tags' => array(
'is_new' => true,
'is_advance' => false,
'is_discount' => false,
'is_yohoood' => false,
'is_limited' => false
),
'is_soon_sold_out' => false
),
array(
'url' => 'http://m.yohobuy.com/product/pro_320421_412063/SYSTAGYuanLingWeiYiSYSA601HC09.html',
'thumb' => 'http://img10.static.yhbimg.com/goodsimg/2015/12/07/09/01ced0e2ed6a4f2a6d95be70cd0a6c5a56.jpg?imageView/2/w/235/h/314',
'name' => 'NEFF ONE OF US RAGLAN L/S 男款森林风连帽卫衣',
'salePrice' => '759.00',
'price' => '799.00',
'tags' => array(
'is_new' => true,
'is_advance' => false,
'is_discount' => false,
'is_yohoood' => false,
'is_limited' => false
),
'is_soon_sold_out' => false
),
array(
'url' => 'http://m.yohobuy.com/product/pro_320421_412063/SYSTAGYuanLingWeiYiSYSA601HC09.html',
'thumb' => 'http://img10.static.yhbimg.com/goodsimg/2015/12/07/09/01ced0e2ed6a4f2a6d95be70cd0a6c5a56.jpg?imageView/2/w/235/h/314',
'name' => 'NEFF ONE OF US RAGLAN L/S 男款森林风连帽卫衣',
'salePrice' => '759.00',
'price' => '799.00',
'tags' => array(
'is_new' => true,
'is_advance' => false,
'is_discount' => false,
'is_yohoood' => false,
'is_limited' => false
),
'is_soon_sold_out' => false
),
array(
'url' => 'http://m.yohobuy.com/product/pro_320421_412063/SYSTAGYuanLingWeiYiSYSA601HC09.html',
'thumb' => 'http://img10.static.yhbimg.com/goodsimg/2015/12/07/09/01ced0e2ed6a4f2a6d95be70cd0a6c5a56.jpg?imageView/2/w/235/h/314',
'name' => 'NEFF ONE OF US RAGLAN L/S 男款森林风连帽卫衣',
'salePrice' => '759.00',
'price' => '799.00',
'tags' => array(
'is_new' => true,
'is_advance' => false,
'is_discount' => false,
'is_yohoood' => false,
'is_limited' => false
),
'is_soon_sold_out' => false
),
array(
'url' => 'http://m.yohobuy.com/product/pro_320421_412063/SYSTAGYuanLingWeiYiSYSA601HC09.html',
'thumb' => 'http://img10.static.yhbimg.com/goodsimg/2015/12/07/09/01ced0e2ed6a4f2a6d95be70cd0a6c5a56.jpg?imageView/2/w/235/h/314',
'name' => 'NEFF ONE OF US RAGLAN L/S 男款森林风连帽卫衣',
'salePrice' => '759.00',
'price' => '799.00',
'tags' => array(
'is_new' => true,
'is_advance' => false,
'is_discount' => false,
'is_yohoood' => false,
'is_limited' => false
),
'is_soon_sold_out' => false
)
)
);
return $this->_view->display('index', array(
'shopIndex' => $data,
'shopPage' => true
));
}
}
\ No newline at end of file