作者 张关杰

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -37,6 +37,7 @@ class RatingLogic extends BaseLogic @@ -37,6 +37,7 @@ class RatingLogic extends BaseLogic
37 'uptime'=>$this->project['uptime'], 37 'uptime'=>$this->project['uptime'],
38 'domain'=>$this->user['domain'], 38 'domain'=>$this->user['domain'],
39 'question'=>$this->model->list(['type'=>$this->param['type']]), 39 'question'=>$this->model->list(['type'=>$this->param['type']]),
  40 + 'project_id'=>$this->user['project_id']
40 ]; 41 ];
41 return $this->success($data); 42 return $this->success($data);
42 } 43 }
@@ -49,6 +49,9 @@ class TranslateLogic extends BaseLogic @@ -49,6 +49,9 @@ class TranslateLogic extends BaseLogic
49 $new_key = $this->getUrlRead($url); 49 $new_key = $this->getUrlRead($url);
50 if($info === false){ 50 if($info === false){
51 $translate_list = Translate::tran($new_key, $languageInfo['short']); 51 $translate_list = Translate::tran($new_key, $languageInfo['short']);
  52 + if(empty($translate_list)){
  53 + $this->fail('翻译失败,请联系管理员');
  54 + }
52 foreach ($new_key as $k=>$v){ 55 foreach ($new_key as $k=>$v){
53 $data[] = [ 56 $data[] = [
54 trim($v)=>$translate_list[$k], 57 trim($v)=>$translate_list[$k],