From 3fcfac1f37c2aeabbb2af4897ada6ba8c225c667 Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: 星期三, 24 十一月 2021 23:25:13 +0800
Subject: [PATCH] wip: Upgrade ant-design-vue 3.0

---
 src/views/sys/lock/useNow.ts |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/views/sys/lock/useNow.ts b/src/views/sys/lock/useNow.ts
index 2fac748..76a5470 100644
--- a/src/views/sys/lock/useNow.ts
+++ b/src/views/sys/lock/useNow.ts
@@ -1,11 +1,8 @@
 import { dateUtil } from '/@/utils/dateUtil';
 import { reactive, toRefs } from 'vue';
-import { useLocaleStore } from '/@/store/modules/locale';
 import { tryOnMounted, tryOnUnmounted } from '@vueuse/core';
 
 export function useNow(immediate = true) {
-  const localeStore = useLocaleStore();
-  const localData = dateUtil.localeData(localeStore.getLocale);
   let timer: IntervalHandle;
 
   const state = reactive({
@@ -28,13 +25,13 @@
 
     state.year = now.get('y');
     state.month = now.get('M') + 1;
-    state.week = localData.weekdays()[now.day()];
-    state.day = now.get('D');
+    state.week = '鏄熸湡' + ['涓�', '浜�', '涓�', '鍥�', '浜�', '鍏�', '鏃�'][now.day() - 1];
+    state.day = now.get('d');
     state.hour = h;
     state.minute = m;
     state.second = s;
 
-    state.meridiem = localData.meridiem(Number(h), Number(h), true);
+    state.meridiem = now.format('A');
   };
 
   function start() {

--
Gitblit v1.8.0