gemercheung 2 سال پیش
والد
کامیت
452e894b8a

+ 1 - 1
src/App.vue

@@ -282,7 +282,7 @@
       {{ t('base.debuginfo') }}:公告,当前测试最新: {{ test_version }}, 当前满员条件:
       {{ maxNumber }}
     </span> -->
-    <span> {{ t('base.debuginfo') }}:公告,当前测试1.1.0-20230328-03,超时文案在调试,勿动! </span>
+    <span> {{ t('base.debuginfo') }}:公告,当前测试1.1.0-20230329-05 </span>
     <span class="close" @click.stop="showDebug = false">X</span>
   </div>
   <LoadingLogo :thumb="true" />

+ 3 - 3
src/components/chatRoom/chat.vue

@@ -73,10 +73,10 @@
       width: auto;
       border-radius: 0.44rem;
       background: rgba(0, 0, 0, 0.3);
-      // padding: 0.17rem 0.28rem;
-      padding: 0.07rem 0.28rem;
+      padding: 0.17rem 0.28rem;
+      // padding: 0.07rem 0.28rem;
       box-sizing: border-box;
-
+      overflow: hidden;
       display: inline-block;
       // margin-bottom: 0.17rem;
       margin-bottom: 0.1rem;

+ 6 - 1
src/components/chatRoom/index.vue

@@ -144,7 +144,11 @@
     @confirm-dialog="handleCloseRoom"
   />
   <CreatedName :show="showCreateNameDialog" @confirm-dialog="handleNameConfirm" />
-  <PasswordDialog :show="showPasswordDialog" @confirm-dialog="handlePasswordConfirm" />
+  <PasswordDialog
+    :show="showPasswordDialog"
+    @confirm-dialog="handlePasswordConfirm"
+    @close-dialog="closeSocket"
+  />
 </template>
 
 <script lang="ts" setup>
@@ -185,6 +189,7 @@
   import dayjs from 'dayjs';
   import duration from 'dayjs/plugin/duration';
   import { useMiniApp } from '/@/hooks/useMiniApp';
+  const { closeSocket } = useSocket();
   dayjs.extend(duration);
   // hook
   const { isDrawing, setDraw, setCloseDraw } = useDraw();

+ 0 - 1
src/components/chatRoom/roomControl.ts

@@ -38,7 +38,6 @@ export function initSocketEvent(socket: SocketIOClient.Socket): void {
           handleEarlyError();
           return;
         }
-        debugger;
       }
 
       if (unref(room)) {

+ 1 - 1
src/locales/lang/en/action.ts

@@ -15,5 +15,5 @@ export default {
   errorRoomMaxing: 'The studio is fully staffed; please try again later!',
   errorInvalidMaster: 'Inappropriate host, please check the settings !',
   earlyRoomError: 'Please wait till the reservation can be made.',
-  timeOutRoomError: '当前房间使用期限已到',
+  timeOutRoomError: 'You have reached your time limit for the use of the current studio.',
 };