From 136f52b0487ba354fcbad294a2c5998e39573478 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Sat, 9 Sep 2023 18:26:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0cover=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/system/merchant/MerchantCategoryRepository.php | 1 +
 app/controller/api/Common.php                                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/common/repositories/system/merchant/MerchantCategoryRepository.php b/app/common/repositories/system/merchant/MerchantCategoryRepository.php
index 167eaf42..27ad23bc 100644
--- a/app/common/repositories/system/merchant/MerchantCategoryRepository.php
+++ b/app/common/repositories/system/merchant/MerchantCategoryRepository.php
@@ -85,6 +85,7 @@ class MerchantCategoryRepository extends BaseRepository
             Elm::input('category_name', '分类名称')->required(),
             Elm::number('commission_rate', '手续费(%)', 0)->required()->max(100)->precision(2),
             Elm::frameImage('background', '背景图', '/' . config('admin.admin_prefix') . '/setting/uploadPicture?field=background&type=1')->width('896px')->height('480px')->props(['footer' => false])->modal(['modal' => false, 'custom-class' => 'suibian-modal']),
+            Elm::frameImage('cover', '主图', '/' . config('admin.admin_prefix') . '/setting/uploadPicture?field=background&type=1')->width('896px')->height('480px')->props(['footer' => false])->modal(['modal' => false, 'custom-class' => 'suibian-modal']),
             Elm::textarea('description', '简介')->required(),
         ]);
 
diff --git a/app/controller/api/Common.php b/app/controller/api/Common.php
index c2c22e88..9d81edd8 100644
--- a/app/controller/api/Common.php
+++ b/app/controller/api/Common.php
@@ -501,7 +501,7 @@ class Common extends BaseController
             ->where('m.status',1)
             ->where('m.street_id',$street_code)
             ->join('merchant_category c','m.category_id=c.merchant_category_id')
-            ->field('m.mer_id,category_id,category_name,c.background,c.description')->select();
+            ->field('m.mer_id,category_id,category_name,c.background,c.cover,c.description')->select();
         return app('json')->success($find??[]);
     }
 }