🔧 build(svg): 升级taro-iconfont-svg依赖

src/components/customer/index.tsx

@@ -9,8 +9,8 @@ import { alert } from '@/common/common'
 
 interface Param {
   onClose?: () => void
-  show: boolean,
-  messageTitle?: string,
+  show: boolean
+  messageTitle?: string
   messagePath?: string
   showCard?: true|false
 }
@@ -46,7 +46,7 @@ export default (props: Param) => {
             className={styles.customer}
             openType="contact"
             sendMessageTitle={props.messageTitle}
-            showMessageCard = {props.showCard}
+            showMessageCard={props.showCard}
             sendMessagePath={props.messagePath}
           ></Button>
         </View>

src/components/shopCart/index.tsx

@@ -14,7 +14,7 @@ import Popup from '@/components/popup'
 import MCheckbox from '@/components/checkbox'
 import LoadingCard from '@/components/loadingCard'
 import InfiniteScroll from '@/components/infiniteScroll'
-import { alert, goLink } from '@/common/common'
+import { alert, goLink, retrieval } from '@/common/common'
 import { DelShoppingCartApi, GetShoppingCartApi, UpdateShoppingCartApi } from '@/api/shopCart'
 import { formatHashTag, formatImgUrl, formatPriceDiv } from '@/common/fotmat'
 import { setParam } from '@/common/system'
@@ -22,6 +22,9 @@ import { debounce, throttle } from '@/common/util'
 import { ApplyOrderAccessApi, GetAdminUserInfoApi, SubscriptionMessageApi } from '@/api/user'
 import useCommonData from '@/use/useCommonData'
 import type { saleModeType } from '@/common/enum'
+import { useSelector } from '@/reducers/hooks'
+import { companyDetailApi, companyUpdateApi } from '@/api/company'
+import useLogin from '@/use/useLogin'
 
 interface param {
   show?: true | false
@@ -46,6 +49,8 @@ const ShopCart = ({ show = false, onClose, intoStatus = 'shop', default_sale_mod
     { value: 1, title: '剪板', unit: '米', eunit: 'm', step: 1, digits: 2, minNum: 0.3, maxNum: 100000, defaultNum: 0.3 },
     { value: 2, title: '散剪', unit: '米', eunit: 'kg', step: 1, digits: 2, minNum: 3, maxNum: 100000, defaultNum: 3 },
   ]
+  const userInfo = useSelector(state => state.userInfo)
+
   const bindSalesManDialogRef = useRef<SalesManDialogRef | null>(null)
   const [isPending, startTransition] = useTransition()
 
@@ -276,12 +281,11 @@ const ShopCart = ({ show = false, onClose, intoStatus = 'shop', default_sale_mod
     if (res.data.order_access_status !== 3) {
       if (res.data.order_access_status == 1) { applyOrderAccessFetchData() }
       bindSalesManDialogRef.current?.handleChange(true)
-      // setShowBindSalesman(() => true)
       onClose?.()
       return
     }
-    // TODO 检测是否修改过组织昵称
-    if (false) {
+    // 检测是否修改过组织昵称
+    if (userInfo.adminUserInfo.first_change_name) {
       setShowModal(true)
       return
     }
@@ -323,7 +327,31 @@ const ShopCart = ({ show = false, onClose, intoStatus = 'shop', default_sale_mod
       setSelectStatus(true)
     })
   }, [selectIndex])
-
+  // 弹出修改组织昵称弹窗
+  const handleBindSalesManSuccess = () => {
+    // 检测是否修改过组织昵称
+    if (userInfo.adminUserInfo.first_change_name) {
+      setShowModal(true)
+    }
+  }
+  const { getAdminUserInfo } = useLogin()
+  const { fetchData: saveFetch } = companyUpdateApi()
+  const { fetchData: getCompanyFetch } = companyDetailApi()
+  const handleOrganizationNameModalConfirm = async(text: string) => {
+    const params = await getCompanyFetch()
+    const result = await saveFetch({
+      ...params.data,
+      company_name: text,
+    })
+    if (result.success) {
+      getAdminUserInfo()
+      handleClose()
+      alert.success('保存成功')
+    }
+    else {
+      alert.none(result.msg)
+    }
+  }
   return (
     <View className={styles.shop_cart_main}>
       <Popup showTitle={false} show={showPopup} onClose={() => closePopup()}>
@@ -389,12 +417,12 @@ const ShopCart = ({ show = false, onClose, intoStatus = 'shop', default_sale_mod
         </View>
       </Popup>
       <View>
-        <BindSalesManDialog ref={bindSalesManDialogRef} />
+        <BindSalesManDialog ref={bindSalesManDialogRef} onSuccess={handleBindSalesManSuccess} />
       </View>
       <View>
         <LabAndImgShow value={labImageValue} show={showLabImage} onClose={closeLabImgShow} />
       </View>
-      <OrganizationNameModal showModal={showModal} onClose={handleClose} onShowModalChange={handleShowChange} />
+      <OrganizationNameModal showModal={showModal} onClose={handleClose} onShowModalChange={handleShowChange} onConfirm={handleOrganizationNameModalConfirm} />
     </View>
   )
 }