From 1ea67b0a35ec56057e4e17c2507489f751a18644 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Wed, 17 Aug 2022 17:59:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=85=88=E7=99=BB=E5=BD=95,=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BA=A7=E5=93=81=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=A4=AA=E9=95=BF=E9=97=AE=E9=A2=98=20https://guangda?=
 =?UTF-8?q?git.com/beike/beikeshop/issues/108?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Shop/Http/Controllers/CartController.php |  3 +--
 beike/Shop/Http/Resources/CartDetail.php       |  2 +-
 beike/Shop/Routes/shop.php                     | 11 ++++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/beike/Shop/Http/Controllers/CartController.php b/beike/Shop/Http/Controllers/CartController.php
index 8ad15953..1823e060 100644
--- a/beike/Shop/Http/Controllers/CartController.php
+++ b/beike/Shop/Http/Controllers/CartController.php
@@ -72,12 +72,11 @@ class CartController extends Controller
 
     /**
      * 右上角购物车
-     * @return array
+     * @return mixed
      */
     public function miniCart()
     {
         $data = CartService::reloadData();
-        // return json_success('获取成功', $data);
         return view('cart/mini', $data);
     }
 
diff --git a/beike/Shop/Http/Resources/CartDetail.php b/beike/Shop/Http/Resources/CartDetail.php
index 6875f037..829cc05d 100644
--- a/beike/Shop/Http/Resources/CartDetail.php
+++ b/beike/Shop/Http/Resources/CartDetail.php
@@ -28,7 +28,7 @@ class CartDetail extends JsonResource
             'cart_id' => $this->id,
             'product_id' => $this->product_id,
             'sku_id' => $this->product_sku_id,
-            'name' => $description->name,
+            'name' => sub_string($description->name),
             'image' => $image,
             'image_url' => image_resize($image),
             'quantity' => $this->quantity,
diff --git a/beike/Shop/Routes/shop.php b/beike/Shop/Routes/shop.php
index 523b7364..ab8590e7 100644
--- a/beike/Shop/Routes/shop.php
+++ b/beike/Shop/Routes/shop.php
@@ -35,12 +35,7 @@ Route::prefix('/')
         Route::get('brands/autocomplete', [BrandController::class, 'autocomplete'])->name('brands.autocomplete');
         Route::get('brands/{id}', [BrandController::class, 'show'])->name('brands.show');
 
-        Route::get('carts', [CartController::class, 'index'])->name('carts.index');
-        Route::post('carts', [CartController::class, 'store'])->name('carts.store');
         Route::get('carts/mini', [CartController::class, 'miniCart'])->name('carts.mini');
-        Route::put('carts/{cart}', [CartController::class, 'update'])->name('carts.update');
-        Route::post('carts/select', [CartController::class, 'select'])->name('carts.select');
-        Route::delete('carts/{cart}', [CartController::class, 'destroy'])->name('carts.destroy');
 
         Route::get('categories', [CategoryController::class, 'index'])->name('categories.index');
         Route::get('categories/{category}', [CategoryController::class, 'show'])->name('categories.show');
@@ -70,6 +65,12 @@ Route::prefix('/')
 
         Route::middleware('shop_auth:' . Customer::AUTH_GUARD)
             ->group(function () {
+                Route::get('carts', [CartController::class, 'index'])->name('carts.index');
+                Route::post('carts', [CartController::class, 'store'])->name('carts.store');
+                Route::put('carts/{cart}', [CartController::class, 'update'])->name('carts.update');
+                Route::post('carts/select', [CartController::class, 'select'])->name('carts.select');
+                Route::delete('carts/{cart}', [CartController::class, 'destroy'])->name('carts.destroy');
+
                 Route::get('checkout', [CheckoutController::class, 'index'])->name('checkout.index');
                 Route::put('checkout', [CheckoutController::class, 'update'])->name('checkout.update');
                 Route::post('checkout/confirm', [CheckoutController::class, 'confirm'])->name('checkout.confirm');