diff --git a/.gitignore b/.gitignore index ba56a3e1..25f3edf9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ test/e2e/reports selenium-debug.log # Editor directories and files -.idea +/.idea/workspace.xml .vscode *.suo *.ntvs* diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 00000000..055a1869 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,24 @@ + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 00000000..79ee123c --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..15a15b21 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..c4e998ee --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,15 @@ + + + + \ No newline at end of file diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml new file mode 100644 index 00000000..d23208fb --- /dev/null +++ b/.idea/jsLibraryMappings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..92003410 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..8ad00b21 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/zealouscrm-vue.iml b/.idea/zealouscrm-vue.iml new file mode 100644 index 00000000..c956989b --- /dev/null +++ b/.idea/zealouscrm-vue.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 3b946b4b..b90dca78 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -41,7 +41,8 @@ module.exports = { }, module: { rules: [ - ...(config.dev.useEslint ? [createLintingRule()] : []), + // 暂时禁用 Eslint todo + // ...(config.dev.useEslint ? [createLintingRule()] : []), { test: /\.vue$/, loader: 'vue-loader', diff --git a/src/lang/index.js b/src/lang/index.js index 7c9c8af6..cd8d49e0 100644 --- a/src/lang/index.js +++ b/src/lang/index.js @@ -26,6 +26,8 @@ const messages = { } const i18n = new VueI18n({ + // 暂时隐藏 i18n 警告 todo + silentTranslationWarn: true, // set locale // options: en | zh | es locale: Cookies.get('language') || 'en', diff --git a/src/views/gift/list.vue b/src/views/gift/list.vue index 25cb9428..1e38b09a 100644 --- a/src/views/gift/list.vue +++ b/src/views/gift/list.vue @@ -18,14 +18,14 @@ + v-loading="listLoading" + :key="tableKey" + :data="list" + border + fit + highlight-current-row + style="width: 100%;" + @sort-change="sortChange"> - + @@ -81,7 +81,7 @@ - + @@ -128,235 +128,247 @@ diff --git a/src/views/gift/local.js b/src/views/gift/local.js new file mode 100644 index 00000000..775ca0be --- /dev/null +++ b/src/views/gift/local.js @@ -0,0 +1,11 @@ +export default { + en: { + giftName: 'Name' + }, + zh: { + giftName: '礼品' + }, + es: { + giftName: 'Gift' + } +}