From 8201099a4366e5c658da5229564c819f5fbe1475 Mon Sep 17 00:00:00 2001
From: xuan <w1359774872@gmail.com>
Date: Mon, 6 Mar 2023 17:45:45 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E7=AB=8B=E5=8D=B3=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0):=20=E4=BF=AE=E5=A4=8D=E7=AB=8B=E5=8D=B3=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E7=82=B9=E5=87=BB=E6=B2=A1=E5=8F=8D=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/organizationNameModal/index.tsx    |  4 +++-
 src/pages/details/components/orderCount/index.tsx | 11 ++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/organizationNameModal/index.tsx b/src/components/organizationNameModal/index.tsx
index fe0319d..36f7149 100644
--- a/src/components/organizationNameModal/index.tsx
+++ b/src/components/organizationNameModal/index.tsx
@@ -13,6 +13,7 @@ interface PropsType {
   onShowModalChange?: (val: boolean) => void
   onCancel?: () => void
   onConfirm?: (val: string) => void
+  zIndex?: number
 }
 const OrganizationNameModal = (props: PropsType) => {
   const {
@@ -21,6 +22,7 @@ const OrganizationNameModal = (props: PropsType) => {
     onShowModalChange,
     onCancel,
     onConfirm,
+    zIndex = 9999,
   } = props
 
   const handleClose = () => {
@@ -78,7 +80,7 @@ const OrganizationNameModal = (props: PropsType) => {
     setInputStyles(() => [])
   }
 
-  return <Dialog show={showModal} customStyles={{ zIndex: '9999' }} onClose={handleClose} onChange={onShowModalChange}>
+  return <Dialog show={showModal} customStyles={{ zIndex }} onClose={handleClose} onChange={onShowModalChange}>
     <View className={styles.organizationNameModal}>
       <View className={styles.organizationNameModal_title}>请设置您的组织昵称</View>
       <View className={styles.organizationNameModal_content}>
diff --git a/src/pages/details/components/orderCount/index.tsx b/src/pages/details/components/orderCount/index.tsx
index 7c3a2b0..74f6b84 100644
--- a/src/pages/details/components/orderCount/index.tsx
+++ b/src/pages/details/components/orderCount/index.tsx
@@ -228,11 +228,12 @@ const OrderCount = ({ show = false, onClose, title = '', productId = 0, is_first
       })
       return false
     }
+    setShowModal(true)
+    return
     // 检测是否修改过组织昵称
-    if (userInfo.adminUserInfo.first_change_name) {
-      setShowModal(true)
-      return
-    }
+    // if (userInfo.adminUserInfo.first_change_name) {
+    //   return
+    // }
     Taro.navigateTo({
       url: `/pages/order/speedComfirm?sale_mode=${Number(selectIndex)}&buyList=${JSON.stringify(selectCount.color_list)}`,
     })
@@ -499,7 +500,7 @@ const OrderCount = ({ show = false, onClose, title = '', productId = 0, is_first
       <View>
         <LabAndImgShow value={labImageValue} show={showLabImage} onClose={closeLabImgShow} />
       </View>
-      <OrganizationNameModal showModal={showModal} onClose={handleClose} onShowModalChange={handleShowChange} onConfirm={handleOrganizationNameModalConfirm} />
+      <OrganizationNameModal zIndex={99999} showModal={showModal} onClose={handleClose} onShowModalChange={handleShowChange} onConfirm={handleOrganizationNameModalConfirm} />
 
     </View>
   )