Merge branch 'main' of ssh://18.167.251.121:10002/aidlab/lanecarford_front
All checks were successful
git提交控制 AiDA WEB-Node.js main 分支构建部署 / build (20.19.0) (push) Has been skipped

This commit is contained in:
X1627315083
2025-12-30 15:57:20 +08:00
10 changed files with 548 additions and 546 deletions

View File

@@ -2,12 +2,11 @@
import { ref } from 'vue'
import { useRouter } from 'vue-router'
import MyEvent from '@/utils/myEvent'
const router = useRouter()
defineProps({
title: { type: String, default: 'STYLING ASSISTANT' },
title: { type: String, default: 'STYLING ASSISTANT' }
})
const emit = defineEmits(['clickReturn', 'clickProfile'])
@@ -16,7 +15,7 @@
const handleProfileVisibleChange = (visible) => {
profileVisible.value = visible
}
MyEvent.add('change-profile-visible',handleProfileVisibleChange)
MyEvent.add('change-profile-visible', handleProfileVisibleChange)
const handleClickReturn = () => {
router.back()
@@ -61,6 +60,7 @@
color: #2c2c2c;
font-family: 'satoshiRegular';
font-size: 4rem;
letter-spacing: 0.3rem;
}
> .profile {
position: absolute;

View File

@@ -234,7 +234,7 @@
margin-top: 5rem;
width: 73rem;
height: 109.5rem;
border-radius: 2rem;
border-radius: 1rem;
// box-shadow: 1.3rem 1.4rem 2rem 0.2rem #0000004d;
border: 0.2rem solid #d9d9d9;
overflow: hidden;
@@ -272,14 +272,13 @@
}
> .icons {
bottom: 0.27rem;
bottom: 3.6rem;
right: 0;
height: 10rem;
display: flex;
align-items: center;
justify-content: center;
> div {
margin-right: 1.5rem;
margin-right: 2.4rem;
width: 6.2rem;
height: 6.2rem;
border-radius: 1rem;
@@ -299,13 +298,13 @@
justify-content: space-between;
> button {
padding: 0;
font-family: satoshiRegular;
font-family: satoshiMedium;
border: none;
width: 34rem;
height: 9.2rem;
border-radius: 1.3rem;
font-weight: 400;
font-size: 3.8rem;
border-radius: 1rem;
font-weight: 500;
font-size: 4rem;
&:active {
opacity: 0.7;
}
@@ -325,7 +324,7 @@
background-color: #fff;
background-clip: padding-box;
border: 0.25rem solid transparent;
border-radius: 1.3rem;
border-radius: 1rem;
}
}
> :first-child.finish {

View File

@@ -13,7 +13,9 @@
<div class="content">
<div class="title">Thank you.</div>
<div class="tip">
We are starting to learn your preferences, Looking forward to see you again,
We are starting to learn your preferences,
<br />
Looking forward to see you again,
</div>
</div>
</div>
@@ -33,21 +35,19 @@
background-size: cover;
> .content {
position: absolute;
top: 12.9rem;
left: 6rem;
// width: 100%;
top: 15.4rem;
left: 9.6rem;
display: flex;
flex-direction: column;
> .title {
font-family: satoshiBold;
font-size: 14.7rem;
font-size: 11rem;
line-height: 124%;
}
> .tip {
margin-top: 2.5rem;
width: 58.2rem;
font-family: satoshiRegular;
font-size: 4.1rem;
font-size: 4rem;
line-height: 132%;
}
}

View File

@@ -117,7 +117,7 @@
> .title {
font-family: satoshiBold;
font-size: 8.9rem;
font-size: 8.6rem;
text-align: left;
line-height: 124%;
margin: 5rem 9.1rem;
@@ -143,7 +143,7 @@
margin-top: 0;
}
> .image {
width: 22.9rem;
width: 19.2rem;
height: 100%;
overflow: hidden;
border-radius: 2rem;
@@ -151,7 +151,7 @@
> img {
width: 100%;
height: 100%;
object-fit: cover;
object-fit: contain;
display: block;
}
}
@@ -160,41 +160,33 @@
display: flex;
flex-direction: column;
height: 90%;
> .userID {
font-family: satoshiRegular;
font-weight: 500;
font-size: 3.8rem;
line-height: 89%;
color: #000;
}
> .datetime {
margin-top: 1.8rem;
font-family: satoshiRegular;
font-weight: 400;
margin-top: 1rem;
font-family: satoshiMedium;
font-weight: 500;
font-size: 3.2rem;
line-height: 89%;
color: #000;
}
> .lastopened {
margin-top: 1rem;
margin-top: 1.8rem;
font-family: satoshiRegular;
font-weight: 400;
font-style: Regular;
font-size: 2.6rem;
line-height: 89%;
color: #6f6f6f;
}
> button {
margin-top: auto;
font-family: satoshiRegular;
width: 12.3rem;
height: 3.8rem;
border-radius: 0.5rem;
box-sizing: content-box;
border: 0.193rem solid #000;
line-height: 100%;
border-radius: 0.4rem;
border: 0.2rem solid #000;
background: transparent;
font-family: satoshiRegular;
font-weight: 400;
font-size: 2.576rem;
font-size: 2.4rem;
color: #000;
margin-right: 5rem;
&:active {
@@ -208,8 +200,8 @@
right: 2rem;
width: 5.5rem;
height: 5.5rem;
border: 0.188rem solid #000;
border-radius: 1.88rem;
border: 0.188rem solid rgba(0, 0, 0, 0.5);
border-radius: 0.9rem;
display: flex;
align-items: center;
justify-content: center;

File diff suppressed because it is too large Load Diff

View File

@@ -197,7 +197,9 @@ const startRecording = () => {
// 检查浏览器支持
if (!('webkitSpeechRecognition' in window) && !('SpeechRecognition' in window)) {
// alert('您的浏览器不支持语音识别功能')
showToast('Your browser does not support speech recognition, please try again with another browser')
showToast(
'Your browser does not support speech recognition, please try again with another browser'
)
isRecording.value = false
return
}
@@ -296,7 +298,7 @@ const stopRecording = () => {
.shortcut-item {
font-size: 4.2rem;
width: fit-content;
font-family: 'robotoRegular';
font-family: 'satoshiMedium';
white-space: nowrap;
height: 8.1rem;
line-height: 8.1rem;
@@ -351,8 +353,8 @@ const stopRecording = () => {
outline: none;
background: transparent;
font-size: 4rem;
font-family: 'robotoRegular';
font-weight: 400;
font-family: 'satoshiMedium';
font-weight: 500;
line-height: 4.8rem; /* 设置行高等于实际渲染高度,实现垂直居中 */
padding: 0;
color: #000;
@@ -361,8 +363,8 @@ const stopRecording = () => {
&::placeholder {
color: #888;
letter-spacing: -0.01em;
font-weight: 400;
font-family: 'robotoRegular';
font-weight: 500;
font-family: 'satoshiMedium';
word-spacing: -5px;
line-height: 4.8rem;
}

View File

@@ -103,13 +103,15 @@ const actionList: ActionItem[] = [
display: flex;
margin-bottom: 16px;
align-items: flex-start;
color: #000;
.message-text {
font-size: 4.2rem;
font-family: 'robotoRegular';
font-size: 4rem;
font-family: 'satoshiMedium';
line-height: 121%;
font-weight: 400;
font-weight: 500;
background-color: #efefef;
padding: 3.43rem 4.35rem;
letter-spacing: -0.01em;
}
&.user-message {

View File

@@ -4,7 +4,7 @@
<div class="content">
<!-- 返回按钮 -->
<div class="back-button" @click="goBack">
<img src="@/assets/images/arrow_left.png" class="back-icon" />
<SvgIcon name="left" size="50" color="#fff" />
</div>
<!-- 标题区域 -->
@@ -133,9 +133,9 @@ const handleSuccess = (data: any) => {
cursor: pointer;
z-index: 3;
font-size: 3.4rem;
.back-icon {
width: 2.83rem;
height: 3.47rem;
.c-svg {
width: initial;
height: initial;
}
}

View File

@@ -2,7 +2,7 @@
<div class="login-page">
<div class="content">
<div class="back-button" @click="goBack">
<img src="@/assets/images/arrow_left.png" class="back-icon" />
<SvgIcon name="left" size="50" color="#fff" />
</div>
<div class="header">
@@ -187,9 +187,9 @@ const handleGoogleSignup = async (accessToken: string) => {
cursor: pointer;
z-index: 3;
font-size: 3.4rem;
.back-icon {
width: 2.83rem;
height: 3.47rem;
.c-svg {
width: initial;
height: initial;
}
}

View File

@@ -143,7 +143,7 @@ const handleConfirm = async () => {
const handleShowPopup = (flag: Boolean) => {
// showPopup.value = flag
profileRef.value.handleShowPopup(flag)
profileRef.value.handleShowPopup(flag,true)
}
const handleSelectCustomer = (value) => {
@@ -189,7 +189,7 @@ const handleBack = (e?: Event) => {
.setting {
z-index: 1;
padding: 3.67rem 4.9rem 0 8.4rem;
padding: 16.4rem 4.9rem 0 8.4rem;
font-size: 7rem;
.c-svg {
width: initial;