diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..d3cc83a --- /dev/null +++ b/.babelrc @@ -0,0 +1,19 @@ +{ + "presets": [ + ["env", { + "modules": false + }], + "stage-2" + ], + "plugins": ["transform-runtime", ["component", [ + { + "libraryName": "element-ui" + } + ]]], + "env": { + "test": { + "presets": ["env", "stage-2"], + "plugins": ["transform-es2015-modules-commonjs", "dynamic-import-node"] + } + } +} diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..9d08a1a --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..ce49828 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,6 @@ +/build/ +/config/ +/dist/ +/*.js +/test/unit/coverage/ +/src/icons/iconfont.js diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..2e2e211 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,25 @@ +// https://eslint.org/docs/user-guide/configuring + +module.exports = { + root: true, + parser: 'babel-eslint', + parserOptions: { + sourceType: 'module' + }, + env: { + browser: true, + }, + // https://github.com/standard/standard/blob/master/docs/RULES-en.md + extends: 'standard', + // required to lint *.vue files + plugins: [ + 'html' + ], + // add your custom rules here + rules: { + // allow async-await + 'generator-star-spacing': 'off', + // allow debugger during development + 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' + } +} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9652515 --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +.DS_Store +node_modules/ +dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +/test/unit/coverage/ +/test/e2e/reports/ +selenium-debug.log + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln + + +# common +common/common.vue +/src/views/common/common.vue diff --git a/.postcssrc.js b/.postcssrc.js new file mode 100644 index 0000000..249472d --- /dev/null +++ b/.postcssrc.js @@ -0,0 +1,9 @@ +// https://github.com/michael-ciniawsky/postcss-load-config + +module.exports = { + "plugins": { + // to edit target browsers: use "browserslist" field in package.json + "postcss-import": {}, + "autoprefixer": {} + } +} diff --git a/dist.zip b/dist.zip deleted file mode 100644 index b68e4c8..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/views/modules/book/book-add-or-update.vue b/src/views/modules/book/book-add-or-update.vue index 6681dd8..9c9efc0 100644 --- a/src/views/modules/book/book-add-or-update.vue +++ b/src/views/modules/book/book-add-or-update.vue @@ -158,13 +158,13 @@ - + diff --git a/src/views/modules/book/book.vue b/src/views/modules/book/book.vue index 0977605..507b41c 100644 --- a/src/views/modules/book/book.vue +++ b/src/views/modules/book/book.vue @@ -67,7 +67,7 @@ --> - + - + + + diff --git a/static/config/index-prod.js b/static/config/index-prod.js index 29fccec..df82460 100644 --- a/static/config/index-prod.js +++ b/static/config/index-prod.js @@ -5,8 +5,8 @@ window.SITE_CONFIG = {}; // api接口请求地址 - // window.SITE_CONFIG['baseUrl'] = 'http://59.110.212.44:9100/pb'; - window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com'; + //window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9300/pb'; //zcc + window.SITE_CONFIG['baseUrl'] = 'https://global.nuttyreading.com'; // cdn地址 = 域名 + 版本号 window.SITE_CONFIG['domain'] = './'; // 域名 diff --git a/static/config/index.js b/static/config/index.js index 9e62848..9090123 100644 --- a/static/config/index.js +++ b/static/config/index.js @@ -5,13 +5,10 @@ window.SITE_CONFIG = {}; // api接口请求地址 - // window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb';//张川川 - // window.SITE_CONFIG['baseUrl'] = 'http://59.110.212.44:9200/pb'; - // window.SITE_CONFIG['baseUrl'] = 'https://testapi.nuttyreading.com'; // 线上测试环境11 - window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com'; // 线上正式环境 - // window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.110:9200/pb';//磊哥 - // window.SITE_CONFIG['baseUrl'] = 'http://59.110.212.44:9200/pb'; - // window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb'; + //window.SITE_CONFIG['baseUrl'] = 'https://testapi.nuttyreading.com'; // 线上测试环境11 + window.SITE_CONFIG['baseUrl'] = 'https://global.nuttyreading.com'; //线上 + //window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com'; //线上正式环境 + //window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9300/pb'; //zcc // cdn地址 = 域名 + 版本号 window.SITE_CONFIG['domain'] = './'; // 域名