From 1e87d13d8e90ed79add5a84411be39df61d2ea2c Mon Sep 17 00:00:00 2001 From: li tong bao <2903733959@qq.com> Date: Fri, 24 Jun 2022 15:07:06 +0800 Subject: [PATCH] =?UTF-8?q?--=E8=A1=A5=E5=85=A8=E8=AE=A4=E8=AF=81=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/certification/index.tsx | 17 +++++++++++------ src/pages/user/index.module.scss | 16 +++++++++++++++- src/pages/user/index.tsx | 23 ++++++++++++++++------- src/pages/userEdit/index.scss | 4 ++++ src/pages/userEdit/index.tsx | 4 ++-- 5 files changed, 48 insertions(+), 16 deletions(-) diff --git a/src/pages/certification/index.tsx b/src/pages/certification/index.tsx index b468626..c0eaf8b 100644 --- a/src/pages/certification/index.tsx +++ b/src/pages/certification/index.tsx @@ -10,8 +10,12 @@ import useUploadCDNImg from "@/use/useUploadImage"; import Message from "@/components/Message" import { IMG_CND_Prefix } from "@/common/constant"; import SelectEnterpriseType from "./components/SelectEnterpriseType" +import { useSelector } from "@/reducers/hooks"; +import useLogin from "@/use/useLogin"; export default ()=>{ + const { getAdminUserInfo } = useLogin(); + const {adminUserInfo} = useSelector(state => state.userInfo); useEffect(()=>{ initalFormData(); },[]); @@ -48,10 +52,10 @@ export default ()=>{ legal_person: [{ message: "请输入法人名称" }], - // legal_person_identity: [{ - // message: "请输入正确法人身份证", - // regex: /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/ - // }], + legal_person_identity: [{ + message: "请输入正确法人身份证", + regex: /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/ + }], legal_person_identity_url: [{ message: "请上传法人身份证", validator: (value:any, rule:any)=>{ @@ -68,6 +72,7 @@ export default ()=>{ const result = await fetchData({...formData}) if(result.success){ // Taro.eventCenter.trigger("weightList:refresh"); + getAdminUserInfo(); Taro.navigateBack(); alert.success("保存成功"); }else{ @@ -119,7 +124,7 @@ export default ()=>{ return ( - {/* */} + {(adminUserInfo as any)?.authentication_status==3&&} 企业认证 @@ -183,7 +188,7 @@ export default ()=>{ 取消 - 提交 + {[3,4].includes((adminUserInfo as any)?.authentication_status)?"重新认证":"提交"} diff --git a/src/pages/user/index.module.scss b/src/pages/user/index.module.scss index a34a08c..c225f98 100644 --- a/src/pages/user/index.module.scss +++ b/src/pages/user/index.module.scss @@ -222,13 +222,23 @@ font-weight: 400; color: #707070; } + .auth-status,.auth-status-ongoing{ + color: #EE7500; + background-color: #FFE6CE; + } + .auth-status,.auth-status-adopt{ + color: #007AFF; + background-color: #CDE5FF; + } .auth-tips{ font-size: 18px; font-weight: 400; color: #007aff; - width: 150px; text-align: right; } + .auth-tips,.auth-tips-adopt{ + color: #ABABAB; + } .auth-tips text{ font-size: 17px; } @@ -243,6 +253,10 @@ color: #707070; display: flex;align-items: center;justify-content: center; } + .auth-company,.auth-company-adopt{ + background: #ecf5ff; + border: 2px solid #cde5ff; + } .tips-modal{ background: rgba(0,0,0,0.6); diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx index 6852d2e..25e1452 100644 --- a/src/pages/user/index.tsx +++ b/src/pages/user/index.tsx @@ -67,7 +67,7 @@ const Header = memo((props:any) => { const {data} = props; let menu = [{ text: "待配布", icon: "icon-daipeibu", url: "/pages/orderList/index" }, { text: "待付款", icon: "icon-daifukuan", url: "/pages/orderList/index" }, { text: "待发货", icon: "icon-daifahuo", url: "/pages/orderList/index" }, { text: "已发货", icon: "icon-yifahuo", url: "/pages/orderList/index" }, - { text: "退款/售后", icon: "icon-a-tuikuanshouhou", url: "/pages/salesAfterList/index" }]; + { text: "退款/售后", icon: "icon-a-tuikuanshouhou", url: "/pages/orderList/index" }]; const { getPhoneNumber } = useLogin(); const mGetPhoneNumber = (ev)=>{ if(ev.detail?.code){ @@ -106,15 +106,24 @@ const Header = memo((props:any) => { - - + + 1 - 认证不通过 + {data?.authentication_status==1&&"未认证"} + {data?.authentication_status==2&&"认证中"} + {data?.authentication_status==3&&"认证不通过"} + {data?.authentication_status==4&&"已认证"} - 重新认证 + {data?.authentication_status==1&&认证通过后，解锁更多权限 } + {data?.authentication_status==2&&1-3个工作日，审核完成 } + {data?.authentication_status==3&&重新认证 } + {data?.authentication_status==4&&认证通过，可以下单啦 } - - {data?.company_name} + + {data?.authentication_status==1&&"暂未加入或注册组织"} + {data?.authentication_status==2&&data?.company_name} + {data?.authentication_status==3&&data?.company_name} + {data?.authentication_status==4&&data?.company_name} diff --git a/src/pages/userEdit/index.scss b/src/pages/userEdit/index.scss index ecc9473..2899aa8 100644 --- a/src/pages/userEdit/index.scss +++ b/src/pages/userEdit/index.scss @@ -65,6 +65,10 @@ font-weight: 400; color: #707070; } + .user-edit-content-company,.user-edit-content-company-adopt{ + background: #CDF3DF; + color: #07C160; + } .user-edit-content-company text{ margin-left: 5px; } diff --git a/src/pages/userEdit/index.tsx b/src/pages/userEdit/index.tsx index 7a3eed9..4ebb0aa 100644 --- a/src/pages/userEdit/index.tsx +++ b/src/pages/userEdit/index.tsx @@ -168,8 +168,8 @@ export default ()=>{ onNavigate("/pages/certification/index")} label="我的认证" placeholder="待绑定" icon=""> - - 未认证 + + {(formData as any)?.authentication_status==4?"已认证":"未认证"}