From 2da2172f03d7c2bc2faab755460b3d4ee6f247ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Thu, 27 Oct 2022 09:48:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20$dayJs=E6=94=B9=E4=B8=BA=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=BC=95=E7=94=A8=EF=BC=8C=E5=8E=BB=E9=99=A4=E4=B8=8D?=
 =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=BB=84=E4=BB=B6=E5=BC=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                       | 11 +++++++++++
 src/components/common/TimeRange/DateTimeRange.vue |  6 +-----
 src/main.js                                       |  6 ------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 82eb1989..d8d9e9ad 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,6 +5,17 @@
 </template>
 <script>
 import { storageKey } from '@/utils/constants'
+const dayjs = require('dayjs')
+const utc = require('dayjs/plugin/utc')
+const timezone = require('dayjs/plugin/timezone')
+const advancedFormat = require('dayjs/plugin/advancedFormat')
+const weekday = require('dayjs/plugin/weekday')
+dayjs.extend(utc)
+dayjs.extend(timezone)
+dayjs.extend(advancedFormat)
+dayjs.extend(weekday)
+window.$dayJs = dayjs
+
 export default {
   name: 'App',
   setup () {
diff --git a/src/components/common/TimeRange/DateTimeRange.vue b/src/components/common/TimeRange/DateTimeRange.vue
index 2b71f41c..7536bbed 100644
--- a/src/components/common/TimeRange/DateTimeRange.vue
+++ b/src/components/common/TimeRange/DateTimeRange.vue
@@ -77,7 +77,6 @@
 
 <script>
 import { ref, computed } from 'vue'
-import MyDatePicker from '../MyDatePicker'
 import { storageKey } from '@/utils/constants'
 import { getMillisecond, timestampToList } from '@/utils/date-util'
 import { useStore } from 'vuex'
@@ -98,9 +97,6 @@ export default {
     }
   },
   emits: ['change'],
-  components: {
-    MyDatePicker
-  },
   setup (props, ctx) {
     // data
     const store = useStore()
@@ -253,7 +249,6 @@ export default {
     return {
       myStartTime,
       myEndTime,
-      getMillisecond,
       dropdownFlag,
       utcStr,
       address,
@@ -265,6 +260,7 @@ export default {
       showDetail,
       rangeHistory,
       rangeHistoryArr,
+      getMillisecond,
       myDatePickerShow,
       showDropdown,
       changeDropdown,
diff --git a/src/main.js b/src/main.js
index 0a7fb03d..842bbe8a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -26,12 +26,6 @@ const emitter = new bus()
 
 const _ = require('lodash') // lodash工具
 
-/* dayjs.extend(utc)
-dayjs.extend(timezone)
-dayjs.extend(advancedFormat)
-dayjs.extend(weekday)
-window.$dayJs = dayjs */
-
 const app = createApp(App)
 
 app.use(router)