From 6429a0d46885b6b97ec3fe76b73f7d8edf957013 Mon Sep 17 00:00:00 2001
From: zhuchunshu <laravel@88.com>
Date: Sat, 14 Jan 2023 22:34:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0:=E4=BC=98=E5=8C=96=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=81=E5=8F=91=E5=B8=96=E8=A7=86=E5=9B=BE,?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=9C=A8=E6=A0=87=E7=AD=BE=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8F=91=E5=B8=96=E6=97=B6=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Plugins/Topic/resources/views/create.blade.php   |  2 +-
 .../Topic/resources/views/create/basis.blade.php     | 12 ++++++------
 app/Plugins/Topic/resources/views/edit.blade.php     |  2 +-
 .../views/widget/topic/tags/right_start_1.blade.php  |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Plugins/Topic/resources/views/create.blade.php b/app/Plugins/Topic/resources/views/create.blade.php
index dff85aa8f..89d540edf 100644
--- a/app/Plugins/Topic/resources/views/create.blade.php
+++ b/app/Plugins/Topic/resources/views/create.blade.php
@@ -33,7 +33,7 @@
 
                         <div class="card">
                             <div class="card-header">
-                                <h3 class="card-title">帖子信息</h3>
+                                <h3 class="card-title">发布帖子</h3>
                             </div>
                             <div class="card-body">
                                 @foreach(Itf()->get('topic-create-data') as $k=>$v)
diff --git a/app/Plugins/Topic/resources/views/create/basis.blade.php b/app/Plugins/Topic/resources/views/create/basis.blade.php
index 56662c271..cd761bda7 100644
--- a/app/Plugins/Topic/resources/views/create/basis.blade.php
+++ b/app/Plugins/Topic/resources/views/create/basis.blade.php
@@ -7,13 +7,10 @@
     <div class="mb-3">
         <label class="form-label">选择标签</label>
         <select type="text" x-model="tag" name="basis[tag]" class="form-select" id="select-topic-tags" required>
-            <option value="null"
-                    data-custom-properties="">
-                请选择
-            </option>
+
             @foreach(\App\Plugins\Topic\src\Models\TopicTag::query()->where('status','=',null)->get() as $topic_tags)
                 <option value="{{$topic_tags->id}}"
-                        data-custom-properties="&lt;span class=&quot;badge&quot; style=&quot;background-color: {{$topic_tags->color}} &quot; &gt;{{$topic_tags->icon}}&lt;/span&gt;" @if(request()->input('basis.tag') && request()->input('basis.tag')==$topic_tags->id){{"selected"}}@endif>
+                        data-custom-properties="&lt;span class=&quot;badge&quot; style=&quot;background-color: {{$topic_tags->color}} &quot; &gt;{{$topic_tags->icon}}&lt;/span&gt;" @if((int)request()->input('basis.tag')===(int)$topic_tags->id){{"selected"}}@endif>
                     {{$topic_tags->name}}
                 </option>
             @endforeach
@@ -46,10 +43,13 @@
                 return null;
             }),
             tag:(()=>{
+                @if(!request()->has('basis.tag'))
                 if(localStorage.getItem('create_topic_tag')){
                     return localStorage.getItem('create_topic_tag')
                 }
-                return null;
+                @else
+                    return {{request()->input('basis.tag')}};
+                @endif
             })
         }))
     })
diff --git a/app/Plugins/Topic/resources/views/edit.blade.php b/app/Plugins/Topic/resources/views/edit.blade.php
index 0a32c144c..727dcbba9 100644
--- a/app/Plugins/Topic/resources/views/edit.blade.php
+++ b/app/Plugins/Topic/resources/views/edit.blade.php
@@ -35,7 +35,7 @@
 
                         <div class="card">
                             <div class="card-header">
-                                <h3 class="card-title">帖子信息</h3>
+                                <h3 class="card-title">修改帖子</h3>
                             </div>
                             <div class="card-body">
                                 @foreach(Itf()->get('topic-edit-data') as $k=>$v)
diff --git a/app/Themes/CodeFec/resources/views/widget/topic/tags/right_start_1.blade.php b/app/Themes/CodeFec/resources/views/widget/topic/tags/right_start_1.blade.php
index 5e4c6a20f..9405e53c9 100644
--- a/app/Themes/CodeFec/resources/views/widget/topic/tags/right_start_1.blade.php
+++ b/app/Themes/CodeFec/resources/views/widget/topic/tags/right_start_1.blade.php
@@ -30,7 +30,7 @@
 
         <div class="card-footer">
             @if(auth()->check())
-                <a href="/topic/create" class="btn btn-dark">{{__("topic.create")}}</a>
+                <a href="/topic/create?basis[tag]={{$data->id}}" class="btn btn-dark">{{__("topic.create")}}</a>
                 @if(Authority()->check('topic_tag_create') && $data->user_id == auth()->id())
                     <a href="/tags/{{$data->id}}/edit" class="btn btn-primary">{{__("app.edit")}}</a>
                 @endif