merge

7 months ago · bb38390a6e
parent a5ffdae069
commit bb38390a6e
1 changed files with 2 additions and 2 deletions
--- a/app/common/model/Merchant.php
+++ b/app/common/model/Merchant.php
@ -79,12 +79,12 @@ class Merchant extends BaseModel
                    ->order(['sort' => 'asc', $this->getPk()])
                    ->paginate(15)->toArray();

-        foreach ($res as $kr => $r) {
+        foreach ($res['data'] 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;
+                $res['data'][$kr]['licenseImg'] = $files ?: null;
            }
        }