fix:合并

src/App.vue

@@ -10,7 +10,6 @@
   <!--
  -->
   <div id="container">
-
     <!-- <div id="nav">
       <router-link
         v-for="item in routes"
@@ -37,8 +36,7 @@ import {onMounted} from "vue";
 import {useRoute} from "vue-router/dist/vue-router";
 import {USER_INFO} from "@/api/api";
 import {IsPhone} from "@/api/utils";
-
-console.log("版本1.2.2------------");
+console.log("版本1.2.4------------");
 const store = useStore();
 const { path } = useRoute();
 onMounted(() => {
@@ -51,7 +49,6 @@ onMounted(() => {
     }
   }
 });
-
 function getUserInfo() {
   if (import.meta.env.MODE === "development" || import.meta.env.MODE === "test") {
     request(USER_INFO, {}).then(res => {
@@ -76,22 +73,18 @@ function getUserInfo() {
   color: #2c3e50;
   height: 100%;
 }
-
 .return {
   right: 0 !important;
 }
-
 .preNext {
   right: 115px !important;
   margin-top: 4px;
 }
-
 #container {
   display: flex;
   width: 100%;
   min-height: 100%;
   background-color: rgba(242, 245, 247, 1);
-
   // background-color: #ccc;
   #nav {
     width: 220px;
@@ -103,26 +96,22 @@ function getUserInfo() {
     box-sizing: border-box;
     background: #f1f1f1;
     box-shadow: 0 5px 15px 8px rgba(1, 22, 54, 0.795);
-
     .link {
       text-decoration: none;
       color: rgb(0, 0, 0);
       padding: 10px;
       transition: all 0.4s;
       text-align: center;
-
       &:hover {
         background: rgba(4, 37, 223, 0.274);
         color: #f1f1f1;
       }
-
       &.active {
         color: #f1f1f1;
         background: rgba(17, 120, 255, 0.74);
       }
     }
   }
-
   main {
     flex: 1;
     width: 100%;
@@ -130,4 +119,4 @@ function getUserInfo() {
     box-sizing: border-box;
   }
 }
-</style>
+</style>