合并分支 'master-server' 到 'master'
gx 查看合并请求 !907
正在显示
1 个修改的文件
包含
1 行增加
和
1 行删除
| @@ -94,7 +94,7 @@ class TranslateController extends BaseController | @@ -94,7 +94,7 @@ class TranslateController extends BaseController | ||
| 94 | $resData['route'] = $values['url']; | 94 | $resData['route'] = $values['url']; |
| 95 | $resData['page'] = $values['page']; | 95 | $resData['page'] = $values['page']; |
| 96 | $resData['data'] = []; | 96 | $resData['data'] = []; |
| 97 | - $keyInfo = $keyModel->read(['route'=>$values['url'],'page'=>$values['page']],['id','proof_key']); | 97 | + $keyInfo = $keyModel->read(['url'=>$values['url'],'page'=>$values['page']],['id','proof_key']); |
| 98 | if($keyInfo !== false){ | 98 | if($keyInfo !== false){ |
| 99 | $result_id_data[] = $keyInfo['id']; | 99 | $result_id_data[] = $keyInfo['id']; |
| 100 | $translate_data = json_decode($values['translate_data']['data'],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES); | 100 | $translate_data = json_decode($values['translate_data']['data'],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES); |
-
请 注册 或 登录 后发表评论