Merge branch 'main' of ssh://18.167.251.121:10002/aidlab/lanecarford_front

src/components/HeaderTitle.vue

@@ -5,9 +5,8 @@
 
 	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;

src/views/Workshop/customize.vue

@@ -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 {

src/views/Workshop/end.vue

@@ -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%;
 			}
 		}

src/views/Workshop/library.vue

@@ -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;

src/views/Workshop/profile.vue

@@ -1,57 +1,61 @@
 <script setup lang="ts">
-	import { ref, reactive, onMounted, inject } from 'vue'
-	import router from '@/router'
-	import { showConfirmDialog, showToast } from 'vant'
-	import { useUserInfoStore, useOverallStore,useGenerateStore } from '@/stores'
-	import { LogOut } from '@/api/login'
-	import { getCustomerList, type CustomerListParams, customerCheckin } from '@/api/workshop'
-	import MyEvent from '@/utils/myEvent'
-	import { encryptPassword } from '@/utils/tools'
-	import { updateUserInfo } from '@/api/login'
+import { ref, reactive, onMounted, inject, watch } from 'vue'
+import router from '@/router'
+import { showConfirmDialog, showToast } from 'vant'
+import { useUserInfoStore, useOverallStore, useGenerateStore } from '@/stores'
+import { LogOut } from '@/api/login'
+import { getCustomerList, type CustomerListParams, customerCheckin } from '@/api/workshop'
+import MyEvent from '@/utils/myEvent'
+import { encryptPassword } from '@/utils/tools'
+import { updateUserInfo } from '@/api/login'
 
-	const props = defineProps<{
+const props = defineProps<{
   isCustomer?: boolean
-	}>()
+}>()
 
-	const userInfoStore = useUserInfoStore()
-	const overallStore = useOverallStore()
-	const generateStore = useGenerateStore()
+const userInfoStore = useUserInfoStore()
+const overallStore = useOverallStore()
+const generateStore = useGenerateStore()
 
-	const emit = defineEmits(['selected-customer'])
-	const show = ref(false)
-	const isEdit = ref(false)
-	const form = reactive({
+const emit = defineEmits(['selected-customer', 'change-visible'])
+const show = ref(false)
+const isEdit = ref(false)
+const form = reactive({
   name: { msg: '', value: '' },
   email: { msg: '', value: '' },
   password: { show: true, msg: '', value: '' }
-	})
-	const open = () => {
+})
+const open = () => {
   form.name.value = userInfoStore.state.userInfo.username
   form.email.value = userInfoStore.state.userInfo.email
   form.password.value = ''
   isEdit.value = false
   show.value = true
-	}
-	const close = () => {
+}
+const close = () => {
   show.value = false
-	}
-	const onEditItem = (item) => {
+}
+watch(show, (newVal) => {
+  emit('change-visible', newVal)
+  MyEvent.emit('change-profile-visible', newVal)
+})
+const onEditItem = (item) => {
   if (!form[item]) return
   form[item].edit = true
-	}
-	const onSaveItem = (item) => {
+}
+const onSaveItem = (item) => {
   if (!form[item]) return
   form[item].edit = false
-	}
-	const switchCustomer = () => {
+}
+const switchCustomer = () => {
   // console.log('switchCustomer')
   handleShowPopup(true)
-	}
-	const edit = () => {
+}
+const edit = () => {
   form.password.value = ''
   isEdit.value = true
-	}
-	const confirm = () => {
+}
+const confirm = () => {
   if (!isEdit.value) return
   const password = form.password.value
   const params = {
@@ -80,8 +84,8 @@
     form.password.value = ''
     isEdit.value = false
   })
-	}
-	const logout = () => {
+}
+const logout = () => {
   showConfirmDialog({
     title: 'Log out',
     message: 'Are you sure you want to log out?',
@@ -95,23 +99,23 @@
       })
     })
     .catch(() => {})
-	}
+}
 
-	const showSwitchCustomerPopup = ref(false)
-	const custmerParams = ref<CustomerListParams>({
+const showSwitchCustomerPopup = ref(false)
+const custmerParams = ref<CustomerListParams>({
   current: 1,
   size: 5,
   desc: true
-	})
-	const customerList = ref<any[]>([])
-	const pager = reactive({
+})
+const customerList = ref<any[]>([])
+const pager = reactive({
   loading: false,
   noMore: false,
   total: null as number | null
-	})
-	const customerListEl = ref<HTMLElement | null>(null)
+})
+const customerListEl = ref<HTMLElement | null>(null)
 
-	const loadCustomers = async (reset = false) => {
+const loadCustomers = async (reset = false) => {
   if (pager.loading) return
   if (reset) {
     custmerParams.value.current = 1
@@ -155,36 +159,39 @@
   } finally {
     pager.loading = false
   }
-	}
+}
 
-	const onScroll = (e: Event) => {
+const onScroll = (e: Event) => {
   const el = e.target as HTMLElement
   if (!el) return
   if (pager.loading || pager.noMore) return
   if (el.scrollTop + el.clientHeight >= el.scrollHeight - 50) {
     loadCustomers(false)
   }
-	}
-	// 打开customer选择时关闭profile弹窗 如果不是点击confirem关闭则重新打开profile弹窗
-	const handleShowPopup = (flag: boolean) => {
+}
+// 打开customer选择时关闭profile弹窗 如果不是点击confirem关闭则重新打开profile弹窗
+let isCustomerOnly = false
+const handleShowPopup = (flag: boolean, customer: boolean) => {
+	// customer: 是否是顾客页面只展示customer选择弹窗
+	isCustomerOnly = customer
   showSwitchCustomerPopup.value = flag
-		if (props.isCustomer) return
+  if (isCustomerOnly) return
   show.value = !flag
   if (flag) {
     loadCustomers(true)
   }
-	}
-	const handleChangeChecked = (item) => {
+}
+const handleChangeChecked = (item) => {
   customerList.value.forEach((customer) => {
     customer.checked = customer.vipId === item.vipId
   })
-	}
-	const handleSelectCustomer = () => {
+}
+const handleSelectCustomer = () => {
   const selectedCustomer = customerList.value.find((customer) => customer.checked)
   if (selectedCustomer) {
     emit('selected-customer', selectedCustomer)
   }
-		if (!props.isCustomer) {
+  if (!isCustomerOnly) {
     // show.value = true
     customerCheckin({ nickname: selectedCustomer.name }).then((res) => {
       useUserInfoStore().resetGenerateParams()
@@ -194,22 +201,22 @@
     })
   }
   showSwitchCustomerPopup.value = false
-	}
+}
 
-	const handleFetchCustomerList = () => {
+const handleFetchCustomerList = () => {
   loadCustomers(true)
-	}
-	MyEvent.add('update-customer-list', handleFetchCustomerList)
+}
+MyEvent.add('update-customer-list', handleFetchCustomerList)
 
-	// const openSwitchCustomerPopup = (flag = true) => {
-	//   showSwitchCustomerPopup.value = flag
-	// }
+// const openSwitchCustomerPopup = (flag = true) => {
+//   showSwitchCustomerPopup.value = flag
+// }
 
-	onMounted(() => {
+onMounted(() => {
   handleFetchCustomerList()
-	})
+})
 
-	defineExpose({ open, close, handleShowPopup })
+defineExpose({ open, close, handleShowPopup })
 </script>
 
 <template>
@@ -334,11 +341,11 @@
 </template>
 
 <style scoped lang="less">
-	.van-popup {
+.van-popup {
   max-height: 90%;
   --van-popup-round-radius: 7.8rem;
-	}
-	.profile {
+}
+.profile {
   margin: 6.5rem 0;
   display: flex;
   flex-direction: column;
@@ -447,9 +454,9 @@
       margin-top: 17.8rem;
     }
   }
-	}
+}
 
-	.van-popup.user-popup {
+.van-popup.user-popup {
   height: 116.1rem;
   color: #181725;
   border-top-left-radius: 7.8rem;
@@ -519,5 +526,5 @@
     box-sizing: border-box;
     text-align: center;
   }
-	}
+}
 </style>

src/views/asistant/components/InputArea.vue

@@ -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;
   }

src/views/asistant/components/NoticeItem.vue

@@ -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 {

src/views/login/ResetPage.vue

@@ -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;
   }
 }
 

src/views/login/SignupPage.vue

@@ -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;
   }
 }
 

src/views/login/customer.vue

@@ -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;