Merge branches 'main' and 'main' of ssh://18.167.251.121:10002/aidlab/lanecarford_front

src/views/Workshop/profile.vue

@@ -172,10 +172,11 @@ const onScroll = (e: Event) => {
 // 打开customer选择时关闭profile弹窗 如果不是点击confirem关闭则重新打开profile弹窗
 let isCustomerOnly = false
 const handleShowPopup = (flag: boolean, customer: boolean) => {
+  console.log(flag,customer)
 	// customer: 是否是顾客页面只展示customer选择弹窗
 	isCustomerOnly = customer
   showSwitchCustomerPopup.value = flag
-  if (isCustomerOnly) return
+  if (props.isCustomer) return
   show.value = !flag
   if (flag) {
     loadCustomers(true)
@@ -310,7 +311,7 @@ defineExpose({ open, close, handleShowPopup })
   >
     <div class="popup-title flex">
       <div class="title-txt">Saved Customer ID</div>
-      <SvgIcon name="close_nocolor" color="#a1a1a1" size="40" @click="handleShowPopup(false)" />
+      <SvgIcon name="close_nocolor" color="#a1a1a1" size="40" @click="handleShowPopup(false,false)" />
     </div>
     <div ref="customerListEl" class="cusomter-list" @scroll="onScroll">
       <div