周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 2e5ad0723bb20798d549fd3d3e6be61eb8ab5d62 2 个父辈 1d15fa76 78cc50b9

合并分支 'lyh-server' 到 'master' 

gx



查看合并请求 !2540
内嵌 并排对比
正在显示 2 个修改的文件 包含 11 行增加 和 3 行删除
@@ -178,7 +178,7 @@ class LoginController extends BaseController @@ -178,7 +178,7 @@ class LoginController extends BaseController
178 $wechat = new Wechat(); 178 $wechat = new Wechat();
179 $accessToken = $wechat->getAccessToken(); 179 $accessToken = $wechat->getAccessToken();
180 $data = $wechat->setQrcode('global-v6_'.$this->param['type'].'_'.$this->param['id'],$accessToken); 180 $data = $wechat->setQrcode('global-v6_'.$this->param['type'].'_'.$this->param['id'],$accessToken);
181 - if(!empty($data)){ 181 + if(!empty($data) && isset($data['Ticket'])){
182 $data['url'] = "https://mp.weixin.qq.com/cgi-bin/showqrcode?Ticket=".$data['Ticket']; 182 $data['url'] = "https://mp.weixin.qq.com/cgi-bin/showqrcode?Ticket=".$data['Ticket'];
183 } 183 }
184 $this->response('success',Code::SUCCESS,$data); 184 $this->response('success',Code::SUCCESS,$data);
@@ -51,7 +51,11 @@ class TranslateLogic extends BaseLogic @@ -51,7 +51,11 @@ class TranslateLogic extends BaseLogic
51 return $this->success($data); 51 return $this->success($data);
52 } 52 }
53 // 需要校对路由 53 // 需要校对路由
54 - $url = $this->user['domain'] . (($this->param['url'] != '/') ? $this->param['url'] : ''); 54 + if($this->user['project_id'] == 3778){
  55 + $url = $this->user['test_domain'] . (($this->param['url'] != '/') ? $this->param['url'] : '');
  56 + }else{
  57 + $url = $this->user['domain'] . (($this->param['url'] != '/') ? $this->param['url'] : '');
  58 + }
55 // 需要校对语种 59 // 需要校对语种
56 $languageInfo = $this->getLanguage($this->param['language_id']); 60 $languageInfo = $this->getLanguage($this->param['language_id']);
57 // 原始校对内容 61 // 原始校对内容
@@ -139,7 +143,11 @@ class TranslateLogic extends BaseLogic @@ -139,7 +143,11 @@ class TranslateLogic extends BaseLogic
139 } 143 }
140 return $this->success($data); 144 return $this->success($data);
141 } 145 }
142 - $url = $this->user['domain'].(($this->param['url'] != '/') ? $this->param['url'] : ''); 146 + if($this->user['project_id'] == 3778){
  147 + $url = $this->user['test_domain'] . (($this->param['url'] != '/') ? $this->param['url'] : '');
  148 + }else{
  149 + $url = $this->user['domain'] . (($this->param['url'] != '/') ? $this->param['url'] : '');
  150 + }
143 $param = $this->getRouteSource($this->param['url']); 151 $param = $this->getRouteSource($this->param['url']);
144 $param['language_id'] = $this->param['language_id']; 152 $param['language_id'] = $this->param['language_id'];
145 $param['type'] = $this->param['type']; 153 $param['type'] = $this->param['type'];