From 044a2058ed3d3688da8f0fdb2b11e859d521339e Mon Sep 17 00:00:00 2001
From: "liupo.wu" <liupo.wu@wz-inc.com>
Date: Mon, 4 Apr 2022 18:52:21 +0800
Subject: [PATCH 1/6] fix: move js to ts

---
 index.html                                    | 17 +++--------
 mock/{crud.js => crud.ts}                     |  0
 mock/{menu.js => menu.ts}                     |  0
 mock/{user.js => user.ts}                     |  0
 package.json                                  |  5 ++--
 src/api/crud/{index.js => index.ts}           |  0
 src/api/{user.js => user.ts}                  |  0
 src/{axios.js => axios.ts}                    |  0
 .../basic-video/{plugin.js => plugin.ts}      |  0
 src/config/{env.js => env.ts}                 |  0
 src/config/{website.js => website.ts}         |  0
 src/{error.js => error.ts}                    |  0
 src/lang/{en.js => en.ts}                     |  0
 src/lang/{index.js => index.ts}               |  0
 src/lang/{ja.js => ja.ts}                     |  0
 src/lang/{zh.js => zh.ts}                     |  0
 src/mac/mode/{index.js => index.ts}           |  0
 src/{main.js => main.ts}                      |  0
 src/mixins/{crud.js => crud.ts}               |  0
 src/mixins/{index.js => index.ts}             |  0
 src/{mockProdServer.js => mockProdServer.ts}  |  0
 src/option/crud/{index.js => index.ts}        |  0
 src/{permission.js => permission.ts}          |  0
 src/router/{avue-router.js => avue-router.ts} |  0
 src/router/{index.js => index.ts}             |  0
 src/router/page/{index.js => index.ts}        |  0
 src/router/views/{index.js => index.ts}       |  0
 src/store/{getters.js => getters.ts}          |  0
 src/store/{index.js => index.ts}              |  0
 src/store/modules/{common.js => common.ts}    |  0
 src/store/modules/{logs.js => logs.ts}        |  0
 src/store/modules/{tags.js => tags.ts}        |  0
 src/store/modules/{user.js => user.ts}        |  0
 src/utils/{auth.js => auth.ts}                |  0
 src/utils/{store.js => store.ts}              |  0
 src/utils/{util.js => util.ts}                |  0
 src/utils/{validate.js => validate.ts}        |  0
 tsconfig.json                                 | 28 +++++++++++++++++++
 vite.config.js => vite.config.ts              |  3 +-
 yarn.lock                                     |  5 ++++
 40 files changed, 42 insertions(+), 16 deletions(-)
 rename mock/{crud.js => crud.ts} (100%)
 rename mock/{menu.js => menu.ts} (100%)
 rename mock/{user.js => user.ts} (100%)
 rename src/api/crud/{index.js => index.ts} (100%)
 rename src/api/{user.js => user.ts} (100%)
 rename src/{axios.js => axios.ts} (100%)
 rename src/components/basic-video/{plugin.js => plugin.ts} (100%)
 rename src/config/{env.js => env.ts} (100%)
 rename src/config/{website.js => website.ts} (100%)
 rename src/{error.js => error.ts} (100%)
 rename src/lang/{en.js => en.ts} (100%)
 rename src/lang/{index.js => index.ts} (100%)
 rename src/lang/{ja.js => ja.ts} (100%)
 rename src/lang/{zh.js => zh.ts} (100%)
 rename src/mac/mode/{index.js => index.ts} (100%)
 rename src/{main.js => main.ts} (100%)
 rename src/mixins/{crud.js => crud.ts} (100%)
 rename src/mixins/{index.js => index.ts} (100%)
 rename src/{mockProdServer.js => mockProdServer.ts} (100%)
 rename src/option/crud/{index.js => index.ts} (100%)
 rename src/{permission.js => permission.ts} (100%)
 rename src/router/{avue-router.js => avue-router.ts} (100%)
 rename src/router/{index.js => index.ts} (100%)
 rename src/router/page/{index.js => index.ts} (100%)
 rename src/router/views/{index.js => index.ts} (100%)
 rename src/store/{getters.js => getters.ts} (100%)
 rename src/store/{index.js => index.ts} (100%)
 rename src/store/modules/{common.js => common.ts} (100%)
 rename src/store/modules/{logs.js => logs.ts} (100%)
 rename src/store/modules/{tags.js => tags.ts} (100%)
 rename src/store/modules/{user.js => user.ts} (100%)
 rename src/utils/{auth.js => auth.ts} (100%)
 rename src/utils/{store.js => store.ts} (100%)
 rename src/utils/{util.js => util.ts} (100%)
 rename src/utils/{validate.js => validate.ts} (100%)
 create mode 100644 tsconfig.json
 rename vite.config.js => vite.config.ts (95%)

diff --git a/index.html b/index.html
index 4368eb1..88ee924 100755
--- a/index.html
+++ b/index.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh">
 
 <head>
   <meta charset="UTF-8" />
   <link rel="icon" href="/favicon.ico" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_567566_82imxaft0by.css" />
-  <link rel="stylesheet" href="./public/css/loading.css">
+  <link rel="stylesheet" href="/public/css/loading.css">
   <title>Avue-cli 通用管理 系统快速开发框架</title>
 </head>
 
@@ -28,16 +28,7 @@
       </div>
     </div>
   </div>
-  <script type="module" src="/src/main.js"></script>
-  <script>
-    var _hmt = _hmt || [];
-    (function () {
-      var hm = document.createElement("script");
-      hm.src = "https://hm.baidu.com/hm.js?490b251f4d9784aae195c0f2db602e8c";
-      var s = document.getElementsByTagName("script")[0];
-      s.parentNode.insertBefore(hm, s);
-    })();
-  </script>
+  <script type="module" src="/src/main.ts"></script>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/mock/crud.js b/mock/crud.ts
similarity index 100%
rename from mock/crud.js
rename to mock/crud.ts
diff --git a/mock/menu.js b/mock/menu.ts
similarity index 100%
rename from mock/menu.js
rename to mock/menu.ts
diff --git a/mock/user.js b/mock/user.ts
similarity index 100%
rename from mock/user.js
rename to mock/user.ts
diff --git a/package.json b/package.json
index 60c5689..2fb276c 100755
--- a/package.json
+++ b/package.json
@@ -2,9 +2,9 @@
   "name": "avue-cli",
   "version": "3.0.0",
   "scripts": {
-    "dev": "vite --host",
+    "dev": "vite",
     "build": "vite build",
-    "serve": "vite preview --host"
+    "serve": "vite preview"
   },
   "dependencies": {
     "@element-plus/icons-vue": "^1.1.4",
@@ -27,6 +27,7 @@
     "@vitejs/plugin-vue": "^1.3.0",
     "@vue/compiler-sfc": "^3.0.5",
     "sass": "^1.37.5",
+    "typescript": "^4.6.3",
     "vite": "^2.4.4"
   }
 }
diff --git a/src/api/crud/index.js b/src/api/crud/index.ts
similarity index 100%
rename from src/api/crud/index.js
rename to src/api/crud/index.ts
diff --git a/src/api/user.js b/src/api/user.ts
similarity index 100%
rename from src/api/user.js
rename to src/api/user.ts
diff --git a/src/axios.js b/src/axios.ts
similarity index 100%
rename from src/axios.js
rename to src/axios.ts
diff --git a/src/components/basic-video/plugin.js b/src/components/basic-video/plugin.ts
similarity index 100%
rename from src/components/basic-video/plugin.js
rename to src/components/basic-video/plugin.ts
diff --git a/src/config/env.js b/src/config/env.ts
similarity index 100%
rename from src/config/env.js
rename to src/config/env.ts
diff --git a/src/config/website.js b/src/config/website.ts
similarity index 100%
rename from src/config/website.js
rename to src/config/website.ts
diff --git a/src/error.js b/src/error.ts
similarity index 100%
rename from src/error.js
rename to src/error.ts
diff --git a/src/lang/en.js b/src/lang/en.ts
similarity index 100%
rename from src/lang/en.js
rename to src/lang/en.ts
diff --git a/src/lang/index.js b/src/lang/index.ts
similarity index 100%
rename from src/lang/index.js
rename to src/lang/index.ts
diff --git a/src/lang/ja.js b/src/lang/ja.ts
similarity index 100%
rename from src/lang/ja.js
rename to src/lang/ja.ts
diff --git a/src/lang/zh.js b/src/lang/zh.ts
similarity index 100%
rename from src/lang/zh.js
rename to src/lang/zh.ts
diff --git a/src/mac/mode/index.js b/src/mac/mode/index.ts
similarity index 100%
rename from src/mac/mode/index.js
rename to src/mac/mode/index.ts
diff --git a/src/main.js b/src/main.ts
similarity index 100%
rename from src/main.js
rename to src/main.ts
diff --git a/src/mixins/crud.js b/src/mixins/crud.ts
similarity index 100%
rename from src/mixins/crud.js
rename to src/mixins/crud.ts
diff --git a/src/mixins/index.js b/src/mixins/index.ts
similarity index 100%
rename from src/mixins/index.js
rename to src/mixins/index.ts
diff --git a/src/mockProdServer.js b/src/mockProdServer.ts
similarity index 100%
rename from src/mockProdServer.js
rename to src/mockProdServer.ts
diff --git a/src/option/crud/index.js b/src/option/crud/index.ts
similarity index 100%
rename from src/option/crud/index.js
rename to src/option/crud/index.ts
diff --git a/src/permission.js b/src/permission.ts
similarity index 100%
rename from src/permission.js
rename to src/permission.ts
diff --git a/src/router/avue-router.js b/src/router/avue-router.ts
similarity index 100%
rename from src/router/avue-router.js
rename to src/router/avue-router.ts
diff --git a/src/router/index.js b/src/router/index.ts
similarity index 100%
rename from src/router/index.js
rename to src/router/index.ts
diff --git a/src/router/page/index.js b/src/router/page/index.ts
similarity index 100%
rename from src/router/page/index.js
rename to src/router/page/index.ts
diff --git a/src/router/views/index.js b/src/router/views/index.ts
similarity index 100%
rename from src/router/views/index.js
rename to src/router/views/index.ts
diff --git a/src/store/getters.js b/src/store/getters.ts
similarity index 100%
rename from src/store/getters.js
rename to src/store/getters.ts
diff --git a/src/store/index.js b/src/store/index.ts
similarity index 100%
rename from src/store/index.js
rename to src/store/index.ts
diff --git a/src/store/modules/common.js b/src/store/modules/common.ts
similarity index 100%
rename from src/store/modules/common.js
rename to src/store/modules/common.ts
diff --git a/src/store/modules/logs.js b/src/store/modules/logs.ts
similarity index 100%
rename from src/store/modules/logs.js
rename to src/store/modules/logs.ts
diff --git a/src/store/modules/tags.js b/src/store/modules/tags.ts
similarity index 100%
rename from src/store/modules/tags.js
rename to src/store/modules/tags.ts
diff --git a/src/store/modules/user.js b/src/store/modules/user.ts
similarity index 100%
rename from src/store/modules/user.js
rename to src/store/modules/user.ts
diff --git a/src/utils/auth.js b/src/utils/auth.ts
similarity index 100%
rename from src/utils/auth.js
rename to src/utils/auth.ts
diff --git a/src/utils/store.js b/src/utils/store.ts
similarity index 100%
rename from src/utils/store.js
rename to src/utils/store.ts
diff --git a/src/utils/util.js b/src/utils/util.ts
similarity index 100%
rename from src/utils/util.js
rename to src/utils/util.ts
diff --git a/src/utils/validate.js b/src/utils/validate.ts
similarity index 100%
rename from src/utils/validate.js
rename to src/utils/validate.ts
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000..54252e5
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,28 @@
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "esnext",
+    // "strict": true,
+    "jsx": "preserve",
+    "importHelpers": true,
+    "moduleResolution": "node",
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "sourceMap": true,
+    "baseUrl": ".",
+    "types": ["webpack-env"],
+    "paths": {
+      "@/*": ["src/*"]
+    },
+    "lib": ["esnext", "dom", "dom.iterable", "scripthost"]
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    "src/**/*.vue",
+    "tests/**/*.ts",
+    "tests/**/*.tsx"
+  ],
+  "exclude": ["node_modules"]
+}
diff --git a/vite.config.js b/vite.config.ts
similarity index 95%
rename from vite.config.js
rename to vite.config.ts
index 9834112..5379a46 100755
--- a/vite.config.js
+++ b/vite.config.ts
@@ -1,7 +1,8 @@
 import { viteMockServe } from "vite-plugin-mock";
 import { defineConfig, loadEnv } from 'vite'
 import vue from '@vitejs/plugin-vue'
-const { resolve } = require('path')
+import { resolve } from 'path'
+
 // https://vitejs.dev/config/
 export default ({ mode }) => {
   const config = loadEnv(mode, './')
diff --git a/yarn.lock b/yarn.lock
index c710807..9de2153 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -966,6 +966,11 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
+typescript@^4.6.3:
+  version "4.6.3"
+  resolved "https://registry.npmmirror.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c"
+  integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
+
 unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-- 
Gitee


From 088439da3605f0b9927d3b528ef8bed2620bc39e Mon Sep 17 00:00:00 2001
From: "liupo.wu" <liupo.wu@wz-inc.com>
Date: Mon, 4 Apr 2022 19:03:38 +0800
Subject: [PATCH 2/6] fix: move js to ts

---
 src/App.vue                             | 2 +-
 src/components/basic-block/main.vue     | 2 +-
 src/components/basic-container/main.vue | 2 +-
 src/components/basic-video/main.vue     | 2 +-
 src/components/error-page/403.vue       | 2 +-
 src/components/error-page/404.vue       | 2 +-
 src/components/error-page/500.vue       | 2 +-
 src/components/iframe/main.vue          | 4 ++--
 src/mac/index.vue                       | 4 ++--
 src/mac/lock.vue                        | 4 ++--
 src/mac/login.vue                       | 4 ++--
 src/mac/mode/index.vue                  | 4 ++--
 src/page/index/index.vue                | 4 ++--
 src/page/index/logo.vue                 | 4 ++--
 src/page/index/search.vue               | 2 +-
 src/page/index/setting.vue              | 4 ++--
 src/page/index/sidebar/index.vue        | 2 +-
 src/page/index/sidebar/sidebarItem.vue  | 2 +-
 src/page/index/tags.vue                 | 2 +-
 src/page/index/top/index.vue            | 4 ++--
 src/page/index/top/top-full.vue         | 4 ++--
 src/page/index/top/top-lang.vue         | 2 +-
 src/page/index/top/top-lock.vue         | 2 +-
 src/page/index/top/top-logs.vue         | 2 +-
 src/page/index/top/top-menu.vue         | 4 ++--
 src/page/index/top/top-search.vue       | 4 ++--
 src/page/index/top/top-theme.vue        | 2 +-
 src/page/lock/index.vue                 | 4 ++--
 src/page/login/authredirect.vue         | 2 +-
 src/page/login/codelogin.vue            | 2 +-
 src/page/login/facelogin.vue            | 4 ++--
 src/page/login/index.vue                | 2 +-
 src/page/login/thirdlogin.vue           | 2 +-
 src/page/login/userlogin.vue            | 2 +-
 src/views/user/info.vue                 | 2 +-
 src/views/user/setting.vue              | 2 +-
 src/views/util/about.vue                | 2 +-
 src/views/util/affix.vue                | 2 +-
 src/views/util/cache.vue                | 2 +-
 src/views/util/crud.vue                 | 2 +-
 src/views/util/deep.vue                 | 2 +-
 src/views/util/detail.vue               | 4 ++--
 src/views/util/form.vue                 | 4 ++--
 src/views/util/logs.vue                 | 4 ++--
 src/views/util/params.vue               | 4 ++--
 src/views/util/store.vue                | 2 +-
 src/views/util/table.vue                | 4 ++--
 src/views/util/tags.vue                 | 4 ++--
 src/views/util/test.vue                 | 2 +-
 src/views/util/top.vue                  | 2 +-
 src/views/wel/dashboard.vue             | 2 +-
 src/views/wel/index.vue                 | 2 +-
 52 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index e5f4f16..65c18a0 100755
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,7 +5,7 @@
 
 </template>
 
-<script>
+<script lang="ts">
 import { messages } from '@/lang/';
 export default {
   computed: {
diff --git a/src/components/basic-block/main.vue b/src/components/basic-block/main.vue
index 09faa22..1300171 100755
--- a/src/components/basic-block/main.vue
+++ b/src/components/basic-block/main.vue
@@ -12,7 +12,7 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   name: 'basicBlock',
   props: {
diff --git a/src/components/basic-container/main.vue b/src/components/basic-container/main.vue
index 16c8a19..288262d 100755
--- a/src/components/basic-container/main.vue
+++ b/src/components/basic-container/main.vue
@@ -8,7 +8,7 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   name: "basicContainer",
   props: {
diff --git a/src/components/basic-video/main.vue b/src/components/basic-video/main.vue
index f81de87..132cb70 100644
--- a/src/components/basic-video/main.vue
+++ b/src/components/basic-video/main.vue
@@ -17,7 +17,7 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 import RecordVideo from './plugin'
 export default {
   name: 'basic-video',
diff --git a/src/components/error-page/403.vue b/src/components/error-page/403.vue
index b73a484..e20d5bd 100755
--- a/src/components/error-page/403.vue
+++ b/src/components/error-page/403.vue
@@ -14,7 +14,7 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   name: "error-403"
 };
diff --git a/src/components/error-page/404.vue b/src/components/error-page/404.vue
index 170cabf..398dcd4 100755
--- a/src/components/error-page/404.vue
+++ b/src/components/error-page/404.vue
@@ -14,7 +14,7 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   name: "error-404"
 };
diff --git a/src/components/error-page/500.vue b/src/components/error-page/500.vue
index 6d14b56..b97c935 100755
--- a/src/components/error-page/500.vue
+++ b/src/components/error-page/500.vue
@@ -14,7 +14,7 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   name: "error-500"
 };
diff --git a/src/components/iframe/main.vue b/src/components/iframe/main.vue
index 6521734..0f5e6a0 100755
--- a/src/components/iframe/main.vue
+++ b/src/components/iframe/main.vue
@@ -6,7 +6,7 @@
   </basic-container>
 </template>
 
-<script>
+<script lang="ts">
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 export default {
@@ -81,4 +81,4 @@ export default {
   overflow: hidden;
   box-sizing: border-box;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/mac/index.vue b/src/mac/index.vue
index 770aeb8..681d3e3 100644
--- a/src/mac/index.vue
+++ b/src/mac/index.vue
@@ -59,7 +59,7 @@
     </div>
   </div>
 </template>
-<script>
+<script lang="ts">
 import { mapGetters } from "vuex";
 import $Mode from './mode/index'
 import index from '@/mixins/index'
@@ -383,4 +383,4 @@ export default {
 .app-item:hover {
   border: 2px solid rgba(255, 255, 255, 0.5);
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/mac/lock.vue b/src/mac/lock.vue
index ed255f8..fd72242 100644
--- a/src/mac/lock.vue
+++ b/src/mac/lock.vue
@@ -23,7 +23,7 @@
     </div>
   </div>
 </template>
-<script>
+<script lang="ts">
 import { mapGetters } from "vuex";
 export default {
   data () {
@@ -64,4 +64,4 @@ export default {
 </script>
 <style scoped>
 @import url("./login.css");
-</style>
\ No newline at end of file
+</style>
diff --git a/src/mac/login.vue b/src/mac/login.vue
index 00a8e47..9df39b4 100644
--- a/src/mac/login.vue
+++ b/src/mac/login.vue
@@ -27,7 +27,7 @@
     </div>
   </div>
 </template>
-<script>
+<script lang="ts">
 import { mapGetters } from "vuex";
 export default {
   data () {
@@ -72,4 +72,4 @@ export default {
 </script>
 <style scoped>
 @import url("./login.css");
-</style>
\ No newline at end of file
+</style>
diff --git a/src/mac/mode/index.vue b/src/mac/mode/index.vue
index ccca19e..a9ec88b 100644
--- a/src/mac/mode/index.vue
+++ b/src/mac/mode/index.vue
@@ -55,7 +55,7 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 import { isURL } from 'utils/validate'
 import { defineAsyncComponent } from 'vue'
 export default {
@@ -474,4 +474,4 @@ export default {
   justify-content: center;
   align-items: center;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/index/index.vue b/src/page/index/index.vue
index b982f73..550533a 100755
--- a/src/page/index/index.vue
+++ b/src/page/index/index.vue
@@ -35,7 +35,7 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 import index from '@/mixins/index'
 import { validatenull } from 'utils/validate'
 import { mapGetters } from "vuex";
@@ -97,4 +97,4 @@ export default {
     },
   }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index a75ca99..abd0ac2 100755
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -16,7 +16,7 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 import { mapGetters } from "vuex";
 export default {
   name: "logo",
@@ -29,4 +29,4 @@ export default {
   },
   methods: {}
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/page/index/search.vue b/src/page/index/search.vue
index 90b40b9..64141c8 100755
--- a/src/page/index/search.vue
+++ b/src/page/index/search.vue
@@ -34,7 +34,7 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 import { mapGetters } from "vuex";
 export default {
   data () {
diff --git a/src/page/index/setting.vue b/src/page/index/setting.vue
index 418f858..e74a233 100755
--- a/src/page/index/setting.vue
+++ b/src/page/index/setting.vue
@@ -52,7 +52,7 @@
   </el-drawer>
 </template>
 
-<script>
+<script lang="ts">
 import { mapGetters } from "vuex";
 export default {
   data () {
@@ -163,4 +163,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/index/sidebar/index.vue b/src/page/index/sidebar/index.vue
index f06908e..85d9a7c 100755
--- a/src/page/index/sidebar/index.vue
+++ b/src/page/index/sidebar/index.vue
@@ -11,7 +11,7 @@
   </el-scrollbar>
 </template>
 
-<script>
+<script lang="ts">
 import { mapGetters } from "vuex";
 import sidebarItem from "./sidebarItem.vue";
 export default {
diff --git a/src/page/index/sidebar/sidebarItem.vue b/src/page/index/sidebar/sidebarItem.vue
index b45c679..278daee 100755
--- a/src/page/index/sidebar/sidebarItem.vue
+++ b/src/page/index/sidebar/sidebarItem.vue
@@ -33,7 +33,7 @@
     </el-sub-menu>
   </template>
 </template>
-<script>
+<script lang="ts">
 import { mapGetters } from "vuex";
 import { validatenull } from 'utils/validate'
 import website from '@/config/website'
diff --git a/src/page/index/tags.vue b/src/page/index/tags.vue
index b16fb12..4f90b67 100755
--- a/src/page/index/tags.vue
+++ b/src/page/index/tags.vue
@@ -52,7 +52,7 @@
 
   </div>
 </template>
-<script>
+<script lang="ts">
 import { mapGetters } from "vuex";
 export default {
   name: "tags",
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 69f13d7..b5b998a 100755
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -61,7 +61,7 @@
     </div>
   </div>
 </template>
-<script>
+<script lang="ts">
 import { mapGetters } from "vuex";
 import topLock from "./top-lock.vue";
 import topMenu from "./top-menu.vue";
@@ -121,4 +121,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/index/top/top-full.vue b/src/page/index/top/top-full.vue
index 981dfdd..936ef9f 100644
--- a/src/page/index/top/top-full.vue
+++ b/src/page/index/top/top-full.vue
@@ -2,7 +2,7 @@
   <i :class="isFullScren?'icon-tuichuquanping':'icon-quanping'"
      @click="handleScreen"></i>
 </template>
-<script>
+<script lang="ts">
 import { mapGetters } from "vuex";
 import { fullscreenToggel, listenfullscreen } from "utils/util";
 export default {
@@ -21,4 +21,4 @@ export default {
     },
   }
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/page/index/top/top-lang.vue b/src/page/index/top/top-lang.vue
index bc43967..39f04a0 100755
--- a/src/page/index/top/top-lang.vue
+++ b/src/page/index/top/top-lang.vue
@@ -15,7 +15,7 @@
   </el-dropdown>
 </template>
 
-<script>
+<script lang="ts">
 import { mapGetters } from "vuex";
 export default {
   name: "top-lang",
diff --git a/src/page/index/top/top-lock.vue b/src/page/index/top/top-lock.vue
index ed15f2f..03b4079 100755
--- a/src/page/index/top/top-lock.vue
+++ b/src/page/index/top/top-lock.vue
@@ -26,7 +26,7 @@
   </el-dialog>
 </template>
 
-<script>
+<script lang="ts">
 import { validatenull } from "utils/validate";
 import { mapGetters } from "vuex";
 export default {
diff --git a/src/page/index/top/top-logs.vue b/src/page/index/top/top-logs.vue
index fff4c5b..6b69d2a 100755
--- a/src/page/index/top/top-logs.vue
+++ b/src/page/index/top/top-logs.vue
@@ -40,7 +40,7 @@
   </span>
 </template>
 
-<script>
+<script lang="ts">
 import { mapGetters } from "vuex";
 export default {
   name: "top-logs",
diff --git a/src/page/index/top/top-menu.vue b/src/page/index/top/top-menu.vue
index 60f4a99..539312d 100755
--- a/src/page/index/top/top-menu.vue
+++ b/src/page/index/top/top-menu.vue
@@ -16,7 +16,7 @@
   </el-menu>
 </template>
 
-<script>
+<script lang="ts">
 import { mapGetters } from "vuex";
 export default {
   name: "top-menu",
@@ -47,4 +47,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/page/index/top/top-search.vue b/src/page/index/top/top-search.vue
index 5a15439..7bcdb16 100755
--- a/src/page/index/top/top-search.vue
+++ b/src/page/index/top/top-search.vue
@@ -14,7 +14,7 @@
   </el-autocomplete>
 </template>
 
-<script>
+<script lang="ts">
 import { mapGetters } from "vuex";
 export default {
   data () {
@@ -119,4 +119,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/index/top/top-theme.vue b/src/page/index/top/top-theme.vue
index 4e8bd49..19c90ce 100755
--- a/src/page/index/top/top-theme.vue
+++ b/src/page/index/top/top-theme.vue
@@ -24,7 +24,7 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 import { setTheme } from "utils/util";
 import { mapGetters } from "vuex";
 export default {
diff --git a/src/page/lock/index.vue b/src/page/lock/index.vue
index 4e1de9a..c41c08f 100755
--- a/src/page/lock/index.vue
+++ b/src/page/lock/index.vue
@@ -36,7 +36,7 @@
     </div>
   </div>
 </template>
-<script>
+<script lang="ts">
 import { mapGetters, mapState } from "vuex";
 export default {
   name: "lock",
@@ -101,4 +101,4 @@ export default {
 </script>
 
 <style lang="scss">
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/login/authredirect.vue b/src/page/login/authredirect.vue
index 15cbce1..d35d6c2 100755
--- a/src/page/login/authredirect.vue
+++ b/src/page/login/authredirect.vue
@@ -2,7 +2,7 @@
   <div></div>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   name: 'authredirect',
   created () {
diff --git a/src/page/login/codelogin.vue b/src/page/login/codelogin.vue
index a37229b..739be88 100755
--- a/src/page/login/codelogin.vue
+++ b/src/page/login/codelogin.vue
@@ -39,7 +39,7 @@
   </el-form>
 </template>
 
-<script>
+<script lang="ts">
 import { isvalidatemobile } from "utils/validate";
 import { mapGetters } from "vuex";
 export default {
diff --git a/src/page/login/facelogin.vue b/src/page/login/facelogin.vue
index 49e2cda..fccde60 100755
--- a/src/page/login/facelogin.vue
+++ b/src/page/login/facelogin.vue
@@ -4,7 +4,7 @@
   </basic-video>
 </template>
 
-<script>
+<script lang="ts">
 import { mapGetters } from "vuex";
 import basicVideo from '@/components/basic-video/main.vue'
 export default {
@@ -39,4 +39,4 @@ export default {
 </script>
 
 <style>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/login/index.vue b/src/page/login/index.vue
index 647fe97..e7d1a3c 100755
--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -34,7 +34,7 @@
     </div>
   </div>
 </template>
-<script>
+<script lang="ts">
 import userLogin from "./userlogin.vue";
 import codeLogin from "./codelogin.vue";
 import thirdLogin from "./thirdlogin.vue";
diff --git a/src/page/login/thirdlogin.vue b/src/page/login/thirdlogin.vue
index 5665bf4..7f81208 100755
--- a/src/page/login/thirdlogin.vue
+++ b/src/page/login/thirdlogin.vue
@@ -20,7 +20,7 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 import { openWindow } from "utils/util";
 
 export default {
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index fea1966..bf16833 100755
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -62,7 +62,7 @@
   </el-form>
 </template>
 
-<script>
+<script lang="ts">
 import { randomLenNum } from "utils/util";
 import { mapGetters } from "vuex";
 export default {
diff --git a/src/views/user/info.vue b/src/views/user/info.vue
index ce24885..ec06003 100755
--- a/src/views/user/info.vue
+++ b/src/views/user/info.vue
@@ -94,7 +94,7 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   data () {
     return {
diff --git a/src/views/user/setting.vue b/src/views/user/setting.vue
index 7ae2325..4451def 100755
--- a/src/views/user/setting.vue
+++ b/src/views/user/setting.vue
@@ -82,7 +82,7 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   data () {
     return {
diff --git a/src/views/util/about.vue b/src/views/util/about.vue
index cb273f1..e2ac114 100644
--- a/src/views/util/about.vue
+++ b/src/views/util/about.vue
@@ -56,7 +56,7 @@
   </basic-container>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   data () {
     return {
diff --git a/src/views/util/affix.vue b/src/views/util/affix.vue
index 71d9328..8c00778 100755
--- a/src/views/util/affix.vue
+++ b/src/views/util/affix.vue
@@ -25,7 +25,7 @@
   </basic-container>
 </template>
 
-<script>
+<script lang="ts">
 export default {};
 </script>
 
diff --git a/src/views/util/cache.vue b/src/views/util/cache.vue
index 96431d6..222573c 100755
--- a/src/views/util/cache.vue
+++ b/src/views/util/cache.vue
@@ -10,7 +10,7 @@
   </basic-container>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   data () {
     return {
diff --git a/src/views/util/crud.vue b/src/views/util/crud.vue
index c745ca3..94739f5 100644
--- a/src/views/util/crud.vue
+++ b/src/views/util/crud.vue
@@ -8,7 +8,7 @@
   </basic-container>
 </template>
 
-<script>
+<script lang="ts">
 export default window.$crudCommon({}, {
   name: 'crud/index'
 })
diff --git a/src/views/util/deep.vue b/src/views/util/deep.vue
index 332d09c..0166859 100644
--- a/src/views/util/deep.vue
+++ b/src/views/util/deep.vue
@@ -2,7 +2,7 @@
   <basic-container>多级菜单</basic-container>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   data () {
     return {};
diff --git a/src/views/util/detail.vue b/src/views/util/detail.vue
index 75fca5b..42323f7 100644
--- a/src/views/util/detail.vue
+++ b/src/views/util/detail.vue
@@ -11,7 +11,7 @@
   </basic-container>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   data () {
     return {
@@ -38,4 +38,4 @@ export default {
 </script>
 
 <style>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/util/form.vue b/src/views/util/form.vue
index d089710..7800c6f 100644
--- a/src/views/util/form.vue
+++ b/src/views/util/form.vue
@@ -6,7 +6,7 @@
   </basic-container>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   data () {
     return {
@@ -52,4 +52,4 @@ export default {
 </script>
 
 <style>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/util/logs.vue b/src/views/util/logs.vue
index a6d5dc5..a9f34ed 100755
--- a/src/views/util/logs.vue
+++ b/src/views/util/logs.vue
@@ -6,7 +6,7 @@
   </basic-container>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   methods: {
     handleNewError () {
@@ -14,4 +14,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/util/params.vue b/src/views/util/params.vue
index 92e0fba..67856d7 100755
--- a/src/views/util/params.vue
+++ b/src/views/util/params.vue
@@ -8,7 +8,7 @@
   </basic-container>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   data () {
     return {
@@ -35,4 +35,4 @@ export default {
 </script>
 
 <style>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/util/store.vue b/src/views/util/store.vue
index 68fa073..794af68 100755
--- a/src/views/util/store.vue
+++ b/src/views/util/store.vue
@@ -38,7 +38,7 @@
 
 </template>
 
-<script>
+<script lang="ts">
 import {
   setStore,
   getStore,
diff --git a/src/views/util/table.vue b/src/views/util/table.vue
index 2eae084..8d7bb89 100644
--- a/src/views/util/table.vue
+++ b/src/views/util/table.vue
@@ -6,7 +6,7 @@
   </basic-container>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   data () {
     return {
@@ -122,4 +122,4 @@ export default {
 </script>
 
 <style>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/util/tags.vue b/src/views/util/tags.vue
index de4ac95..2357594 100755
--- a/src/views/util/tags.vue
+++ b/src/views/util/tags.vue
@@ -11,11 +11,11 @@
   </basic-container>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   methods: {}
 };
 </script>
 
 <style>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/util/test.vue b/src/views/util/test.vue
index f87cb14..93867be 100755
--- a/src/views/util/test.vue
+++ b/src/views/util/test.vue
@@ -2,7 +2,7 @@
   <basic-container>测试页</basic-container>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   name: "wel",
   data () {
diff --git a/src/views/util/top.vue b/src/views/util/top.vue
index e02d20b..4dbf1d4 100755
--- a/src/views/util/top.vue
+++ b/src/views/util/top.vue
@@ -12,7 +12,7 @@
   </basic-container>
 </template>
 
-<script>
+<script lang="ts">
 export default {};
 </script>
 
diff --git a/src/views/wel/dashboard.vue b/src/views/wel/dashboard.vue
index 96aa79a..80d4cf8 100755
--- a/src/views/wel/dashboard.vue
+++ b/src/views/wel/dashboard.vue
@@ -135,7 +135,7 @@
   </basic-container>
 </template>
 
-<script>
+<script lang="ts">
 export default {
   data () {
     return {
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 3bd37e4..6e54c37 100755
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -48,7 +48,7 @@
   </basic-container>
 </template>
 
-<script>
+<script lang="ts">
 import { mapGetters } from "vuex";
 import dashboard from './dashboard.vue'
 export default {
-- 
Gitee


From cf6bf2609fab2611c44b6932c8c2761bacd9dcc8 Mon Sep 17 00:00:00 2001
From: "liupo.wu" <liupo.wu@wz-inc.com>
Date: Mon, 4 Apr 2022 19:14:05 +0800
Subject: [PATCH 3/6] fix: axios, types

---
 src/axios.ts            | 30 ++++++++++++++++++------------
 src/main.ts             |  8 +++-----
 src/shims-vue.d.ts      |  5 +++++
 src/utils/store.ts      | 16 ++++++++--------
 src/views/util/crud.vue |  4 +++-
 5 files changed, 37 insertions(+), 26 deletions(-)
 create mode 100644 src/shims-vue.d.ts

diff --git a/src/axios.ts b/src/axios.ts
index 2b561d4..08f92b7 100755
--- a/src/axios.ts
+++ b/src/axios.ts
@@ -8,25 +8,30 @@
 import axios from 'axios'
 import store from '@/store/';
 import router from '@/router/'
-import { serialize } from 'utils/util'
-import { getToken } from 'utils/auth'
+import { serialize } from '@/utils/util'
+import { getToken } from '@/utils/auth'
 import { ElMessage } from 'element-plus'
 import website from '@/config/website';
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
-axios.defaults.timeout = 10000;
-//返回其他状态吗
-axios.defaults.validateStatus = function (status) {
-  return status >= 200 && status <= 500; // 默认的
-};
-//跨域请求，允许保存cookie
-axios.defaults.withCredentials = true;
+
+const http = axios.create({
+  timeout: 10000,
+  //跨域请求，允许保存cookie
+  withCredentials: true,
+  validateStatus(status) {
+    //返回其他状态吗
+    return status >= 200 && status <= 500; // 默认的
+  }
+});
+
 // NProgress Configuration
 NProgress.configure({
   showSpinner: false
 });
+
 //HTTPrequest拦截
-axios.interceptors.request.use(config => {
+http.interceptors.request.use(config => {
   NProgress.start() // start progress bar
   const meta = (config.meta || {});
   const isToken = meta.isToken === false;
@@ -41,8 +46,9 @@ axios.interceptors.request.use(config => {
 }, error => {
   return Promise.reject(error)
 });
+
 //HTTPresponse拦截
-axios.interceptors.response.use(res => {
+http.interceptors.response.use(res => {
   NProgress.done();
   const status = Number(res.status) || 200;
   const statusWhiteList = website.statusWhiteList || [];
@@ -65,4 +71,4 @@ axios.interceptors.response.use(res => {
   return Promise.reject(new Error(error));
 })
 
-export default axios;
\ No newline at end of file
+export default http;
diff --git a/src/main.ts b/src/main.ts
index b9483ad..92b4b23 100755
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,17 +8,15 @@ import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
 import Avue from '@smallwei/avue';
 import '@smallwei/avue/lib/index.css';
-import crudCommon from '@/mixins/crud.js'
 import { getScreen } from './utils/util'
 import './permission';
-import error from './error';
-import basicBlock from 'components/basic-block/main.vue'
-import basicContainer from 'components/basic-container/main.vue'
+import error from '@/error';
+import basicBlock from '@/components/basic-block/main.vue'
+import basicContainer from '@/components/basic-container/main.vue'
 import App from './App.vue'
 import 'animate.css'
 import dayjs from 'dayjs'
 import 'styles/common.scss';
-window.$crudCommon = crudCommon
 const app = createApp(App)
 //注册全局容器
 app.component('basicContainer', basicContainer)
diff --git a/src/shims-vue.d.ts b/src/shims-vue.d.ts
new file mode 100644
index 0000000..2b97bd9
--- /dev/null
+++ b/src/shims-vue.d.ts
@@ -0,0 +1,5 @@
+declare module '*.vue' {
+  import type { DefineComponent } from 'vue'
+  const component: DefineComponent<{}, {}, any>
+  export default component
+}
diff --git a/src/utils/store.ts b/src/utils/store.ts
index eef9c37..3a2c262 100755
--- a/src/utils/store.ts
+++ b/src/utils/store.ts
@@ -1,13 +1,13 @@
 import {
   validatenull
-} from 'utils/validate';
+} from '@/utils/validate';
 import website from '@/config/website'
 
 const keyName = website.key + '-';
 /**
  * 存储localStorage
  */
-export const setStore = (params = {}) => {
+export const setStore = (params: any = {}) => {
   let {
     name,
     content,
@@ -27,13 +27,13 @@ export const setStore = (params = {}) => {
  * 获取localStorage
  */
 
-export const getStore = (params = {}) => {
+export const getStore = (params: any = {}) => {
   let {
     name,
     debug
   } = params;
   name = keyName + name
-  let obj = {},
+  let obj: any = {},
     content;
   obj = window.sessionStorage.getItem(name);
   if (validatenull(obj)) obj = window.localStorage.getItem(name);
@@ -60,7 +60,7 @@ export const getStore = (params = {}) => {
 /**
  * 删除localStorage
  */
-export const removeStore = (params = {}) => {
+export const removeStore = (params: any = {}) => {
   let {
     name,
     type
@@ -77,7 +77,7 @@ export const removeStore = (params = {}) => {
 /**
  * 获取全部localStorage
  */
-export const getAllStore = (params = {}) => {
+export const getAllStore = (params: any = {}) => {
   let list = [];
   let {
     type
@@ -110,7 +110,7 @@ export const getAllStore = (params = {}) => {
 /**
  * 清空全部localStorage
  */
-export const clearStore = (params = {}) => {
+export const clearStore = (params: any = {}) => {
   let { type } = params;
   if (type) {
     window.sessionStorage.clear();
@@ -118,4 +118,4 @@ export const clearStore = (params = {}) => {
     window.localStorage.clear()
   }
 
-}
\ No newline at end of file
+}
diff --git a/src/views/util/crud.vue b/src/views/util/crud.vue
index 94739f5..4d91ee4 100644
--- a/src/views/util/crud.vue
+++ b/src/views/util/crud.vue
@@ -9,7 +9,9 @@
 </template>
 
 <script lang="ts">
-export default window.$crudCommon({}, {
+import crudCommon from '../../mixins/crud'
+
+export default crudCommon({}, {
   name: 'crud/index'
 })
 </script>
-- 
Gitee


From 8cf484843c5c28fcc3d6c19865fd53bca28031a1 Mon Sep 17 00:00:00 2001
From: "liupo.wu" <liupo.wu@wz-inc.com>
Date: Mon, 4 Apr 2022 19:17:06 +0800
Subject: [PATCH 4/6] rollback

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 88ee924..e91f354 100755
--- a/index.html
+++ b/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="zh">
+<html lang="en">
 
 <head>
   <meta charset="UTF-8" />
-- 
Gitee


From 83c69bb23120b56ce14d7557d6750cfb94b3ce8e Mon Sep 17 00:00:00 2001
From: "liupo.wu" <liupo.wu@wz-inc.com>
Date: Mon, 4 Apr 2022 19:21:07 +0800
Subject: [PATCH 5/6] fix:mv utils

---
 src/api/crud/index.ts             | 2 +-
 src/api/user.ts                   | 4 ++--
 src/main.ts                       | 4 ++--
 src/{ => utils}/axios.ts          | 0
 src/{ => utils}/error.ts          | 2 +-
 src/{ => utils}/mockProdServer.ts | 4 ++--
 src/{ => utils}/permission.ts     | 8 ++++----
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename src/{ => utils}/axios.ts (100%)
 rename src/{ => utils}/error.ts (95%)
 rename src/{ => utils}/mockProdServer.ts (68%)
 rename src/{ => utils}/permission.ts (94%)

diff --git a/src/api/crud/index.ts b/src/api/crud/index.ts
index 12a3f2c..8cd4ff8 100755
--- a/src/api/crud/index.ts
+++ b/src/api/crud/index.ts
@@ -1,5 +1,5 @@
 
-import request from '@/axios';
+import request from '@/utils/axios';
 import { baseUrl } from '@/config/env';
 export const list = (data) => {
   return request({
diff --git a/src/api/user.ts b/src/api/user.ts
index 6966a1c..5ed9b72 100755
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -1,4 +1,4 @@
-import request from '@/axios';
+import request from '@/utils/axios';
 import { baseUrl } from '@/config/env';
 export const loginByUsername = (username, password, code, redomStr) => request({
   url: baseUrl + '/user/login',
@@ -49,4 +49,4 @@ export const logout = () => request({
     isToken: false
   },
   method: 'get'
-})
\ No newline at end of file
+})
diff --git a/src/main.ts b/src/main.ts
index 92b4b23..c121ff7 100755
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import website from './config/website'
-import axios from './axios';
+import axios from './utils/axios';
 import router from './router/';
 import store from './store';
 import i18n from './lang/';
@@ -9,7 +9,7 @@ import 'element-plus/dist/index.css'
 import Avue from '@smallwei/avue';
 import '@smallwei/avue/lib/index.css';
 import { getScreen } from './utils/util'
-import './permission';
+import './utils/permission';
 import error from '@/error';
 import basicBlock from '@/components/basic-block/main.vue'
 import basicContainer from '@/components/basic-container/main.vue'
diff --git a/src/axios.ts b/src/utils/axios.ts
similarity index 100%
rename from src/axios.ts
rename to src/utils/axios.ts
diff --git a/src/error.ts b/src/utils/error.ts
similarity index 95%
rename from src/error.ts
rename to src/utils/error.ts
index 06358c9..cb195e1 100755
--- a/src/error.ts
+++ b/src/utils/error.ts
@@ -1,4 +1,4 @@
-import store from './store'
+import store from '../store'
 export default {
   install: (app) => {
     app.config.errorHandler = (err, vm, info) => {
diff --git a/src/mockProdServer.ts b/src/utils/mockProdServer.ts
similarity index 68%
rename from src/mockProdServer.ts
rename to src/utils/mockProdServer.ts
index 3f4ee69..5e65b20 100644
--- a/src/mockProdServer.ts
+++ b/src/utils/mockProdServer.ts
@@ -1,7 +1,7 @@
 import { createProdMockServer } from 'vite-plugin-mock/es/createProdMockServer';
 
-import menuModule from '../mock/menu';
-import userModule from '../mock/user';
+import menuModule from '../../mock/menu';
+import userModule from '../../mock/user';
 export const setupProdMockServer = () => {
   createProdMockServer([...menuModule, ...userModule]);
 }
diff --git a/src/permission.ts b/src/utils/permission.ts
similarity index 94%
rename from src/permission.ts
rename to src/utils/permission.ts
index ac66928..271e484 100755
--- a/src/permission.ts
+++ b/src/utils/permission.ts
@@ -1,9 +1,9 @@
-import router from './router/'
-import store from './store'
-import { validatenull } from '@/utils/validate'
+import router from '../router'
+import store from '../store'
 import { getToken } from '@/utils/auth'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
+
 NProgress.configure({ showSpinner: false });
 const lockPage = '/lock'; //锁屏页
 router.beforeEach((to, from, next) => {
@@ -59,4 +59,4 @@ router.afterEach(to => {
   let title = router.$avueRouter.generateTitle(to)
   router.$avueRouter.setTitle(title);
   store.commit('SET_IS_SEARCH', false)
-});
\ No newline at end of file
+});
-- 
Gitee


From 406c3afa9e6d7364631c87c44b54863d00f391ab Mon Sep 17 00:00:00 2001
From: "liupo.wu" <liupo.wu@wz-inc.com>
Date: Mon, 4 Apr 2022 19:25:13 +0800
Subject: [PATCH 6/6] fix: utils

---
 src/main.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.ts b/src/main.ts
index c121ff7..623217c 100755
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,7 +10,7 @@ import Avue from '@smallwei/avue';
 import '@smallwei/avue/lib/index.css';
 import { getScreen } from './utils/util'
 import './utils/permission';
-import error from '@/error';
+import error from './utils/error';
 import basicBlock from '@/components/basic-block/main.vue'
 import basicContainer from '@/components/basic-container/main.vue'
 import App from './App.vue'
-- 
Gitee