From 7535ec8c4540ac0e16956bd120a053deb513b2ff Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 15 May 2024 17:34:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/settings.js                     | 2 +-
 src/views/dashboard/admin/index.vue | 2 --
 vue.config.js                       | 6 +++---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/settings.js b/src/settings.js
index 8d9ba53..5b9505a 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -11,7 +11,7 @@ module.exports = {
   // 路由前缀
   roterPre: '/merchant',
   // 路由标题
-  title: '加载中...',
+  title: '惠农生活 - 商户端',
   /**
    * @type {boolean} true | false
    * @description Whether show the settings right-panel
diff --git a/src/views/dashboard/admin/index.vue b/src/views/dashboard/admin/index.vue
index 04d1477..2650d85 100644
--- a/src/views/dashboard/admin/index.vue
+++ b/src/views/dashboard/admin/index.vue
@@ -426,8 +426,6 @@ export default {
         this.$store.commit('user/SET_WHOLESALE', resData.wholesale)
         if (
           !resData.mer_avatar ||
-          !resData.mer_banner ||
-          !resData.mer_info ||
           !resData.mer_address
         ) {
           this.$alert(
diff --git a/vue.config.js b/vue.config.js
index 3e46a4d..eeb4c43 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,10 +24,10 @@ module.exports = {
    * In most cases please use '/' !!!
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: '/',
+  publicPath: '/merchant',
   outputDir: 'dist',
-  assetsDir: 'mer',
-  indexPath: process.env.NODE_ENV === 'development' ? 'index.html' : 'mer.html',
+  assetsDir: 'static',
+  indexPath: 'index.html',
   lintOnSave: false,
   // lintOnSave: process.env.NODE_ENV === 'development',
   productionSourceMap: false,