调整上线

.env.development

@@ -1,6 +1,9 @@
 # 页面标题
 VITE_APP_TITLE = 多麦管理系统
 
+# 网站根目录
+VITE_PUBLIC_PATH = /
+
 # 开发环境配置
 VITE_APP_ENV = 'development'
 

.env.production

@@ -1,11 +1,17 @@
 # 页面标题
 VITE_APP_TITLE = 多麦管理系统
 
+# 网站根目录
+VITE_PUBLIC_PATH = /admin/
+
 # 生产环境配置
 VITE_APP_ENV = 'production'
 
 # 多麦管理系统/生产环境
-VITE_APP_BASE_API = 'http://192.168.0.192:8080/'
+VITE_APP_BASE_API = 'https://www.saas.duomailianmeng.com/srv'
+
+# 接口前缀
+# VITE_GLOB_API_URL_PREFIX = /srv
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

src/components/HeaderSearch/index.vue

@@ -152,7 +152,7 @@ watch(searchPool, (list) => {
 
   .search-icon {
     cursor: pointer;
-    font-size: 18px;
+    font-size: 14px;
     vertical-align: middle;
   }
 

src/components/Screenfull/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'" @click="toggle" />
+    <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'" @click="toggle" class-name="search-icon"/>
   </div>
 </template>
 
@@ -19,4 +19,7 @@ const { isFullscreen, enter, exit, toggle } = useFullscreen();
   height: 20px;
   vertical-align: 10px;
 }
+.search-icon{
+  font-size: 14px;
+}
 </style>

src/components/SizeSelect/index.vue

@@ -38,7 +38,7 @@ function handleSetSize(size) {
 
 <style lang='scss' scoped>
 .size-icon--style {
-  font-size: 18px;
+  font-size: 14px;
   line-height: 50px;
   padding-right: 7px;
 }

src/layout/components/Navbar.vue

@@ -12,8 +12,8 @@
 
         <el-tooltip content="主题模式" effect="dark" placement="bottom">
           <div class="right-menu-item hover-effect theme-switch-wrapper" @click="toggleTheme">
-            <svg-icon v-if="settingsStore.isDark" icon-class="sunny" />
-            <svg-icon v-if="!settingsStore.isDark" icon-class="moon" />
+            <svg-icon v-if="settingsStore.isDark" icon-class="sunny" style="font-size: 16px;"/>
+            <svg-icon v-if="!settingsStore.isDark" icon-class="moon" style="font-size: 16px;"/>
           </div>
         </el-tooltip>
 
@@ -24,8 +24,9 @@
       <div class="avatar-container">
         <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
           <div class="avatar-wrapper">
-            <img :src="userStore.avatar" class="user-avatar" />
-            <el-icon><caret-bottom /></el-icon>
+            <div style="transform:translateY(12px)">{{ userStore.name }}</div>
+            <!-- <img :src="userStore.avatar" class="user-avatar" /> -->
+            <el-icon style="transform:translateY(-10px)"><caret-bottom /></el-icon>
           </div>
           <template #dropdown>
             <el-dropdown-menu>
@@ -88,7 +89,7 @@ function logout() {
     type: 'warning'
   }).then(() => {
     userStore.logOut().then(() => {
-      location.href = '/index';
+      location.href = '/admin/index';
     })
   }).catch(() => { });
 }
@@ -183,6 +184,9 @@ function toggleTheme() {
       margin-right: 40px;
 
       .avatar-wrapper {
+        display: flex;
+        align-items: center;
+        justify-content: center;
         margin-top: 5px;
         position: relative;
 

src/layout/components/Sidebar/Logo.vue

@@ -84,7 +84,7 @@ const getLogoTextColor = computed(() => {
       color: v-bind(getLogoTextColor);
       font-weight: 600;
       line-height: 50px;
-      font-size: 14px;
+      font-size: 18px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
       vertical-align: middle;
     }

src/permission.js

@@ -58,7 +58,7 @@ router.beforeEach((to, from, next) => {
       // 在免登录白名单，直接进入
       next()
     } else {
-      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      next(`/login`) // 否则全部重定向到登录页
       NProgress.done()
     }
   }

src/router/index.js

@@ -176,7 +176,7 @@ export const dynamicRoutes = [
 ]
 
 const router = createRouter({
-  history: createWebHistory(),
+  history: createWebHistory(import.meta.env.VITE_PUBLIC_PATH),
   routes: constantRoutes,
   scrollBehavior(to, from, savedPosition) {
     if (savedPosition) {

src/views/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container home">
     <el-row :gutter="20">
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>多麦后台管理系统</h2>
+        <h1 style="font-size:26px;">多麦SAAS后台管理系统</h1>
         <p>
         </p>
 
@@ -10,7 +10,7 @@
         </p>
       </el-col>
 
-      <el-col :sm="24" :lg="12" style="padding-left: 50px">
+      <!-- <el-col :sm="24" :lg="12" style="padding-left: 50px">
         <el-row>
           <el-col :span="12">
             <h2>技术选型</h2>
@@ -42,7 +42,7 @@
             </ul>
           </el-col>
         </el-row>
-      </el-col>
+      </el-col> -->
     </el-row>
     <el-divider />
     <el-row :gutter="20">

src/views/login.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="login">
     <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">{{ title }}</h3>
+      <div style="width:100%;display:flex;align-items: center;justify-content: center;gap:10px;">
+        <img src="@/assets/logo/logo2.png" style="width: 48px;height:48px;">
+        <h2 class="title">{{ title }}</h2>
+      </div>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -169,13 +172,14 @@ getCookie();
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
+  background-image: url("../assets/images/loginbg.png");
   background-size: cover;
 }
 .title {
-  margin: 0px auto 30px auto;
+  // margin: 0px auto 30px auto;
   text-align: center;
   color: #707070;
+  transform: translateY(-5px);
 }
 
 .login-form {
@@ -183,6 +187,7 @@ getCookie();
   background: #ffffff;
   width: 400px;
   padding: 25px 25px 5px 25px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
   .el-input {
     height: 40px;
     input {

src/views/system/user/index.vue

@@ -3,7 +3,7 @@
     <el-row :gutter="20">
       <splitpanes :horizontal="appStore.device === 'mobile'" class="default-theme">
         <!--部门数据-->
-        <pane size="16">
+        <!-- <pane size="16" >
           <el-col>
             <div class="head-container">
               <el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search" style="margin-bottom: 20px" />
@@ -12,7 +12,7 @@
               <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false" :filter-node-method="filterNode" ref="deptTreeRef" node-key="id" highlight-current default-expand-all @node-click="handleNodeClick" />
             </div>
           </el-col>
-        </pane>
+        </pane> -->
         <!--用户数据-->
         <pane size="84">
           <el-col>

vite.config.js

@@ -10,7 +10,7 @@ export default defineConfig(({ mode, command }) => {
     // 部署生产环境和开发环境下的URL。
     // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
     // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-    base: VITE_APP_ENV === 'production' ? '/' : '/',
+    base: env.VITE_PUBLIC_PATH,
     plugins: createVitePlugins(env, command === 'build'),
     resolve: {
       // https://cn.vitejs.dev/config/#resolve-alias