Merge branch 'master' of http://192.168.0.115:3000/bill/shop-back

src/layout/header.vue

@@ -44,9 +44,9 @@ const menus = [
   { label: '退出', key: 'logout' }
 ]
 const handlerMenuClick: MenuProps['onClick'] = async e => {
-  await postLogout()
   if (e.key === 'logout') {
-    location.replace(mainURL)
+    await postLogout()
+    location.replace(`${mainURL}/`)
   } else {
     location.href = `${mainURL}/#/information`
   }

src/views/room/edit-room/index.vue

@@ -69,12 +69,12 @@
         <h4>主持人信息</h4>
         <a-form-item
           label="昵称"
-          placeholder="请输入主持人昵称，限15字"
           name="leaderName"
           :rules="[{ required: true, message: '请输入昵称' }]"
         >
           <a-input
             v-model:value="current.leaderName"
+            placeholder="请输入主持人昵称，限15字"
             :maxlength="15"
             show-count
           />

src/views/room/list.vue

@@ -17,7 +17,7 @@
     :keyword="keyword"
     name="作品"
   >
-    <template #undata>
+    <template v-if="!keyword" #undata>
       <a-button type="primary" shape="round" size="middle" @click="editRoom()">
         创建房间
       </a-button>