gemercheung 2 år sedan
förälder
incheckning
93628c35c3

+ 10 - 4
src/layout/header.vue

@@ -5,7 +5,7 @@
         <a :href="mainURL"><img :src="logoPng" /></a>
       </h2>
       <div class="right_menu_container">
-        <a-dropdown placement="bottomRight" trigger="click">
+        <a-dropdown placement="bottomRight">
           <template #overlay>
             <a-menu style="width: 100px" @click="handlerLangClick">
               <a-menu-item
@@ -29,7 +29,12 @@
 
         <a-dropdown placement="bottomRight">
           <template #overlay>
-            <a-menu style="width: 100px" @click="handlerMenuClick">
+            <a-menu
+              :style="{
+                width: isEn ? '140px' : '100px'
+              }"
+              @click="handlerMenuClick"
+            >
               <a-menu-item
                 v-for="menu in menus"
                 :key="menu.key"
@@ -87,6 +92,7 @@ const currentLang = computed(() => {
     label: t(`base.lang.${unref(getLocale)}`)
   }
 })
+const isEn = computed(() => unref(getLocale) === 'en')
 // console.log('getImgSrc', getImgSrc)
 const langList = localInfo.availableLocales.map((item: string) => {
   return {
@@ -99,8 +105,8 @@ const langList = localInfo.availableLocales.map((item: string) => {
 console.log('langList', langList)
 
 const menus = [
-  { label: '个人中心', key: 'user' },
-  { label: '退出登录', key: 'logout' }
+  { label: t('base.personalCenter'), key: 'user' },
+  { label: t('base.logout'), key: 'logout' }
 ]
 const handlerMenuClick: MenuProps['onClick'] = async e => {
   if (e.key === 'logout') {

+ 6 - 4
src/locales/lang/en/base.ts

@@ -3,10 +3,12 @@ export default {
     en: 'English',
     zh_CN: '简体中文'
   },
-  personalCenter: '个人中心',
-  logout: '退出登录',
-  startLivestring: '开始带看',
+  personalCenter: 'personal center',
+  logout: 'logout',
   edit: 'Edit',
   share: 'Share',
-  delede: 'Delete'
+  delede: 'Delete',
+  save: 'Save',
+  cancel: 'Cancel',
+  loginFail: '登录状态失效,请重新登录'
 }

+ 13 - 9
src/locales/lang/en/room.ts

@@ -1,19 +1,23 @@
 export default {
   createRoom: 'Create studios',
+  editRoom: 'Edit studios',
   myRoom: 'My studios',
-  searchRoom: '搜索房间',
-  personalCenter: '个人中心',
+  searchRoom: 'search Room',
+  personalCenter: 'personal Center',
   logout: 'log out',
   startLivestreaming: 'Start livestreaming',
-  roomInfo: '房间信息',
+  roomInfo: 'room Info',
   form: {
-    title: '标题',
-    titleRequired: '标题为必填字段',
+    title: 'title',
+    titleRequired: 'Title is Required',
     titleplaceHolder: '请输入标题名称,限15字。',
     desc: '简介',
-    title3: '主持人信息,',
-
-    placeHolder2: '请输入简介,限200字。',
-    placeHolder3: '昵称,请输入主持人昵称,限15字。'
+    descplaceHolder: '请输入简介,限200字。',
+    host: '主持人信息',
+    nickname: '昵称',
+    nicknameRequired: '请输入昵称',
+    nicknameDesc: '请输入主持人昵称,限15字',
+    selectScene: '选择场景',
+    addScene: '添加场景'
   }
 }

+ 0 - 1
src/locales/lang/zh-CN/base.ts

@@ -7,7 +7,6 @@ export default {
   confirm: '确定',
   personalCenter: '个人中心',
   logout: '退出登录',
-  startLivestring: '开始带看',
   edit: '编辑',
   share: '分享',
   delede: '删除',

+ 7 - 4
src/locales/lang/zh-CN/room.ts

@@ -12,9 +12,12 @@ export default {
     titleRequired: '标题为必填字段',
     titleplaceHolder: '请输入标题名称,限15字。',
     desc: '简介',
-    title3: '主持人信息,',
-
-    placeHolder2: '请输入简介,限200字。',
-    placeHolder3: '昵称,请输入主持人昵称,限15字。'
+    descplaceHolder: '请输入简介,限200字。',
+    host: '主持人信息',
+    nickname: '昵称',
+    nicknameRequired: '请输入昵称',
+    nicknameDesc: '请输入主持人昵称,限15字',
+    selectScene: '选择场景',
+    addScene: '添加场景'
   }
 }

+ 10 - 8
src/views/room/edit-room/index.vue

@@ -61,30 +61,32 @@
             show-count
           />
         </a-form-item>
-        <a-form-item label="简介" name="desc">
+        <a-form-item :label="t('room.form.desc')" name="desc">
           <a-textarea
             v-model:value="current.desc"
-            placeholder="请输入简介,限200字"
+            :placeholder="t('room.form.descplaceHolder')"
             :maxlength="200"
             show-count
           />
         </a-form-item>
-        <h4>主持人信息</h4>
+        <h4>{{ t('room.form.host') }}</h4>
         <a-form-item
-          label="昵称"
+          :label="t('room.form.nickname')"
           name="leaderName"
-          :rules="[{ required: true, message: '请输入昵称' }]"
+          :rules="[
+            { required: true, message: t('room.form.nicknameRequired') }
+          ]"
         >
           <a-input
             v-model:value.trim="current.leaderName"
-            placeholder="请输入主持人昵称,限15字"
+            :placeholder="t('room.form.nicknameDesc')"
             :maxlength="15"
             show-count
           />
         </a-form-item>
-        <h4>选择场景</h4>
+        <h4>{{ t('room.form.selectScene') }}</h4>
         <a-form-item
-          label="添加场景"
+          :label="t('room.form.addScene')"
           class="select-scene"
           name="scenes"
           style="margin-bottom: 2px"