diff --git a/beike/Admin/Http/Controllers/RmaController.php b/beike/Admin/Http/Controllers/RmaController.php index 4b18c054..26ee75a1 100644 --- a/beike/Admin/Http/Controllers/RmaController.php +++ b/beike/Admin/Http/Controllers/RmaController.php @@ -46,6 +46,12 @@ class RmaController extends Controller public function addHistory(Request $request, int $id) { RmaRepo::addHistory($id, $request->only('status', 'notify', 'comment')); + + $data = [ + 'rma' => RmaRepo::find($id), + 'statuses' => RmaRepo::getStatuses(), + ]; + return json_success('更新成功', $data); } public function destroy(int $id): array diff --git a/beike/Admin/Routes/admin.php b/beike/Admin/Routes/admin.php index 5e7c3a3d..042fe97d 100644 --- a/beike/Admin/Routes/admin.php +++ b/beike/Admin/Routes/admin.php @@ -72,7 +72,7 @@ Route::prefix($adminName) Route::resource('products', Controllers\ProductController::class); Route::resource('regions', Controllers\RegionController::class); - Route::post('rmas/history', [Controllers\RmaController::class, 'addHistory'])->name('rmas.add_history'); + Route::post('rmas/history/{id}', [Controllers\RmaController::class, 'addHistory'])->name('rmas.add_history'); Route::resource('rmas', Controllers\RmaController::class); Route::resource('rma_reasons', Controllers\RmaReasonController::class); diff --git a/beike/Admin/View/Components/Sidebar.php b/beike/Admin/View/Components/Sidebar.php index 70bd3740..b5d4da8e 100644 --- a/beike/Admin/View/Components/Sidebar.php +++ b/beike/Admin/View/Components/Sidebar.php @@ -58,8 +58,9 @@ class Sidebar extends Component $this->addLink('用户组', 'customer_groups.index', 'fa fa-tachometer-alt', $this->equalRoute('customer_groups.index')); } - if (Str::startsWith($routeName, ['orders.'])) { + if (Str::startsWith($routeName, ['orders.', 'rmas.'])) { $this->addLink('订单列表', 'orders.index', 'fa fa-tachometer-alt', $this->equalRoute('orders.index')); + $this->addLink('售后列表', 'rmas.index', 'fa fa-tachometer-alt', $this->equalRoute('rmas.index')); } if (Str::startsWith($routeName, ['settings.', 'admin_users.', 'admin_roles.', 'plugins.', 'tax_classes', 'tax_rates', 'regions', 'currencies'])) { diff --git a/resources/beike/admin/views/pages/admin_roles/index.blade.php b/resources/beike/admin/views/pages/admin_roles/index.blade.php index 0368837a..13ef3b39 100644 --- a/resources/beike/admin/views/pages/admin_roles/index.blade.php +++ b/resources/beike/admin/views/pages/admin_roles/index.blade.php @@ -36,7 +36,7 @@