diff --git a/beike/Shop/Routes/shop.php b/beike/Shop/Routes/shop.php index aa78ebd1..bea501d7 100644 --- a/beike/Shop/Routes/shop.php +++ b/beike/Shop/Routes/shop.php @@ -80,23 +80,24 @@ Route::prefix('/') }); Route::prefix('account') + ->name('account.') ->middleware('shop_auth:' . Customer::AUTH_GUARD) ->group(function () { - Route::get('/', [AccountController::class, 'index'])->name('account.index'); + Route::get('/', [AccountController::class, 'index'])->name('index'); Route::resource('addresses', AddressController::class); - Route::get('edit', [EditController::class, 'index'])->name('account.edit.index'); + Route::get('edit', [EditController::class, 'index'])->name('edit.index'); - Route::get('rmas', [RmaController::class, 'index'])->name('account.rma.index'); - Route::get('rmas/{id}', [RmaController::class, 'show'])->name('account.rma.show'); - Route::get('rmas/create/{order_product_id}', [RmaController::class, 'create'])->name('account.rma.create'); - Route::post('rmas/store', [RmaController::class, 'store'])->name('account.rma.store'); + Route::get('rmas', [RmaController::class, 'index'])->name('rma.index'); + Route::get('rmas/{id}', [RmaController::class, 'show'])->name('rma.show'); + Route::get('rmas/create/{order_product_id}', [RmaController::class, 'create'])->name('rma.create'); + Route::post('rmas/store', [RmaController::class, 'store'])->name('rma.store'); - Route::put('edit', [EditController::class, 'update'])->name('account.edit.update'); - Route::get('orders', [OrderController::class, 'index'])->name('account.order.index'); - Route::get('orders/{number}', [OrderController::class, 'show'])->name('account.order.show'); - Route::get('update_password', [AccountController::class, 'updatePassword'])->name('account.update_password'); - Route::get('wishlist', [WishlistController::class, 'index'])->name('account.wishlist.index'); - Route::post('wishlist', [WishlistController::class, 'add'])->name('account.wishlist.add'); - Route::delete('wishlist/{id}', [WishlistController::class, 'remove'])->name('account.wishlist.remove'); + Route::put('edit', [EditController::class, 'update'])->name('edit.update'); + Route::get('orders', [OrderController::class, 'index'])->name('order.index'); + Route::get('orders/{number}', [OrderController::class, 'show'])->name('order.show'); + Route::get('update_password', [AccountController::class, 'updatePassword'])->name('update_password'); + Route::get('wishlist', [WishlistController::class, 'index'])->name('wishlist.index'); + Route::post('wishlist', [WishlistController::class, 'add'])->name('wishlist.add'); + Route::delete('wishlist/{id}', [WishlistController::class, 'remove'])->name('wishlist.remove'); }); }); diff --git a/beike/Shop/View/Components/Breadcrumb.php b/beike/Shop/View/Components/Breadcrumb.php index 7b9f05a3..e3609b45 100644 --- a/beike/Shop/View/Components/Breadcrumb.php +++ b/beike/Shop/View/Components/Breadcrumb.php @@ -12,10 +12,10 @@ namespace Beike\Shop\View\Components; use Beike\Models\Product; -use Illuminate\Contracts\View\View; -use Illuminate\Support\Collection; use Illuminate\Support\Str; use Illuminate\View\Component; +use Illuminate\Support\Collection; +use Illuminate\Contracts\View\View; class Breadcrumb extends Component { diff --git a/resources/lang/en/shop/account.php b/resources/lang/en/shop/account.php index b1f61bb1..e17c2c9a 100644 --- a/resources/lang/en/shop/account.php +++ b/resources/lang/en/shop/account.php @@ -21,5 +21,9 @@ return [ 'order' => [ 'index' => 'Order List', 'order_completed' => 'Completed Order', - ] + ], + + 'addresses' => [ + 'index' => 'My Addresses' + ], ]; diff --git a/resources/lang/zh_cn/shop/account.php b/resources/lang/zh_cn/shop/account.php index 8e0e61ab..9d08a89e 100644 --- a/resources/lang/zh_cn/shop/account.php +++ b/resources/lang/zh_cn/shop/account.php @@ -42,5 +42,9 @@ return [ 'order' => [ 'index' => '订单列表', 'order_completed' => '已确认收货', - ] + ], + + 'addresses' => [ + 'index' => '我的地址' + ], ]; diff --git a/themes/default/account/address.blade.php b/themes/default/account/address.blade.php index 49a38dae..b4162eb4 100644 --- a/themes/default/account/address.blade.php +++ b/themes/default/account/address.blade.php @@ -10,12 +10,8 @@ @section('content')
- + +
diff --git a/themes/default/components/account/sidebar.blade.php b/themes/default/components/account/sidebar.blade.php index bf29da75..38bb2a8b 100644 --- a/themes/default/components/account/sidebar.blade.php +++ b/themes/default/components/account/sidebar.blade.php @@ -12,7 +12,7 @@ 修改个人信息 我的订单 - + 我的地址 我的收藏