From 361e352c5e42f5ae905ba45ffff79f7efa3abbde Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Mon, 29 Aug 2022 14:40:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E5=95=86=E5=93=81=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Shop/Http/Controllers/ProductController.php | 9 ++++++---
 resources/lang/en/product.php                     | 1 +
 resources/lang/zh_cn/product.php                  | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/beike/Shop/Http/Controllers/ProductController.php b/beike/Shop/Http/Controllers/ProductController.php
index 7a45dfc5..e186b1b9 100644
--- a/beike/Shop/Http/Controllers/ProductController.php
+++ b/beike/Shop/Http/Controllers/ProductController.php
@@ -3,11 +3,10 @@
 namespace Beike\Shop\Http\Controllers;
 
 use Beike\Models\Product;
-use Beike\Shop\Http\Resources\ProductSimple;
 use Illuminate\Http\Request;
 use Beike\Repositories\ProductRepo;
+use Beike\Shop\Http\Resources\ProductSimple;
 use Beike\Shop\Http\Resources\ProductDetail;
-use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 
 class ProductController extends Controller
 {
@@ -21,7 +20,11 @@ class ProductController extends Controller
     {
         $product = ProductRepo::getProductDetail($product);
         if ($product->active == 0) {
-            return redirect(shop_route('home.index'));
+            $data = [
+                'product' => (new ProductDetail($product))->jsonSerialize(),
+                'error' => trans('product.has_been_inactive')
+            ];
+            return view('product', $data);
         }
         $data = [
             'product' => (new ProductDetail($product))->jsonSerialize(),
diff --git a/resources/lang/en/product.php b/resources/lang/en/product.php
index 1961c91f..0d3e0577 100644
--- a/resources/lang/en/product.php
+++ b/resources/lang/en/product.php
@@ -21,4 +21,5 @@ return [
 
     'active' => 'Active',
     'inactive' => 'Inactive',
+    'has_been_inactive' => 'The product has been inactive',
 ];
diff --git a/resources/lang/zh_cn/product.php b/resources/lang/zh_cn/product.php
index f75c9772..faccbe45 100644
--- a/resources/lang/zh_cn/product.php
+++ b/resources/lang/zh_cn/product.php
@@ -21,4 +21,5 @@ return [
 
     'active' => '上架',
     'inactive' => '下架',
+    'has_been_inactive' => '该商品已下架',
 ];