diff --git a/src/components/balance/BalanceHead.tsx b/src/components/balance/BalanceHead.tsx index d854fa8..8f5065b 100644 --- a/src/components/balance/BalanceHead.tsx +++ b/src/components/balance/BalanceHead.tsx @@ -26,17 +26,20 @@ export default function BalanceHead() {
{ // console.log('查看余额') // setMoneyModal(true) - }}>¥{globalContext.user.balance} + }}> + {/* ¥ */} + {/* */} + {globalContext.user.balance}
-
{ +
{ setCapitalModal(true) }}> - +
资金流水
@@ -45,14 +48,14 @@ export default function BalanceHead() { width: 68, height: 1, background: '#EAEAEA', - marginLeft:18 + marginLeft: 18 }}>
-
{ +
{ setRecordModal(true) }}> - -
+
分账记录
diff --git a/src/components/balance/balance-head.css b/src/components/balance/balance-head.css index d8f4f8f..38e6abd 100644 --- a/src/components/balance/balance-head.css +++ b/src/components/balance/balance-head.css @@ -15,12 +15,13 @@ } .balance-head .balance { - font-size: 18px; + font-size: 20px; color: #f78e4c; margin-top: 8px; cursor: pointer; /* background-color: pink; */ position: relative; + font-weight: 700; } .moneyModal { diff --git a/src/components/recharge/recharge-head.css b/src/components/recharge/recharge-head.css index 505b583..7e81b7b 100644 --- a/src/components/recharge/recharge-head.css +++ b/src/components/recharge/recharge-head.css @@ -10,5 +10,6 @@ font-weight: 300; font-size: 16px; color: #FFFFFF; - margin-left: 43px; + /* margin-left: 43px; */ + margin-left: 20px; } \ No newline at end of file diff --git a/src/layout/head/Head.tsx b/src/layout/head/Head.tsx index b09a922..be68a77 100644 --- a/src/layout/head/Head.tsx +++ b/src/layout/head/Head.tsx @@ -3,7 +3,7 @@ import { useDispatch } from 'react-redux' import BalanceHead from '../../components/balance/BalanceHead.tsx'; import RechargeHead from '../../components/recharge/RechargeHead.tsx'; import { Dropdown, MenuProps, message, Modal, Space, Spin, Input } from "antd"; -import { DownOutlined, UserOutlined, KeyOutlined, LogoutOutlined, AccountBookOutlined, ContainerOutlined, MenuFoldOutlined, UsergroupAddOutlined } from "@ant-design/icons"; +import { DownOutlined, UserOutlined, QuestionCircleOutlined,KeyOutlined, LogoutOutlined, AccountBookOutlined, ContainerOutlined, MenuFoldOutlined, UsergroupAddOutlined } from "@ant-design/icons"; import { useContext, useEffect, useState } from "react"; import { put, get, post } from "../../util/AjaxUtils.ts"; import { GlobalContext, GlobalDispatchContext, reloadUser } from "../../context/GlobalContext.ts"; @@ -22,6 +22,8 @@ import MyOrder from '../../components/myOrder/MyOrder.tsx' export default function Head() { // 邀请码弹窗 const [invitationModal, setinvitationModal] = useState(false) + // 邀请码弹窗加载 + const [isLoading,setisLoading] = useState(false) // 解除绑定邀请码弹窗 // const [relieveModal, setRelieveModal] = useState(false) // 申请的邀请码 @@ -52,6 +54,9 @@ export default function Head() { get({ messageApi, url: '/api/ic/get/self', + onBefore() { + setisLoading(true) + }, onSuccess({ data }) { console.log(data); setInvNum(data.ic) @@ -60,6 +65,9 @@ export default function Head() { if (data.ic == '') { getIcStatus() } + }, + onFinally() { + setisLoading(false) } }) } @@ -371,22 +379,33 @@ export default function Head() { {/*
*/}
+ + {/*
{ + window.open('https://www.aimzhu.com/operator/route/agreementportal/view?agreementId=c0c5683a-bef3-40c3-8395-900a362ea234&title=系统操作流程') + }}> + +
*/} + {/*
*/} + + {/*
*/} + +
{ setinvitationModal(true) getIc() }}> 邀请码
-
{ +
+
{ window.open('https://www.aimzhu.com/operator/route/agreementportal/view?agreementId=c0c5683a-bef3-40c3-8395-900a362ea234&title=系统操作流程') }}> - 系统操作流程 +
- - +
{/**/} -
-
+
+
-
-
-
- 我的邀请码 -
-
-
{ - getInvNum() - }} style={{ display: invNum || icStatus ? 'none' : 'block' }}> - 点击申请 -
-
- 正在申请中 -
-
-
-
申请失败!
-
{ - getInvNum() - }}>重新申请
+ +
+
+
+ 我的邀请码
- -
-
-
-
- {invNum} +
+
{ + getInvNum() + }} style={{ display: invNum || icStatus ? 'none' : 'block' }}> + 点击申请 +
+
+ 正在申请中 +
+
+
+
申请失败!
+
{ + getInvNum() + }}>重新申请
-
{ - copyInvNum() - }}> - 复制 + +
+
+
+
+ {invNum} +
+
{ + copyInvNum() + }}> + 复制 +
-
- {/*
*/} -
-
- {icRebateRatio ? `邀请码分享给他人,即可获得${icRebateRatio}%佣金` : '邀请码分享给他人,即可获得佣金'} - {/* 邀请码分享给他人,即可获得{icRebateRatio}%佣金 */} + {/*
*/} +
+
+ {icRebateRatio ? `邀请码分享给他人,即可获得${icRebateRatio}%佣金` : '邀请码分享给他人,即可获得佣金'} + {/* 邀请码分享给他人,即可获得{icRebateRatio}%佣金 */} -
- {/*
+
+ {/*
失败的原因可能是XXXXXX导致,如有疑问请您咨询客服人员
*/} -
- {/*
*/} -
-
-
-
- 他人邀请码
-
-
-
- { - setInInvNum(e.target.value) - }} /> -
{ - postInvNum() - }}> - + {/*
*/} +
+
+
+
+ 他人邀请码 +
+
+
+
+ { + setInInvNum(e.target.value) + }} /> +
{ + postInvNum() + }}> + +
-
-
-
-
-
- {bindingInvNum} -
- {/*
{ +
+
+
+
+ {bindingInvNum} +
+ {/*
{ setRelieveModal(true) }}> 解绑
*/} +
-
-
-
- {bindingInvNum ? '已绑定邀请码' : '输入他人的邀请码,即可获得相应优惠'} +
+
+ {bindingInvNum ? '已绑定邀请码' : '输入他人的邀请码,即可获得相应优惠'} +
+ +
- -
-
+ {/*