diff --git a/.env.development b/.env.development index 74b216c..4f6e78b 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,7 @@ ENV = 'development' # http://mer.crmeb.net/admin # base api # VUE_APP_BASE_API = 'http://192.168.31.106:8324' -VUE_APP_BASE_API = 'https://crmeb-test.shop.lihaink.cn' +VUE_APP_BASE_API = '' # socket 连接地址 # VUE_APP_WS_URL = 'ws://0.0.0.0:8324' diff --git a/.env.staging b/.env.staging index a8793a0..097edb1 100644 --- a/.env.staging +++ b/.env.staging @@ -4,5 +4,5 @@ NODE_ENV = production ENV = 'staging' # base api -VUE_APP_BASE_API = '/stage-api' +VUE_APP_BASE_API = '' diff --git a/src/libs/settingMer.js b/src/libs/settingMer.js index 455aa5c..bce602b 100644 --- a/src/libs/settingMer.js +++ b/src/libs/settingMer.js @@ -16,7 +16,7 @@ const SettingMer = { // 服务器地址 httpUrl: VUE_APP_API_URL, // 接口请求地址 - https: VUE_APP_API_URL + '/sys', + https: VUE_APP_API_URL + '/sysApi', // socket连接 wsSocketUrl: VUE_APP_WS_URL, // 路由标题 diff --git a/src/settings.js b/src/settings.js index ccef22e..01d133b 100644 --- a/src/settings.js +++ b/src/settings.js @@ -9,10 +9,10 @@ // +---------------------------------------------------------------------- module.exports = { // 路由前缀 - roterPre: '/admin', + roterPre: '/', // 路由标题 - title: '加载中...', + title: '惠农生活 - 平台端', /** * @type {boolean} true | false * @description Whether show the settings right-panel diff --git a/vue.config.js b/vue.config.js index 6138b33..c222704 100644 --- a/vue.config.js +++ b/vue.config.js @@ -27,7 +27,7 @@ module.exports = { publicPath: '/', outputDir: 'dist', assetsDir: 'system', - indexPath: process.env.NODE_ENV === 'development' ? 'index.html' : 'system.html', + indexPath: 'index.html', lintOnSave: process.env.NODE_ENV === 'development', productionSourceMap: false, devServer: {