diff --git a/app/Http/Controllers/Console/Link.php b/app/Http/Controllers/Console/Link.php index c2e08fb..d2c1393 100644 --- a/app/Http/Controllers/Console/Link.php +++ b/app/Http/Controllers/Console/Link.php @@ -52,7 +52,7 @@ protected function viewCheckAdmin($userId): View|Factory|Application|RedirectRes return view('console.friends-link.edit', $this->data); } - protected function ViewList(Request $request): Factory|View|Application|RedirectResponse + protected function viewList(Request $request): Factory|View|Application|RedirectResponse { $this->data['request'] = $request; $dataMarge = [ @@ -102,7 +102,7 @@ protected function ViewList(Request $request): Factory|View|Application|Redirect return view('console.friends-link.list', $this->data); } - protected function ViewCheck(Request $request): Factory|View|Application + protected function viewCheck(): Factory|View|Application { // 检查是否存在含有未在本站分配位置 $this->data['blog'] = DB::table('blog_link') @@ -121,17 +121,29 @@ protected function ViewCheck(Request $request): Factory|View|Application return view('console.friends-link.check', $this->data); } - protected function ViewAdd(Request $request): Factory|View|Application + protected function viewAdd(): Factory|View|Application { + $this->data['blogSort'] = DB::table('blog_sort') + ->orderBy('sort') + ->get() + ->toArray(); + $blogColor = DB::table('blog_color') + ->orderBy('id') + ->get() + ->toArray(); + for ($i = 0; !empty($blogColor[$i]->id); $i++) { + $blogColor[$i]->colorDarkType = str_replace('dark:', '', $blogColor[$i]->colorDarkType); + } + $this->data['blogColor'] = $blogColor; return view('console.friends-link.add', $this->data); } - protected function ViewSort(): Factory|View|Application + protected function viewSort(): Factory|View|Application { - return view('console.friends-link.sort',$this->data); + return view('console.friends-link.sort', $this->data); } - protected function ViewColor(): Factory|View|Application + protected function viewColor(): Factory|View|Application { return view('console.friends-link.color', $this->data); } diff --git a/resources/views/console/friends-link/edit.blade.php b/resources/views/console/friends-link/edit.blade.php index 14efcdd..cc69754 100644 --- a/resources/views/console/friends-link/edit.blade.php +++ b/resources/views/console/friends-link/edit.blade.php @@ -357,7 +357,9 @@ class="z-[9999] fixed top-5 left-5 hidden items-center w-full max-w-xs p-4 space }); $('#userDescription').blur(function () { $('#DemoDesc').text($('#userDescription').val()) + $('#friend-light').html($('#userDescription').val() + '
') $('#DemoDescDark').text($('#userDescription').val()) + $('#friend-dark').html($('#userDescription').val() + '') }); let colorLight_Num = [ @foreach($blogColor as $blogValue) diff --git a/routes/web.php b/routes/web.php index 4ad333f..b7a34ac 100644 --- a/routes/web.php +++ b/routes/web.php @@ -56,13 +56,13 @@ Route::get('dashboard', [Dashboard::class, 'ViewDashboard'])->name('console.dashboard'); Route::prefix('friends-link')->group(function () { Route::redirect('list', 'list/1'); - Route::get('list', [ConsoleLink::class, 'ViewList'])->name('console.friends-link.list'); - Route::get('check', [ConsoleLink::class, 'ViewCheck'])->name('console.friends-link.check'); + Route::get('list', [ConsoleLink::class, 'viewList'])->name('console.friends-link.list'); + Route::get('check', [ConsoleLink::class, 'viewCheck'])->name('console.friends-link.check'); Route::get('edit/{userId}', [ConsoleLink::class, 'viewEdit'])->name('console.friends-link.edit'); Route::get('check/{userId}', [ConsoleLink::class, 'viewCheckAdmin'])->name('console.friends-link.check-admin'); - Route::get('add', [ConsoleLink::class, 'ViewAdd'])->name('console.friends-link.add'); - Route::get('sort', [ConsoleLink::class, 'ViewSort'])->name('console.friends-link.sort'); - Route::get('color', [ConsoleLink::class, 'ViewColor'])->name('console.friends-link.color'); + Route::get('add', [ConsoleLink::class, 'viewAdd'])->name('console.friends-link.add'); + Route::get('sort', [ConsoleLink::class, 'viewSort'])->name('console.friends-link.sort'); + Route::get('color', [ConsoleLink::class, 'viewColor'])->name('console.friends-link.color'); }); });