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

gx



查看合并请求 !2540

@@ -178,7 +178,7 @@ class LoginController extends BaseController
         $wechat = new Wechat();
         $accessToken = $wechat->getAccessToken();
         $data = $wechat->setQrcode('global-v6_'.$this->param['type'].'_'.$this->param['id'],$accessToken);
-        if(!empty($data)){
+        if(!empty($data) && isset($data['Ticket'])){
             $data['url'] = "https://mp.weixin.qq.com/cgi-bin/showqrcode?Ticket=".$data['Ticket'];
         }
         $this->response('success',Code::SUCCESS,$data);

@@ -51,7 +51,11 @@ class TranslateLogic extends BaseLogic
             return $this->success($data);
         }
         // 需要校对路由
-        $url = $this->user['domain'] . (($this->param['url'] != '/') ? $this->param['url'] : '');
+        if($this->user['project_id'] == 3778){
+            $url = $this->user['test_domain'] . (($this->param['url'] != '/') ? $this->param['url'] : '');
+        }else{
+            $url = $this->user['domain'] . (($this->param['url'] != '/') ? $this->param['url'] : '');
+        }
         // 需要校对语种
         $languageInfo = $this->getLanguage($this->param['language_id']);
         // 原始校对内容
@@ -139,7 +143,11 @@ class TranslateLogic extends BaseLogic
             }
             return $this->success($data);
         }
-        $url = $this->user['domain'].(($this->param['url'] != '/') ? $this->param['url'] : '');
+        if($this->user['project_id'] == 3778){
+            $url = $this->user['test_domain'] . (($this->param['url'] != '/') ? $this->param['url'] : '');
+        }else{
+            $url = $this->user['domain'] . (($this->param['url'] != '/') ? $this->param['url'] : '');
+        }
         $param = $this->getRouteSource($this->param['url']);
         $param['language_id'] = $this->param['language_id'];
         $param['type'] = $this->param['type'];