From 4afb508a042f7fa98f5a8f10bd985b4a0ca815fb Mon Sep 17 00:00:00 2001 From: li tong bao <2903733959@qq.com> Date: Tue, 14 Jun 2022 20:05:04 +0800 Subject: [PATCH 1/2] 1 --- src/styles/iconfont.ttf | Bin 12196 -> 12236 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/styles/iconfont.ttf b/src/styles/iconfont.ttf index fbb95ea110f813e75d5619225ab621bd7b42905c..a8e0a5ae506b1ba86cf5311419d1e377cb8c42bb 100644 GIT binary patch delta 411 zcmZ1yeD+4zR0|?wZr>+m9H?uIBveuU{d|-58Jj4{ow2#@2 z`4P(@Ruk4sY+KkP*pG1}aNOW@;q2k+;d;Yu#Jzwgif03_0q-n6ExrW4F1|&4ANVWy zPx1c|FcP>VC?ljHhsfoIpx|*<=9HR&y zqc)?cu@Q(>4`Pb(F)HaX+A=BwNfSFpYerKjOWasp&BV+|p3&TnQI3g?pOJ~ty*b6q zETy@(CE46iKQKs&gP#M4;uJXeIDkljk%M1=k3$~9laJ-#=j7z)F!taSl;liHV-w)# zW@TmdV0vPf($d?M3N*-~**!5hK;Q7+9Yzj5K|T(94nClMJ5D}MAhH8hCMh{L& UL5{REpnh%vem0NI?(DG|0Jel!fdBvi delta 371 zcmX>Tza)NwgGj+6mv9CKwhjgcl@%GOi75)x#Ox=A=&&4LaG_~pi?W~r0|QffL4I*b zir}v$3=Fz6Chjnhk$ioGKc3&_D+4zR0|?yPov8?;H?uIBveqXs++j3eT*u_aw2E1a z`5enSRt465Yzx?3*f(+ba2(+@;H==P;JU#r$KAu@#xsXkhPRDRjL(O!jIWRH4u1;& zHvSg^asvAVIfO)nOoT!hm_Wuer!qZZ5Mpp;U|>|@V-k^LGO}YbHBnbnR}(f86JgV4 z6g7s@^&)IaYPO8ZN@^x%){Lf5S{=wUl4mqG1FGU@WMXu0PBAk}Y3^-FHaFA{3}WHp z=jZa30+CYuBK#1BFBcylm$nT%zX(Tg2!{wiyA9J5vy_(Jrc{tt_r%};eZzm}fyzzz eMEOiWdO-{U6QGDSP&r3P2nSHB_2zu`SPcLxHd0Uk From c092b0a638c1a0c5a1e9ce0aa025efd372e35b48 Mon Sep 17 00:00:00 2001 From: li tong bao <2903733959@qq.com> Date: Wed, 15 Jun 2022 20:04:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?--=E5=AF=B9=E6=8E=A5=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/company.ts | 33 ------------ src/api/user.ts | 21 ++++++++ src/pages/userEdit/index.tsx | 101 +++++++++++++++++++++++++++++------ 3 files changed, 106 insertions(+), 49 deletions(-) diff --git a/src/api/company.ts b/src/api/company.ts index 8b72c6d..799464b 100644 --- a/src/api/company.ts +++ b/src/api/company.ts @@ -21,36 +21,3 @@ import { useRequest } from "@/use/useHttp" method: "put", }) } - -/** - * 地址详情 - * @returns - */ - export const addressDetailApi = () => { - return useRequest({ - url: `/v1/mall/address`, - method: "get", - }) -} - -/** - * 地址编辑 - * @returns - */ - export const addressEditApi = () => { - return useRequest({ - url: `/v1/mall/address`, - method: "put", - }) -} - -/** - * 地址删除 - * @returns - */ - export const addressDeleteApi = () => { - return useRequest({ - url: `/v1/mall/address`, - method: "delete", - }) -} diff --git a/src/api/user.ts b/src/api/user.ts index 283f55c..345c9c7 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -39,3 +39,24 @@ import { useRequest } from "@/use/useHttp" method: "put", }) } + +/** + * 公司类型|企业类型 下拉列表 + */ + export const companyTypeApi = () => { + return useRequest({ + url: `/v1/mall/enum/purchaserType`, + method: "get", + }) +} + +/** + * 头像更改 + */ + export const portraitUpdateApi = () => { + return useRequest({ + url: `/v1/mall/user/avatar`, + method: "put", + }) +} + diff --git a/src/pages/userEdit/index.tsx b/src/pages/userEdit/index.tsx index bea22f1..7a3eed9 100644 --- a/src/pages/userEdit/index.tsx +++ b/src/pages/userEdit/index.tsx @@ -1,15 +1,17 @@ import { alert, goLink, isEmptyObject, retrieval } from "@/common/common"; import Popup from "@/components/popup"; -import { Button, Image, Text, Textarea, View } from "@tarojs/components" +import { Button, Image, Picker, Text, Textarea, View } from "@tarojs/components" import Taro, { chooseMedia } from "@tarojs/taro"; -import { realNameUpdateApi } from "@/api/user"; +import { realNameUpdateApi, companyTypeApi, portraitUpdateApi } from "@/api/user"; import { companyDetailApi, companyUpdateApi } from "@/api/company" import { memo, useCallback, useEffect, useRef, useState } from "react" import "./index.scss" import ModifyModal from "./components/ModifyModal"; import useLogin from "@/use/useLogin"; import { useSelector } from "@/reducers/hooks"; +import useUploadCDNImg from "@/use/useUploadImage"; +import { IMG_CND_Prefix } from "@/common/constant"; export default ()=>{ const { getPhoneNumber, getAdminUserInfo } = useLogin(); @@ -17,9 +19,17 @@ export default ()=>{ // 用户信息 useEffect(()=>{ setFormData({ - ...adminUserInfo as any - }) - }, [adminUserInfo]) + ...formData, + ...adminUserInfo as any, + }); + }, [adminUserInfo]); + useEffect(()=>{ + setFormData({ + ...adminUserInfo as any, + company_type_index: 0 + }); + getCompanyTypeData(); + },[]) // 表单数据 const [formData, setFormData] = useState({ user_name: "麦兜" @@ -27,21 +37,28 @@ export default ()=>{ // 昵称修改保存 const { fetchData: realNameUpdateFetch } = realNameUpdateApi(); const rules = { - user_name: [{ + text: [{ message: "请输入" }] } const {fetchData: saveFetch} = companyUpdateApi(); + const {fetchData: getCompanyFetch} = companyDetailApi(); const handleTextareaSave = async (text, type)=>{ retrieval({text},rules).then(async ()=>{ let result; if(type=="Ickname"){ result = await realNameUpdateFetch({real_name: text}); }else{ - result = saveFetch({company_name: text}); + const params = await getCompanyFetch(); + result = await saveFetch({ + ...params.data, + company_name: text + }); } if(result.success){ getAdminUserInfo(); + (ModifyIcknameEl.current as any).setModalShow(false); + (ModifyCompanyNameEl.current as any).setModalShow(false) alert.success("保存成功"); }else{ alert.none(result.msg); @@ -56,13 +73,26 @@ export default ()=>{ goLink(url); } // 肖像编辑 + const { fetchData: portraitUpdateFetch } = portraitUpdateApi(); + const {getWxPhoto} = useUploadCDNImg(); const handleSelectRortrait = ()=>{ - chooseMedia({ - count: 1, - mediaType: ["image"], - success(ev){ - console.log(ev); - + Taro.showModal({ + title: "提示", + content: "是否确定更改头像？", + showCancel: true, + async success(ev){ + if(ev.confirm){ + let result = await getWxPhoto('mall'); + const portraitUpdateResult = await portraitUpdateFetch({ + avatar_url: IMG_CND_Prefix+(result as any).url + }); + if(portraitUpdateResult.success){ + getAdminUserInfo(); + alert.success("保存成功"); + }else{ + alert.none(portraitUpdateResult.msg); + } + } } }) } @@ -75,11 +105,46 @@ export default ()=>{ } const ModifyIcknameEl = useRef(null); const ModifyCompanyNameEl = useRef(null); + // 获取企业类型 + const { fetchData: companyTypeFetch, state: companyTypeData } = companyTypeApi(); + const getCompanyTypeData = async ()=>{ + const reuslt = await companyTypeFetch(); + if(reuslt.success){ + reuslt.data?.list?.every((item,index)=>{ + if(item.id==(adminUserInfo as any).purchaser_type){ + setFormData({ + ...adminUserInfo as any, + company_type_index: index + }); + return false; + } + return true; + }) + } + } + // 修改企业类型 + const handleCompanyType = async (ev)=>{ + const {value} = ev.detail; + const item = companyTypeData.data.list&&companyTypeData.data.list[value]; + if(item){ + const params = await getCompanyFetch(); + const result = await saveFetch({ + ...params.data, + purchaser_type: item.id + }); + if(result.success){ + getAdminUserInfo(); + alert.success("保存成功") + }else{ + alert.none(result.msg); + } + } + } return ( - + 点击编辑头像 @@ -97,13 +162,17 @@ export default ()=>{ 组织资料 (ModifyCompanyNameEl.current as any).setModalShow(true)} data={(formData as any)?.company_name} label="名称" placeholder="待绑定" icon=""/> - onNavigate("/pages/company/index")} label="类型" placeholder="完善公司/组织信息" icon=""/> + + + {(companyTypeData.data as any).list&&(companyTypeData.data as any).list[(formData as any)?.company_type_index].name} + + onNavigate("/pages/certification/index")} label="我的认证" placeholder="待绑定" icon=""> 未认证 - onNavigate("/pages/weightList/index")} label="创建人" data={(formData as any)?.founder_user_name} placeholder="完善公司/组织信息" icon=""/> +