From 0c4783e088ce4fa6762edecf320e870d134347ea Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Tue, 23 Apr 2024 16:56:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.staging           | 2 +-
 src/libs/settingMer.js | 2 +-
 src/settings.js        | 4 ++--
 vue.config.js          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

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,