提交修改的侧边栏样式

.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 若依管理系统
+VITE_APP_TITLE = 区块链金融
 
 # 开发环境配置
 VITE_APP_ENV = 'development'

.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 若依管理系统
+VITE_APP_TITLE = 区块链金融
 
 # 生产环境配置
 VITE_APP_ENV = 'production'

.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 若依管理系统
+VITE_APP_TITLE = 区块链金融
 
 # 生产环境配置
 VITE_APP_ENV = 'staging'

index.html

@@ -7,7 +7,7 @@
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="/favicon.ico">
-  <title>若依管理系统</title>
+  <title>区块链金融</title>
   <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
   <style>
     html,

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.8.6",
-  "description": "若依管理系统",
+  "description": "区块链金融",
   "author": "若依",
   "license": "MIT",
   "scripts": {

src/assets/styles/sidebar.scss

@@ -15,7 +15,7 @@
     -webkit-transition: width .28s;
     transition: width 0.28s;
     width: $base-sidebar-width !important;
-    background-color: $base-menu-background;
+    background-color: transparent !important;
     height: 100%;
     position: fixed;
     font-size: 0px;
@@ -34,6 +34,9 @@
 
     .scrollbar-wrapper {
       overflow-x: hidden !important;
+      padding-top: 52px;
+      background: url('../images/侧边栏.png') no-repeat center !important;
+      background-size: cover !important;
     }
 
     .el-scrollbar__bar.is-vertical {
@@ -68,12 +71,14 @@
       border: none;
       height: 100%;
       width: 100% !important;
+      background-color: transparent !important;
     }
 
     .el-menu-item, .menu-title {
       overflow: hidden !important;
       text-overflow: ellipsis !important;
       white-space: nowrap !important;
+
     }
 
     .el-menu-item .el-menu-tooltip__trigger {
@@ -213,7 +218,7 @@
   .el-menu-item {
     &:hover {
       // you can use $sub-menuHover
-      background-color: rgba(0, 0, 0, 0.06) !important;
+      background-color: pink !important;
     }
   }
 

src/components/SvgIcon/index.vue

@@ -24,6 +24,7 @@ export default defineComponent({
     return {
       iconName: computed(() => `#icon-${props.iconClass}`),
       svgClass: computed(() => {
+      
         if (props.className) {
           return `svg-icon ${props.className}`
         }

src/layout/components/Sidebar/Logo.vue

@@ -1,29 +1,43 @@
 <template>
-  <div class="sidebar-logo-container" :class="{ 'collapse': collapse }" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
+  <div
+    class="sidebar-logo-container"
+    :class="{ collapse: collapse }"
+    :style="{
+      backgroundColor:
+        sideTheme === 'theme-dark'
+          ? variables.menuBackground
+          : variables.menuLightBackground,
+    }"
+  >
     <transition name="sidebarLogoFade">
-      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
+      <router-link
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        v-if="collapse"
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }}</h1>
+        key="collapse"
+        class="sidebar-logo-link"
+        to="/"
+      >
+        <!-- <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }}</h1> -->
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <!-- <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }}</h1>
+        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }}</h1> -->
       </router-link>
     </transition>
   </div>
 </template>
 
 <script setup>
-import variables from '@/assets/styles/variables.module.scss'
+import variables from "@/assets/styles/variables.module.scss";
-import logo from '@/assets/logo/logo.png'
+import logo from "@/assets/logo/logo.png";
-import useSettingsStore from '@/store/modules/settings'
+import useSettingsStore from "@/store/modules/settings";
 
 defineProps({
   collapse: {
     type: Boolean,
-    required: true
+    required: true,
-  }
+  },
-})
+});
 
 const title = import.meta.env.VITE_APP_TITLE;
 const settingsStore = useSettingsStore();
@@ -43,8 +57,8 @@ const sideTheme = computed(() => settingsStore.sideTheme);
 .sidebar-logo-container {
   position: relative;
   width: 100%;
-  height: 50px;
+  // height: 50px;
-  line-height: 50px;
+  // line-height: 50px;
   background: #2b2f3a;
   text-align: center;
   overflow: hidden;

src/layout/index.vue

@@ -1,10 +1,11 @@
 <template>
   <div :class="classObj" class="app-wrapper" :style="{ '--current-color': theme }">
     <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
+    <navbar @setLayout="setLayout" />
     <sidebar v-if="!sidebar.hide" class="sidebar-container" />
     <div :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container">
       <div :class="{ 'fixed-header': fixedHeader }">
-        <navbar @setLayout="setLayout" />
+       
         <tags-view v-if="needTagsView" />
       </div>
       <app-main />
@@ -55,7 +56,6 @@ watchEffect(() => {
 function handleClickOutside() {
   useAppStore().closeSideBar({ withoutAnimation: false })
 }
-
 const settingRef = ref(null);
 function setLayout() {
   settingRef.value.openSetting();

src/views/login.vue

@@ -1,7 +1,13 @@
 <template>
   <div class="login">
-    <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
+    <div class="login-main">
-      <h3 class="title">若依后台管理系统</h3>
+      <el-form
+        ref="loginRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+      >
+        <h3 class="title">区块链管理系统</h3>
         <el-form-item prop="username">
           <el-input
             v-model="loginForm.username"
@@ -10,7 +16,9 @@
             auto-complete="off"
             placeholder="账号"
           >
-          <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
+            <template #prefix
+              ><svg-icon icon-class="user" class="el-input__icon input-icon"
+            /></template>
           </el-input>
         </el-form-item>
         <el-form-item prop="password">
@@ -22,10 +30,14 @@
             placeholder="密码"
             @keyup.enter="handleLogin"
           >
-          <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
+            <template #prefix
+              ><svg-icon
+                icon-class="password"
+                class="el-input__icon input-icon"
+            /></template>
           </el-input>
         </el-form-item>
-      <el-form-item prop="code" v-if="captchaEnabled">
+        <!-- <el-form-item prop="code" v-if="captchaEnabled">
           <el-input
             v-model="loginForm.code"
             size="large"
@@ -34,31 +46,42 @@
             style="width: 63%"
             @keyup.enter="handleLogin"
           >
-          <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
+            <template #prefix
+              ><svg-icon
+                icon-class="validCode"
+                class="el-input__icon input-icon"
+            /></template>
           </el-input>
           <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+            <img :src="codeUrl" @click="getCode" class="login-code-img" />
           </div>
-      </el-form-item>
+        </el-form-item> -->
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
+        <el-checkbox
-      <el-form-item style="width:100%;">
+          v-model="loginForm.rememberMe"
+          style="margin: 0px 0px 25px 0px"
+          >记住密码</el-checkbox
+        >
+        <el-form-item style="width: 100%">
           <el-button
             :loading="loading"
             size="large"
             type="primary"
-          style="width:100%;"
+            style="width: 100%"
             @click.prevent="handleLogin"
           >
             <span v-if="!loading">登 录</span>
             <span v-else>登 录 中...</span>
           </el-button>
-        <div style="float: right;" v-if="register">
+          <div style="float: right" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
+            <router-link class="link-type" :to="'/register'"
+              >立即注册</router-link
+            >
           </div>
         </el-form-item>
       </el-form>
+    </div>
     <!--  底部  -->
-    <div class="el-login-footer">
+    <div class="el-login-footer" style="display: none;">
       <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
     </div>
   </div>
@@ -68,9 +91,9 @@
 import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from "@/utils/jsencrypt";
-import useUserStore from '@/store/modules/user'
+import useUserStore from "@/store/modules/user";
 
-const userStore = useUserStore()
+const userStore = useUserStore();
 const route = useRoute();
 const router = useRouter();
 const { proxy } = getCurrentInstance();
@@ -80,35 +103,41 @@ const loginForm = ref({
   password: "admin123",
   rememberMe: false,
   code: "",
-  uuid: ""
+  uuid: "",
 });
 
 const loginRules = {
   username: [{ required: true, trigger: "blur", message: "请输入您的账号" }],
   password: [{ required: true, trigger: "blur", message: "请输入您的密码" }],
-  code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+ 
 };
 
 const codeUrl = ref("");
 const loading = ref(false);
 // 验证码开关
-const captchaEnabled = ref(true);
+// const captchaEnabled = ref(true);
 // 注册开关
 const register = ref(false);
 const redirect = ref(undefined);
 
-watch(route, (newRoute) => {
+watch(
+  route,
+  (newRoute) => {
     redirect.value = newRoute.query && newRoute.query.redirect;
-}, { immediate: true });
+  },
+  { immediate: true }
+);
 
 function handleLogin() {
-  proxy.$refs.loginRef.validate(valid => {
+  proxy.$refs.loginRef.validate((valid) => {
     if (valid) {
       loading.value = true;
       // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
       if (loginForm.value.rememberMe) {
         Cookies.set("username", loginForm.value.username, { expires: 30 });
-        Cookies.set("password", encrypt(loginForm.value.password), { expires: 30 });
+        Cookies.set("password", encrypt(loginForm.value.password), {
+          expires: 30,
+        });
         Cookies.set("rememberMe", loginForm.value.rememberMe, { expires: 30 });
       } else {
         // 否则移除
@@ -117,9 +146,12 @@ function handleLogin() {
         Cookies.remove("rememberMe");
       }
       // 调用action的登录方法
-      userStore.login(loginForm.value).then(() => {
+      userStore
+        .login(loginForm.value)
+        .then(() => {
           router.push({ path: redirect.value || "/" });
-      }).catch(() => {
+        })
+        .catch(() => {
           loading.value = false;
           // 重新获取验证码
           if (captchaEnabled.value) {
@@ -130,15 +162,16 @@ function handleLogin() {
   });
 }
 
-function getCode() {
+// function getCode() {
-  getCodeImg().then(res => {
+//   getCodeImg().then((res) => {
-    captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled;
+//     captchaEnabled.value =
-    if (captchaEnabled.value) {
+//       res.captchaEnabled === undefined ? true : res.captchaEnabled;
-      codeUrl.value = "data:image/gif;base64," + res.img;
+//     if (captchaEnabled.value) {
-      loginForm.value.uuid = res.uuid;
+//       codeUrl.value = "data:image/gif;base64," + res.img;
-    }
+//       loginForm.value.uuid = res.uuid;
-  });
+//     }
-}
+//   });
+// }
 
 function getCookie() {
   const username = Cookies.get("username");
@@ -146,16 +179,17 @@ function getCookie() {
   const rememberMe = Cookies.get("rememberMe");
   loginForm.value = {
     username: username === undefined ? loginForm.value.username : username,
-    password: password === undefined ? loginForm.value.password : decrypt(password),
+    password:
-    rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+      password === undefined ? loginForm.value.password : decrypt(password),
+    rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
   };
 }
 
-getCode();
+// getCode();
 getCookie();
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .login {
   display: flex;
   justify-content: center;
@@ -167,14 +201,21 @@ getCookie();
 .title {
   margin: 0px auto 30px auto;
   text-align: center;
-  color: #707070;
+  color: rgb(48, 50, 52);
+  font-size: 22px;
+}
+.login-main {
+  width: 81%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: end;
 }
-
 .login-form {
   border-radius: 6px;
   background: #ffffff;
   width: 400px;
-  padding: 25px 25px 5px 25px;
+  padding:55px 25px 33px 25px;
   .el-input {
     height: 40px;
     input {