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');