From d60e00d993cbaea6b204b7853e90ae4dbd84037a Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Thu, 18 Aug 2022 17:18:28 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=BB=84=E5=A4=9A=E4=BD=99=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/views/pages/customer_groups/index.blade.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/resources/beike/admin/views/pages/customer_groups/index.blade.php b/resources/beike/admin/views/pages/customer_groups/index.blade.php index 521591d0..76737984 100644 --- a/resources/beike/admin/views/pages/customer_groups/index.blade.php +++ b/resources/beike/admin/views/pages/customer_groups/index.blade.php @@ -15,10 +15,11 @@ 名称 描述 等级 - 消费额度 + 创建时间 + {{-- 消费额度 折扣率 奖励积分系数 - 使用积分系数 + 使用积分系数 --}} 操作 @@ -28,10 +29,11 @@ @{{ group.description?.name || '' }} @{{ group.description?.description || '' }} @{{ group.level }} - @{{ group.total }} + @{{ group.created_at }} + {{-- @{{ group.total }} @{{ group.discount_factor }} @{{ group.reward_point_factor }} - @{{ group.use_point_factor }} + @{{ group.use_point_factor }} --}} From 35c464f47e6af27b9145f63d549c9859fbc31a9e Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Thu, 18 Aug 2022 17:20:39 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=9C=80=E6=B1=82=E5=9C=B0=E5=9D=80=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/beike/admin/views/pages/customers/form.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/beike/admin/views/pages/customers/form.blade.php b/resources/beike/admin/views/pages/customers/form.blade.php index 282140d6..6f5c3e76 100644 --- a/resources/beike/admin/views/pages/customers/form.blade.php +++ b/resources/beike/admin/views/pages/customers/form.blade.php @@ -159,6 +159,7 @@ zipcode: '', zone_id: '', city: '', + city_id: '', address_1: '', address_2: '', } From 36208c0c35f1964ad7ccaf644cdb6c987b8b4581 Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Thu, 18 Aug 2022 17:24:02 +0800 Subject: [PATCH 03/12] fixed brand for https://guangdagit.com/beike/beikeshop/issues/107 --- beike/Models/Brand.php | 2 +- beike/Repositories/BrandRepo.php | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/beike/Models/Brand.php b/beike/Models/Brand.php index 84559d4f..c926a8f0 100644 --- a/beike/Models/Brand.php +++ b/beike/Models/Brand.php @@ -18,7 +18,7 @@ class Brand extends Base { use HasFactory; - protected $fillable = ['name', 'country_id', 'first', 'logo', 'code', 'sort_order', 'status']; + protected $fillable = ['name', 'first', 'logo', 'sort_order', 'status']; public function products() :HasMany { diff --git a/beike/Repositories/BrandRepo.php b/beike/Repositories/BrandRepo.php index 907de8cc..95c9c0d8 100644 --- a/beike/Repositories/BrandRepo.php +++ b/beike/Repositories/BrandRepo.php @@ -31,7 +31,14 @@ class BrandRepo */ public static function create($data) { - return Brand::query()->create($data); + $brandData = [ + 'name' => $data['name'] ?? '', + 'first' => $data['first'] ?? '', + 'logo' => $data['logo'] ?? '', + 'sort_order' => (int)($data['sort_order'] ?? 0), + 'status' => (bool)($data['status'] ?? 1), + ]; + return Brand::query()->create($brandData); } /** @@ -48,7 +55,15 @@ class BrandRepo if (!$brand) { throw new Exception("品牌id $brand 不存在"); } - $brand->update($data); + + $brandData = [ + 'name' => $data['name'] ?? '', + 'first' => $data['first'] ?? '', + 'logo' => $data['logo'] ?? '', + 'sort_order' => (int)($data['sort_order'] ?? 0), + 'status' => (bool)($data['status'] ?? 1), + ]; + $brand->update($brandData); return $brand; } From 334a321bfc0bdfe5225a31b83bb2c9a181d230f5 Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Thu, 18 Aug 2022 17:37:01 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E6=88=90=E5=8A=9F=20https:?= =?UTF-8?q?//guangdagit.com/beike/beikeshop/issues/126?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Middleware/ShopAuthenticate.php | 25 +++++++++++++++++++ .../Controllers/Account/LoginController.php | 11 ++++---- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/app/Http/Middleware/ShopAuthenticate.php b/app/Http/Middleware/ShopAuthenticate.php index 82eb9b3a..ad6b7d2d 100644 --- a/app/Http/Middleware/ShopAuthenticate.php +++ b/app/Http/Middleware/ShopAuthenticate.php @@ -2,12 +2,37 @@ namespace App\Http\Middleware; +use Beike\Models\Customer; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use Illuminate\Auth\AuthenticationException; use Illuminate\Auth\Middleware\Authenticate as Middleware; class ShopAuthenticate extends Middleware { + /** + * Handle an incoming request. + * + * @param Request $request + * @param \Closure $next + * @param string[] ...$guards + * @return mixed + * + * @throws AuthenticationException + */ + public function handle($request, \Closure $next, ...$guards) + { + $this->authenticate($request, $guards); + + $customer = current_customer(); + if ($customer->status != 1) { + Auth::guard(Customer::AUTH_GUARD)->logout(); + } + + return $next($request); + } + + /** * Get the path the user should be redirected to when they are not authenticated. * diff --git a/beike/Shop/Http/Controllers/Account/LoginController.php b/beike/Shop/Http/Controllers/Account/LoginController.php index 2a42ee4e..e00f65f5 100644 --- a/beike/Shop/Http/Controllers/Account/LoginController.php +++ b/beike/Shop/Http/Controllers/Account/LoginController.php @@ -14,11 +14,7 @@ namespace Beike\Shop\Http\Controllers\Account; use Beike\Models\Customer; use Beike\Shop\Http\Controllers\Controller; use Beike\Shop\Http\Requests\LoginRequest; -use Illuminate\Http\Request; -use function auth; -use function back; -use function redirect; -use function view; +use Illuminate\Support\Facades\Auth; class LoginController extends Controller { @@ -36,6 +32,11 @@ class LoginController extends Controller throw new \Exception("账号密码错误！"); } + $customer = current_customer(); + if ($customer && $customer->status != 1) { + Auth::guard(Customer::AUTH_GUARD)->logout(); + throw new \Exception("用户已被禁用！"); + } return json_success("登录成功!"); } } From bef8d6fe760f31eda81a988827ed78aa89980db4 Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Thu, 18 Aug 2022 17:40:19 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- beike/Shop/Http/Controllers/Account/OrderController.php | 2 +- resources/lang/en/shop/account.php | 2 +- resources/lang/zh_cn/shop/account.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/beike/Shop/Http/Controllers/Account/OrderController.php b/beike/Shop/Http/Controllers/Account/OrderController.php index 5451b4b5..f9f6ef70 100644 --- a/beike/Shop/Http/Controllers/Account/OrderController.php +++ b/beike/Shop/Http/Controllers/Account/OrderController.php @@ -104,6 +104,6 @@ class OrderController extends Controller throw new \Exception('无效的订单'); } StateMachineService::getInstance($order)->changeStatus(StateMachineService::COMPLETED); - return json_success(trans('shop/account.order_completed')); + return json_success(trans('shop/account.order.completed')); } } diff --git a/resources/lang/en/shop/account.php b/resources/lang/en/shop/account.php index e17c2c9a..24259897 100644 --- a/resources/lang/en/shop/account.php +++ b/resources/lang/en/shop/account.php @@ -20,7 +20,7 @@ return [ 'order' => [ 'index' => 'Order List', - 'order_completed' => 'Completed Order', + 'completed' => 'Completed Order', ], 'addresses' => [ diff --git a/resources/lang/zh_cn/shop/account.php b/resources/lang/zh_cn/shop/account.php index 82cf2161..c18ecfd4 100644 --- a/resources/lang/zh_cn/shop/account.php +++ b/resources/lang/zh_cn/shop/account.php @@ -46,7 +46,7 @@ return [ 'order' => [ 'index' => '订单列表', - 'order_completed' => '已确认收货', + 'completed' => '已确认收货', 'order_details' => '订单详情', 'amount' => '金额', 'state' => '状态', From 73de2614c1dccfb1d23d705980bba325cd0bac4d Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Thu, 18 Aug 2022 17:43:51 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/lang/en/admin/order.php | 4 ++++ resources/lang/zh_cn/admin/order.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/resources/lang/en/admin/order.php b/resources/lang/en/admin/order.php index 555c6a83..2f40adbe 100644 --- a/resources/lang/en/admin/order.php +++ b/resources/lang/en/admin/order.php @@ -12,7 +12,11 @@ return [ 'list' => 'Order List', 'orders_index' => 'Index', + 'unpaid' => 'Unpaid', + 'shipped' => 'Shipped', + 'completed' => 'Completed', + 'orders_create' => 'Create', 'orders_show' => 'Detail', 'orders_update' => 'Update', diff --git a/resources/lang/zh_cn/admin/order.php b/resources/lang/zh_cn/admin/order.php index e60a884b..619256bd 100644 --- a/resources/lang/zh_cn/admin/order.php +++ b/resources/lang/zh_cn/admin/order.php @@ -12,7 +12,11 @@ return [ 'list' => '订单列表', 'orders_index' => '订单列表', + 'unpaid' => '待支付', + 'shipped' => '已发货', + 'completed' => '已完成', + 'orders_create' => '创建订单', 'orders_show' => '订单详情', 'orders_update' => '更新订单', From 162771bdfe35bfd96baa2b1833df4ff10347d860 Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Thu, 18 Aug 2022 18:05:35 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/beike/admin/views/pages/pages/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/beike/admin/views/pages/pages/index.blade.php b/resources/beike/admin/views/pages/pages/index.blade.php index 76e32a0a..73fbe993 100644 --- a/resources/beike/admin/views/pages/pages/index.blade.php +++ b/resources/beike/admin/views/pages/pages/index.blade.php @@ -52,7 +52,7 @@ const id = $(this).data('id'); const self = $(this); - layer.confirm('确定要删除角色吗？', { + layer.confirm('确定要删除页面吗？', { title: "提示", btn: ['取消', '确定'], area: ['400px'], From 5bc7e004fb6c4604a8ececc10e4a8206507cb1e2 Mon Sep 17 00:00:00 2001 From: TL Date: Thu, 18 Aug 2022 18:05:35 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=BC=95=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- beike/Installer/config.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/beike/Installer/config.php b/beike/Installer/config.php index dd0590ef..4cc21c84 100644 --- a/beike/Installer/config.php +++ b/beike/Installer/config.php @@ -43,9 +43,9 @@ return [ | */ 'permissions' => [ - 'storage/framework/' => '775', - 'storage/logs/' => '775', - 'bootstrap/cache/' => '775', + 'storage/framework/' => '755', + 'storage/logs/' => '755', + 'bootstrap/cache/' => '755', ], /* From e38626d2f4756ad658309882e788156f1979c528 Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Thu, 18 Aug 2022 18:13:05 +0800 Subject: [PATCH 09/12] fixed composer --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8f54e396..87779eb7 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "keywords": ["framework", "laravel"], "license": "MIT", "require": { - "php": "^7.4|^8.0", + "php": "^8.0.2", "ext-json": "*", "ext-zip": "*", "doctrine/dbal": "^3.3", From 8f07c8448aa50b0a34b3c6e485eb465abd63e6ea Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Thu, 18 Aug 2022 18:13:35 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=93=81=E7=89=8C?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/beike/admin/views/pages/brands/index.blade.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/beike/admin/views/pages/brands/index.blade.php b/resources/beike/admin/views/pages/brands/index.blade.php index 607cd07f..fd602b89 100644 --- a/resources/beike/admin/views/pages/brands/index.blade.php +++ b/resources/beike/admin/views/pages/brands/index.blade.php @@ -27,7 +27,9 @@
@{{ brand.sort_order }} @{{ brand.first }} - @{{ brand.status }} + + @{{ brand.status ? '启用' : '禁用' }} + From 31f163d56de0f20b50496357f8baa6d34ce2da85 Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Thu, 18 Aug 2022 18:21:48 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- beike/Shop/Http/Controllers/ProductController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beike/Shop/Http/Controllers/ProductController.php b/beike/Shop/Http/Controllers/ProductController.php index 3527a1de..9e3d9d14 100644 --- a/beike/Shop/Http/Controllers/ProductController.php +++ b/beike/Shop/Http/Controllers/ProductController.php @@ -20,6 +20,9 @@ class ProductController extends Controller public function show(Request $request, Product $product) { $product = ProductRepo::getProductDetail($product); + if ($product->active == 0) { + return redirect(shop_route('home.index')); + } $data = [ 'product' => (new ProductDetail($product))->jsonSerialize(), ]; @@ -31,7 +34,7 @@ class ProductController extends Controller * 通过关键字搜索产品 * * @param Request $request - * @return AnonymousResourceCollection + * @return mixed */ public function search(Request $request) { From d23d07cdf0c0127547ab06ab30d5b233c790f02b Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Thu, 18 Aug 2022 18:25:02 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=A1=B5=20https://guangdagit.com/beike/beikeshop/issues/129?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Middleware/ShopAuthenticate.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Middleware/ShopAuthenticate.php b/app/Http/Middleware/ShopAuthenticate.php index ad6b7d2d..6430f8d3 100644 --- a/app/Http/Middleware/ShopAuthenticate.php +++ b/app/Http/Middleware/ShopAuthenticate.php @@ -27,6 +27,7 @@ class ShopAuthenticate extends Middleware $customer = current_customer(); if ($customer->status != 1) { Auth::guard(Customer::AUTH_GUARD)->logout(); + return redirect(shop_route('account.login')); } return $next($request);