From 8fa4ae983c1ce99d4d99c68d1c740c1a69754f6f Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 23 Dec 2021 15:05:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B9=BF=E5=91=8A=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=92=8C=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/AdController.php        |  4 +++
 .../Api/Http/Resources/AdResource.php         |  2 ++
 ...0053_add_name_and_remarks_to_ads_table.php | 35 +++++++++++++++++++
 resources/lang/zh_CN/ad.php                   |  2 ++
 4 files changed, 43 insertions(+)
 create mode 100644 database/migrations/2021_12_23_150053_add_name_and_remarks_to_ads_table.php

diff --git a/app/Admin/Controllers/AdController.php b/app/Admin/Controllers/AdController.php
index 7ed3afca..288b54f2 100644
--- a/app/Admin/Controllers/AdController.php
+++ b/app/Admin/Controllers/AdController.php
@@ -24,6 +24,7 @@ class AdController extends AdminController
         $builder = Ad::with(['address']);
         return Grid::make($builder, function (Grid $grid) {
             $grid->column('id')->sortable();
+            $grid->column('name');
             $grid->column('address.name');
             $grid->column('image')->image(50, 100);
             $grid->column('sort');
@@ -43,6 +44,7 @@ class AdController extends AdminController
                 ->else(function (Column $column) {
                     $column->bool();
                 });
+            $grid->column('remarks');
             $grid->column('created_at')->sortable();
             //排序
             $grid->model()->orderBy('created_at', 'desc');
@@ -101,6 +103,7 @@ class AdController extends AdminController
         return Form::make(new Ad(), function (Form $form) {
             $form->display('id');
             $form->select('address_id')->options(AdAddress::all()->pluck('name', 'id'));
+            $form->text('name')->required();
             $form->image('image')
                 ->move('ads/'.Carbon::now()->toDateString())
                 ->saveFullUrl()
@@ -114,6 +117,7 @@ class AdController extends AdminController
             $form->text('jump_link');
             $form->switch('is_show');
             $form->number('sort')->min(0)->default(0);
+            $form->text('remarks');
 
             $form->display('created_at');
             $form->display('updated_at');
diff --git a/app/Endpoint/Api/Http/Resources/AdResource.php b/app/Endpoint/Api/Http/Resources/AdResource.php
index c505c9a4..32c880e8 100644
--- a/app/Endpoint/Api/Http/Resources/AdResource.php
+++ b/app/Endpoint/Api/Http/Resources/AdResource.php
@@ -15,6 +15,8 @@ class AdResource extends JsonResource
     public function toArray($request)
     {
         return [
+            'name' => (string) $this->name,
+            'remarks' => (string) $this->remarks,
             'image' => (string) $this->image,
             'jump_type' => $this->jump_type,
             'jump_link' => (string) $this->jump_link,
diff --git a/database/migrations/2021_12_23_150053_add_name_and_remarks_to_ads_table.php b/database/migrations/2021_12_23_150053_add_name_and_remarks_to_ads_table.php
new file mode 100644
index 00000000..27419341
--- /dev/null
+++ b/database/migrations/2021_12_23_150053_add_name_and_remarks_to_ads_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddNameAndRemarksToAdsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('ads', function (Blueprint $table) {
+            //
+            $table->string('name')->comment('广告名称');
+            $table->string('remarks')->nullable()->comment('备注');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('ads', function (Blueprint $table) {
+            //
+            $table->dropColumn(['name', 'remarks']);
+        });
+    }
+}
diff --git a/resources/lang/zh_CN/ad.php b/resources/lang/zh_CN/ad.php
index c599f118..891be7b4 100644
--- a/resources/lang/zh_CN/ad.php
+++ b/resources/lang/zh_CN/ad.php
@@ -6,12 +6,14 @@ return [
         'ad' => '广告',
     ],
     'fields' => [
+        'name'=>'名称',
         'address_id' => '广告位',
         'image' => '图片地址',
         'sort' => '广告排序',
         'jump_type' => '跳转类型',
         'jump_link' => '跳转地址',
         'is_show' => '显示',
+        'remarks' => '备注',
         'address'=>[
             'name'=>'广告位',
         ],