From c1b55293d6df698f502baadd02388177c5a01a7f Mon Sep 17 00:00:00 2001 From: Karen Date: Wed, 27 Oct 2021 15:18:57 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=9B=E9=AA=8C=E8=AF=81=E5=AE=9E=E9=99=85=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E9=87=91=E9=A2=9D=E5=92=8C=E8=AE=A2=E5=8D=95=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E6=98=AF=E5=90=A6=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Auth/LoginController.php | 1 + .../Controllers/Common/RegionController.php | 6 +++ app/Http/Controllers/HomeController.php | 5 +- .../Controllers/Payment/PaypalController.php | 4 +- .../Product/CheckoutController.php | 19 ++++++- app/Http/Middleware/Authenticate.php | 4 +- app/Repositories/AppRepository.php | 10 ++-- app/Repositories/CartRepository.php | 10 ++-- app/Repositories/OrderRepository.php | 14 +++-- composer.lock | 6 +-- config/strongshop.php | 1 + .../themes/default/shoppingcart/pay.blade.php | 2 +- routes/api.php | 53 +++++++++++++++++-- 13 files changed, 108 insertions(+), 27 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 702d5a0..5146d18 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -143,6 +143,7 @@ class LoginController extends Controller return ['code' => 200, 'message' => __('Success'), 'data' => [ 'token' => $user->api_token, + 'user' => $user, ]]; } diff --git a/app/Http/Controllers/Common/RegionController.php b/app/Http/Controllers/Common/RegionController.php index 0361e1a..527b62a 100644 --- a/app/Http/Controllers/Common/RegionController.php +++ b/app/Http/Controllers/Common/RegionController.php @@ -17,6 +17,12 @@ use App\Repositories\RegionRepository; class RegionController extends Controller { + public function countries() + { + $rows = RegionRepository::countries(); + return ['code' => 200, 'message' => __('Success'), 'data' => $rows]; + } + public function states(Request $request) { $rows = RegionRepository::states($request->country_code); diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 8b885a2..e62f6a1 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -6,7 +6,6 @@ * @license http://www.strongshop.cn/license/ * @copyright StrongShop Software */ - /** * StrongShop * @author Karen @@ -52,6 +51,10 @@ class HomeController extends Controller Cache::put('product:home', $data, now()->tomorrow()); } + if ($this->isApi) + { + return ['code' => 200, 'message' => __('Success'), 'data' => $data]; + } View::share('_meta_keywords', AppRepository::getShopConfig('meta_keywords')); View::share('_meta_description', AppRepository::getShopConfig('meta_description')); return view('home', $data); diff --git a/app/Http/Controllers/Payment/PaypalController.php b/app/Http/Controllers/Payment/PaypalController.php index 2e56579..daf70e8 100644 --- a/app/Http/Controllers/Payment/PaypalController.php +++ b/app/Http/Controllers/Payment/PaypalController.php @@ -59,7 +59,7 @@ class PaypalController extends Controller $cancel_url = config('app.url'); $return_url = route('paypal.return'); - $notify_url = route('paypal.notify'); + $notify_url = config('strongshop.payment.paypal.notify_url', route('paypal.notify')); //收款账号 $business = $model->more['business'] ?? config('strongshop.payment.paypal.business'); //默认设置结算货币 @@ -177,7 +177,7 @@ class PaypalController extends Controller if ($verifyReturn == 'VERIFIED') { - OrderRepository::paid($order_no, $transaction_id, null); + OrderRepository::paid($order_no, $transaction_id, $paid_amount); return 'success'; } return 'failed'; diff --git a/app/Http/Controllers/Product/CheckoutController.php b/app/Http/Controllers/Product/CheckoutController.php index 4743430..fd881a2 100644 --- a/app/Http/Controllers/Product/CheckoutController.php +++ b/app/Http/Controllers/Product/CheckoutController.php @@ -100,10 +100,25 @@ class CheckoutController extends Controller } $cart = CartRepository::getCart($request->buyNow); $shipping_options = ShippingRepository::getShippingFeeList($cart['cart_weight'], $request->country_code); + if ($this->isApi) + { + return ['code' => 200, 'message' => __('Success'), 'data' => $shipping_options]; + } $content = (string) view('layouts.includes.shippingOptions', ['shipping_options' => $shipping_options]); return ['code' => 200, 'message' => __('Success'), 'data' => $shipping_options, 'content' => $content]; } + /** + * 支付方式列表 + * @return type + */ + public function getPaymentOptions() + { + $rows = PaymentOption::where('status', 1)->get(); + $rows->makeHidden('more'); + return ['code' => 200, 'message' => __('Success'), 'data' => $rows]; + } + /** * 订单总计 */ @@ -172,7 +187,7 @@ class CheckoutController extends Controller 'billing_postal_code' => ['required', 'string', 'max:255'], //积分 'use_credits' => ['nullable', 'integer', 'gte:100', 'lte:' . $this->user->pay_credits], - 'shipping_option_id' => ['required', 'integer', Rule::exists('shipping_option_config', 'shipping_option_id')->where('status', 1)->where(function($query)use($request) { + 'shipping_option_id' => ['required', 'integer', Rule::exists('shipping_option_config', 'shipping_option_id')->where('status', 1)->where(function ($query)use ($request) { return $query->whereJsonContains('countries', [$request->country_code]); })], 'payment_option_id' => ['required', 'integer', Rule::exists('payment_option', 'id')->where('status', 1)], @@ -246,7 +261,7 @@ class CheckoutController extends Controller $orderModel->payment_option_id = $request->payment_option_id; $orderModel->remark = (string) $request->remark; - DB::transaction(function ()use($orderModel, $cart, $request) { + DB::transaction(function ()use ($orderModel, $cart, $request) { $orderModel->save(); //订单产品 foreach ($cart['rows'] as $cartRow) diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index d38bd65..1e458ce 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -21,11 +21,11 @@ class Authenticate extends Middleware $user = auth('api')->user(); if ($user->api_token_at && now()->gte($user->api_token_at)) { - return response()->json(['code' => 432, 'message' => __('token expired 已过期')]); + return response()->json(['code' => 431, 'message' => __('token expired 已过期')]); } if ($user->api_token_refresh_at && now()->gte($user->api_token_refresh_at)) { - return response()->json(['code' => 433, 'message' => __('token must be refreshed 请刷新token')]); + return response()->json(['code' => 432, 'message' => __('token must be refreshed 请刷新token')]); } } return $next($request); diff --git a/app/Repositories/AppRepository.php b/app/Repositories/AppRepository.php index f5640ca..54be7fe 100644 --- a/app/Repositories/AppRepository.php +++ b/app/Repositories/AppRepository.php @@ -170,12 +170,16 @@ class AppRepository /** * 保留小数位数 - * @param type $number + * @param type $number 金额 + * @param type $defaultDedimal 小数位数 * @return type */ - public static function dedimalTruncate($number) + public static function dedimalTruncate($number, $defaultDedimal = null) { - $defaultDedimal = config('strongshop.defaultDedimal'); + if (!$defaultDedimal) + { + $defaultDedimal = config('strongshop.defaultDedimal'); + } if ($defaultDedimal < 0) { $defaultDedimal = 0; diff --git a/app/Repositories/CartRepository.php b/app/Repositories/CartRepository.php index 53e63ac..fe503f2 100644 --- a/app/Repositories/CartRepository.php +++ b/app/Repositories/CartRepository.php @@ -37,10 +37,10 @@ class CartRepository $model->orderByDesc('id'); $model->whereHas('product'); $model->with([ - 'product' => function($query) { + 'product' => function ($query) { $query->select('id', 'title', 'sku', 'img_cover', 'original_price', 'sale_price', 'stock', 'stock_status', 'wholesale_set', 'weight'); $query->with([ - 'specs' => function($query) { + 'specs' => function ($query) { $query->select('id', 'name'); $query->where('product_spec.spec_type', 1); } @@ -119,10 +119,10 @@ class CartRepository { $model = ShoppingCart::where('id', $id); $model->with([ - 'product' => function($query) { + 'product' => function ($query) { $query->select('id', 'title', 'sku', 'img_cover', 'original_price', 'sale_price', 'stock', 'stock_status', 'wholesale_set'); $query->with([ - 'specs' => function($query) { + 'specs' => function ($query) { $query->select('id', 'name'); $query->where('product_spec.spec_type', 1); } @@ -199,7 +199,7 @@ class CartRepository $data['tax_fee'] = $tax_fee; $data['used_credits_amount'] = $used_credits_amount; $data['cart_total'] = $cart_total; - $data['order_total'] = AppRepository::dedimalTruncate($order_total); + $data['order_total'] = AppRepository::dedimalTruncate($order_total, 2);//强制订单金额为两位小数 return $data; } diff --git a/app/Repositories/OrderRepository.php b/app/Repositories/OrderRepository.php index 09122b8..d5f51c7 100644 --- a/app/Repositories/OrderRepository.php +++ b/app/Repositories/OrderRepository.php @@ -35,7 +35,7 @@ class OrderRepository * @param type $paid_amount * @return type */ - public static function paid($order_no, $transaction_id, $paid_amount = null) + public static function paid($order_no, $transaction_id, $paid_amount) { $order = Order::where('order_no', $order_no)->first(); if (!$order) @@ -46,10 +46,18 @@ class OrderRepository } return false; } - if ($paid_amount === null) + + $order_amount = $order->order_amount; + //验证实际支付金额和订单金额是否一致 + if ($paid_amount != $order_amount) { - $paid_amount = $order->order_amount; + $order->order_status = Order::STATUS_PAY_EXCEPTION;//支付异常 + $order->paid_amount = $paid_amount; + $order->transaction_id = $transaction_id; + $order->paid_at = now(); + return true; } + $order->order_status = Order::STATUS_PAID; $order->paid_amount = $paid_amount; $order->transaction_id = $transaction_id; diff --git a/composer.lock b/composer.lock index 562aac7..bf52979 100644 --- a/composer.lock +++ b/composer.lock @@ -2606,11 +2606,11 @@ }, { "name": "openstrong/laravel-strongadmin", - "version": "v1.4", + "version": "v1.6", "source": { "type": "git", "url": "https://gitee.com/openstrong/laravel-strongadmin.git", - "reference": "17d181893748edc1e9a1ac992c942a2760785284" + "reference": "1bb81ca4ce1fd5f0fc8557676a4c2096c7bbe80f" }, "require": { "laravel/framework": ">=5.5", @@ -2649,7 +2649,7 @@ "php", "后台管理" ], - "time": "2021-09-28T04:23:43+00:00" + "time": "2021-10-26T02:09:54+00:00" }, { "name": "openstrong/laravel-strongstub", diff --git a/config/strongshop.php b/config/strongshop.php index d5b8366..fcf4d48 100644 --- a/config/strongshop.php +++ b/config/strongshop.php @@ -115,6 +115,7 @@ return [ 'paypal' => [ 'business' => env('PAYMENT_PAYPAL_BUSINESS'), //收款账号 'env' => env('PAYMENT_PAYPAL_ENV', 'sandbox'), //环境 + 'notify_url' => env('PAYMENT_PAYPAL_NOTIFY_URL'), ], ], ]; diff --git a/resources/views/themes/default/shoppingcart/pay.blade.php b/resources/views/themes/default/shoppingcart/pay.blade.php index 047a501..15df022 100644 --- a/resources/views/themes/default/shoppingcart/pay.blade.php +++ b/resources/views/themes/default/shoppingcart/pay.blade.php @@ -105,7 +105,7 @@ $('.progress-bar').css({width: widthStr}); }, 50); //自动提交支付 - $('form').submit(); +// $('form').submit(); } (); diff --git a/routes/api.php b/routes/api.php index b7ef0af..0fad2ad 100644 --- a/routes/api.php +++ b/routes/api.php @@ -16,18 +16,61 @@ Route::post('login', 'Auth\LoginController@login'); Route::post('login/code', 'Auth\LoginController@loginCode')->middleware(['throttle:3,1']); //获取验证码 //登出 -Route::get('logout', 'Auth\LoginController@logout'); +Route::post('logout', 'Auth\LoginController@logout'); //注册 Route::post('register', 'Auth\RegisterController@register')->middleware(['throttle:10,1', 'guest']); //重置密码 Route::post('password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail'); Route::post('password/reset', 'Auth\ResetPasswordController@reset'); //刷新token -Route::get('user/refreshtoken', 'User\UserController@refreshToken')->middleware('auth:api'); +Route::post('user/refreshtoken', 'User\UserController@refreshToken')->middleware('auth:api'); //验证邮箱 -Route::get('email/verify/{id}/{hash}', 'Auth\VerificationController@verifyForApi')->middleware('auth:api'); -//auth +Route::post('email/verify/{id}/{hash}', 'Auth\VerificationController@verifyForApi')->middleware('auth:api'); +//地区 +Route::post('common/region/countries', 'Common\RegionController@countries'); +Route::post('common/region/states', 'Common\RegionController@states'); +//首页信息 +Route::post('home/index', 'HomeController@index'); +//产品分类 +Route::post('product/category', 'Product\CategoryController@index'); +//产品列表 +Route::post('product/index', 'Product\ProductController@index'); +//产品搜索 +Route::post('product/search', 'Product\ProductController@search'); +//产品详情 +Route::post('product', 'Product\ProductController@show')->name('product.show'); +Route::post('product/collect', 'Product\ProductController@collect')->middleware(['auth:api']); //收藏产品 +//购物车 +Route::post('shoppingcart/show', 'Product\ShoppingCartController@show'); //购物车详情 +Route::post('shoppingcart/create', 'Product\ShoppingCartController@create'); //添加购物车 +Route::post('shoppingcart/update', 'Product\ShoppingCartController@update'); //更新购物车 +Route::post('shoppingcart/remove', 'Product\ShoppingCartController@remove'); //移除购物车产品 +//配送方式列表 +Route::post('shoppingcart/shippingoptions', 'Product\CheckoutController@getShippingOptions'); +//支付方式列表 +Route::post('shoppingcart/paymentoptions', 'Product\CheckoutController@getPaymentOptions'); +//创建订单 +Route::post('shoppingcart/checkout/createOrder', 'Product\CheckoutController@createOrder'); +//订单总计 +Route::post('shoppingcart/ordertotal', 'Product\CheckoutController@orderTotal'); +//paypal 异步通知 +Route::post('payment/paypal/notify', 'Payment\PaypalController@notify'); +//文章 +Route::post('article/list', 'ArticleController@index'); //列表 +Route::post('article', 'ArticleController@show'); //详情 +//个人中心 Route::middleware(['auth:api'])->group(function () { - Route::get('user/account', 'User\UserController@account'); //我的账号 + Route::post('user/account', 'User\UserController@account'); //我的账号 Route::post('user/email/resendVerify', 'User\UserController@resendEmailVerification')->middleware(['throttle:3,1']); //重新发送email验证 + Route::post('user/update', 'User\UserController@update'); //更新个人信息 + Route::post('user/collects', 'User\UserController@collects'); //我的收藏 + Route::post('user/collects/remove', 'User\UserController@removeCollects'); //移除收藏 + Route::post('user/orders', 'User\UserController@orders'); //我的订单 + Route::post('user/order/detail/{orderId}', 'User\UserController@orderDetail'); //我的订单-详情 + Route::post('user/order/cancel', 'User\UserController@cancelOrder'); //取消订单 + Route::post('user/order/receive', 'User\UserController@receiveOrder'); //确认收货 + //意见反馈 + Route::post('user/feedback/index', 'User\FeedbackController@index'); //我的反馈 + Route::post('user/feedback/create', 'User\FeedbackController@create')->middleware(['throttle:3,1']); //提交反馈 + Route::post('user/feedback/replies', 'User\FeedbackController@replies'); //回复列表 }); -- Gitee From 5dfaf2114f53b3a149950dd34356612347754788 Mon Sep 17 00:00:00 2001 From: Karen Date: Wed, 27 Oct 2021 15:31:19 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=87=91=E9=A2=9D=E5=92=8C=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=98=AF=E5=90=A6=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Repositories/OrderRepository.php | 8 ++++++-- resources/views/themes/default/shoppingcart/pay.blade.php | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Repositories/OrderRepository.php b/app/Repositories/OrderRepository.php index d5f51c7..204d2b2 100644 --- a/app/Repositories/OrderRepository.php +++ b/app/Repositories/OrderRepository.php @@ -46,12 +46,16 @@ class OrderRepository } return false; } - + $order_amount = $order->order_amount; //验证实际支付金额和订单金额是否一致 if ($paid_amount != $order_amount) { - $order->order_status = Order::STATUS_PAY_EXCEPTION;//支付异常 + if (config('app.debug') || env('PAYMENT_LOG')) + { + Log::debug('验证实际支付金额和订单金额不一致 $order_no,$transaction_id,$paid_amount: ', [$order_no, $transaction_id, $paid_amount]); + } + $order->order_status = Order::STATUS_PAY_EXCEPTION; //支付异常 $order->paid_amount = $paid_amount; $order->transaction_id = $transaction_id; $order->paid_at = now(); diff --git a/resources/views/themes/default/shoppingcart/pay.blade.php b/resources/views/themes/default/shoppingcart/pay.blade.php index 15df022..047a501 100644 --- a/resources/views/themes/default/shoppingcart/pay.blade.php +++ b/resources/views/themes/default/shoppingcart/pay.blade.php @@ -105,7 +105,7 @@ $('.progress-bar').css({width: widthStr}); }, 50); //自动提交支付 -// $('form').submit(); + $('form').submit(); } (); -- Gitee From 72b228a1dbc670703d878b7025c7ae6a05210073 Mon Sep 17 00:00:00 2001 From: Karen Date: Wed, 27 Oct 2021 15:34:17 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=87=91=E9=A2=9D=E5=92=8C=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=98=AF=E5=90=A6=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Repositories/OrderRepository.php | 1 + resources/views/themes/default/shoppingcart/pay.blade.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Repositories/OrderRepository.php b/app/Repositories/OrderRepository.php index 204d2b2..657bc7a 100644 --- a/app/Repositories/OrderRepository.php +++ b/app/Repositories/OrderRepository.php @@ -59,6 +59,7 @@ class OrderRepository $order->paid_amount = $paid_amount; $order->transaction_id = $transaction_id; $order->paid_at = now(); + $order->save(); return true; } diff --git a/resources/views/themes/default/shoppingcart/pay.blade.php b/resources/views/themes/default/shoppingcart/pay.blade.php index 047a501..15df022 100644 --- a/resources/views/themes/default/shoppingcart/pay.blade.php +++ b/resources/views/themes/default/shoppingcart/pay.blade.php @@ -105,7 +105,7 @@ $('.progress-bar').css({width: widthStr}); }, 50); //自动提交支付 - $('form').submit(); +// $('form').submit(); } (); -- Gitee From 7e84f6684006d51c2f8b10e3166744a93459c1fe Mon Sep 17 00:00:00 2001 From: Karen Date: Wed, 27 Oct 2021 15:39:08 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=87=91=E9=A2=9D=E5=92=8C=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=98=AF=E5=90=A6=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Repositories/OrderRepository.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Repositories/OrderRepository.php b/app/Repositories/OrderRepository.php index 657bc7a..e9ef405 100644 --- a/app/Repositories/OrderRepository.php +++ b/app/Repositories/OrderRepository.php @@ -59,6 +59,7 @@ class OrderRepository $order->paid_amount = $paid_amount; $order->transaction_id = $transaction_id; $order->paid_at = now(); + $order->pay_remark = '实际支付金额和订单金额不一致'; $order->save(); return true; } -- Gitee From dd2d531195d265c256506d6750a76cf24ac66247 Mon Sep 17 00:00:00 2001 From: Karen Date: Wed, 27 Oct 2021 15:39:27 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=87=91=E9=A2=9D=E5=92=8C=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=98=AF=E5=90=A6=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/themes/default/shoppingcart/pay.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/themes/default/shoppingcart/pay.blade.php b/resources/views/themes/default/shoppingcart/pay.blade.php index 15df022..047a501 100644 --- a/resources/views/themes/default/shoppingcart/pay.blade.php +++ b/resources/views/themes/default/shoppingcart/pay.blade.php @@ -105,7 +105,7 @@ $('.progress-bar').css({width: widthStr}); }, 50); //自动提交支付 -// $('form').submit(); + $('form').submit(); } (); -- Gitee From b9c42ad65eea57e308bcd3ab33a6d718e6f81d3f Mon Sep 17 00:00:00 2001 From: Karen Date: Wed, 27 Oct 2021 17:22:26 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E4=B8=80=E7=BA=A7=E5=88=86=E7=B1=BB=E4=B8=8D=E8=83=BD=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Strongadmin/Product/CategoryController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Strongadmin/Product/CategoryController.php b/app/Http/Controllers/Strongadmin/Product/CategoryController.php index 60725e5..a1ee5b8 100644 --- a/app/Http/Controllers/Strongadmin/Product/CategoryController.php +++ b/app/Http/Controllers/Strongadmin/Product/CategoryController.php @@ -125,7 +125,7 @@ class CategoryController extends BaseController if (!$request->expectsJson()) { $model = $category::with('parent')->find($request->id); - $menus = Category::where('parent_id', $model->parent['parent_id'])->orderByDesc('sort')->get(); + $menus = Category::where('parent_id', $model->parent['parent_id'] ?? 0)->orderByDesc('sort')->get(); return $this->view('category.form', ['model' => $model, 'menus' => $menus]); } $rules = array_merge_recursive($category->rules(), [ -- Gitee From b8b97e967729ac2bba9b56d6ebf2c4f145a531fd Mon Sep 17 00:00:00 2001 From: Karen Date: Mon, 1 Nov 2021 13:31:42 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=AF=8C=E6=96=87=E6=9C=AC=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../article/article/form.blade.php | 1 + .../views/strongadmin/order/index.blade.php | 31 +++++++------------ .../views/strongadmin/order/show.blade.php | 6 ++-- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/resources/views/strongadmin/article/article/form.blade.php b/resources/views/strongadmin/article/article/form.blade.php index 118ddf0..471ac4a 100644 --- a/resources/views/strongadmin/article/article/form.blade.php +++ b/resources/views/strongadmin/article/article/form.blade.php @@ -103,6 +103,7 @@ @endsection @push('scripts_bottom') + -- Gitee From ae925e789d75ac6d150c36eba59614f640558783 Mon Sep 17 00:00:00 2001 From: Karen Date: Mon, 8 Nov 2021 15:56:55 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4=E9=85=8D=E9=80=81=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/strongadmin/shippingOption/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/strongadmin/shippingOption/index.blade.php b/resources/views/strongadmin/shippingOption/index.blade.php index 4f1a401..3efc0c0 100644 --- a/resources/views/strongadmin/shippingOption/index.blade.php +++ b/resources/views/strongadmin/shippingOption/index.blade.php @@ -49,7 +49,7 @@