From 890c20b40bd74764b443e6804bdc4ec055a9e286 Mon Sep 17 00:00:00 2001
From: jiangx <jiangx@1000mu.com>
Date: Tue, 1 Mar 2022 14:00:57 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=8A=BD=E7=A6=BB=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96=E6=97=A5=E6=9C=9Fhook=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80scss=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                              | 11 +++++++++++
 package.json                                   |  1 +
 src/App.vue                                    |  6 +++---
 src/assets/scss/{mixin.scss => variables.scss} |  0
 src/components/Map/Map.vue                     |  2 --
 src/composables/useDay.ts                      |  8 +-------
 src/main.ts                                    |  3 +++
 src/utils/utils.ts                             | 11 ++++++-----
 src/views/Nav/Nav.vue                          |  2 +-
 vue.config.js                                  |  7 +++++++
 10 files changed, 33 insertions(+), 18 deletions(-)
 rename src/assets/scss/{mixin.scss => variables.scss} (100%)

diff --git a/package-lock.json b/package-lock.json
index 329b067..1b43f8e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
       "dependencies": {
         "@better-scroll/core": "^2.4.2",
         "@better-scroll/scroll-bar": "^2.4.2",
+        "animate.css": "^4.1.1",
         "axios": "^0.26.0",
         "core-js": "^3.8.3",
         "pinia": "^2.0.11",
@@ -3506,6 +3507,11 @@
         "ajv": "^6.9.1"
       }
     },
+    "node_modules/animate.css": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz",
+      "integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ=="
+    },
     "node_modules/ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmmirror.com/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -14445,6 +14451,11 @@
       "dev": true,
       "requires": {}
     },
+    "animate.css": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz",
+      "integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ=="
+    },
     "ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmmirror.com/ansi-colors/-/ansi-colors-4.1.1.tgz",
diff --git a/package.json b/package.json
index a2f532e..3590346 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "@better-scroll/core": "^2.4.2",
     "@better-scroll/scroll-bar": "^2.4.2",
+    "animate.css": "^4.1.1",
     "axios": "^0.26.0",
     "core-js": "^3.8.3",
     "pinia": "^2.0.11",
diff --git a/src/App.vue b/src/App.vue
index 4610d27..749db2a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -63,14 +63,14 @@ onMounted(() => {
 
 watch(route, to => {
   if (to.fullPath === '/guide' || to.fullPath === '/nav') {
-    ;(window as any).Map_QM && (window as any).Map_QM.startRender()
+    window?.Map_QM?.startRender()
   } else {
-    ;(window as any).Map_QM && (window as any).Map_QM.cancelRender()
+    window?.Map_QM?.cancelRender()
   }
 })
 </script>
 
-<style>
+<style lang="scss">
 body,
 html,
 #app {
diff --git a/src/assets/scss/mixin.scss b/src/assets/scss/variables.scss
similarity index 100%
rename from src/assets/scss/mixin.scss
rename to src/assets/scss/variables.scss
diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index 58901e9..12fc3eb 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -34,8 +34,6 @@ const handleDetail = () => {
 </script>
 
 <style lang="scss" scoped>
-@import '@/assets/scss/mixin.scss';
-
 #shopInfo {
   position: absolute;
   z-index: 400;
diff --git a/src/composables/useDay.ts b/src/composables/useDay.ts
index 7ab3655..0b95695 100644
--- a/src/composables/useDay.ts
+++ b/src/composables/useDay.ts
@@ -1,6 +1,5 @@
 import { computed, ref } from 'vue'
 import { useStore } from '@/store'
-import { formatDay, Format } from '@/utils/utils'
 import { Language } from '@/store/state'
 
 type Keys = {
@@ -23,10 +22,5 @@ export const useDay = () => {
 
   const whichWeek = computed(currentWeek)
 
-  return {
-    whichWeek,
-    formatDayHandler(time: Format) {
-      return formatDay(date.value, time)
-    }
-  }
+  return { whichWeek }
 }
diff --git a/src/main.ts b/src/main.ts
index a63f461..3cd6008 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,6 +8,9 @@ import { i18n } from '@/i18n'
 import { useStore } from '@/store'
 import directives from '@/directives'
 
+import '@/assets/scss/index.scss'
+import 'animate.css/animate.min.css'
+
 get('/static/offline/JSON/config.json').then(res => {
   const app = createApp(App)
 
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index a24f854..cdd1c99 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -89,19 +89,20 @@ export const importAll = (context: any) => {
  * @returns {string}
  */
 export type Format = 'y.m.d' | 'y/m/d' | 'y-m-d'
-export const formatDay = (date: Date, format: Format = 'y-m-d') => {
+export const formatDay = (format: Format = 'y-m-d') => {
+  const date = new Date()
   const year = date.getFullYear()
 
   const month = String(date.getMonth() + 1).padStart(2, '0')
-  const week = String(date.getDate()).padStart(2, '0')
+  const day = String(date.getDate()).padStart(2, '0')
 
   if (format === 'y.m.d') {
-    return `${year}.${month}.${week}`
+    return `${year}.${month}.${day}`
   }
 
   if (format === 'y/m/d') {
-    return `${year}/${month}/${week}`
+    return `${year}/${month}/${day}`
   }
 
-  return year + '-' + month + '-' + week
+  return year + '-' + month + '-' + day
 }
diff --git a/src/views/Nav/Nav.vue b/src/views/Nav/Nav.vue
index 61e4503..db297f3 100644
--- a/src/views/Nav/Nav.vue
+++ b/src/views/Nav/Nav.vue
@@ -122,7 +122,7 @@ function handleSpeedUp() {
   state.pause = false
   state.speedUp = !state.speedUp
   nextTick(() => {
-    state.speedUp ? (window as any).Config.setPlaySpeed(10) : (window as any).Config.setPlaySpeed(4)
+    state.speedUp ? window.Config.setPlaySpeed(10) : window.Config.setPlaySpeed(4)
   })
 }
 
diff --git a/vue.config.js b/vue.config.js
index 2079456..fbdf103 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,6 +1,13 @@
 const { defineConfig } = require('@vue/cli-service')
 
 module.exports = defineConfig({
+  css: {
+    loaderOptions: {
+      scss: {
+        additionalData: `@import "@/assets/scss/variables.scss";`
+      }
+    }
+  },
   transpileDependencies: true,
   chainWebpack: config => {
     config.resolve.alias.set('vue-i18n', 'vue-i18n/dist/vue-i18n.cjs.js')