fe / YOHOBUYPC · Commits

Go to a project

Authored by 周少峰
Commit 1e821ab7fef5994d25f30e9ac397388e00ee35d5 2 parents 226636c0 988ae634

Merge branch 'hotfix/serviceSwitch' into release/5.4.1

Inline Side-by-side
Showing 3 changed files with 3 additions and 5 deletions
... ... @@ -79,8 +79,7 @@ class AbstractAction extends Controller_Abstract
//客服配置
protected function getCustomerServiceSwitch() {
return $this->_useSession && $this->getCacheBy('zookeeper:/pc/clientService/new') === 'true' ? '/service/client' :
'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409';
return $this->_useSession && $this->getCacheBy('zookeeper:/pc/clientService/new') === 'true' ? 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409' : '/service/client';
}
/**
* 封装一下获取get参数
... ...
... ... @@ -95,8 +95,7 @@ class WebAction extends Controller_Abstract
//客服配置
protected function getCustomerServiceSwitch() {
return $this->_useSession && $this->getCacheBy('zookeeper:/pc/clientService/new') === 'true' ? '/service/client' :
'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409';
return $this->_useSession && $this->getCacheBy('zookeeper:/pc/clientService/new') === 'true' ? 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409' : '/service/client';
}
/**
... ...
... ... @@ -45,7 +45,7 @@ class UserModel
}
public static function getCustomerServiceSwitch() {
return USE_CACHE && Cache::getBy('zookeeper:/pc/clientService/new') === 'true' ? '/service/client' : 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409';
return USE_CACHE && Cache::getBy('zookeeper:/pc/clientService/new') === 'true' ? 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409' : '/service/client';
}
/**
* 个人中心-左侧导航
... ...