fe / YOHOBUYPC · Commits

Go to a project

Authored by hf
Commit d42336221cbb1edabad18aa297cf182eb038d275 2 parents 0fc894e5 4a465406

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

Inline Side-by-side
Showing 1 changed file with 10 additions and 5 deletions
@@ -9,6 +9,11 @@ use LibModels\Web\Home\IndexData; @@ -9,6 +9,11 @@ use LibModels\Web\Home\IndexData;
9 use LibModels\Web\Product\SearchData; 9 use LibModels\Web\Product\SearchData;
10 use WebPlugin\DataProcess\Channel as ChannelProcess; 10 use WebPlugin\DataProcess\Channel as ChannelProcess;
11 11
  12 +define('CODE_BOYS_CHANNEL_TMP', (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '79372627eee75d73afe7f9bac91e5ce6' : 'c15bf0cbfbd4893fd70c869c991f6d3d');
  13 +define('CODE_GIRLS_CHANNEL_TMP', (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '75215008957605c05e8cd375eac4f817' : 'a519ba44ef3a85cf3c05e405c6ba8e53');
  14 +define('CODE_KIDS_CHANNEL_TMP', (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? 'd71f4b27f2a7229fbb31a4bc490a6f36' : 'a7741b94e8bb9d56d0d36e00c05956f7');
  15 +define('CODE_LIFESTYLE_CHANNEL_TMP', (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '8a341ca7eacc069ba80f02dec80eaf34' : '1b053fd044834f5c86d5eb15fb237af9');
  16 +
12 /** 17 /**
13 * web首页模板数据模型 18 * web首页模板数据模型
14 * 19 *
@@ -40,15 +45,15 @@ class HomeModel @@ -40,15 +45,15 @@ class HomeModel
40 //lifestyle:8a341ca7eacc069ba80f02dec80eaf34,1b053fd044834f5c86d5eb15fb237af9 45 //lifestyle:8a341ca7eacc069ba80f02dec80eaf34,1b053fd044834f5c86d5eb15fb237af9
41 46
42 // 男首首页 47 // 男首首页
43 - const CODE_BOYS_CHANNEL = (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '79372627eee75d73afe7f9bac91e5ce6': 'c15bf0cbfbd4893fd70c869c991f6d3d'; 48 + const CODE_BOYS_CHANNEL = CODE_BOYS_CHANNEL_TMP;
44 // 女首首页 49 // 女首首页
45 - const CODE_GIRLS_CHANNEL = (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '75215008957605c05e8cd375eac4f817': 'a519ba44ef3a85cf3c05e405c6ba8e53'; 50 + const CODE_GIRLS_CHANNEL = CODE_GIRLS_CHANNEL_TMP;
46 51
47 // 潮童首页 52 // 潮童首页
48 - const CODE_KIDS_CHANNEL = (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? 'd71f4b27f2a7229fbb31a4bc490a6f36':'a7741b94e8bb9d56d0d36e00c05956f7'; 53 + const CODE_KIDS_CHANNEL = CODE_KIDS_CHANNEL_TMP;
49 54
50 // 创意生活新 55 // 创意生活新
51 - const CODE_LIFESTYLE_CHANNEL = (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '8a341ca7eacc069ba80f02dec80eaf34': '8a341ca7eacc069ba80f02dec80eaf34'; 56 + const CODE_LIFESTYLE_CHANNEL = CODE_LIFESTYLE_CHANNEL_TMP;
52 57
53 // 创意生活 58 // 创意生活
54 const CODE_LIFESTYLE_CHANNEL_1 = '380c38155fd8beee10913a3f5b462da6'; 59 const CODE_LIFESTYLE_CHANNEL_1 = '380c38155fd8beee10913a3f5b462da6';
@@ -254,7 +259,7 @@ class HomeModel @@ -254,7 +259,7 @@ class HomeModel
254 { 259 {
255 $key = WebCacheConfig::KEY_WEB_HOME_CHANNEL_NEWARRIVAL_DATA . '_' . $channel; 260 $key = WebCacheConfig::KEY_WEB_HOME_CHANNEL_NEWARRIVAL_DATA . '_' . $channel;
256 //缓存数据 261 //缓存数据
257 - $result = '';//Cache::get($key); 262 + $result = Cache::get($key);
258 if (empty($result)) { 263 if (empty($result)) {
259 $params = array( 264 $params = array(
260 'order' => 's_t_desc', 265 'order' => 's_t_desc',