Authored by hf

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

... ... @@ -9,6 +9,11 @@ use LibModels\Web\Home\IndexData;
use LibModels\Web\Product\SearchData;
use WebPlugin\DataProcess\Channel as ChannelProcess;
define('CODE_BOYS_CHANNEL_TMP', (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '79372627eee75d73afe7f9bac91e5ce6' : 'c15bf0cbfbd4893fd70c869c991f6d3d');
define('CODE_GIRLS_CHANNEL_TMP', (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '75215008957605c05e8cd375eac4f817' : 'a519ba44ef3a85cf3c05e405c6ba8e53');
define('CODE_KIDS_CHANNEL_TMP', (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? 'd71f4b27f2a7229fbb31a4bc490a6f36' : 'a7741b94e8bb9d56d0d36e00c05956f7');
define('CODE_LIFESTYLE_CHANNEL_TMP', (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '8a341ca7eacc069ba80f02dec80eaf34' : '1b053fd044834f5c86d5eb15fb237af9');
/**
* web首页模板数据模型
*
... ... @@ -40,15 +45,15 @@ class HomeModel
//lifestyle:8a341ca7eacc069ba80f02dec80eaf34,1b053fd044834f5c86d5eb15fb237af9
// 男首首页
const CODE_BOYS_CHANNEL = (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '79372627eee75d73afe7f9bac91e5ce6': 'c15bf0cbfbd4893fd70c869c991f6d3d';
const CODE_BOYS_CHANNEL = CODE_BOYS_CHANNEL_TMP;
// 女首首页
const CODE_GIRLS_CHANNEL = (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '75215008957605c05e8cd375eac4f817': 'a519ba44ef3a85cf3c05e405c6ba8e53';
const CODE_GIRLS_CHANNEL = CODE_GIRLS_CHANNEL_TMP;
// 潮童首页
const CODE_KIDS_CHANNEL = (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? 'd71f4b27f2a7229fbb31a4bc490a6f36':'a7741b94e8bb9d56d0d36e00c05956f7';
const CODE_KIDS_CHANNEL = CODE_KIDS_CHANNEL_TMP;
// 创意生活新
const CODE_LIFESTYLE_CHANNEL = (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '8a341ca7eacc069ba80f02dec80eaf34': '8a341ca7eacc069ba80f02dec80eaf34';
const CODE_LIFESTYLE_CHANNEL = CODE_LIFESTYLE_CHANNEL_TMP;
// 创意生活
const CODE_LIFESTYLE_CHANNEL_1 = '380c38155fd8beee10913a3f5b462da6';
... ... @@ -254,7 +259,7 @@ class HomeModel
{
$key = WebCacheConfig::KEY_WEB_HOME_CHANNEL_NEWARRIVAL_DATA . '_' . $channel;
//缓存数据
$result = '';//Cache::get($key);
$result = Cache::get($key);
if (empty($result)) {
$params = array(
'order' => 's_t_desc',
... ...