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

src/components/HeaderTitle.vue

@@ -1,13 +1,23 @@
 <script setup lang="ts">
+	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'])
 
+	const profileVisible = ref(false)
+	const handleProfileVisibleChange = (visible) => {
+		profileVisible.value = visible
+	}
+	MyEvent.add('change-profile-visible',handleProfileVisibleChange)
+
 	const handleClickReturn = () => {
 		router.back()
 		// emit('clickReturn')
@@ -22,7 +32,9 @@
 	<div class="header-title">
 		<div class="return" @click="handleClickReturn"><SvgIcon name="return" size="34" /></div>
 		<span class="title">{{ title }}</span>
-		<div class="profile" @click="handleClickProfile"><SvgIcon name="profile" size="45" /></div>
+		<div class="profile" @click="handleClickProfile">
+			<SvgIcon :name="profileVisible ? 'profileFilledBlack' : 'profile_white'" size="45" />
+		</div>
 	</div>
 </template>
 

src/utils/myEvent.js

@@ -7,7 +7,6 @@ class MyEvent {
     MyEvent.list = MyEvent.list.filter(item => item.name != name && item.call != call)
   }
   emit(name, data) {
-    console.log('Myevent触发--',name)
     MyEvent.list.forEach(item => {
       if (item.name == name) item.call(data)
     })

src/views/Workshop/profile.vue

@@ -50,6 +50,7 @@
 		isEdit.value = true
 	}
 	const confirm = () => {
+		if (!isEdit.value) return
 		const password = form.password.value
 		const params = {
 			username: form.name.value,

src/views/login/customer.vue

@@ -5,7 +5,11 @@
   >
     <div class="setting flex flex-between">
       <SvgIcon name="left" size="70" @click.stop="handleBack" />
-      <SvgIcon name="profile_white" size="55" @click="handleOpenProfile" />
+      <SvgIcon
+        :name="profileVisible ? 'profileFilledWhite' : 'profile_white'"
+        size="55"
+        @click="handleOpenProfile"
+      />
     </div>
     <template v-if="pageMode === 'entry'">
       <div class="content flex-1 flex flex-center flex-column">
@@ -58,7 +62,12 @@
       </div>
     </template>
 
-    <Profile ref="profileRef" @selected-customer="handleSelectCustomer" is-customer />
+    <Profile
+      ref="profileRef"
+      @change-visible="handleChangeVisible"
+      @selected-customer="handleSelectCustomer"
+      is-customer
+    />
   </div>
 </template>
 <script setup lang="ts">
@@ -147,6 +156,11 @@ const handleSelectCustomer = (value) => {
   }
 }
 
+const profileVisible = ref(false)
+const handleChangeVisible = (visible: boolean) => {
+  profileVisible.value = visible
+}
+
 const handleBack = (e?: Event) => {
   if (e) {
     e.stopPropagation()