zhouchijian
/
fe-drone-ci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Signed-off-by: Logaxn <logaxn@foxmail.com>

This commit is contained in:
Logaxn 2019-03-11 23:37:17 +08:00
parent 49ae4d9aee
commit 08e09565bd
13 changed files with 336 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -12,7 +12,7 @@ test/e2e/reports
selenium-debug.log
# Editor directories and files
.idea
/.idea/workspace.xml
.vscode
*.suo
*.ntvs*

24
.idea/codeStyles/Project.xml Normal file
View File

@ -0,0 +1,24 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<option name="RIGHT_MARGIN" value="250" />
<option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
<codeStyleSettings language="HTML">
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="4" />
<option name="TAB_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="JavaScript">
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="PHP">
<option name="CLASS_BRACE_STYLE" value="1" />
<option name="METHOD_BRACE_STYLE" value="1" />
</codeStyleSettings>
</code_scheme>
</component>

5
.idea/codeStyles/codeStyleConfig.xml Normal file
View File

@ -0,0 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>

4
.idea/encodings.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with NO BOM" />
</project>

15
.idea/inspectionProfiles/Project_Default.xml Normal file
View File

@ -0,0 +1,15 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="HtmlUnknownAttribute" enabled="true" level="WARNING" enabled_by_default="true">
<option name="myValues">
<value>
<list size="1">
<item index="0" class="java.lang.String" itemvalue="slot-scope" />
</list>
</value>
</option>
<option name="myCustomValuesEnabled" value="true" />
</inspection_tool>
</profile>
</component>

6
.idea/jsLibraryMappings.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptLibraryMappings">
<includedPredefinedLibrary name="Node.js Core" />
</component>
</project>

9
.idea/misc.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="WebPackConfiguration">
<option name="path" value="$PROJECT_DIR$/build/webpack.dev.conf.js" />
</component>
</project>

8
.idea/modules.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/zealouscrm-vue.iml" filepath="$PROJECT_DIR$/.idea/zealouscrm-vue.iml" />
</modules>
</component>
</project>

8
.idea/zealouscrm-vue.iml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

3
build/webpack.base.conf.js
View File

@ -41,7 +41,8 @@ module.exports = {
},
module: {
rules: [
...(config.dev.useEslint ? [createLintingRule()] : []),
// 暂时禁用 Eslint todo
// ...(config.dev.useEslint ? [createLintingRule()] : []),
{
test: /\.vue$/,
loader: 'vue-loader',

2
src/lang/index.js
View File

@ -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',

14
src/views/gift/list.vue
View File

@ -42,7 +42,7 @@
<el-tag>{{ scope.row.type | typeFilter }}</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('table.author')" width="110px" align="center">
<el-table-column :label="$t('giftList.giftName')" width="110px" align="center">
<template slot-scope="scope">
<span>{{ scope.row.author }}</span>
</template>
@ -133,6 +133,10 @@ import waves from '@/directive/waves' // Waves directive
import {parseTime} from '@/utils'
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
import local from './local'
const viewName = 'giftList'
const calendarTypeOptions = [
{key: 'CN', display_name: 'China'},
{key: 'US', display_name: 'USA'},
@ -208,6 +212,14 @@ export default {
}
},
created() {
if (!this.$i18n.getLocaleMessage('en')[viewName]) {
for (let lang in local) {
const obj = {}
obj[viewName] = local[lang]
this.$i18n.mergeLocaleMessage(lang, obj)
}
}
this.getList()
},
methods: {

11
src/views/gift/local.js Normal file
View File

@ -0,0 +1,11 @@
export default {
en: {
giftName: 'Name'
},
zh: {
giftName: '礼品'
},
es: {
giftName: 'Gift'
}
}