diff --git a/src/components/card/CardProj.tsx b/src/components/card/CardProj.tsx index 50ddb2e..c981d6c 100644 --- a/src/components/card/CardProj.tsx +++ b/src/components/card/CardProj.tsx @@ -119,6 +119,9 @@ export default function CardProj(props: any) { }); }, + // onError(error) { + // messageApi.error(error.message); + // }, onFinally() { } diff --git a/src/components/payment/Payment.tsx b/src/components/payment/Payment.tsx index d12fbe8..a907e36 100644 --- a/src/components/payment/Payment.tsx +++ b/src/components/payment/Payment.tsx @@ -530,7 +530,7 @@ export default function Payment(props: IPaymentProps) { if (thirdParty == '对公转账') { return (
@@ -698,7 +698,7 @@ export default function Payment(props: IPaymentProps) {
支付Pay
{ setPaymentModal(true) - + // if (!isRechargeMoneyEdit) { // setPaymentModal(true); // } else { @@ -920,10 +920,10 @@ export default function Payment(props: IPaymentProps) { form.setFieldValue('thirdParty', e.target.value); setThirdParty(e.target.value); // console.log(e.target.value); - setPackageInfoId(''); + // setPackageInfoId(''); setIsRechargeMoneyEdit(false) // setValue('') - form.setFieldValue('rechargeMoney', 280); + // form.setFieldValue('rechargeMoney', 280); // setSelectedRowKeys([]); }}> @@ -1049,17 +1049,22 @@ export default function Payment(props: IPaymentProps) { display: packList.length <= 0 ? 'unset' : 'none', marginLeft: 90 }}> - +
+ +
暂无服务包
diff --git a/src/components/recharge/RechargeHead.tsx b/src/components/recharge/RechargeHead.tsx index 2b9b205..5a232aa 100644 --- a/src/components/recharge/RechargeHead.tsx +++ b/src/components/recharge/RechargeHead.tsx @@ -57,7 +57,7 @@ export default function RechargeHead() { onCancel={() => { setIsPaymentModalOpen(false); }} - width={1300} + width={1200} footer={false} centered > diff --git a/src/layout/head/head.css b/src/layout/head/head.css index 3c5baa9..a0893a1 100644 --- a/src/layout/head/head.css +++ b/src/layout/head/head.css @@ -33,12 +33,13 @@ .head .center .left img { /* width: 263px; */ - height:50px; + height:40px; /* height:78px; */ /* background-color: red; */ - margin-left: 15px; - margin-top: 12px; + margin-left: 120px; + /* margin-left: 80%; */ + margin-top: 13px; } .head .center .right { diff --git a/src/route/proj/ProjNew.tsx b/src/route/proj/ProjNew.tsx index 38b3086..54c14e1 100644 --- a/src/route/proj/ProjNew.tsx +++ b/src/route/proj/ProjNew.tsx @@ -311,7 +311,7 @@ export default function ProjNew() { ]; // 获取我得服务包信息 - const getPickList = (page:number) => { + const getPickList = (page: number) => { get({ messageApi, @@ -320,7 +320,7 @@ export default function ProjNew() { params: { page: page, rows: 5, - keyong : "keyong", + keyong: "keyong", packageType: pathParams.projChargeType, } }, @@ -472,15 +472,15 @@ export default function ProjNew() { }} autoComplete="off" > -
-
系统全称*
+
系统全称*
name="projName" rules={[ @@ -521,8 +521,9 @@ export default function ProjNew() { allowClear style={{ // background: '#eeeeee', - fontSize: '16px', - width: '800px', height: '50px', + // fontSize: '16px', + width: '780px', + height: '42px', }} placeholder="请输入系统全称 (注:系统全称建议以“软件”、“系统”、“平台”或“APP”结尾)" options={selectList} @@ -583,7 +584,7 @@ export default function ProjNew() { style={{ position: 'absolute', right: -35, - top: 15, + top: 10, }}>推荐
+ +
+
+ 产权所属者* + +
+ + name="belongPeople" + rules={[{ required: true, message: '请选择/创建知识产权所属者' }]} + > + + + +
{ + setBelongModal(true) + }}>选择
+
+
+
+ 产权联系人* +
+ + name="contacts" + rules={[{ required: true, message: '请选择/创建知识产权联系人' }]} + > + + + +
{ + setConcatModal(true) + }}>选择
+
+
+
-
系统版本*
+
系统版本*
name="projVersion" @@ -605,14 +656,15 @@ export default function ProjNew() { style={{ // background: '#eeeeee', - width: '310px', height: '50px', fontSize: '16px' + width: '310px', height: '42px', + // fontSize: '16px' }} placeholder="请输入系统版本 (注:默认版本为v1.0)" />
-
系统语言*
+
系统语言*
name="backendCodeLang" rules={[ @@ -620,7 +672,10 @@ export default function ProjNew() { ]} > +
知识产权选择 :
*/} -
-
*/} + {/*
知识产权
-
-
- -
-
- 产权所属者* - -
- - name="belongPeople" - rules={[{ required: true, message: '请选择/创建知识产权所属者' }]} - > - - - -
{ - setBelongModal(true) - }}>选择
-
-
-
- 产权联系人* -
- - name="contacts" - rules={[{ required: true, message: '请选择/创建知识产权联系人' }]} - > - - - -
{ - setConcatModal(true) - }}>选择
-
-
+
*/} +
= { onBefore?(): void; onSuccess(data: AxiosResponse): void; onFinally?(): void; + // onError?: (error: any) => void; // 添加 onError 属性 } export interface IDictionary { @@ -128,7 +129,7 @@ export function getUseUrl() { export function post(req: Req) { req.onBefore?.(); - Axios.post(req.url, req.body, req.config).then(res => { + Axios.post(req.url, req.body ? req.body : {}, req.config).then(res => { req.onSuccess(res); }).catch(error => { if (error.response) { @@ -147,7 +148,7 @@ export function post(req: Req) { export function put(req: Req) { req.onBefore?.(); - Axios.put(req.url, req.body, req.config).then(res => { + Axios.put(req.url, req.body ? req.body : {}, req.config).then(res => { req.onSuccess(res); }).catch(error => { if (error.response) {