图片

app/common/model/Merchant.php

@@ -73,11 +73,22 @@ class Merchant extends BaseModel
      */
     public function getList(array $param = []): \think\Paginator
     {
-        return $this->with(['logoImage'])
+        $res = $this->with(['logoImage'])
                     ->where($this->getFilter($param))
                     ->where('is_delete', '=', 0)
                     ->order(['sort' => 'asc', $this->getPk()])
-                    ->paginate(15);
+                    ->paginate(15)->toArray();
+
+        foreach ($res as $kr => $r) {
+            $res[$kr]['licenseImg'] = [];
+            if ($r['license_img_id']) {
+                $img_ids = explode(",", $r['license_img_id']);
+                $files = UploadFile::getFileList($img_ids);
+                $res[$kr]['licenseImg'] = $files ?: null;
+            }
+        }
+
+        return $res;
     }
 
     /**

app/store/controller/Merchant.php

@@ -115,14 +115,6 @@ class Merchant extends Controller
         return $this->renderSuccess(compact('list'));
     }
 
-    /**
-     * 门店入驻详情
-     */
-    public function settleDetail(int $id): Json
-    {
-        $detail = MerchantModel::get($id);
-        return $this->renderSuccess(compact('detail'));
-    }
 
     /**
      * 更新商城信息