fe / YOHOBUYPC · Commits

Go to a project

Authored by 周少峰
Commit 5b4b80bb3248b1bfa21f35fb6e844c0537012830 1 parent b7da509a

new more link

Inline Side-by-side
Showing 2 changed files with 6 additions and 6 deletions
@@ -531,7 +531,7 @@ class ShopModel @@ -531,7 +531,7 @@ class ShopModel
531 531
532 if (isset($data['resource_data']['new'])) { 532 if (isset($data['resource_data']['new'])) {
533 foreach ($data['resource_data']['new'] as $val) { 533 foreach ($data['resource_data']['new'] as $val) {
534 - if (empty($val['url'])) { 534 + if (empty($val['url']) || empty($val['position'])) {
535 continue; 535 continue;
536 } 536 }
537 $result['new'][] = array( 537 $result['new'][] = array(
@@ -712,7 +712,7 @@ class ShopModel @@ -712,7 +712,7 @@ class ShopModel
712 } 712 }
713 } 713 }
714 714
715 - if (!iseet($val['data']) && is_array($val)) { 715 + if (!isset($val['data']) && is_array($val)) {
716 foreach ($val as $k1 => &$v1) { 716 foreach ($val as $k1 => &$v1) {
717 $url = self::modifyUrl($v1, $shopId); 717 $url = self::modifyUrl($v1, $shopId);
718 if (!empty($url)) { 718 if (!empty($url)) {
@@ -12,15 +12,15 @@ defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'developer'); @@ -12,15 +12,15 @@ defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'developer');
12 define('EXHIBITION_TICKET', 51335912);//展览票skn 12 define('EXHIBITION_TICKET', 51335912);//展览票skn
13 13
14 #test环境 14 #test环境
15 -//define('API_URL', 'http://testapi.yoho.cn:28078/');  
16 -//define('SERVICE_URL', 'http://testservice.yoho.cn:28077/'); 15 +define('API_URL', 'http://testapi.yoho.cn:28078/');
  16 +define('SERVICE_URL', 'http://testservice.yoho.cn:28077/');
17 //define('YOHOBUY_URL', 'http://www.yohobuy.com/'); 17 //define('YOHOBUY_URL', 'http://www.yohobuy.com/');
18 //define('SERVICE_NOTIFY', 'http://testservice.yoho.cn:28077/'); 18 //define('SERVICE_NOTIFY', 'http://testservice.yoho.cn:28077/');
19 //define('API_OLD', 'http://test2.open.yohobuy.com/'); 19 //define('API_OLD', 'http://test2.open.yohobuy.com/');
20 20
21 #dev环境 21 #dev环境
22 - define('API_URL', 'http://dev-api.yohops.com:9999/');  
23 - define('SERVICE_URL', 'http://dev-service.yohops.com:9999/'); 22 +// define('API_URL', 'http://dev-api.yohops.com:9999/');
  23 +// define('SERVICE_URL', 'http://dev-service.yohops.com:9999/');
24 define('YOHOBUY_URL', 'http://www.yohobuy.com/'); 24 define('YOHOBUY_URL', 'http://www.yohobuy.com/');
25 define('SERVICE_NOTIFY', 'http://test2.open.yohobuy.com/'); 25 define('SERVICE_NOTIFY', 'http://test2.open.yohobuy.com/');
26 define('API_OLD', 'http://devservice.yoho.cn:58077/'); 26 define('API_OLD', 'http://devservice.yoho.cn:58077/');