Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
Showing
1 changed file
with
29 additions
and
1 deletions
@@ -374,7 +374,7 @@ class HomeModel | @@ -374,7 +374,7 @@ class HomeModel | ||
374 | } | 374 | } |
375 | $result['channelList'][] = $build; | 375 | $result['channelList'][] = $build; |
376 | } | 376 | } |
377 | - } | 377 | + } |
378 | 378 | ||
379 | if (USE_CACHE) { | 379 | if (USE_CACHE) { |
380 | // 接口调用异常时, 不害怕,从我们的二级缓存(slave)里再取数据. | 380 | // 接口调用异常时, 不害怕,从我们的二级缓存(slave)里再取数据. |
@@ -386,6 +386,34 @@ class HomeModel | @@ -386,6 +386,34 @@ class HomeModel | ||
386 | Cache::set($key, $result); | 386 | Cache::set($key, $result); |
387 | } | 387 | } |
388 | } | 388 | } |
389 | + | ||
390 | + // 当接口和缓存都挂了时候,返回静态的数据 | ||
391 | + if (empty($result)) { | ||
392 | + $result = array( | ||
393 | + 'channelList' => array( | ||
394 | + array( | ||
395 | + 'href' => '/boys', | ||
396 | + 'title' => '男生', | ||
397 | + 'entitle' => 'BOYS', | ||
398 | + ), | ||
399 | + array( | ||
400 | + 'href' => '/girls', | ||
401 | + 'title' => '女生', | ||
402 | + 'entitle' => 'GIRLS', | ||
403 | + ), | ||
404 | + array( | ||
405 | + 'href' => '/kids', | ||
406 | + 'title' => '潮童', | ||
407 | + 'entitle' => 'KIDS', | ||
408 | + ), | ||
409 | + array( | ||
410 | + 'href' => '/lifestyle', | ||
411 | + 'title' => '创意生活', | ||
412 | + 'entitle' => 'LIFESTYLE', | ||
413 | + ), | ||
414 | + ) | ||
415 | + ); | ||
416 | + } | ||
389 | 417 | ||
390 | return $result; | 418 | return $result; |
391 | } | 419 | } |
-
Please register or login to post a comment