diff --git a/config/index.js b/config/index.js index bc0ae0a..eb83e20 100644 --- a/config/index.js +++ b/config/index.js @@ -1,102 +1,105 @@ -'use strict' +"use strict"; // Template version: 1.2.5 // see http://vuejs-templates.github.io/webpack for documentation. -const path = require('path') -const devEnv = require('./dev.env') +const path = require("path"); +const devEnv = require("./dev.env"); module.exports = { - dev: { - // Paths - assetsSubDirectory: 'static', - assetsPublicPath: '/', - // 代理列表, 是否开启代理通过[./dev.env.js]配置 - proxyTable: devEnv.OPEN_PROXY === false ? {} : { - '/czg': { - // target: 'http://192.168.0.132:8100/czg/', - // target: 'https://duanjuadmin.xianmxkj.com/czg/', - target: 'http://127.0.0.1/czg/', - changeOrigin: true, - pathRewrite: { - '^/czg': '' - } - }, - '/weixin': { - target: 'https://api.weixin.qq.com/', - // target: 'https://duanjuadmin.xianmxkj.com/czg/', - // target: 'http://127.0.0.1/czg/', - changeOrigin: true, - pathRewrite: { - '^/weixin': '' - } - }, - }, + dev: { + // Paths + assetsSubDirectory: "static", + assetsPublicPath: "/", + // 代理列表, 是否开启代理通过[./dev.env.js]配置 + proxyTable: + devEnv.OPEN_PROXY === false + ? {} + : { + "/czg": { + // target: 'http://192.168.0.132:8100/czg/', + // target: 'https://duanjuadmin.xianmxkj.com/czg/', + target: "http://127.0.0.1/czg/", + changeOrigin: true, + pathRewrite: { + "^/czg": "" + } + }, + "/weixin": { + target: "https://api.weixin.qq.com/", + // target: 'https://duanjuadmin.xianmxkj.com/czg/', + // target: 'http://127.0.0.1/czg/', + changeOrigin: true, + pathRewrite: { + "^/weixin": "" + } + } + }, - // Various Dev Server settings - host: 'localhost', // can be overwritten by process.env.HOST - port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined - autoOpenBrowser: true, - errorOverlay: true, - notifyOnErrors: true, - poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- + // Various Dev Server settings + host: "localhost", // can be overwritten by process.env.HOST + port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + autoOpenBrowser: true, + errorOverlay: true, + notifyOnErrors: true, + poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- - // Use Eslint Loader? - // If true, your code will be linted during bundling and - // linting errors and warnings will be shown in the console. - useEslint: true, - // If true, eslint errors and warnings will also be shown in the error overlay - // in the browser. - showEslintErrorsInOverlay: false, + // Use Eslint Loader? + // If true, your code will be linted during bundling and + // linting errors and warnings will be shown in the console. + useEslint: true, + // If true, eslint errors and warnings will also be shown in the error overlay + // in the browser. + showEslintErrorsInOverlay: false, - /** - * Source Maps - */ + /** + * Source Maps + */ - // https://webpack.js.org/configuration/devtool/#development - devtool: 'eval-source-map', + // https://webpack.js.org/configuration/devtool/#development + devtool: "eval-source-map", - // If you have problems debugging vue-files in devtools, - // set this to false - it *may* help - // https://vue-loader.vuejs.org/en/options.html#cachebusting - cacheBusting: true, + // If you have problems debugging vue-files in devtools, + // set this to false - it *may* help + // https://vue-loader.vuejs.org/en/options.html#cachebusting + cacheBusting: true, - // CSS Sourcemaps off by default because relative paths are "buggy" - // with this option, according to the CSS-Loader README - // (https://github.com/webpack/css-loader#sourcemaps) - // In our experience, they generally work as expected, - // just be aware of this issue when enabling this option. - cssSourceMap: false, - }, + // CSS Sourcemaps off by default because relative paths are "buggy" + // with this option, according to the CSS-Loader README + // (https://github.com/webpack/css-loader#sourcemaps) + // In our experience, they generally work as expected, + // just be aware of this issue when enabling this option. + cssSourceMap: false + }, - build: { - // publicPath: '/admin/', - // Template for index.html - index: path.resolve(__dirname, '../dist/index.html'), + build: { + // publicPath: '/admin/', + // Template for index.html + index: path.resolve(__dirname, "../dist/index.html"), - // Paths - assetsRoot: path.resolve(__dirname, '../dist'), - assetsSubDirectory: 'static', - assetsPublicPath: './', + // Paths + assetsRoot: path.resolve(__dirname, "../dist"), + assetsSubDirectory: "static", + assetsPublicPath: "./", - /** - * Source Maps - */ + /** + * Source Maps + */ - productionSourceMap: false, - // https://webpack.js.org/configuration/devtool/#production - devtool: '#source-map', + productionSourceMap: false, + // https://webpack.js.org/configuration/devtool/#production + devtool: "#source-map", - // Gzip off by default as many popular static hosts such as - // Surge or Netlify already gzip all static assets for you. - // Before setting to `true`, make sure to: - // npm install --save-dev compression-webpack-plugin - productionGzip: false, - productionGzipExtensions: ['js', 'css'], + // Gzip off by default as many popular static hosts such as + // Surge or Netlify already gzip all static assets for you. + // Before setting to `true`, make sure to: + // npm install --save-dev compression-webpack-plugin + productionGzip: false, + productionGzipExtensions: ["js", "css"], - // Run the build command with an extra argument to - // View the bundle analyzer report after build finishes: - // `npm run build --report` - // Set to `true` or `false` to always turn it on or off - bundleAnalyzerReport: process.env.npm_config_report - } -} + // Run the build command with an extra argument to + // View the bundle analyzer report after build finishes: + // `npm run build --report` + // Set to `true` or `false` to always turn it on or off + bundleAnalyzerReport: process.env.npm_config_report + } +}; diff --git a/src/config/index.js b/src/config/index.js index 68aed2a..73cd2bd 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -4,8 +4,8 @@ export const productUrl='dj-admin'; // const baseUrl = "http://192.168.1.7:8100/czg/" // const baseUrl = "https://api.tianjinzhitongdaohe.com/czg/" - const baseUrl = "https://web-api.hnsiyao.cn/czg/" //测试 -// const baseUrl = "https://web.hnsiyao.cn/czg/" // 线上 +// const baseUrl = "https://web-api.hnsiyao.cn/czg/" //测试 +const baseUrl = "https://web.hnsiyao.cn/czg/" // 线上 export default{ baseUrl diff --git a/src/views/user/userDetail.vue b/src/views/user/userDetail.vue index 339cbd8..c0b48d4 100644 --- a/src/views/user/userDetail.vue +++ b/src/views/user/userDetail.vue @@ -1,172 +1,168 @@