From 9e68c0f1a14ed3e3a7161f76efece72314ed6306 Mon Sep 17 00:00:00 2001 From: panliang <1163816051@qq.com> Date: Sun, 10 Dec 2023 11:05:05 +0800 Subject: [PATCH] h5 --- app/Admin/Controllers/PartyCateController.php | 10 ++++----- app/Admin/Controllers/PartyUserController.php | 6 +++--- app/Admin/Services/BaseService.php | 4 ++++ app/Admin/Services/KeywordService.php | 19 ++++++++++++++++++ app/Models/Banner.php | 4 ++-- app/Traits/TreePath.php | 4 ++-- database/seeders/AdminMenuSeeder.php | 2 +- database/seeders/KeywordSeeder.php | 7 +++++++ database/seeders/PermissionSeeder.php | 2 +- public/h5/index.html | 2 +- public/h5/static/js/index.5636736e.js | 1 + public/h5/static/js/index.dd471c90.js | 1 - ...55cab5.js => pages-auth-login.3d41af23.js} | 0 .../static/js/pages-index-index.be886597.js | 1 + .../static/js/pages-index-index.f51e8e93.js | 1 - .../static/js/pages-index-welcome.1a9f3d2b.js | 1 + .../static/js/pages-index-welcome.a491f7af.js | 1 - .../js/pages-score-category.768e95a4.js | 1 - .../js/pages-score-category.de043a23.js | 1 + ...8.js => pages-score-user-rank.c7abd906.js} | 0 ...f439.js => pages-user-profile.2759c4b1.js} | 0 public/images/form-active.png | Bin 0 -> 3279 bytes 22 files changed, 49 insertions(+), 19 deletions(-) create mode 100644 public/h5/static/js/index.5636736e.js delete mode 100644 public/h5/static/js/index.dd471c90.js rename public/h5/static/js/{pages-auth-login.e955cab5.js => pages-auth-login.3d41af23.js} (100%) create mode 100644 public/h5/static/js/pages-index-index.be886597.js delete mode 100644 public/h5/static/js/pages-index-index.f51e8e93.js create mode 100644 public/h5/static/js/pages-index-welcome.1a9f3d2b.js delete mode 100644 public/h5/static/js/pages-index-welcome.a491f7af.js delete mode 100644 public/h5/static/js/pages-score-category.768e95a4.js create mode 100644 public/h5/static/js/pages-score-category.de043a23.js rename public/h5/static/js/{pages-score-user-rank.f0675868.js => pages-score-user-rank.c7abd906.js} (100%) rename public/h5/static/js/{pages-user-profile.9c7ef439.js => pages-user-profile.2759c4b1.js} (100%) create mode 100644 public/images/form-active.png diff --git a/app/Admin/Controllers/PartyCateController.php b/app/Admin/Controllers/PartyCateController.php index a73dd1e..fb915e6 100644 --- a/app/Admin/Controllers/PartyCateController.php +++ b/app/Admin/Controllers/PartyCateController.php @@ -69,11 +69,11 @@ class PartyCateController extends AdminController amisMake()->TableColumn()->name('name')->label(__('party_cate.name')), amisMake()->TableColumn()->name('master.name')->label(__('party_cate.master_id')), amisMake()->TableColumn()->name('plan.name')->label(__('party_cate.plan_id')), - amisMake()->TableColumn()->name('current_score')->label(__('party_cate.current_score')), - amisMake()->TableColumn()->name('score')->label(__('party_cate.score')), + amisMake()->TableColumn()->name('current_score')->label(__('party_cate.current_score'))->sortable(), + amisMake()->TableColumn()->name('score')->label(__('party_cate.score'))->sortable(), amisMake()->TableColumn()->name('remarks')->label(__('party_cate.remarks')), $this->rowActions([ - amisMake()->LinkAction()->label('党员管理')->level('link')->link('/party-cate/${'.$primary.'}/user'), + // amisMake()->LinkAction()->label('党员管理')->level('link')->link('/party-cate/${'.$primary.'}/user'), // 弹窗修改文章, initApi 参数请求次数有问题 // amisMake()->DialogAction()->label('评星规则')->level('link')->level('link')->dialog( // amisMake()->Dialog()->size('lg')->title('')->body( @@ -87,8 +87,8 @@ class PartyCateController extends AdminController // ]) // ) // ), - amisMake()->LinkAction()->label('审核评定')->level('link')->link('/party-cate/${'.$primary.'}/score'), - amisMake()->LinkAction()->label('排名')->level('link')->link('/party-cate/${'.$primary.'}/rank'), + // amisMake()->LinkAction()->label('审核评定')->level('link')->link('/party-cate/${'.$primary.'}/score'), + // amisMake()->LinkAction()->label('排名')->level('link')->link('/party-cate/${'.$primary.'}/rank'), $this->rowShowButton(), $this->rowEditButton(true), $this->rowDeleteButton(), diff --git a/app/Admin/Controllers/PartyUserController.php b/app/Admin/Controllers/PartyUserController.php index 278cc9e..35e430c 100644 --- a/app/Admin/Controllers/PartyUserController.php +++ b/app/Admin/Controllers/PartyUserController.php @@ -27,7 +27,7 @@ class PartyUserController extends AdminController ]) ->filter($this->baseFilter()->actions([])->body([ amisMake()->TextControl()->name('name')->label(__('party_user.name'))->size('md')->clearable(), - amisMake()->SelectControl()->name('cate_id')->label(__('party_user.cate_id'))->options($this->getCateOptions())->size('md')->clearable(), + amisMake()->SelectControl()->name('cate_id')->label(__('party_user.cate_id'))->options($this->getCateOptions())->size('md')->searchable()->clearable(), amisMake()->Component()->setType('submit')->label(__('admin.search'))->level('primary'), ])) ->columns([ @@ -36,8 +36,8 @@ class PartyUserController extends AdminController amisMake()->TableColumn()->name('name')->label(__('party_user.name')), amisMake()->TableColumn()->type('avatar')->src('${avatar}')->name('avatar')->label(__('party_user.avatar')), amisMake()->TableColumn()->name('cate.name')->label(__('party_user.cate_id')), - amisMake()->TableColumn()->name('current_score')->label(__('party_user.current_score')), - amisMake()->TableColumn()->name('score')->label(__('party_user.score')), + amisMake()->TableColumn()->name('current_score')->label(__('party_user.current_score'))->sortable(), + amisMake()->TableColumn()->name('score')->label(__('party_user.score'))->sortable(), $this->rowActions([ $this->rowShowButton(), $this->rowEditButton(true), diff --git a/app/Admin/Services/BaseService.php b/app/Admin/Services/BaseService.php index 56ff18f..433804f 100644 --- a/app/Admin/Services/BaseService.php +++ b/app/Admin/Services/BaseService.php @@ -43,6 +43,10 @@ class BaseService extends AdminService $query->filter(request()->input(), $filter); } + if (request()->orderBy && request()->orderDir) { + $query->orderBy(request()->orderBy, request()->orderDir ?? 'asc'); + } + return $query->orderByDesc($model->getKeyName()); } diff --git a/app/Admin/Services/KeywordService.php b/app/Admin/Services/KeywordService.php index bc75736..ae369c2 100644 --- a/app/Admin/Services/KeywordService.php +++ b/app/Admin/Services/KeywordService.php @@ -19,6 +19,25 @@ class KeywordService extends BaseService protected string $modelFilterName = KeywordFilter::class; + public function listQuery() + { + $model = $this->getModel(); + $filter = $this->getModelFilter(); + + $query = $this->query(); + if ($this->withRelationships) { + $query->with($this->withRelationships); + } + + if ($filter) { + $query->filter(request()->input(), $filter); + } + + $this->sortable($query); + + return $query->sort(); + } + public function getTree($filters = []) { $list = $this->query()->filter($filters, $this->getModelFilter())->sort()->get(); diff --git a/app/Models/Banner.php b/app/Models/Banner.php index 6c488f6..e41a58c 100644 --- a/app/Models/Banner.php +++ b/app/Models/Banner.php @@ -33,11 +33,11 @@ class Banner extends Model public function scopeSort($q) { - return $q->orderBy('sort', 'desc'); + $q->orderBy('sort'); } public function scopeEnable($q) { - return $q->where('is_enable', 1)->where('published_at', '<=', now()); + $q->where('is_enable', 1)->where('published_at', '<=', now()); } } diff --git a/app/Traits/TreePath.php b/app/Traits/TreePath.php index 61aff97..6c579c0 100644 --- a/app/Traits/TreePath.php +++ b/app/Traits/TreePath.php @@ -59,12 +59,12 @@ trait TreePath public function scopeAllChildren($q, $pid) { - return $q->where('path', 'like', '%-'.$pid.'-%'); + $q->where('path', 'like', '%-'.$pid.'-%'); } public function scopeSort($q) { - return $q->orderBy('parent_id')->orderBy('sort'); + $q->orderBy('parent_id', 'asc')->orderBy('sort', 'asc'); } public static function getTreeList($list, $pid = 0) diff --git a/database/seeders/AdminMenuSeeder.php b/database/seeders/AdminMenuSeeder.php index 163a553..a6ec4fe 100644 --- a/database/seeders/AdminMenuSeeder.php +++ b/database/seeders/AdminMenuSeeder.php @@ -35,7 +35,7 @@ class AdminMenuSeeder extends Seeder ['title' => '权限管理', 'icon' => 'icon-park:key-one', 'url' => '/system/admin_permissions', 'permission' => ['admin_permission']], ['title' => '菜单管理', 'icon' => 'icon-park:menu-fold-one', 'url' => '/system/admin_menus', 'permission' => ['admin_menu']], ['title' => '字典管理', 'icon' => 'icon-park:arrow-keys', 'url' => '/keywords', 'permission' => ['keyword']], - ['title' => '配置管理', 'icon' => 'icon-park:setting-two', 'url' => '/system/settings', 'permission' => ['admin_setting']], + // ['title' => '配置管理', 'icon' => 'icon-park:setting-two', 'url' => '/system/settings', 'permission' => ['admin_setting']], ]], ]; $this->permissions = AdminPermission::all(); diff --git a/database/seeders/KeywordSeeder.php b/database/seeders/KeywordSeeder.php index 4993a3e..9336432 100644 --- a/database/seeders/KeywordSeeder.php +++ b/database/seeders/KeywordSeeder.php @@ -7,6 +7,7 @@ use App\Admin\Services\{KeywordService, BannerService}; use Illuminate\Database\Console\Seeds\WithoutModelEvents; use Illuminate\Database\Seeder; use Illuminate\Support\Arr; +use App\Enums\TargetType; class KeywordSeeder extends Seeder { @@ -28,6 +29,7 @@ class KeywordSeeder extends Seeder ['key' => 'banner', 'name' => '广告位', 'children' => [ ['key' => 'banner_1', 'name' => '首页广告'], ['key' => 'banner_2', 'name' => '考核填报'], + ['key' => 'banner_3', 'name' => '首页导航'], ]], ['key' => 'category', 'name' => '文章分类', 'children' => [ ['key' => 'category_1', 'name' => '共性指标'], @@ -66,6 +68,11 @@ class KeywordSeeder extends Seeder 'banner_2' => [ ['picture' => 'http://www.gzcsxy.cn/ewebeditor/uploadimages/WebLink/20221027123658712-869.jpg'] ], + 'banner_3' => [ + ['title' => '共性指标', 'picture' => url('images/form-active.png'), 'link_config' => ['target_type' => TargetType::App, 'target_url' => '/pages/article/detail?type=common']], + ['title' => '进阶指标', 'picture' => url('images/form-active.png'), 'link_config' => ['target_type' => TargetType::App, 'target_url' => '/pages/article/detail?type=cate']], + ['title' => '书记信箱', 'picture' => url('images/form-active.png'), 'link_config' => ['target_type' => TargetType::App, 'target_url' => '/pages/feedback/add']], + ] ]; foreach ($banners as $key => $values) { $place = Keyword::where('key', $key)->first(); diff --git a/database/seeders/PermissionSeeder.php b/database/seeders/PermissionSeeder.php index f76b069..5c0871b 100644 --- a/database/seeders/PermissionSeeder.php +++ b/database/seeders/PermissionSeeder.php @@ -35,7 +35,7 @@ class PermissionSeeder extends Seeder ['name' => '权限管理', 'slug' => 'admin_permission'], ['name' => '菜单管理', 'slug' => 'admin_menu'], ['name' => '字典管理', 'slug' => 'keyword'], - ['name' => '配置管理', 'slug' => 'admin_setting'], + // ['name' => '配置管理', 'slug' => 'admin_setting'], ]], ]; diff --git a/public/h5/index.html b/public/h5/index.html index ae041c1..3951e50 100644 --- a/public/h5/index.html +++ b/public/h5/index.html @@ -1,2 +1,2 @@