aidlab/lanecarford_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
Details

Browse Source
This commit is contained in:
X1627315083
2025-12-30 15:57:20 +08:00
parent cf15e371ab ef314931eb
commit e230b4c83f
10 changed files with 548 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/HeaderTitle.vue
View File

@@ -5,9 +5,8 @@
const router = useRouter() const router = useRouter()
defineProps({ defineProps({
title: { type: String, default: 'STYLING ASSISTANT' }, title: { type: String, default: 'STYLING ASSISTANT' }
}) })
const emit = defineEmits(['clickReturn', 'clickProfile']) const emit = defineEmits(['clickReturn', 'clickProfile'])
@@ -61,6 +60,7 @@
color: #2c2c2c; color: #2c2c2c;
font-family: 'satoshiRegular'; font-family: 'satoshiRegular';
font-size: 4rem; font-size: 4rem;
letter-spacing: 0.3rem;
} }
> .profile { > .profile {
position: absolute; position: absolute;

17
src/views/Workshop/customize.vue
View File

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

14
src/views/Workshop/end.vue
View File

@@ -13,7 +13,9 @@
<div class="content"> <div class="content">
<div class="title">Thank you.</div> <div class="title">Thank you.</div>
<div class="tip"> <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> </div>
</div> </div>
@@ -33,21 +35,19 @@
background-size: cover; background-size: cover;
> .content { > .content {
position: absolute; position: absolute;
top: 12.9rem; top: 15.4rem;
left: 6rem; left: 9.6rem;
// width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
> .title { > .title {
font-family: satoshiBold; font-family: satoshiBold;
font-size: 14.7rem; font-size: 11rem;
line-height: 124%; line-height: 124%;
} }
> .tip { > .tip {
margin-top: 2.5rem; margin-top: 2.5rem;
width: 58.2rem;
font-family: satoshiRegular; font-family: satoshiRegular;
font-size: 4.1rem; font-size: 4rem;
line-height: 132%; line-height: 132%;
} }
} }

36
src/views/Workshop/library.vue
View File

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

17
src/views/Workshop/profile.vue
View File

@@ -1,5 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, reactive, onMounted, inject } from 'vue' import { ref, reactive, onMounted, inject, watch } from 'vue'
import router from '@/router' import router from '@/router'
import { showConfirmDialog, showToast } from 'vant' import { showConfirmDialog, showToast } from 'vant'
import { useUserInfoStore, useOverallStore, useGenerateStore } from '@/stores' import { useUserInfoStore, useOverallStore, useGenerateStore } from '@/stores'
@@ -17,7 +17,7 @@
const overallStore = useOverallStore() const overallStore = useOverallStore()
const generateStore = useGenerateStore() const generateStore = useGenerateStore()
const emit = defineEmits(['selected-customer']) const emit = defineEmits(['selected-customer', 'change-visible'])
const show = ref(false) const show = ref(false)
const isEdit = ref(false) const isEdit = ref(false)
const form = reactive({ const form = reactive({
@@ -35,6 +35,10 @@
const close = () => { const close = () => {
show.value = false show.value = false
} }
watch(show, (newVal) => {
emit('change-visible', newVal)
MyEvent.emit('change-profile-visible', newVal)
})
const onEditItem = (item) => { const onEditItem = (item) => {
if (!form[item]) return if (!form[item]) return
form[item].edit = true form[item].edit = true
@@ -166,9 +170,12 @@
} }
} }
// 打开customer选择时关闭profile弹窗 如果不是点击confirem关闭则重新打开profile弹窗 // 打开customer选择时关闭profile弹窗 如果不是点击confirem关闭则重新打开profile弹窗
const handleShowPopup = (flag: boolean) => { let isCustomerOnly = false
const handleShowPopup = (flag: boolean, customer: boolean) => {
// customer: 是否是顾客页面只展示customer选择弹窗
isCustomerOnly = customer
showSwitchCustomerPopup.value = flag showSwitchCustomerPopup.value = flag
if (props.isCustomer) return if (isCustomerOnly) return
show.value = !flag show.value = !flag
if (flag) { if (flag) {
loadCustomers(true) loadCustomers(true)
@@ -184,7 +191,7 @@
if (selectedCustomer) { if (selectedCustomer) {
emit('selected-customer', selectedCustomer) emit('selected-customer', selectedCustomer)
} }
if (!props.isCustomer) { if (!isCustomerOnly) {
// show.value = true // show.value = true
customerCheckin({ nickname: selectedCustomer.name }).then((res) => { customerCheckin({ nickname: selectedCustomer.name }).then((res) => {
useUserInfoStore().resetGenerateParams() useUserInfoStore().resetGenerateParams()

14
src/views/asistant/components/InputArea.vue
View File

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

8
src/views/asistant/components/NoticeItem.vue
View File

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

8
src/views/login/ResetPage.vue
View File

@@ -4,7 +4,7 @@
<div class="content"> <div class="content">
<!-- 返回按钮 --> <!-- 返回按钮 -->
<div class="back-button" @click="goBack"> <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>
<!-- 标题区域 --> <!-- 标题区域 -->
@@ -133,9 +133,9 @@ const handleSuccess = (data: any) => {
cursor: pointer; cursor: pointer;
z-index: 3; z-index: 3;
font-size: 3.4rem; font-size: 3.4rem;
.back-icon { .c-svg {
width: 2.83rem; width: initial;
height: 3.47rem; height: initial;
} }
} }

8
src/views/login/SignupPage.vue
View File

@@ -2,7 +2,7 @@
<div class="login-page"> <div class="login-page">
<div class="content"> <div class="content">
<div class="back-button" @click="goBack"> <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>
<div class="header"> <div class="header">
@@ -187,9 +187,9 @@ const handleGoogleSignup = async (accessToken: string) => {
cursor: pointer; cursor: pointer;
z-index: 3; z-index: 3;
font-size: 3.4rem; font-size: 3.4rem;
.back-icon { .c-svg {
width: 2.83rem; width: initial;
height: 3.47rem; height: initial;
} }
} }

4
src/views/login/customer.vue
View File

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