Merge remote-tracking branch 'upstream/master'

src/App.vue

@@ -1,11 +1,9 @@
 <template>
-  <el-config-provider :locale="locale">
-    <router-view v-slot="{ Component }">
-      <keep-alive>
-        <component :is="Component"/>
-      </keep-alive>
-    </router-view>
-  </el-config-provider>
+  <router-view v-slot="{ Component }">
+    <keep-alive>
+      <component :is="Component"/>
+    </keep-alive>
+  </router-view>
 </template>
 
 <script>

src/main.js

@@ -1,26 +1,27 @@
-import { createApp } from 'vue'
+import {createApp} from 'vue'
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
 import 'normalize.css' // css初始化
 import './assets/style/common.scss' // 公共css
 import App from './App.vue'
 import store from './store'
-import router, { addRoutes } from './router'
+import router, {addRoutes} from './router'
 import * as Component from '@/components/index.ts'
 import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+import zhCn from 'element-plus/es/locale/lang/zh-cn'
 
 addRoutes()
 
 const app = createApp(App)
 for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-  app.component(key, component)
+    app.component(key, component)
 }
-app.use(ElementPlus, { size: store.state.app.elementSize })
+app.use(ElementPlus, {locale: zhCn, size: store.state.app.elementSize})
 app.use(store)
 app.use(router)
 app.mount('#app')
 
 // 注册全局组件
 for (const name in Component) {
-  app.component(name, Component[name])
+    app.component(name, Component[name])
 }