Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/stores/themeConfig.ts

src/views/login/index.vue

@@ -30,8 +30,8 @@
     <div class="login-footer">
       <div class="login-footer-content mt15">
         <div class="login-footer-content-warp">
-          <div>Copyright © 2021-2023 g-fast.cn All Rights Reserved.</div>
-          <div class="mt5">云南奇讯科技有限公司版权所有</div>
+          <div>红动未来</div>
+          <div class="mt5"></div>
         </div>
       </div>
     </div>
@@ -51,35 +51,35 @@ import Scan from '/@/views/login/component/scan.vue';
 
 // 定义接口来定义对象的类型
 interface LoginState {
-	tabsActiveName: string;
-	isScan: boolean;
+  tabsActiveName: string;
+  isScan: boolean;
 }
 
 export default defineComponent({
-	name: 'loginIndex',
-	components: { Account, Mobile, Scan },
-	setup() {
-		const storesThemeConfig = useThemeConfig();
-		const { themeConfig } = storeToRefs(storesThemeConfig);
-		const state = reactive<LoginState>({
-			tabsActiveName: 'account',
-			isScan: false,
-		});
-		// 获取布局配置信息
-		const getThemeConfig = computed(() => {
-			return themeConfig.value;
-		});
-		// 页面加载时
-		onMounted(() => {
-			NextLoading.done();
-		});
-		return {
-			logoMini,
-			loginIconTwo,
-			getThemeConfig,
-			...toRefs(state),
-		};
-	},
+  name: 'loginIndex',
+  components: { Account, Mobile, Scan },
+  setup() {
+    const storesThemeConfig = useThemeConfig();
+    const { themeConfig } = storeToRefs(storesThemeConfig);
+    const state = reactive<LoginState>({
+      tabsActiveName: 'account',
+      isScan: false,
+    });
+    // 获取布局配置信息
+    const getThemeConfig = computed(() => {
+      return themeConfig.value;
+    });
+    // 页面加载时
+    onMounted(() => {
+      NextLoading.done();
+    });
+    return {
+      logoMini,
+      loginIconTwo,
+      getThemeConfig,
+      ...toRefs(state),
+    };
+  },
 });
 </script>
 
@@ -91,22 +91,27 @@ export default defineComponent({
   position: relative;
   background-image: url("/@/assets/bg.jpg");
   background-size: cover;
+
   .login-icon-group {
     width: 100%;
     height: 100%;
     position: relative;
+
     .login-icon-group-title {
       display: flex;
       align-items: center;
+
       img {
         width: 80px;
         height: 70px;
       }
+
       &-text {
         padding-left: 5px;
         color: var(--el-color-primary);
       }
     }
+
     &-icon {
       width: 60%;
       height: 70%;
@@ -115,6 +120,7 @@ export default defineComponent({
       bottom: 0;
     }
   }
+
   .login-content-out {
     width: 100%;
     height: 100%;
@@ -123,6 +129,7 @@ export default defineComponent({
     justify-content: center;
     align-items: center;
   }
+
   .login-content {
     width: 500px;
     padding: 20px;
@@ -133,9 +140,11 @@ export default defineComponent({
     overflow: hidden;
     z-index: 1;
     position: relative;
+
     .login-content-main {
       margin: 0 auto;
       width: 80%;
+
       .login-content-title {
         color: var(--el-text-color-primary);
         font-weight: 500;
@@ -149,6 +158,7 @@ export default defineComponent({
         transition: all 0.3s ease;
       }
     }
+
     .login-content-main-sacn {
       position: absolute;
       top: 0;
@@ -159,6 +169,7 @@ export default defineComponent({
       cursor: pointer;
       transition: all ease 0.3s;
       color: var(--el-text-color-primary);
+
       &-delta {
         position: absolute;
         width: 35px;
@@ -169,11 +180,13 @@ export default defineComponent({
         background: var(--el-color-white);
         transform: rotate(-45deg);
       }
+
       &:hover {
         opacity: 1;
         transition: all ease 0.3s;
         color: var(--el-color-primary) !important;
       }
+
       i {
         width: 47px;
         height: 50px;
@@ -185,13 +198,16 @@ export default defineComponent({
       }
     }
   }
-  .login-footer{
+
+  .login-footer {
     position: absolute;
     bottom: 5px;
     width: 100%;
+
     &-content {
       width: 100%;
       display: flex;
+
       &-warp {
         margin: auto;
         color: #e0e3e9;