Przeglądaj źródła

feat: 优化锁库详情左侧ui布局

lanjianrong 4 lat temu
rodzic
commit
1b52735fbe

+ 1 - 0
src/pages/Customer/Company/components/ChangeCompany/index.less

@@ -1,5 +1,6 @@
 .companyInput {
 .companyInput {
   padding: 8px 12px 6px;
   padding: 8px 12px 6px;
+  min-height: 38px;
   color: @primary-color;
   color: @primary-color;
   background: #f7f7f7;
   background: #f7f7f7;
   border: 1px solid #f7f7f7;
   border: 1px solid #f7f7f7;

+ 3 - 1
src/pages/Product/Lock/LockStore/components/CopyAuthorizeStr/index.jsx

@@ -4,11 +4,13 @@ import { Copy } from '@icon-park/react'
 import { CopyToClipboard } from 'react-copy-to-clipboard'
 import { CopyToClipboard } from 'react-copy-to-clipboard'
 import styles from '@/pages/Product/Lock/LockStore/components/ChangeClient/index.less'
 import styles from '@/pages/Product/Lock/LockStore/components/ChangeClient/index.less'
 import { isEmpty, isNullOrUnDef } from '@/utils/is'
 import { isEmpty, isNullOrUnDef } from '@/utils/is'
+import classNames from 'classnames'
 
 
 const CopyAuthorizeStr = ({ authorizeStr }) => {
 const CopyAuthorizeStr = ({ authorizeStr }) => {
   if (isNullOrUnDef(authorizeStr) || isEmpty(authorizeStr)) return null
   if (isNullOrUnDef(authorizeStr) || isEmpty(authorizeStr)) return null
+  const className = classNames(styles.companyInput, 'mb-2')
   return (
   return (
-    <div className={styles.companyInput}>
+    <div className={className}>
       <Card size="small">
       <Card size="small">
         <div className="flex justify-between">
         <div className="flex justify-between">
           <div className={`${styles.nameContent} ${styles.nameContentWidth}`}>{authorizeStr}</div>
           <div className={`${styles.nameContent} ${styles.nameContentWidth}`}>{authorizeStr}</div>

+ 3 - 1
src/pages/Product/Lock/LockStore/components/DownUpdateFile/index.jsx

@@ -3,6 +3,7 @@ import { Card, Tooltip } from 'antd'
 import { Download } from '@icon-park/react'
 import { Download } from '@icon-park/react'
 import styles from '@/pages/Product/Lock/LockStore/components/ChangeClient/index.less'
 import styles from '@/pages/Product/Lock/LockStore/components/ChangeClient/index.less'
 import { isEmpty, isNullOrUnDef } from '@/utils/is'
 import { isEmpty, isNullOrUnDef } from '@/utils/is'
+import classNames from 'classnames'
 
 
 const DownUpdateFile = ({ updateFile }) => {
 const DownUpdateFile = ({ updateFile }) => {
   const NewupdateFile = updateFile?.replace('/upload/longle/', '')
   const NewupdateFile = updateFile?.replace('/upload/longle/', '')
@@ -14,8 +15,9 @@ const DownUpdateFile = ({ updateFile }) => {
     document.body.appendChild(oa)
     document.body.appendChild(oa)
     oa.click()
     oa.click()
   }
   }
+  const className = classNames(styles.companyInput, 'mb-2')
   return (
   return (
-    <div className={styles.companyInput}>
+    <div className={className}>
       <Card size="small">
       <Card size="small">
         <div className="flex justify-between">
         <div className="flex justify-between">
           <div className={`${styles.nameContent} ${styles.nameContentWidth}`}>{NewupdateFile}</div>
           <div className={`${styles.nameContent} ${styles.nameContentWidth}`}>{NewupdateFile}</div>

+ 1 - 6
src/pages/Product/Lock/LockStore/components/LockDetail/Form.jsx

@@ -135,20 +135,15 @@ const LockForm = props => {
         <Col span={6}>注册码</Col>
         <Col span={6}>注册码</Col>
         <Col span={18}>
         <Col span={18}>
           <CopyAuthorizeStr authorizeStr={longle.authorizeStr} />
           <CopyAuthorizeStr authorizeStr={longle.authorizeStr} />
-        </Col>
-        <Col span={6} />
-        <Col span={18}>
           <small>
           <small>
             使用方法:复制以上注册码,打开软件帮助菜单/产品注册/下一步/下一步/选择&quot;手工输入注册码&quot;。将注册码不分段不空格复制粘贴到&quot;注册码&quot;栏内确定即可。
             使用方法:复制以上注册码,打开软件帮助菜单/产品注册/下一步/下一步/选择&quot;手工输入注册码&quot;。将注册码不分段不空格复制粘贴到&quot;注册码&quot;栏内确定即可。
           </small>
           </small>
         </Col>
         </Col>
+
         <Divider style={{ margin: '12px 0' }} />
         <Divider style={{ margin: '12px 0' }} />
         <Col span={6}>升级文件</Col>
         <Col span={6}>升级文件</Col>
         <Col span={18}>
         <Col span={18}>
           <DownUpdateFile updateFile={longle.updateFile} />
           <DownUpdateFile updateFile={longle.updateFile} />
-        </Col>
-        <Col span={6} />
-        <Col span={18}>
           <small>
           <small>
             使用方法:下载以上升级文件,打开软件帮助菜单/升级加密锁/下一步/下一步/选择“使用升级文件升级”,再点击下一步完成即可。
             使用方法:下载以上升级文件,打开软件帮助菜单/升级加密锁/下一步/下一步/选择“使用升级文件升级”,再点击下一步完成即可。
           </small>
           </small>