diff --git a/src/assets/font/DouyinSansBold.otf b/src/assets/font/DouyinSansBold.otf new file mode 100644 index 0000000..d63f58d Binary files /dev/null and b/src/assets/font/DouyinSansBold.otf differ diff --git a/src/assets/font/DouyinSansBold.ttf b/src/assets/font/DouyinSansBold.ttf index b53f5ad..2b1045e 100644 Binary files a/src/assets/font/DouyinSansBold.ttf and b/src/assets/font/DouyinSansBold.ttf differ diff --git a/src/assets/font/源字体/AlimamaShuHeiTi.ttf b/src/assets/font/源字体/AlimamaShuHeiTi.ttf deleted file mode 100644 index 854c844..0000000 Binary files a/src/assets/font/源字体/AlimamaShuHeiTi.ttf and /dev/null differ diff --git a/src/assets/font/源字体/DouyinSansBold.ttf b/src/assets/font/源字体/DouyinSansBold.ttf deleted file mode 100644 index 581b748..0000000 Binary files a/src/assets/font/源字体/DouyinSansBold.ttf and /dev/null differ diff --git a/src/assets/font/源字体/HYYakuHei-85W.ttf b/src/assets/font/源字体/HYYakuHei-85W.ttf deleted file mode 100644 index 0bb162c..0000000 Binary files a/src/assets/font/源字体/HYYakuHei-85W.ttf and /dev/null differ diff --git a/src/assets/font/源字体/SourceHanSansCN Medium.ttf b/src/assets/font/源字体/SourceHanSansCN Medium.ttf deleted file mode 100644 index 24508e6..0000000 Binary files a/src/assets/font/源字体/SourceHanSansCN Medium.ttf and /dev/null differ diff --git a/src/assets/font/源字体/SourceHanSansCN-Regular.ttf b/src/assets/font/源字体/SourceHanSansCN-Regular.ttf deleted file mode 100644 index 53b6691..0000000 Binary files a/src/assets/font/源字体/SourceHanSansCN-Regular.ttf and /dev/null differ diff --git a/src/assets/font/源字体/fzcy.ttf b/src/assets/font/源字体/fzcy.ttf deleted file mode 100644 index dbabeed..0000000 Binary files a/src/assets/font/源字体/fzcy.ttf and /dev/null differ diff --git a/src/assets/font/源字体/fzzy.ttf b/src/assets/font/源字体/fzzy.ttf deleted file mode 100644 index f03a55a..0000000 Binary files a/src/assets/font/源字体/fzzy.ttf and /dev/null differ diff --git a/src/components/Question.vue b/src/components/Question.vue index f9cc7d2..5e4c1fc 100644 --- a/src/components/Question.vue +++ b/src/components/Question.vue @@ -46,6 +46,11 @@ const answerFn = (item, event) => { userStore.updatePosterId(getRandomNumber([1, 2, 3])) gsap.set('.question-box', { pointerEvents: 'none' }) Toast('答题结束') + Toast.loading({ + message: '结果生成中', + duration: 0, + forbidClick: true, + }) if (import.meta.env.VITE_MODE != "dev") { // 提交完成记录 @@ -55,14 +60,18 @@ const answerFn = (item, event) => { userStore.updateDrawKey(res.data); } - gsap.to('.QuestionPage', { - duration: 0.5, autoAlpha: 0, onComplete: () => { - emit("QuestionPage", { action: "showResult" }); - } - }) + setTimeout(() => { + Toast.clear() + gsap.to('.QuestionPage', { + duration: 0.5, autoAlpha: 0, onComplete: () => { + emit("QuestionPage", { action: "showResult" }); + } + }) + }, 1000) }); } else { setTimeout(() => { + Toast.clear() gsap.to('.QuestionPage', { duration: 0.5, autoAlpha: 0, onComplete: () => { emit("QuestionPage", { action: "showResult" }); @@ -72,32 +81,11 @@ const answerFn = (item, event) => { } } - console.log("答案库", answerList.value); }); }; - -const showResult = () => { - - gsap.set(".answer-box", { pointerEvents: "none" }) - - gsap.to(".prev-btn", { duration: 0.5, x: "-=20px", autoAlpha: 0 }); - questionOut.timeScale(2); - questionOut.restart(); - questionOut.eventCallback("onComplete", () => { - gsap.to(".QuestionPage", { - duration: 0.5, - autoAlpha: 0, - onComplete: () => { - emit("QuestionPage", { action: "showResult" }); - }, - }); - }); - -}; - // 从数组中随机生成一个数字 const getRandomNumber = (arr) => { var randomIndex = Math.floor(Math.random() * arr.length); @@ -107,9 +95,9 @@ const getRandomNumber = (arr) => { // 查看结果事件及动画 // const resultBtnAni = gsap.timeline({ paused: true }); onMounted(() => { - gsap.from('.question-bg',{duration:0.5,autoAlpha:0,}) - gsap.from('.question-box',{duration:0.5,scale:0.4,autoAlpha:0,}) - gsap.to('.question-lantern-icon',{duration:5,transformOrigin:'100% 0%',rotation:'10deg',repeat:-1,yoyo:true,ease:'none'}) + gsap.from('.question-bg', { duration: 0.5, autoAlpha: 0, }) + gsap.from('.question-box', { duration: 0.5, scale: 0.4, autoAlpha: 0, }) + gsap.to('.question-lantern-icon', { duration: 5, transformOrigin: '100% 0%', rotation: '10deg', repeat: -1, yoyo: true, ease: 'none' }) }); @@ -246,7 +234,6 @@ onMounted(() => { width: 100%; font-family: 'DouyinSansBold'; font-size: 35px; - font-family: "DOUYINSANSBOLD"; color: rgb(255, 255, 255); text-align: center; padding: 10px;