diff --git a/MySQL_change.sql b/MySQL_change.sql index df1c207..24f35ce 100644 --- a/MySQL_change.sql +++ b/MySQL_change.sql @@ -129,3 +129,11 @@ ALTER TABLE `users` ALTER TABLE `articles` ADD COLUMN `type` TINYINT NOT NULL DEFAULT 0 COMMENT '0:普通列表显示；1:大图显示；' AFTER `content`, ADD COLUMN `sort` SMALLINT NOT NULL DEFAULT 255 COMMENT '排序，越小越靠前' AFTER `type`; + +# 18:16 2021/8/24 +ALTER TABLE `slides` + COMMENT='广告图、轮播图等'; +RENAME TABLE `slides` TO `advertisings`; + + + diff --git a/app/Admin/Extensions/Grid/AuditAgent.php b/app/Admin/Extensions/Grid/AuditAgent.php index 6a893ad..dc639cd 100644 --- a/app/Admin/Extensions/Grid/AuditAgent.php +++ b/app/Admin/Extensions/Grid/AuditAgent.php @@ -5,7 +5,7 @@ use App\Common\UserStatus; use App\Models\Agent; use App\Models\Category; use App\Models\Channel; -use App\Models\Slide; +use App\Models\Advertising; use Dcat\Admin\Grid\RowAction; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -94,8 +94,8 @@ class AuditAgent extends RowAction } //首页轮播图 - if (!Slide::where('agent_id', $id)->first()) { - $default_slide = Slide::where('agent_id', 0)->orderBy('id')->get()->toArray(); + if (!Advertising::where('agent_id', $id)->first()) { + $default_slide = Advertising::where('agent_id', 0)->orderBy('id')->get()->toArray(); $default_slide = array_map(function ($v) use ($id, $host) { unset($v['id']); @@ -104,7 +104,7 @@ class AuditAgent extends RowAction $v['url'] = str_replace($host, '', $v['url']); return $v; }, $default_slide); - Slide::insert($default_slide); + Advertising::insert($default_slide); } //TODO 还需要插入 演示产品、公告、专题等 diff --git a/app/AdminAgent/Controllers/SlideController.php b/app/AdminAgent/Controllers/AdvertisingController.php similarity index 92% rename from app/AdminAgent/Controllers/SlideController.php rename to app/AdminAgent/Controllers/AdvertisingController.php index 33e7f80..3563779 100644 --- a/app/AdminAgent/Controllers/SlideController.php +++ b/app/AdminAgent/Controllers/AdvertisingController.php @@ -2,14 +2,14 @@ namespace App\AdminAgent\Controllers; -use App\AdminAgent\Repositories\Slide; +use App\AdminAgent\Repositories\Advertising; use Dcat\Admin\Admin; use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Show; use Dcat\Admin\Http\Controllers\AdminController; -class SlideController extends AdminController +class AdvertisingController extends AdminController { /** * Make a grid builder. @@ -18,7 +18,7 @@ class SlideController extends AdminController */ protected function grid() { - return Grid::make(new Slide(), function (Grid $grid) { + return Grid::make(new Advertising(), function (Grid $grid) { $grid->model()->where('agent_id', Admin::user()->id)->orderBy('sort')->orderBy('id', 'DESC'); $grid->column('id')->sortable(); @@ -47,7 +47,7 @@ class SlideController extends AdminController */ protected function detail($id) { - return Show::make($id, new Slide(), function (Show $show) { + return Show::make($id, new Advertising(), function (Show $show) { //不允许查看非自己的数据 if ($show->model()->agent_id != Admin::user()->id) { Admin::exit('数据不存在'); @@ -72,7 +72,7 @@ class SlideController extends AdminController */ protected function form() { - return Form::make(new Slide(), function (Form $form) { + return Form::make(new Advertising(), function (Form $form) { //不允许查看非自己的数据 if ($form->isEditing() && $form->model()->agent_id != Admin::user()->id) { return $form->response()->error('数据不存在'); diff --git a/app/AdminAgent/Repositories/Slide.php b/app/AdminAgent/Repositories/Advertising.php similarity index 71% rename from app/AdminAgent/Repositories/Slide.php rename to app/AdminAgent/Repositories/Advertising.php index a7eef5c..bdc6a0d 100644 --- a/app/AdminAgent/Repositories/Slide.php +++ b/app/AdminAgent/Repositories/Advertising.php @@ -2,10 +2,10 @@ namespace App\AdminAgent\Repositories; -use App\Models\Slide as Model; +use App\Models\Advertising as Model; use Dcat\Admin\Repositories\EloquentRepository; -class Slide extends EloquentRepository +class Advertising extends EloquentRepository { /** * Model. diff --git a/app/AdminAgent/routes.php b/app/AdminAgent/routes.php index 3b28c5b..8f26883 100644 --- a/app/AdminAgent/routes.php +++ b/app/AdminAgent/routes.php @@ -20,7 +20,7 @@ Route::group([ $router->resource('user/list', 'UserController'); $router->resource('user/verifier', 'UserController'); $router->resource('order/list', 'OrderController'); - $router->resource('slide/list', 'SlideController'); + $router->resource('advertising/list', 'AdvertisingController'); $router->resource('special/list', 'SpecialController'); $router->resource('waterfall_ad/list', 'WaterfallAdController'); $router->resource('message/list', 'MessageController'); diff --git a/app/Http/Controllers/Api/IndexController.php b/app/Http/Controllers/Api/IndexController.php index 20b740c..9f6aef1 100644 --- a/app/Http/Controllers/Api/IndexController.php +++ b/app/Http/Controllers/Api/IndexController.php @@ -5,7 +5,7 @@ use App\Http\Controllers\Controller; use App\Models\Channel; use App\Models\Notice; use App\Models\AgentProduct; -use App\Models\Slide; +use App\Models\Advertising; use App\Models\Special; use App\Models\UserChannel; use Illuminate\Support\Facades\Storage; @@ -23,7 +23,7 @@ class IndexController extends Controller $img_prefix = Storage::disk('public')->url(''); # 轮播图 - $slide = Slide::where(['agent_id' => $this->agent_id, 'status' => 1]) + $slide = Advertising::where(['agent_id' => $this->agent_id, 'status' => 1]) ->orderBy('sort')->orderBy('id', 'DESC')->limit(10) ->get(['title', 'picture', 'type', 'url']); foreach ($slide as &$v) { diff --git a/app/Models/Slide.php b/app/Models/Advertising.php similarity index 81% rename from app/Models/Slide.php rename to app/Models/Advertising.php index 22c2c4e..ab58f1d 100644 --- a/app/Models/Slide.php +++ b/app/Models/Advertising.php @@ -6,10 +6,10 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; /** * 轮播图 - * Class Slide + * Class Advertising * @package App\Models */ -class Slide extends BaseModel +class Advertising extends BaseModel { use HasFactory;