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

src/views/Workshop/profile.vue

@@ -2,7 +2,7 @@
 	import { ref, reactive, onMounted, inject } from 'vue'
 	import router from '@/router'
 	import { showConfirmDialog, showToast } from 'vant'
-	import { useUserInfoStore, useOverallStore } from '@/stores'
+	import { useUserInfoStore, useOverallStore,useGenerateStore } from '@/stores'
 	import { LogOut } from '@/api/login'
 	import { getCustomerList, type CustomerListParams, customerCheckin } from '@/api/workshop'
 	import MyEvent from '@/utils/myEvent'
@@ -15,6 +15,8 @@
 
 	const userInfoStore = useUserInfoStore()
 	const overallStore = useOverallStore()
+	const generateStore = useGenerateStore()
+
 	const emit = defineEmits(['selected-customer'])
 	const show = ref(false)
 	const isEdit = ref(false)
@@ -187,7 +189,8 @@
 			customerCheckin({ nickname: selectedCustomer.name }).then((res) => {
 				useUserInfoStore().resetGenerateParams()
 				MyEvent.emit('clear-generate-state')
-				useUserInfoStore().setCustomerInfo(res)
+				useGenerateStore().setCustomerInfo(res)
+				router.push({ path: '/workshop/home' })
 			})
 		}
 		showSwitchCustomerPopup.value = false

src/views/asistant/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="asistant-container flex flex-column">
     <div class="header">
-      <HeaderTitle hasSetting styleType="3" />
+      <HeaderTitle hasSetting styleType="3" @clickProfile="handleClickProfile" />
     </div>
     <div class="content flex-1">
       <NoticeList
@@ -17,12 +17,14 @@
         <div class="btn flex flex-center" @click="handleContinue">Generate</div>
       </div>
     </div>
+    <Profile ref="profileRef" />
   </div>
 </template>
 <script setup lang="ts">
 import HeaderTitle from '@/components/HeaderTitle.vue'
 import NoticeList from './components/NoticeList.vue'
 import InputArea from './components/InputArea.vue'
+import Profile from '../Workshop/profile.vue'
 import { ref, onMounted, onUnmounted, onActivated } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 import { useUserInfoStore, useGenerateStore } from '@/stores'
@@ -54,6 +56,11 @@ interface ChatMessage {
   self?: boolean
 }
 
+const profileRef = ref<InstanceType<typeof Profile> | null>(null)
+const handleClickProfile = () => {
+  profileRef.value.open()
+}
+
 const noticeListRef = ref<NoticeListRef | null>(null)
 const messageList = ref<ChatMessage[]>([])
 

src/views/login/customer.vue

@@ -88,7 +88,7 @@ const router = useRouter()
 const generateStore = useGenerateStore()
 const loading = ref(false)
 
-type PageMode = 'form' | 'entry' | 'create'
+type PageMode = 'entry' | 'form' | 'create'
 const pageMode = ref<PageMode>('entry')
 const formTitle = computed(() => {
   return pageMode.value === 'entry' || pageMode.value === 'form' ? 'Customer ID' : 'Create Profile'
@@ -147,7 +147,7 @@ const handleShowPopup = (flag: Boolean) => {
 }
 
 const handleSelectCustomer = (value) => {
-  if (value) {
+  if (value && pageMode.value  === 'form') {
     customerData.value.nickname = value.name
   }
 }
@@ -189,7 +189,7 @@ const handleBack = (e?: Event) => {
 
   .setting {
     z-index: 1;
-    padding: 3.17rem 4.9rem 0 8.4rem;
+    padding: 3.67rem 4.9rem 0 8.4rem;
     font-size: 7rem;
     .c-svg {
       width: initial;