周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 2fc3ffe53cb93e032495d37f64903f34002dc9e8 1 个父辈 9aa612be

update

内嵌 并排对比
正在显示 1 个修改的文件 包含 4 行增加 和 4 行删除
@@ -38,7 +38,7 @@ class TranslateLogic extends BaseLogic @@ -38,7 +38,7 @@ class TranslateLogic extends BaseLogic
38 public function getTranslateList(){ 38 public function getTranslateList(){
39 $data = []; 39 $data = [];
40 if($this->param['url'] == 'All' || $this->param['url'] == 'other_all_text'){ 40 if($this->param['url'] == 'All' || $this->param['url'] == 'other_all_text'){
41 - $info = $this->model->with('translate_data')->where(['url'=>$this->param['url'],'language_id'=>$this->param['language_id'],'type'=>$this->param['type']])->first()->toArray(); 41 + $info = $this->model->with('translate_data')->where(['url'=>$this->param['url'],'language_id'=>$this->param['language_id'],'type'=>$this->param['type']])->first();
42 if(!empty($info) && !empty($info['translate_data'])){ 42 if(!empty($info) && !empty($info['translate_data'])){
43 $translateInfo = json_decode($info['translate_data']['data'],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES); 43 $translateInfo = json_decode($info['translate_data']['data'],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
44 foreach ($translateInfo as $k => $v){ 44 foreach ($translateInfo as $k => $v){
@@ -52,7 +52,7 @@ class TranslateLogic extends BaseLogic @@ -52,7 +52,7 @@ class TranslateLogic extends BaseLogic
52 // 需要校对语种 52 // 需要校对语种
53 $languageInfo = $this->getLanguage($this->param['language_id']); 53 $languageInfo = $this->getLanguage($this->param['language_id']);
54 // 原始校对内容 54 // 原始校对内容
55 - $info = $this->model->with('translate_data')->where(['url'=>$this->param['url'],'language_id'=>$this->param['language_id'],'type'=>$this->param['type']])->first()->toArray(); 55 + $info = $this->model->with('translate_data')->where(['url'=>$this->param['url'],'language_id'=>$this->param['language_id'],'type'=>$this->param['type']])->first();
56 //获取当前URl的所有文本内容 56 //获取当前URl的所有文本内容
57 $text_array = $this->getUrlRead($url); 57 $text_array = $this->getUrlRead($url);
58 // 原始校对程序 58 // 原始校对程序
@@ -111,7 +111,7 @@ class TranslateLogic extends BaseLogic @@ -111,7 +111,7 @@ class TranslateLogic extends BaseLogic
111 */ 111 */
112 public function getTranslateImageList(){ 112 public function getTranslateImageList(){
113 if($this->param['url'] == 'All'){ 113 if($this->param['url'] == 'All'){
114 - $info = $this->model->with('translate_data')->where(['url'=>$this->param['url'],'language_id'=>$this->param['language_id'],'type'=>$this->param['type']])->first()->toArray(); 114 + $info = $this->model->with('translate_data')->where(['url'=>$this->param['url'],'language_id'=>$this->param['language_id'],'type'=>$this->param['type']])->first();
115 $data = []; 115 $data = [];
116 if(!empty($info) && !empty($info['translate_data'])){ 116 if(!empty($info) && !empty($info['translate_data'])){
117 $translateInfo = json_decode($info['translate_data']['data'],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES); 117 $translateInfo = json_decode($info['translate_data']['data'],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
@@ -122,7 +122,7 @@ class TranslateLogic extends BaseLogic @@ -122,7 +122,7 @@ class TranslateLogic extends BaseLogic
122 return $this->success($data); 122 return $this->success($data);
123 } 123 }
124 $url = $this->user['domain'].(($this->param['url'] != '/') ? $this->param['url'] : ''); 124 $url = $this->user['domain'].(($this->param['url'] != '/') ? $this->param['url'] : '');
125 - $info = $this->model->with('translate_data')->where(['url'=>str_replace_url($this->param['url']),'language_id'=>$this->param['language_id'],'type'=>$this->param['type']])->first()->toArray(); 125 + $info = $this->model->with('translate_data')->where(['url'=>str_replace_url($this->param['url']),'language_id'=>$this->param['language_id'],'type'=>$this->param['type']])->first();
126 $data = []; 126 $data = [];
127 if(empty($info)){ 127 if(empty($info)){
128 $new_list = $this->getUrlImageRead($url); 128 $new_list = $this->getUrlImageRead($url);