From 198b1e2ab536c389dbf5af1d50ef3c4c78cc865c Mon Sep 17 00:00:00 2001
From: iczer <1126263215@qq.com>
Date: Tue, 23 Jun 2020 14:19:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=AF=AD=E8=A8=80=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json |  2 ++
 src/App.vue  |  5 ++++-
 src/main.js  | 13 +++++++++++--
 yarn.lock    | 10 ++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 17b36bf..31de917 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "pouchdb": "^7.2.1",
     "viser-vue": "^2.4.8",
     "vue": "^2.6.11",
+    "vue-i18n": "^8.18.2",
     "vue-router": "^3.3.4",
     "vuedraggable": "^2.23.2",
     "vuex": "^3.4.0"
@@ -34,6 +35,7 @@
     "@vue/cli-service": "^4.4.0",
     "babel-eslint": "^10.1.0",
     "babel-polyfill": "^6.26.0",
+    "deepmerge": "^4.2.2",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.2.2",
     "gh-pages": "^3.1.0",
diff --git a/src/App.vue b/src/App.vue
index 0baf5db..00ddb11 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -22,10 +22,13 @@ export default {
   watch: {
     weekMode(val) {
       this.setWeekModeTheme(val)
+    },
+    lang(val) {
+      this.$i18n.locale = val
     }
   },
   computed: {
-    ...mapState('setting', ['weekMode'])
+    ...mapState('setting', ['weekMode', 'lang'])
   },
   methods: {
     setWeekModeTheme(weekMode) {
diff --git a/src/main.js b/src/main.js
index 16e5252..ef4c5d2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,20 +9,29 @@ import '@/mock'
 import store from './store'
 import PouchDB from 'pouchdb'
 import 'animate.css/source/animate.css'
+import VueI18n from 'vue-i18n'
 
 Vue.prototype.$axios = axios
 Vue.config.productionTip = false
 Vue.use(Viser)
 Vue.use(Antd)
+Vue.use(VueI18n)
+
+const i18n = new VueI18n({
+  locale: 'CN',
+  fallbackLocale: 'US',
+  silentFallbackWarn: true
+})
 
 new Vue({
   router,
   store,
+  i18n,
   render: h => h(App),
   mounted () {
-    var db = new PouchDB('admindb')
+    let db = new PouchDB('adminDb')
     db.get('currUser').then(doc => {
-      this.$store.commit('account/setuser', doc.user)
+      this.$store.commit('account/setUser', doc.user)
     })
   },
 }).$mount('#app')
diff --git a/yarn.lock b/yarn.lock
index d314283..2142cca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3360,6 +3360,11 @@ deepmerge@^1.5.2:
   resolved "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz?cache=0&sync_timestamp=1572279720382&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeepmerge%2Fdownload%2Fdeepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753"
   integrity sha1-EEmdhohEza1P7ghC34x/bwyVp1M=
 
+deepmerge@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.npm.taobao.org/deepmerge/download/deepmerge-4.2.2.tgz?cache=0&sync_timestamp=1572279720382&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeepmerge%2Fdownload%2Fdeepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha1-RNLqNnm49NT/ujPwPYZfwee/SVU=
+
 default-gateway@^4.2.0:
   version "4.2.0"
   resolved "https://registry.npm.taobao.org/default-gateway/download/default-gateway-4.2.0.tgz?cache=0&sync_timestamp=1590419212936&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdefault-gateway%2Fdownload%2Fdefault-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
@@ -9277,6 +9282,11 @@ vue-hot-reload-api@^2.3.0:
   resolved "https://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
   integrity sha1-UylVzB6yCKPZkLOp+acFdGV+CPI=
 
+vue-i18n@^8.18.2:
+  version "8.18.2"
+  resolved "https://registry.npm.taobao.org/vue-i18n/download/vue-i18n-8.18.2.tgz#cd7c12f2e178e6faa23b0e3cfd2f7bac9305f8fc"
+  integrity sha1-zXwS8uF45vqiOw48/S97rJMF+Pw=
+
 vue-loader@^15.9.2:
   version "15.9.2"
   resolved "https://registry.npm.taobao.org/vue-loader/download/vue-loader-15.9.2.tgz#ae01f5f4c9c6a04bff4483912e72ef91a402c1ae"