From 115fe28ce93fbaee78d294a25f788c476a1ca480 Mon Sep 17 00:00:00 2001
From: hf <fei.hong@yoho.cn>
Date: Mon, 14 Mar 2016 13:41:39 +0800
Subject: [PATCH] code review by fei.hong: do merge yang.yang and shaofeng.zhou fixes bugs codes
---
yohobuy/www.yohobuy.com/application/models/Product/Brands.php | 3 +--
yohobuy/www.yohobuy.com/application/models/Product/Sale.php | 2 +-
yohobuy/www.yohobuy.com/public/index-dev.php | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/yohobuy/www.yohobuy.com/application/models/Product/Brands.php b/yohobuy/www.yohobuy.com/application/models/Product/Brands.php
index 3a8a75a..316639e 100644
--- a/yohobuy/www.yohobuy.com/application/models/Product/Brands.php
+++ b/yohobuy/www.yohobuy.com/application/models/Product/Brands.php
@@ -53,10 +53,9 @@ class BrandsModel
//获取静态内容
if ($options['node']) {
$nodeContent = HelperSearch::getNodeContent($options['node']);
- $result['leftContent'][]['picLink']['list'] = $nodeContent;
+ $result['leftContent'][]['cardHtml'] = $nodeContent;
}
-
return $result;
}
diff --git a/yohobuy/www.yohobuy.com/application/models/Product/Sale.php b/yohobuy/www.yohobuy.com/application/models/Product/Sale.php
index 48b7f35..972ebb3 100644
--- a/yohobuy/www.yohobuy.com/application/models/Product/Sale.php
+++ b/yohobuy/www.yohobuy.com/application/models/Product/Sale.php
@@ -72,7 +72,7 @@ class SaleModel
//获取广告位数据
if (isset($special['left_ad_code'])) {
$nodeContent = HelperSearch::getNodeContent($special['left_ad_code']);
- $result['leftContent'][]['picLink']['list'] = $nodeContent;
+ $result['leftContent'][]['cardHtml'] = $nodeContent;
}
diff --git a/yohobuy/www.yohobuy.com/public/index-dev.php b/yohobuy/www.yohobuy.com/public/index-dev.php
index 97ef4c8..79e5493 100644
--- a/yohobuy/www.yohobuy.com/public/index-dev.php
+++ b/yohobuy/www.yohobuy.com/public/index-dev.php
@@ -4,7 +4,7 @@ define('SITE_MAIN', 'http://web.dev.yohobuy.com'); // 网站主域名
define('OLD_MAIN', 'http://www.yohobuy.com'); // 网站旧域名
define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
define('SUB_DOMAIN', '.yohobuy.com'); // 子域名后缀
-define('USE_CACHE', true); // 缓存的开关
+define('USE_CACHE', false); // 缓存的开关
define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录
defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'developer');
--
libgit2 0.24.0