diff --git a/app/Http/Controllers/Admin/PlanController.php b/app/Http/Controllers/Admin/PlanController.php index 40c6f02..5852e94 100644 --- a/app/Http/Controllers/Admin/PlanController.php +++ b/app/Http/Controllers/Admin/PlanController.php @@ -142,12 +142,16 @@ class PlanController extends Controller { $this->ensurePlatformAdmin($request); + $back = (string) $request->query('back', ''); + $safeBack = str_starts_with($back, '/') ? $back : ''; + return view('admin.plans.form', [ 'plan' => new Plan(), 'statusLabels' => $this->statusLabels(), 'billingCycleLabels' => $this->billingCycleLabels(), 'formAction' => '/admin/plans', 'method' => 'post', + 'back' => $safeBack, ]); } @@ -165,12 +169,16 @@ class PlanController extends Controller { $this->ensurePlatformAdmin($request); + $back = (string) $request->query('back', ''); + $safeBack = str_starts_with($back, '/') ? $back : ''; + return view('admin.plans.form', [ 'plan' => $plan, 'statusLabels' => $this->statusLabels(), 'billingCycleLabels' => $this->billingCycleLabels(), 'formAction' => '/admin/plans/' . $plan->id, 'method' => 'post', + 'back' => $safeBack, ]); } diff --git a/resources/views/admin/plans/form.blade.php b/resources/views/admin/plans/form.blade.php index 8855d3a..8d9c411 100644 --- a/resources/views/admin/plans/form.blade.php +++ b/resources/views/admin/plans/form.blade.php @@ -66,8 +66,12 @@ + @php + $back = (string) ($back ?? ''); + $backUrl = $back !== '' ? $back : '/admin/plans'; + @endphp
- 返回 + 返回
diff --git a/resources/views/admin/plans/index.blade.php b/resources/views/admin/plans/index.blade.php index a9cf3d8..79c8b08 100644 --- a/resources/views/admin/plans/index.blade.php +++ b/resources/views/admin/plans/index.blade.php @@ -174,7 +174,10 @@ @endif - 编辑 + @php + $editPlanUrl = '/admin/plans/' . $plan->id . '/edit?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]); + @endphp + 编辑
@csrf