From 53d6d49d6de8eb59be8a26ce7cef321d6d5f9885 Mon Sep 17 00:00:00 2001 From: xuan Date: Tue, 27 Dec 2022 11:09:04 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf(=E5=AE=8C=E6=88=90UI?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=92=8C=E9=80=BB=E8=BE=91):=20=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/constant.ts | 6 +- src/components/bindSalesManDialog/index.tsx | 3 - .../organizationNameModal/index.module.scss | 22 ++++++-- .../organizationNameModal/index.tsx | 31 +++++++---- .../components/ModifyModal/index.module.scss | 55 ++++++++++--------- .../userEdit/components/ModifyModal/index.tsx | 14 ++++- src/pages/userEdit/index.tsx | 14 ++++- 7 files changed, 89 insertions(+), 56 deletions(-) diff --git a/src/common/constant.ts b/src/common/constant.ts index cc281c1..100e8f9 100644 --- a/src/common/constant.ts +++ b/src/common/constant.ts @@ -1,11 +1,11 @@ -// export const BASE_URL = CURRENT_BASE_URL +export const BASE_URL = CURRENT_BASE_URL // export const BASE_URL = `http://192.168.0.75:50001/lymarket` // export const BASE_URL = `http://192.168.0.89:50001/lymarket` // export const BASE_URL = `http://10.0.0.5:50001/lymarket` // export const BASE_URL = `http://192.168.0.89:40001/lymarket` // export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞 -// export const BASE_URL = `https://test.zzfzyc.com/lymarket` // 测试环境 -export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布 +// export const BASE_URL = 'https://test.zzfzyc.com/lymarket' // 测试环境 +// export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布 // export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发 // export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发 diff --git a/src/components/bindSalesManDialog/index.tsx b/src/components/bindSalesManDialog/index.tsx index 97072f0..08acd24 100644 --- a/src/components/bindSalesManDialog/index.tsx +++ b/src/components/bindSalesManDialog/index.tsx @@ -8,14 +8,11 @@ import NormalButton from '../normalButton' import LayoutBlock from '../layoutBlock' import IconText from '../iconText' import IconFont from '../iconfont/iconfont' -import InputX from '../InputX' import Divider from '../divider' import styles from './index.module.scss' -import { formatImgUrl } from '@/common/fotmat' import { alert, goLink } from '@/common/common' import CloseBtn from '@/components/closeBtn' import { getCDNSource } from '@/common/constant' -import { getFilterData } from '@/common/util' import { BindInvitationInfoApi, GetInvitationInfoApi } from '@/api/user' // 获取业务员信息 interface Param { invitation_code: string; name: string; phone: string } diff --git a/src/components/organizationNameModal/index.module.scss b/src/components/organizationNameModal/index.module.scss index bf89b8e..8d003c1 100644 --- a/src/components/organizationNameModal/index.module.scss +++ b/src/components/organizationNameModal/index.module.scss @@ -4,13 +4,23 @@ border-radius: 20px; padding-top: 20px; overflow: hidden; - .input { - border: 1px solid #eee; - margin: 20px 40px; - padding: 8px; - border-radius: 8px; + .inputBar { + border: 1px solid transparent; + background-color: #f5f5f5; + border-radius: 20px; + padding: 20px 42px; + margin: 32px 40px; font-size: 26px; + color: #333; + &_focus { + border: 1px solid #337fff; + } + &_error { + border: 1px solid #f64861; + color: #f64861; + } } + &_title { padding: 10px; text-align: center; @@ -44,7 +54,7 @@ color: #333; } &_right { - color: #606f97; + color: #337fff; } } .tips { diff --git a/src/components/organizationNameModal/index.tsx b/src/components/organizationNameModal/index.tsx index ad01b78..d50d26e 100644 --- a/src/components/organizationNameModal/index.tsx +++ b/src/components/organizationNameModal/index.tsx @@ -1,6 +1,6 @@ import type { CommonEventFunction, InputProps } from '@tarojs/components' import { Input, View } from '@tarojs/components' -import { useState } from 'react' +import React, { useState } from 'react' import classNames from 'classnames' import Dialog from '../Dialog' import InputX from '../InputX' @@ -23,16 +23,7 @@ const OrganizationNameModal = (props: PropsType) => { onConfirm, } = props - const [_show, setShow] = usePropsValue({ - value: showModal, - defaultValue: false, - onChange: (value) => { - onShowModalChange?.(value) - }, - }) - const handleClose = () => { - setShow(false) onClose?.() } @@ -45,16 +36,34 @@ const OrganizationNameModal = (props: PropsType) => { const handleConfirm = () => { onConfirm?.(text) } + const [inputStyles, setInputStyles] = useState([]) + const Reg = /^[a-zA-Z0-9\u4E00-\u9FA5]+$/ + const handleIntput: CommonEventFunction = (e) => { + if (!Reg.test(e.detail.value)) { + setInputStyles(() => [styles.inputBar_error]) + setText(e.detail.value) + return + } setText(e.detail.value) } + const handleFocus = () => { + if (text && !Reg.test(text)) { + setInputStyles(() => [styles.inputBar_error]) + return + } + setInputStyles(() => [styles.inputBar_focus]) + } + const handleBlur = () => { + setInputStyles(() => []) + } return 请设置您的组织昵称 公司名称是辨识您身份的重要依据，请谨慎修改。（仅支持修改一次） - + 下次更改 diff --git a/src/pages/userEdit/components/ModifyModal/index.module.scss b/src/pages/userEdit/components/ModifyModal/index.module.scss index d7cd06b..7e4aa72 100644 --- a/src/pages/userEdit/components/ModifyModal/index.module.scss +++ b/src/pages/userEdit/components/ModifyModal/index.module.scss @@ -1,8 +1,11 @@ .modify-ickname-content { margin: 0 auto; - padding: 40px 50px; + padding: 40px 0; .modify-ickname-input { + margin-top: 30px; + margin-left: 48px; + margin-right: 48px; height: 182px; background: #f3f3f3; border: 2px solid #e6e6e6; @@ -26,6 +29,7 @@ } .modify-ickname-tips { + padding: 0 48px; font-size: 22px; font-weight: 400; color: #ababab; @@ -34,24 +38,28 @@ .modify-ickname-operation { background: #ffffff; - border: 2px solid #cde5ff; - border-radius: 40px; display: flex; - overflow: hidden; + flex-flow: row nowrap; + justify-content: space-around; + align-items: center; + padding: 0 48px; margin-top: 80px; - display: flex; - } - - .modify-ickname-operation .button { - width: 50%; - font-size: 32px; - padding: 20px 0; - font-weight: 400; - color: #007aff; - background-color: white; - border: none; - outline: none; - border-radius: 0; + .button { + width: 45%; + font-size: 32px; + padding: 20px 0; + font-weight: 400; + &::after { + border-radius: 0; + } + } + .modify-ickname-operation-save { + background: #007aff; + color: #ffffff; + } + .modify-ickname-operation-IKnown { + width: 100%; + } } .modify-ickname-operation .button::after, @@ -59,19 +67,12 @@ border-radius: 0; border: none; } - - .modify-ickname-operation .modify-ickname-operation-save { - background: #007aff; - color: #ffffff; - } - - .modify-ickname-operation .button::after { - border-radius: 0; - } } .warn-tips { + background-color: #fef9f4; + line-height: 1.5; + padding: 15px 48px; font-size: 22px; font-weight: 400; color: #ff9b33; - margin-top: 30px; } diff --git a/src/pages/userEdit/components/ModifyModal/index.tsx b/src/pages/userEdit/components/ModifyModal/index.tsx index 12716fe..0ac1f2d 100644 --- a/src/pages/userEdit/components/ModifyModal/index.tsx +++ b/src/pages/userEdit/components/ModifyModal/index.tsx @@ -85,15 +85,23 @@ const ModifyModal = (props: Params, ref: Ref) => { return ( setModalShow(false)} title={title} show={modalShow}> + {tipsComp}