diff --git a/.env.development b/.env.development index 49a0838..dfaf2c7 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ ENV = 'development' VUE_APP_ENCRYPT = 'PUBLIC' VUE_APP_BASE_API = '/api' -VUE_APP_BASE_LSM_API = '/lsm'cls +VUE_APP_BASE_LSM_API = '/lsm' # 文件上传 VUE_APP_UPLOAD_URL = '/api/oil-oss/obejct/uploadFile' VUE_APP_UPLOAD_PRIVATE_URL = '/api/oil-dict/imageHandler/uploadProtectedImg' diff --git a/.env.production b/.env.production index 5c534d9..db9e528 100644 --- a/.env.production +++ b/.env.production @@ -2,7 +2,7 @@ ENV = 'production' # base api VUE_APP_ENCRYPT = 'PRIVATE' - +BASE_URL = '/h5' VUE_APP_BASE_API = '/adminapi' VUE_APP_BASE_LSM_API = '/lsm' # 文件上传 diff --git a/README.md b/README.md index 82b4b07..4bbf788 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# company_h5 +# 星油能源 ## Project setup ``` diff --git a/package-lock.json b/package-lock.json index 0f329e8..bdd4272 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "company_h5", + "name": "星油能源", "version": "0.1.0", "lockfileVersion": 1, "requires": true, @@ -3534,7 +3534,6 @@ "version": "4.3.4", "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, "requires": { "ms": "2.1.2" } @@ -5864,8 +5863,7 @@ "ms": { "version": "2.1.2", "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "multicast-dns": { "version": "7.2.5", @@ -7391,6 +7389,14 @@ "ajv-keywords": "^3.5.2" } }, + "script-ext-html-webpack-plugin": { + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz", + "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==", + "requires": { + "debug": "^4.2.0" + } + }, "select-hose": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz", diff --git a/package.json b/package.json index ac29c4a..a59dc51 100644 --- a/package.json +++ b/package.json @@ -3,10 +3,21 @@ "version": "0.1.0", "private": true, "scripts": { - "serve": "vue-cli-service serve", + "dev": "vue-cli-service serve", "build": "vue-cli-service build", "lint": "vue-cli-service lint" }, + "lint-staged": { + "src/**/*.{js,vue}": [ + "eslint --fix", + "git add" + ] + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged" + } + }, "dependencies": { "amfe-flexible": "^2.2.1", "axios": "^0.27.2", @@ -20,6 +31,7 @@ "postcss-px2rem": "^0.3.0", "postcss-pxtorem": "^5.1.1", "px2rem-loader": "^0.1.9", + "script-ext-html-webpack-plugin": "^2.1.5", "vant": "^2.12.48", "vue": "^2.6.14", "vue-qr": "^4.0.9", diff --git a/public/index.html b/public/index.html index 9f0bb9e..a6d002f 100644 --- a/public/index.html +++ b/public/index.html @@ -6,12 +6,12 @@ - - <%= htmlWebpackPlugin.options.title %> + + <%= webpackConfig.name %>
diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 0000000..b045e21 Binary files /dev/null and b/public/logo.png differ diff --git a/src/App.vue b/src/App.vue index e06c0cd..5bb4587 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,13 +1,17 @@