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

src/views/Workshop/product.vue

@@ -222,6 +222,7 @@ const { isLoading } = toRefs(data);
 			margin-top: 4.3rem;
 			> .history{
 				width: 30.2rem;
+				margin-left: calc(7% / 2);
 				height: 6.52rem;
 				border-radius: 0.91rem;
 				border: 0.24rem solid #000;

src/views/Workshop/profile.vue

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

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;