Merge branch 'ldx' into dev

923f1b9d · 刘殿昕 · 6352017d · 2b062b65 · 923f1b9d · 923f1b9d
Commit 923f1b9d authored Jul 01, 2020 by 刘殿昕
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

src/assets/i18n/language-zh.js src/assets/i18n/language-zh.js +0 -0

src/main.js src/main.js +1 -1

No files found.
--- a/src/i18n/language-zh.js
+++ b/src/i18n/language-zh.js
--- a/src/main.js
+++ b/src/main.js
@@ -44,7 +44,7 @@ Vue.use(VueI18n)
 const i18n = new VueI18n({
  locale: 'zh',
  messages: {
-    'zh': require('@/i18n/language-zh')
+    'zh': require('@/assets/i18n/language-zh')
  }
 })