trac

app/api/controller/Square.php

@@ -50,6 +50,7 @@ class Square extends Controller
         $data['merchant_id'] = $this->merchantId;
         $data['user_name'] = $useInfo['user_id'];
         $data['real_name'] = $useInfo['nick_name'];
+        $data['avatar_id'] = $useInfo['avatar_id'];
         if ((new squareModel)->add($data)) {
             return $this->renderSuccess('添加成功');
         }
@@ -61,16 +62,24 @@ class Square extends Controller
      * 列表
      */
     public function list(): Json {
+        $pageSize = $this->request->param('pageSize');
+        $pageSize = empty($pageSize) ? 15 : $pageSize;
+
         $model = new squareModel;
-        $list = $model->getList($this->request->param())->toArray();
+        $list = $model->getList($this->request->param(), intval($pageSize))->toArray();
 
         foreach ($list['data'] as $kr => $r) {
             $res[$kr]['imgs'] = [];
+            $res[$kr]['avatar_url'] = [];
             if ($r['imgs']) {
                 $img_ids = explode(",", $r['imgs']);
                 $files = UploadFile::getFileList($img_ids);
                 $list['data'][$kr]['imgs'] = $files ?: null;
             }
+            if ($r['user_name']) {
+                $files = UploadFile::getFileList([$r['avatar_id']]);
+                $list['data'][$kr]['avatar_url'] = $files ?: null;
+            }
         }
         return $this->renderSuccess($list);
     }