diff --git a/app/Http/Controllers/Function/Link.php b/app/Http/Controllers/Function/Link.php index 2d79b83..ec89271 100644 --- a/app/Http/Controllers/Function/Link.php +++ b/app/Http/Controllers/Function/Link.php @@ -819,6 +819,8 @@ protected function viewMakeFriend(): Factory|View|Application ->orderBy('sort') ->get() ->toArray(); + $this->data['applicationRule'] = DB::table('info')->find(15)->data; + $this->data['applicationInfo'] = (new Index())->MarkdownToStringReplace(DB::table('info')->find(16)->data); return view('function.make-friend', $this->data); } diff --git a/app/Http/Controllers/Index.php b/app/Http/Controllers/Index.php index fd6aff8..e0c33be 100644 --- a/app/Http/Controllers/Index.php +++ b/app/Http/Controllers/Index.php @@ -76,7 +76,7 @@ protected function viewNoPermission(): Factory|View|Application return view('modules.no-permission', $this->data); } - private function MarkdownToStringReplace(string $dataBase): string + public function MarkdownToStringReplace(string $dataBase): string { $decodeText = MarkdownExtra::defaultTransform($dataBase); $decodeText = str_replace('

', '

', $decodeText); diff --git a/resources/views/function/make-friend.blade.php b/resources/views/function/make-friend.blade.php index f2c6317..c919c52 100644 --- a/resources/views/function/make-friend.blade.php +++ b/resources/views/function/make-friend.blade.php @@ -171,17 +171,29 @@ class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:

- +
- +
- +
- + @@ -236,17 +248,50 @@ class="ml-auto -mx-1.5 -my-1.5 bg-white text-gray-400 hover:text-gray-900 rounde - + +