Merge branch 'xinyan' into dev

src/stores/themeConfig.ts

@@ -147,7 +147,7 @@ export const useThemeConfig = defineStore('themeConfig', {
 			// 网站副标题（登录页顶部文字）
 			globalViceTitle: 'Ansjer',
 			// 网站副标题（登录页顶部文字）
-			globalViceTitleMsg: '企业级快速开发平台',
+			globalViceTitleMsg: '安士佳运营平台',
 			// 默认初始语言，可选值"<zh-cn|en|zh-tw>"，默认 zh-cn
 			globalI18n: 'zh-cn',
 			// 默认全局组件大小，可选值"<large|'default'|small>"，默认 'large'

src/views/system/login/index.vue

@@ -1,12 +1,11 @@
-<script setup lang="ts" name="loginIndex">
-import { computed, defineAsyncComponent, onMounted, reactive, ref } from 'vue'
-import { storeToRefs } from 'pinia'
-import { useThemeConfig } from '/@/stores/themeConfig'
-import { NextLoading } from '/@/utils/loading'
-import loginMain from '/src/assets/login-main.svg'
-import loginBg from '/@/assets/login-bg.svg'
-import loginOne from '/@/assets/login11.jpg'
-import AnsjerImg from '/@/assets/ansjer_image.png'
+<script lang="ts" name="loginIndex" setup>
+import { computed, defineAsyncComponent, onMounted, reactive } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { NextLoading } from '/@/utils/loading';
+import loginMain from '/src/assets/login-main.svg';
+import loginBg from '/@/assets/login-bg.svg';
+import AnsjerImg from '/@/assets/asj.png';
 
 // 引入组件
 const Account = defineAsyncComponent(() => import('/@/views/system/login/component/account.vue'));
@@ -28,7 +27,7 @@ const getThemeConfig = computed(() => {
 
 // 切换登录方式
 function showScan() {
-	state.isScan = !state.isScan
+	state.isScan = !state.isScan;
 }
 
 // const systemConfigStore = SystemConfigStore()
@@ -59,21 +58,15 @@ onMounted(() => {
 <template>
 	<div class="login-container flex">
 		<div class="login-left">
-			<!--<div class="login-left-logo">-->
-				<!-- <img src="src/assets/ansjer_image.png"/> -->
-				<!--<el-image style="width: 110px; height: 110px" :src="AnsjerImg" fit="contain" />-->
-				<!-- 登录页左上角logo后面的文字 -->
-				<!-- <div class="login-left-logo-text">
+			<div class="login-left-logo">
+				<el-image :src="AnsjerImg" fit="contain" style="width: 52px; height: 52px" />
+				<!--登录页左上角logo后面的文字-->
+				<div class="login-left-logo-text">
 					<span>{{ getThemeConfig.globalViceTitle }}</span>
 					<span class="login-left-logo-text-msg">{{ getThemeConfig.globalViceTitleMsg }}</span>
-				</div> -->
-			<!--</div>-->
-			<!--<div class="login-left-img">-->
-			<!--	<img :src="loginMain" alt="" />-->
-			<!--</div>-->
-			<!--<img :src="loginBg" class="login-left-waves" alt="" />-->
+				</div>
+			</div>
 		</div>
-		<!--<img :src="loginOne" alt="" />-->
 		<div class="login-right flex">
 			<div class="login-right-warp flex-margin">
 				<span class="login-right-warp-one"></span>
@@ -94,7 +87,7 @@ onMounted(() => {
 						</div>
 						<Scan v-if="state.isScan" :isScan="state.isScan" />
 						<div class="login-content-main-sacn" @click="showScan">
-							<i class="iconfont" :class="state.isScan ? 'icon-diannao1' : 'icon-barcode-qr'"></i>
+							<i :class="state.isScan ? 'icon-diannao1' : 'icon-barcode-qr'" class="iconfont"></i>
 							<div class="login-content-main-sacn-delta"></div>
 						</div>
 					</div>
@@ -117,12 +110,12 @@ onMounted(() => {
 	</div>
 </template>
 
-
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .login-container {
 	height: 100%;
 	// background: var(--el-color-white);
 	background-image: url('/src/assets/bg-main.jpg');
+
 	.login-left {
 		flex: 1;
 		position: relative;