Merge branch 'master' of http://192.168.1.41:3000/outaozhen/cldV2react

src/pages/Customer/Company/components/CompanyDetail/CompanyLowerList.jsx

@@ -4,7 +4,7 @@ import { dayjsFormat } from '@/utils/utils'
 const CompanyLowerList = props => {
   // const { toggleModal, setModalProps } = useModal()
   const {
-    log: { log: logs = [], total = 0 },
+    log: { log: logs = [] },
     servicelist
   } = props
   const servicelogEnum = {

src/pages/Customer/Company/components/CompanyDetail/index.jsx

@@ -2,9 +2,9 @@ import React, { useState, useEffect } from 'react'
 import { Row, Col, Spin, Tooltip } from 'antd'
 import consts from '@/consts'
 import { apiCompanyDetail } from '@/services/customer'
-import CompanyForm from './CompanyForm'
-import CompanyLowerList from './CompanyLowerList'
-import CompanyTabList from './CompanyTabList'
+import CompanyForm from './Form'
+import CompanyLowerList from './LowerList'
+import CompanyTabList from './TabList'
 import { connect } from 'dva'
 import { Up, Down } from '@icon-park/react'
 import { FlipOverEnum, useFlipOver } from '@/hooks/web/useFlipOver'

src/pages/Customer/Contact/components/ChangeCompany/index.jsx

@@ -3,7 +3,7 @@ import { LinkOne, LinkInterrupt, Switch } from '@icon-park/react'
 import { Card, Tooltip } from 'antd'
 import React from 'react'
 import styles from './index.less'
-import SearchModal from '@/pages/Customer/Contact/components/CustomerModal'
+import SearchModal from '@/pages/Customer/Contact/components/ConnectCompany'
 import { apiDelCustomer } from '@/services/customer'
 import { useDispatch } from 'dva'
 import consts from '@/consts'

src/pages/Product/Lock/Lockstore/components/LocksDetail/LockModal.jsx

@@ -211,7 +211,7 @@ const LockModal = props => {
                     <span className="w-1/6">{item.clientName}</span>
                     <span className="w-1/6">{item.position}</span>
                     <span className="w-1/6">{item.telephone}</span>
-                    <span className="w-1/2 zh-justify-between">
+                    <span className="w-1/2 flex justify-between">
                       <span>{item.companyName}</span>
                       <Button type="primary" size="small" onClick={() => connectClient(item.id)}>
                         选择ta
@@ -230,8 +230,8 @@ const LockModal = props => {
             <Spin spinning={state.laoding}>
               {state.longle.map(item => (
                 <div key={item.id} className={styles.card}>
-                  <div className="zh-flex-sub">{item.keyNum}</div>
-                  <div className="zh-flex-sub zh-justify-between">
+                  <div className="flex flex-1">{item.keyNum}</div>
+                  <div className="flex flex-1 justify-between">
                     <span>{item.product}</span>
                     <Button type="primary" size="small" onClick={() => connectLongle(item.id)}>
                       更换