xuanchen/pingan_unionpay_new
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

微调

Browse Source
This commit is contained in:
徐永宾
2021-02-18 17:55:30 +08:00
parent ae9557cf9e
commit 2c33d82774
4 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/Admin/Controllers/Activity/IndexController.php
View File

@@ -2,9 +2,7 @@
namespace App\Admin\Controllers\Activity;
use App\Admin\Renderable\Activity\Grants;
use App\Models\Activity;
use App\Models\ActivityGrant;
use App\Models\ActivityRule;
use App\Models\User;
use Encore\Admin\Controllers\HasResourceActions;
@@ -37,10 +35,9 @@ class IndexController extends AdminController
*/
public function index(Content $content)
{
return $content
->title($this->title())
->description($this->description['index'] ?? trans('admin.list'))
->body($this->grid());
return $content->title($this->title())
->description($this->description['index'] ?? trans('admin.list'))
->body($this->grid());
}
/**
@@ -51,10 +48,9 @@ class IndexController extends AdminController
*/
public function edit($id, Content $content)
{
return $content
->title($this->title())
->description($this->description['edit'] ?? trans('admin.edit'))
->body($this->form($id)->edit($id));
return $content->title($this->title())
->description($this->description['edit'] ?? trans('admin.edit'))
->body($this->form($id)->edit($id));
}
/**
@@ -64,10 +60,9 @@ class IndexController extends AdminController
*/
public function create(Content $content)
{
return $content
->title($this->title())
->description($this->description['create'] ?? trans('admin.create'))
->body($this->form());
return $content->title($this->title())
->description($this->description['create'] ?? trans('admin.create'))
->body($this->form());
}
protected function grid()
@@ -83,11 +78,6 @@ class IndexController extends AdminController
$filter->column(1 / 2, function ($filter) {
$filter->equal('status', '状态')->select(Activity::STATUS);
$filter->equal('type', '类型')->select(Activity::TYPES);
$users = User::whereHas('identity', function ($query) {
$query->where('identity_id', 1);
})->get()->pluck('nickname', 'id');
});
$filter->column(1 / 2, function ($filter) {
@@ -257,9 +247,11 @@ class IndexController extends AdminController
$users = [];
foreach ($form->grants['user_id'] as $key => $user_id) {
if ($user_id) {
$form->model()->grants()->updateOrCreate([
'user_id' => $user_id,
]);
$form->model()
->grants()
->updateOrCreate([
'user_id' => $user_id,
]);
$users[] = $user_id;
}
}
@@ -267,9 +259,11 @@ class IndexController extends AdminController
$users = [];
foreach ($form->verifications['user_id'] as $key => $user_id) {
if ($user_id) {
$form->model()->verifications()->updateOrCreate([
'user_id' => $user_id,
]);
$form->model()
->verifications()
->updateOrCreate([
'user_id' => $user_id,
]);
$users[] = $user_id;
}
}