diff --git a/src/components/AddressList/index.tsx b/src/components/AddressList/index.tsx index 71e9827..7f71e93 100644 --- a/src/components/AddressList/index.tsx +++ b/src/components/AddressList/index.tsx @@ -102,7 +102,7 @@ const AddressList = memo((props:Params)=>{ {/* {item.address_detail} */} { - item.is_default&&{item.phone.replace(item.phone.substring(4,7), "****")} + item.is_default&&{item.phone.replace(item.phone.substring(3,7), "****")} } e.stopPropagation()} url={`/pages/addressAdd/index?type=edit&id=${item.id}`} hoverClass="none" className="address-edit"> diff --git a/src/pages/creditUsed/index.tsx b/src/pages/creditUsed/index.tsx index 17d60f3..11cdbd8 100644 --- a/src/pages/creditUsed/index.tsx +++ b/src/pages/creditUsed/index.tsx @@ -31,7 +31,7 @@ export default ()=>{ 下单 0?'green':item.amount<0?'red':''}`}> - {item.amount>0?"-":"+"}{toDecimal2(formatPriceDiv(item.amount)).toLocaleString()} + {item.trans_type==2?"-":"+"}{toDecimal2(formatPriceDiv(item.amount)).toLocaleString()} diff --git a/src/pages/depositBeforehand/index.scss b/src/pages/depositBeforehand/index.scss index d782d46..157ea4f 100644 --- a/src/pages/depositBeforehand/index.scss +++ b/src/pages/depositBeforehand/index.scss @@ -3,22 +3,6 @@ background-color: #f3f3f3; display: flex; flex-direction: column; - .deposit-beforehand-tips{ - width: 100%; - height: 66px; - background: #FFE6CE; - border: 2px solid #ffe6ce; - padding: 0 30px; - display: flex;align-items: center; - font-size: 24px; - font-weight: 400; - color: #EE7500; - margin: 0; - } - .deposit-beforehand-tips text{ - margin-right: 10px; - font-size: 30px; - } .deposit-beforehand-card{ width: 702px; diff --git a/src/pages/depositBeforehand/index.tsx b/src/pages/depositBeforehand/index.tsx index c904f4c..9636d30 100644 --- a/src/pages/depositBeforehand/index.tsx +++ b/src/pages/depositBeforehand/index.tsx @@ -6,6 +6,7 @@ import { depositInfoApi } from "@/api/deposit" import { useEffect } from "react"; import { formatPriceDiv, toDecimal2 } from "@/common/fotmat"; import { setClipboardData } from "@tarojs/taro"; +import Message from "@/components/Message"; export default ()=>{ const {fetchData, state} = depositInfoApi(); @@ -23,9 +24,7 @@ export default ()=>{ return ( - - 汇款成功后,1-5分钟自动到账。 - + 余额 (元) diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx index b4849ea..e8fd7a7 100644 --- a/src/pages/user/index.tsx +++ b/src/pages/user/index.tsx @@ -3,26 +3,15 @@ import { memo, useEffect, useState } from "react" import styles from './index.module.scss' import classnames from "classnames"; import { useSelector } from "@/reducers/hooks"; -import { GetAdminUserInfoApi } from "@/api/user"; import { alert, goLink } from "@/common/common"; import useLogin from '@/use/useLogin' export default () => { // 用户信息 - const { fetchData, state } = GetAdminUserInfoApi(); + const { getSelfUserInfo } = useLogin(); const {adminUserInfo, userInfo} = useSelector(state => state.userInfo); - const [mUserInfo, setMUserInfo] = useState({ - phone: "" - }); - const getData = ()=>{ - fetchData(); - } useEffect(()=>{ - setMUserInfo({ - ...mUserInfo, - // phone: userInfo?.phone?.replace(userInfo?.phone?.substring(3,7), "****") as string - }) - getData(); + getSelfUserInfo(); },[]); return ( @@ -69,9 +58,9 @@ const Header = memo((props:any) => { { text: "退款/售后", icon: "icon-a-tuikuanshouhou" }]; const { getPhoneNumber } = useLogin(); const mGetPhoneNumber = (ev)=>{ - try { + if(ev.detail?.code){ getPhoneNumber(ev.detail.code); - } catch (error) { + }else{ alert.none("绑定失败!"); } } @@ -90,7 +79,7 @@ const Header = memo((props:any) => { {data?.user_name} - {userInfo?.phone?.replace(userInfo?.phone?.substring(3,7), "****")||} + {data?.phone?data?.phone?.replace(data?.phone?.substring(3,7), "****"):}