From b4416260fdc1dc71a893ce71b8a4dc5da5449c15 Mon Sep 17 00:00:00 2001 From: toom1996 Date: Fri, 4 Jul 2025 09:50:30 +0800 Subject: [PATCH] update --- .../admin/api/WebsiteController.php | 2 ++ app/FormModel/admin/news/NewsFormModel.php | 1 + app/Model/AppWebsiteConfig.php | 3 +++ app/Rpc/v1/NewsService.php | 3 ++- storage/view/news/insert.blade.php | 18 ++++++++++++++---- storage/view/news/view.blade.php | 19 +++++++++++++++++++ storage/view/website/insert.blade.php | 6 ++++++ storage/view/website/view.blade.php | 6 ++++++ 8 files changed, 53 insertions(+), 5 deletions(-) diff --git a/app/Controller/admin/api/WebsiteController.php b/app/Controller/admin/api/WebsiteController.php index e9efdf9..9f43aa0 100644 --- a/app/Controller/admin/api/WebsiteController.php +++ b/app/Controller/admin/api/WebsiteController.php @@ -42,6 +42,7 @@ class WebsiteController extends AbstractController $model->app_logo = $this->request->post('app_logo'); $model->app_extra = $this->request->post('app_extra'); $model->app_template = $this->request->post('template'); + $model->app_extra_tag = $this->request->post('app_extra_tag'); $model->save(); return $this->response->json([]); @@ -110,6 +111,7 @@ class WebsiteController extends AbstractController $query->app_logo = $this->request->post('app_logo'); $query->app_extra = $this->request->post('app_extra'); $query->app_template = $this->request->post('template'); + $query->app_extra_tag = $this->request->post('app_extra_tag'); $query->save(); diff --git a/app/FormModel/admin/news/NewsFormModel.php b/app/FormModel/admin/news/NewsFormModel.php index 54d5499..a92c368 100644 --- a/app/FormModel/admin/news/NewsFormModel.php +++ b/app/FormModel/admin/news/NewsFormModel.php @@ -38,6 +38,7 @@ class NewsFormModel $model->description = $this->attributes['description']; $model->cover = $this->attributes['cover']; $model->content = $this->attributes['content']; + $model->platform = $this->attributes['platform']; $model->save(); } } \ No newline at end of file diff --git a/app/Model/AppWebsiteConfig.php b/app/Model/AppWebsiteConfig.php index a4e5b70..6c13a19 100644 --- a/app/Model/AppWebsiteConfig.php +++ b/app/Model/AppWebsiteConfig.php @@ -23,6 +23,9 @@ namespace App\Model; * @property string $app_extra * @property string $app_logo * @property int $app_template + * @property string $app_telephone + * @property string $app_download_url + * @property string $app_extra_tag */ class AppWebsiteConfig extends Model { diff --git a/app/Rpc/v1/NewsService.php b/app/Rpc/v1/NewsService.php index d4f21df..3b5ef5e 100755 --- a/app/Rpc/v1/NewsService.php +++ b/app/Rpc/v1/NewsService.php @@ -46,10 +46,11 @@ class NewsService extends BaseService * @param int $page * @return array */ - public function index(int $limit = 30, int $page = 1): array + public function index(int $id, int $limit = 30, int $page = 1): array { $query = AppNews::formatQuery(['created_at']) ->where('is_delete', 0) + ->where('platform', $id) ->select(['id']) ->orderBy('id', 'desc');; $pagination = $query->paginate($limit, page: $page); diff --git a/storage/view/news/insert.blade.php b/storage/view/news/insert.blade.php index 837c01f..030778e 100644 --- a/storage/view/news/insert.blade.php +++ b/storage/view/news/insert.blade.php @@ -1,8 +1,7 @@ [ - 'label' => ucfirst($case->toString()), - 'value' => $case->value, -], \App\Enums\LocationEnum::cases()); +$platforms = call_user_func(function () { + return \App\Model\AppWebsiteConfig::query()->where('is_delete', 0)->get()->toArray(); +}); ?> @@ -21,6 +20,17 @@ $articleLocation = array_map(fn($case) => [
+
+ +
+ +
+
diff --git a/storage/view/news/view.blade.php b/storage/view/news/view.blade.php index 0aec1d7..a81ef1f 100644 --- a/storage/view/news/view.blade.php +++ b/storage/view/news/view.blade.php @@ -1,3 +1,8 @@ +where('is_delete', 0)->get()->toArray(); +}); +?> @@ -16,6 +21,17 @@
+
+ +
+ +
+
@@ -194,6 +210,9 @@ document.querySelector('[id="cover"]').src = res.data.cover $("[name=cover]").val(res.data.cover); + $("select[name=platform]").val(res.data.platform); + layui.form.render("select"); + editor.setHtml(res.data.content) // ajax产生错误 diff --git a/storage/view/website/insert.blade.php b/storage/view/website/insert.blade.php index bf4025a..0e65404 100644 --- a/storage/view/website/insert.blade.php +++ b/storage/view/website/insert.blade.php @@ -70,6 +70,12 @@ {{-- --}}
+
+ +
+ +
+
+
+ +
+ +
+