Merge branch 'main' of http://18.167.251.121:10003/aidlab/FiDA_Front

public/fonts/general/css/general-sans.css

@@ -20,12 +20,13 @@
 * General Sans BoldItalic 
 * General Sans Variable (Variable font)
 * General Sans VariableItalic (Variable font)
+* Misans-Regular
 
 *
 */
 @font-face {
 	font-family: 'Regular';
-	src:url('../fonts/GeneralSans-Regular.otf') format('opentype');
+	src: url('../fonts/GeneralSans-Regular.otf') format('opentype');
 	font-weight: 400;
 	font-display: swap;
 	font-style: normal;
@@ -33,7 +34,7 @@
 
 @font-face {
 	font-family: 'Medium';
-	src:url('../fonts/GeneralSans-Medium.otf') format('opentype'),
+	src: url('../fonts/GeneralSans-Medium.otf') format('opentype'),
 		url('../fonts/GeneralSans-MediumItalic.otf') format('opentype');
 	font-weight: 500;
 	font-display: swap;
@@ -42,7 +43,7 @@
 
 @font-face {
 	font-family: 'SemiBold';
-	src:url('../fonts/GeneralSans-Semibold.otf') format('opentype'),
+	src: url('../fonts/GeneralSans-Semibold.otf') format('opentype'),
 		url('../fonts/GeneralSans-SemiboldItalic.otf') format('opentype');
 	font-weight: 600;
 	font-display: swap;
@@ -51,7 +52,7 @@
 
 @font-face {
 	font-family: 'Bold';
-	src:url('../fonts/GeneralSans-Bold.otf') format('opentype'),
+	src: url('../fonts/GeneralSans-Bold.otf') format('opentype'),
 		url('../fonts/GeneralSans-BoldItalic.otf') format('opentype');
 	font-weight: 700;
 	font-display: swap;
@@ -60,7 +61,7 @@
 
 @font-face {
 	font-family: 'Migra-Extrabold';
-	src:url('../fonts/Migra-Extrabold.otf') format('opentype'),
+	src: url('../fonts/Migra-Extrabold.otf') format('opentype'),
 		url('../fonts/Migra-Extrabold.ttf') format('truetype'),
 		url('../fonts/Migra-Extrabold.woff') format('woff'),
 		url('../fonts/Migra-Extrabold.woff2') format('woff2');
@@ -71,7 +72,7 @@
 
 @font-face {
 	font-family: 'LBold';
-	src:url('../fonts/MazzardL-Bold.otf') format('opentype');
+	src: url('../fonts/MazzardL-Bold.otf') format('opentype');
 	font-weight: 700;
 	font-display: swap;
 	font-style: normal;
@@ -79,15 +80,22 @@
 
 @font-face {
 	font-family: 'MBold';
-	src:url('../fonts/MazzardM-Bold.otf') format('opentype');
+	src: url('../fonts/MazzardM-Bold.otf') format('opentype');
 	font-weight: 700;
 	font-display: swap;
 	font-style: normal;
 }
 @font-face {
 	font-family: 'MSemiBold';
-	src:url('../fonts/MazzardL-SemiBold.otf') format('opentype');
+	src: url('../fonts/MazzardL-SemiBold.otf') format('opentype');
 	font-weight: 700;
 	font-display: swap;
 	font-style: normal;
-}
+}
+
+@font-face {
+	font-family: 'MisansRegular';
+	src: url('../fonts/MiSans-Regular.ttf') format('truetype');
+	font-style: normal;
+	font-weight: 330;
+}

src/components/Assistant/assistant.vue

@@ -87,7 +87,7 @@
 	)
 
 	const listenAssistantPushChat = (message: Message) => {
-		console.log('有新消息--');
+		console.log('有新消息--')
 
 		const exist = messageList.value.find((item: Message) => item.nodeType === message.nodeType)
 		if (!exist) {
@@ -157,7 +157,8 @@
 
 		.assistant-header {
 			height: 5.66rem;
-			font-family: 'Regular';
+			font-family: 'Medium';
+			color: #d58c4d;
 			font-size: 1.6rem;
 			padding: 0 1.59rem 0 2.05rem;
 			background: linear-gradient(

src/components/Assistant/component/List.vue

@@ -78,6 +78,7 @@
 			.thumb {
 				width: 4rem;
 				height: 4rem;
+				flex-shrink: 0;
 				.assistant-head {
 					width: 100%;
 					height: 100%;
@@ -90,7 +91,7 @@
 				// 	width: 26.2rem;
 				// 	align-self: end;
 				// }
-				font-size: 1.4rem;
+				font-size: 1rem;
 				font-family: 'Regular';
 				color: #333;
 				padding: 1.1rem 1.7rem;

src/views/home/agent/components/Item.vue

@@ -1,8 +1,11 @@
 <template>
-	<div class="agent-item">
+	<div class="agent-item" :class="{ zh: isZh }">
 		<div
 			class="message-wrapper flex"
-			:class="{ 'is-user': content.isUser, 'is-loading': content.loading }"
+			:class="{
+				'is-user': content.isUser,
+				'is-loading': content.loading
+			}"
 		>
 			<div class="thumb">
 				<img :src="content.isUser ? userAvatar : agentThumb" class="thumb-icon" />
@@ -56,10 +59,7 @@
 						:rehype-plugins="[rehypeRaw]"
 					>
 						<template v-slot:s-card="{ children: children, ...attrs }">
-							<Card
-								title="Trend Report"
-								@click.native="handleClickReport"
-							/>
+							<Card title="Trend Report" @click.native="handleClickReport" />
 						</template>
 						<template v-slot:s-url="{ children: children }">
 							<Url :list="content.webAddress" @click.native="handleClickUrls" />
@@ -129,7 +129,11 @@
 
 	const userStore = useUserInfoStore()
 
-	const { t } = useI18n()
+	const { t, locale } = useI18n()
+
+	const isZh = computed(() => {
+		return locale.value === 'CHINESE_SIMPLIFIED'
+	})
 
 	const props = defineProps<{
 		content: Object
@@ -181,7 +185,7 @@
 		},
 		heading: {
 			style: {
-				fontFamily: 'Regular',
+				fontFamily: isZh.value ? 'MisansRegular' : 'Regular',
 				lineHeight: 2
 				// fontSize: '1.4rem'
 			}
@@ -425,6 +429,13 @@
 			}
 		}
 	}
+	.agent-item.zh {
+		&,
+		.web-address,
+		.thinking {
+			font-family: 'MisansRegular';
+		}
+	}
 </style>
 
 <style lang="less">