Authored by Lynnic

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

@@ -212,7 +212,16 @@ class Yohobuy @@ -212,7 +212,16 @@ class Yohobuy
212 unset($data['private_key']); 212 unset($data['private_key']);
213 } 213 }
214 if (!empty($data)) { 214 if (!empty($data)) {
215 - curl_setopt($ch, CURLOPT_POSTFIELDS, $data); 215 + // 新加支持application/x-www-form-urlencoded调用方式
  216 + $str = '';
  217 + foreach ($data as $key => $val) {
  218 + $str .= $key . '=' . $val . '&';
  219 + }
  220 +
  221 + $str = rtrim($str, '&');
  222 +
  223 +// curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
  224 + curl_setopt($ch, CURLOPT_POSTFIELDS, $str);
216 } 225 }
217 $result = curl_exec($ch); 226 $result = curl_exec($ch);
218 if (!$returnJson && !empty($result)) { 227 if (!$returnJson && !empty($result)) {
@@ -471,6 +471,7 @@ class HomeController extends AbstractAction @@ -471,6 +471,7 @@ class HomeController extends AbstractAction
471 471
472 $service = array( 472 $service = array(
473 'header' => array('title' => '在线客服'), 473 'header' => array('title' => '在线客服'),
  474 + 'pageFooter' => true,
474 'service' => $service 475 'service' => $service
475 ); 476 );
476 477