diff --git a/README.md b/README.md index c47b4d0e..328bedf5 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,8 @@ ### 定时任务 -- 自动取消未支付的订单: `php artisan order:close-expired`, 常驻内存执行(死循环) -- 自动完成待收货的订单: `php artisan order:complete`, 常驻内存执行(死循环) +[Liux:supervisor] + +- 自动取消未支付的订单: `php artisan order:close-expired` +- 自动完成待收货的订单: `php artisan order:complete` - 生成订单的提成记录: `php artisan order:distribute` diff --git a/app/Admin/Controllers/TagController.php b/app/Admin/Controllers/TagController.php index 648d3f0e..6d00919f 100644 --- a/app/Admin/Controllers/TagController.php +++ b/app/Admin/Controllers/TagController.php @@ -30,7 +30,7 @@ class TagController extends AdminController // dd(Request::Input('type', 0)); /** 操作 **/ $grid->model()->setConstraints([ - 'type' => Request::Input('type', 0), + 'type' => Request::Input('type', 1), ]); //新增 if (Admin::user()->can('dcat.admin.tags.create')) { @@ -79,12 +79,7 @@ class TagController extends AdminController { return Form::make(new Tag(), function (Form $form) { $types = Tag::$typeMaps; - $type = Request::Input('type', 0); - if ($types[$type]) { - $types = [ - $type=> $types[$type], - ]; - } + $type = Request::Input('type', 1); $form->display('id'); $form->radio('type')->options($types)->default($type)->required(); $form->text('name')->required(); diff --git a/database/seeders/UserSeeder.php b/database/seeders/UserSeeder.php index dc3e5b4a..b0659f13 100644 --- a/database/seeders/UserSeeder.php +++ b/database/seeders/UserSeeder.php @@ -19,19 +19,19 @@ class UserSeeder extends Seeder */ public function run() { - // DB::table('user_infos')->truncate(); - // DB::table('user_vips')->truncate(); - // DB::table('socialite_users')->truncate(); - // DB::table('personal_access_tokens')->truncate(); + DB::table('user_infos')->truncate(); + DB::table('user_vips')->truncate(); + DB::table('socialite_users')->truncate(); + DB::table('personal_access_tokens')->truncate(); - // DB::table('wallets')->truncate(); - // DB::table('wallet_logs')->truncate(); - // DB::table('wallet_to_bank_logs')->truncate(); + DB::table('wallets')->truncate(); + DB::table('wallet_logs')->truncate(); + DB::table('wallet_to_bank_logs')->truncate(); - // DB::table('sales_value_logs')->truncate(); + DB::table('sales_value_logs')->truncate(); - // DB::table('balances')->truncate(); - // DB::table('users')->truncate(); + DB::table('balances')->truncate(); + DB::table('users')->truncate(); $this->faker = $this->withFaker(); $this->createUsers(1); }