From dcb9144c322fbb2ecc5729ae21ef23246f7e629c Mon Sep 17 00:00:00 2001 From: panliang <1163816051@qq.com> Date: Thu, 12 May 2022 13:29:37 +0800 Subject: [PATCH] app --- README.md | 67 +------------------ app/Admin/Controllers/OrderController.php | 2 +- app/Admin/Forms/UserEditVip.php | 2 +- .../Controllers/Order/OrderController.php | 2 +- database/seeders/AppSettingSeeder.php | 11 ++- resources/lang/zh_CN/order.php | 1 + 6 files changed, 17 insertions(+), 68 deletions(-) diff --git a/README.md b/README.md index 8878ec11..3f14510b 100644 --- a/README.md +++ b/README.md @@ -1,66 +1,5 @@ -

+# 积趣商城 -

-Build Status -Total Downloads -Latest Stable Version -License -

+## Require -## About Laravel - -Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as: - -- [Simple, fast routing engine](https://laravel.com/docs/routing). -- [Powerful dependency injection container](https://laravel.com/docs/container). -- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage. -- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent). -- Database agnostic [schema migrations](https://laravel.com/docs/migrations). -- [Robust background job processing](https://laravel.com/docs/queues). -- [Real-time event broadcasting](https://laravel.com/docs/broadcasting). - -Laravel is accessible, powerful, and provides tools required for large, robust applications. - -## Learning Laravel - -Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework. - -If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1500 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library. - -## Laravel Sponsors - -We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell). - -### Premium Partners - -- **[Vehikl](https://vehikl.com/)** -- **[Tighten Co.](https://tighten.co)** -- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)** -- **[64 Robots](https://64robots.com)** -- **[Cubet Techno Labs](https://cubettech.com)** -- **[Cyber-Duck](https://cyber-duck.co.uk)** -- **[Many](https://www.many.co.uk)** -- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)** -- **[DevSquad](https://devsquad.com)** -- **[Curotec](https://www.curotec.com/services/technologies/laravel/)** -- **[OP.GG](https://op.gg)** -- **[CMS Max](https://www.cmsmax.com/)** -- **[WebReinvent](https://webreinvent.com/?utm_source=laravel&utm_medium=github&utm_campaign=patreon-sponsors)** -- **[Lendio](https://lendio.com)** -- **[Romega Software](https://romegasoftware.com)** - -## Contributing - -Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions). - -## Code of Conduct - -In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct). - -## Security Vulnerabilities - -If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed. - -## License - -The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT). +- php >= 8.0 diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php index 20da2cf1..b73d975c 100644 --- a/app/Admin/Controllers/OrderController.php +++ b/app/Admin/Controllers/OrderController.php @@ -285,7 +285,7 @@ class OrderController extends AdminController })->prepend('￥'); }); $show->row(function (Show\Row $show) use ($userCouponId) { - $show->width(6)->field('sales_value', '总销售值'); + $show->width(6)->field('sales_value'); $show->field('completed_at', '完成时间'); $show->width(12)->field('note')->width(10, 1); $show->width(12)->field('remark')->width(10, 1); diff --git a/app/Admin/Forms/UserEditVip.php b/app/Admin/Forms/UserEditVip.php index d01af520..2dda8cc6 100644 --- a/app/Admin/Forms/UserEditVip.php +++ b/app/Admin/Forms/UserEditVip.php @@ -71,7 +71,7 @@ class UserEditVip extends Form implements LazyRenderable $user = User::findOrFail($id); $vips = Vip::orderBy('sort')->get(); - $this->text('user_vip', '当前代理')->value(data_get($user, 'userVip.vip.name', ''))->disable(); + $this->text('user_vip', '当前代理')->value(data_get($user, 'userVip.vip.name', '无'))->disable(); $this->select('vip')->options($vips->pluck('name', 'id')); } diff --git a/app/Endpoint/Api/Http/Controllers/Order/OrderController.php b/app/Endpoint/Api/Http/Controllers/Order/OrderController.php index 87d9a044..5ae9871d 100644 --- a/app/Endpoint/Api/Http/Controllers/Order/OrderController.php +++ b/app/Endpoint/Api/Http/Controllers/Order/OrderController.php @@ -147,7 +147,7 @@ class OrderController extends Controller $isSettlable = true; } - (new OrderService())->confirm($order, $isSettlable); + (new OrderService())->confirm($order); }); return response()->noContent(); diff --git a/database/seeders/AppSettingSeeder.php b/database/seeders/AppSettingSeeder.php index e9cf06c3..1e8ff1c9 100644 --- a/database/seeders/AppSettingSeeder.php +++ b/database/seeders/AppSettingSeeder.php @@ -3,7 +3,7 @@ namespace Database\Seeders; use App\Models\Order; -use App\Models\Setting; +use App\Models\{Setting, ShareBg}; use Illuminate\Database\Seeder; class AppSettingSeeder extends Seeder @@ -102,5 +102,14 @@ class AppSettingSeeder extends Seeder ] as $key => $values) { Setting::firstOrCreate(['key' => $key], $values); } + + // 分享背景图 + ShareBg::create([ + 'image' => '', + 'x' => 0, + 'y' => 0, + 'size' => 0, + 'is_use' => 1, + ]); } } diff --git a/resources/lang/zh_CN/order.php b/resources/lang/zh_CN/order.php index 77561557..44a7d2ac 100644 --- a/resources/lang/zh_CN/order.php +++ b/resources/lang/zh_CN/order.php @@ -54,6 +54,7 @@ return [ 'remain_quantity'=>'待发', 'tags'=>'标签', 'profit' => '累计返利', + 'sales_value' => '成长值', ], 'options' => [ ],