Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/forestry-wx

src/main.ts

@@ -2,7 +2,7 @@ import { createSSRApp } from 'vue';
 import App from './App.vue';
 import pinia from './store';
 import 'uno.css';
-import { previewImage, selectDictLabel, selectDictLabels } from './utils/ruoyi';
+import { previewImage, selectDictLabel, selectDictLabels, parseTime } from './utils/ruoyi';
 import { useDict } from '@/utils/dict';
 import uviewPlus, { setConfig } from 'uview-plus';
 import { getDateRangeFrt, navigateBackOrHome, showToast } from '@/utils/common';
@@ -88,6 +88,7 @@ export function createApp() {
     app.config.globalProperties.useDict = useDict;
     app.config.globalProperties.previewImage = previewImage;
     app.config.globalProperties.getDateRangeFrt = getDateRangeFrt;
+    app.config.globalProperties.parseTime = parseTime;
     return {
         app,
         Pinia: { pinia },

src/types/module.d.ts

@@ -11,6 +11,7 @@ declare module '@vue/runtime-core' {
         selectDictLabels: typeof selectDictLabels;
         navigateBackOrHome: typeof navigateBackOrHome;
         getDateRangeFrt: typeof getDateRangeFrt;
+        parseTime: typeof parseTime;
         previewImage: typeof import('@/utils/ruoyi').previewImage;
     }
 }