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 ea9e731..35128db 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 + '/mer', + https: VUE_APP_API_URL + '/merApi', // socket连接 wsSocketUrl: VUE_APP_WS_URL, // 路由标题 diff --git a/src/settings.js b/src/settings.js index 8d9ba53..fc1b698 100644 --- a/src/settings.js +++ b/src/settings.js @@ -9,9 +9,9 @@ // +---------------------------------------------------------------------- module.exports = { // 路由前缀 - roterPre: '/merchant', + 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 3e46a4d..cae2d97 100644 --- a/vue.config.js +++ b/vue.config.js @@ -27,7 +27,7 @@ module.exports = { publicPath: '/', outputDir: 'dist', assetsDir: 'mer', - indexPath: process.env.NODE_ENV === 'development' ? 'index.html' : 'mer.html', + indexPath: 'index.html', lintOnSave: false, // lintOnSave: process.env.NODE_ENV === 'development', productionSourceMap: false,