diff --git a/src/components/AddressList/index.scss b/src/components/AddressList/index.scss index 8c6198c..6b8bd5e 100644 --- a/src/components/AddressList/index.scss +++ b/src/components/AddressList/index.scss @@ -89,7 +89,7 @@ font-weight: 400; color: #ffffff; display: flex;align-items: center;justify-content: center; - position: absolute;bottom: 4%;left: 50%; + position: absolute;bottom: 50px;left: 50%; transform: translateX(-50%); } .address-no-data{ diff --git a/src/pages/creditLine/index.scss b/src/pages/creditLine/index.scss index 29a272e..79772fc 100644 --- a/src/pages/creditLine/index.scss +++ b/src/pages/creditLine/index.scss @@ -5,22 +5,6 @@ width: 238px; height: 238px; } - - .credit-line-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; - } - .credit-line-tips text{ - margin-right: 10px; - font-size: 30px; - } .credit-line-card{ width: 702px; background: #ffffff; diff --git a/src/pages/creditLine/index.tsx b/src/pages/creditLine/index.tsx index 5468d50..2aaf9ff 100644 --- a/src/pages/creditLine/index.tsx +++ b/src/pages/creditLine/index.tsx @@ -7,6 +7,7 @@ import {creditInfoApi} from "@/api/creditLine" import "./index.scss" import { useSelector } from "@/reducers/hooks"; import { formatDateTime, formatPriceDiv } from "@/common/fotmat" +import Message from "@/components/Message" export default ()=>{ @@ -120,9 +121,7 @@ export default ()=>{ return ( - - 暂不支持线上申请授权,请联系平台客服。 - + diff --git a/src/pages/creditUsed/index.tsx b/src/pages/creditUsed/index.tsx index 8858ad9..17d60f3 100644 --- a/src/pages/creditUsed/index.tsx +++ b/src/pages/creditUsed/index.tsx @@ -4,7 +4,7 @@ import Taro, { useReady } from "@tarojs/taro" import { useCallback, useEffect, useMemo, useRef, useState } from "react" import {creditListApi} from "@/api/creditLine" import "./index.scss" -import { formatDateTime } from "@/common/fotmat" +import { formatDateTime, formatPriceDiv, toDecimal2 } from "@/common/fotmat" import { dataLoadingStatus, getFilterData } from "@/common/util"; export default ()=>{ @@ -30,7 +30,9 @@ export default ()=>{ 下单 - 0?'green':item.amount<0?'red':''}`}>{item.amount.toLocaleString()} + 0?'green':item.amount<0?'red':''}`}> + {item.amount>0?"-":"+"}{toDecimal2(formatPriceDiv(item.amount)).toLocaleString()} + {formatDateTime(item.order_pay_time)} diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx index 1a1a0b5..b4849ea 100644 --- a/src/pages/user/index.tsx +++ b/src/pages/user/index.tsx @@ -5,7 +5,7 @@ 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 () => { // 用户信息 @@ -38,7 +38,6 @@ const Modal = memo((props:any)=>{ const {data} = props; const [modalShow, setModalShow]=useState(true); const handleouter = ()=>{ - console.log(222); } return( <> @@ -68,11 +67,12 @@ const Header = memo((props:any) => { let menu = [{ text: "待配布", icon: "icon-daipeibu" }, { text: "待付款", icon: "icon-daifukuan" }, { text: "待发货", icon: "icon-daifahuo" }, { text: "已发货", icon: "icon-yifahuo" }, { text: "退款/售后", icon: "icon-a-tuikuanshouhou" }]; - const getPhoneNumber = (ev)=>{ - console.log(ev); - if(ev.detail?.code){ - }else{ - alert.none("取消了授权"); + const { getPhoneNumber } = useLogin(); + const mGetPhoneNumber = (ev)=>{ + try { + getPhoneNumber(ev.detail.code); + } catch (error) { + alert.none("绑定失败!"); } } @@ -90,7 +90,7 @@ const Header = memo((props:any) => { {data?.user_name} - {userInfo?.phone?.replace(userInfo?.phone?.substring(3,7), "****")||} + {userInfo?.phone?.replace(userInfo?.phone?.substring(3,7), "****")||} @@ -114,7 +114,7 @@ const Header = memo((props:any) => { 重新认证 - 佛山市带生纺织品有限公司 + {data?.company_name}