作者 李宇航

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

gx翻译传递参数



查看合并请求 !1745
@@ -31,6 +31,8 @@ class GoogleLinkController extends BaseController @@ -31,6 +31,8 @@ class GoogleLinkController extends BaseController
31 $data = $linkService->linkPageData($this->user['domain'],$this->user['project_id']); 31 $data = $linkService->linkPageData($this->user['domain'],$this->user['project_id']);
32 $lists = paginateArray($data,$this->page,$this->row); 32 $lists = paginateArray($data,$this->page,$this->row);
33 } 33 }
  34 + $lists['y_total'] = $linkModel->counts(['status'=>1]);
  35 + $lists['n_total'] = $linkModel->counts(['status'=>0]);
34 $this->response('success',Code::SUCCESS,$lists); 36 $this->response('success',Code::SUCCESS,$lists);
35 } 37 }
36 38