gemercheung 2 年之前
父节点
当前提交
fc3d57cf1f
共有 3 个文件被更改,包括 3 次插入2 次删除
  1. 1 1
      src/locales/useLocale.ts
  2. 1 0
      src/views/room/edit-room/index.vue
  3. 1 1
      src/views/room/list.vue

+ 1 - 1
src/locales/useLocale.ts

@@ -36,13 +36,13 @@ export function useLocale() {
     const AntdLocale = i18n.global.getLocaleMessage(unref(getLocale))?.antdLocale ?? {}
     const AntdLocale = i18n.global.getLocaleMessage(unref(getLocale))?.antdLocale ?? {}
     if ( ('locale' in unref(AntdLocale)) && unref(AntdLocale).locale === 'zh-cn') {
     if ( ('locale' in unref(AntdLocale)) && unref(AntdLocale).locale === 'zh-cn') {
       AntdLocale.DatePicker.lang.shortWeekDays = [
       AntdLocale.DatePicker.lang.shortWeekDays = [
+        '日',
         '一',
         '一',
         '二',
         '二',
         '三',
         '三',
         '四',
         '四',
         '五',
         '五',
         '六',
         '六',
-        '日'
       ]
       ]
       AntdLocale.DatePicker.lang.shortMonths = [
       AntdLocale.DatePicker.lang.shortMonths = [
         '1月',
         '1月',

+ 1 - 0
src/views/room/edit-room/index.vue

@@ -306,6 +306,7 @@ export default defineComponent({
       }
       }
       return unref(getLocale)
       return unref(getLocale)
     })
     })
+
     const otpInput = ref('')
     const otpInput = ref('')
     const formRef = ref<FormInstance>()
     const formRef = ref<FormInstance>()
     const current = reactive(createRoom(props.room || {}))
     const current = reactive(createRoom(props.room || {}))

+ 1 - 1
src/views/room/list.vue

@@ -142,7 +142,7 @@ watch(
   }
   }
 )
 )
 const roomList = computed(() =>
 const roomList = computed(() =>
-  roomStore.roomStatus !== 2
+  roomStore.roomStatus === 0
     ? [addMarked, ...roomStore.filter(keyword.value)]
     ? [addMarked, ...roomStore.filter(keyword.value)]
     : roomStore.filter(keyword.value)
     : roomStore.filter(keyword.value)
 )
 )