Tenlion/system-copyright-react
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
lyp 2025-03-04 19:55:31 +08:00
parent 5463deb923
commit be828e097d
7 changed files with 118 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/card/CardProj.tsx
View File

@ -119,6 +119,9 @@ export default function CardProj(props: any) {
}); });
}, },
// onError(error) {
// messageApi.error(error.message);
// },
onFinally() { onFinally() {
} }

27
src/components/payment/Payment.tsx
View File

@ -530,7 +530,7 @@ export default function Payment(props: IPaymentProps) {
if (thirdParty == '对公转账') { if (thirdParty == '对公转账') {
return ( return (
<div style={{ <div style={{
marginLeft: 80 marginLeft: 20
}}> }}>
<div> <div>
@ -698,7 +698,7 @@ export default function Payment(props: IPaymentProps) {
</div> </div>
</div> </div>
<div style={{ <div style={{
marginLeft: 90 marginLeft: 20
}}> }}>
<div className='codeTitle'>支付Pay</div> <div className='codeTitle'>支付Pay</div>
<div style={{ <div style={{
@ -885,7 +885,7 @@ export default function Payment(props: IPaymentProps) {
form={form} form={form}
onFinish={() => { onFinish={() => {
setPaymentModal(true) setPaymentModal(true)
// if (!isRechargeMoneyEdit) { // if (!isRechargeMoneyEdit) {
// setPaymentModal(true); // setPaymentModal(true);
// } else { // } else {
@ -920,10 +920,10 @@ export default function Payment(props: IPaymentProps) {
form.setFieldValue('thirdParty', e.target.value); form.setFieldValue('thirdParty', e.target.value);
setThirdParty(e.target.value); setThirdParty(e.target.value);
// console.log(e.target.value); // console.log(e.target.value);
setPackageInfoId(''); // setPackageInfoId('');
setIsRechargeMoneyEdit(false) setIsRechargeMoneyEdit(false)
// setValue('') // setValue('')
form.setFieldValue('rechargeMoney', 280); // form.setFieldValue('rechargeMoney', 280);
// setSelectedRowKeys([]); // setSelectedRowKeys([]);
}}> }}>
@ -1049,17 +1049,22 @@ export default function Payment(props: IPaymentProps) {
display: packList.length <= 0 ? 'unset' : 'none', display: packList.length <= 0 ? 'unset' : 'none',
marginLeft: 90 marginLeft: 90
}}> }}>
<Image <div style={{
src={nodate} // border: '1px solid #BAC8DA',
// 点击禁止放大 }}>
preview={false} <Image
></Image> src={nodate}
width={730}
// 点击禁止放大
preview={false}
></Image>
</div>
<div style={{ <div style={{
color: '#BAC8DA ', color: '#BAC8DA ',
fontSize: 16, fontSize: 16,
textAlign: 'center', textAlign: 'center',
// background:'pink', // background:'pink',
marginLeft: 90 marginLeft: 20
}}>暂无服务包</div> }}>暂无服务包</div>
</div> </div>
</div> </div>

2
src/components/recharge/RechargeHead.tsx
View File

@ -57,7 +57,7 @@ export default function RechargeHead() {
onCancel={() => { onCancel={() => {
setIsPaymentModalOpen(false); setIsPaymentModalOpen(false);
}} }}
width={1300} width={1200}
footer={false} footer={false}
centered centered
> >

7
src/layout/head/head.css
View File

@ -33,12 +33,13 @@
.head .center .left img { .head .center .left img {
/* width: 263px; */ /* width: 263px; */
height:50px; height:40px;
/* height:78px; */ /* height:78px; */
/* background-color: red; /* background-color: red;
*/ */
margin-left: 15px; margin-left: 120px;
margin-top: 12px; /* margin-left: 80%; */
margin-top: 13px;
} }
.head .center .right { .head .center .right {

161
src/route/proj/ProjNew.tsx
View File

@ -311,7 +311,7 @@ export default function ProjNew() {
]; ];
// 获取我得服务包信息 // 获取我得服务包信息
const getPickList = (page:number) => { const getPickList = (page: number) => {
get<any>({ get<any>({
messageApi, messageApi,
@ -320,7 +320,7 @@ export default function ProjNew() {
params: { params: {
page: page, page: page,
rows: 5, rows: 5,
keyong : "keyong", keyong: "keyong",
packageType: pathParams.projChargeType, packageType: pathParams.projChargeType,
} }
}, },
@ -472,15 +472,15 @@ export default function ProjNew() {
}} }}
autoComplete="off" autoComplete="off"
> >
<div style={{ <div style={{
width: 800, width: 800,
marginLeft: 130, marginLeft: 130,
display: 'flex', display: 'flex',
justifyContent: 'center', justifyContent: 'center',
marginBottom: 30, marginBottom: 30,
fontWeight: 'bold', fontWeight: 'bold',
fontSize: 16, fontSize: 18,
marginTop:5 marginTop: 5
}}> }}>
<img src={homes} width={19} height={19} style={{ <img src={homes} width={19} height={19} style={{
marginTop: 4, marginTop: 4,
@ -492,7 +492,7 @@ export default function ProjNew() {
<div style={{ position: 'relative' }}> <div style={{ position: 'relative' }}>
<div className='formItemOne'> <div className='formItemOne'>
<div className='formItem-title oneTitle'>系统全称*</div> <div className='formItem-title oneTitle'>系统全称<span style={{color:'red'}}>*</span></div>
<Form.Item<ProjInfo> <Form.Item<ProjInfo>
name="projName" name="projName"
rules={[ rules={[
@ -521,8 +521,9 @@ export default function ProjNew() {
allowClear allowClear
style={{ style={{
// background: '#eeeeee', // background: '#eeeeee',
fontSize: '16px', // fontSize: '16px',
width: '800px', height: '50px', width: '780px',
height: '42px',
}} }}
placeholder="请输入系统全称 (注：系统全称建议以“软件”、“系统”、“平台”或“APP”结尾)" placeholder="请输入系统全称 (注：系统全称建议以“软件”、“系统”、“平台”或“APP”结尾)"
options={selectList} options={selectList}
@ -583,7 +584,7 @@ export default function ProjNew() {
style={{ style={{
position: 'absolute', position: 'absolute',
right: -35, right: -35,
top: 15, top: 10,
}}>推荐</a> }}>推荐</a>
<div style={{ <div style={{
position: 'absolute', left: 185, position: 'absolute', left: 185,
@ -593,10 +594,60 @@ export default function ProjNew() {
</div> </div>
<div style={{ <div style={{
display: 'flex', display: 'flex',
marginTop: 30 marginTop: 10
}}>
<div className='formItemOne' style={{ position: 'relative' }}>
<div className='formItem-title ' style={{
// position: 'relative',
// background: 'pink',
}}>
产权所属者<span style={{color:'red'}}>*</span>
</div>
<Form.Item<ProjInfo>
name="belongPeople"
rules={[{ required: true, message: '请选择/创建知识产权所属者' }]}
>
<Input style={{ background: '#eeeeee', width: '310px', height: '42px', color: '#3B3B3B' }} placeholder="请选择/创建知识产权所属者" disabled />
</Form.Item>
<div style={{
position: 'absolute', right: 20, fontSize: 16, color: " #1F79FF", cursor: 'pointer',
// background:'pink',
width: 290,
textAlign: 'right',
}} onClick={() => {
setBelongModal(true)
}}>选择</div>
</div>
<div className='formItemOne' style={{ position: 'relative' }}>
<div className='formItem-title '>
产权联系人<span style={{color:'red'}}>*</span>
</div>
<Form.Item<ProjInfo>
name="contacts"
rules={[{ required: true, message: '请选择/创建知识产权联系人' }]}
>
<Input style={{ background: '#eeeeee', width: '310px', height: '42px', color: '#3B3B3B' }} placeholder="请选择/创建知识产权联系人" disabled />
</Form.Item>
<div style={{
position: 'absolute', right: 20, fontSize: 16, color: " #1F79FF", cursor: 'pointer',
width: 290,
textAlign: 'right',
}} onClick={() => {
setConcatModal(true)
}}>选择</div>
</div>
</div>
<div style={{
display: 'flex',
marginTop: 10
}}> }}>
<div className='formItemOne' style={{}}> <div className='formItemOne' style={{}}>
<div className='formItem-title oneTitle'>系统版本*</div> <div className='formItem-title oneTitle'>系统版本<span style={{color:'red'}}>*</span></div>
<Form.Item<ProjInfo> <Form.Item<ProjInfo>
name="projVersion" name="projVersion"
@ -605,14 +656,15 @@ export default function ProjNew() {
style={{ style={{
// background: '#eeeeee', // background: '#eeeeee',
width: '310px', height: '50px', fontSize: '16px' width: '310px', height: '42px',
// fontSize: '16px'
}} placeholder="请输入系统版本 (注：默认版本为v1.0)" /> }} placeholder="请输入系统版本 (注：默认版本为v1.0)" />
</Form.Item> </Form.Item>
</div> </div>
<div className='formItemOne' style={{}}> <div className='formItemOne' style={{}}>
<div className='formItem-title oneTitle'>系统语言*</div> <div className='formItem-title oneTitle'>系统语言<span style={{color:'red'}}>*</span></div>
<Form.Item<ProjInfo> <Form.Item<ProjInfo>
name="backendCodeLang" name="backendCodeLang"
rules={[ rules={[
@ -620,7 +672,10 @@ export default function ProjNew() {
]} ]}
> >
<Select <Select
style={{ width: '310px', height: '50px', fontSize: '16px', }} style={{
width: '310px', height: '42px',
// fontSize: '16px',
}}
placeholder="请选择系统语言" placeholder="请选择系统语言"
className='langselect' className='langselect'
// defaultValue="JAVA" // defaultValue="JAVA"
@ -638,7 +693,7 @@ export default function ProjNew() {
<div style={{ <div style={{
display: 'flex', display: 'flex',
marginTop: 30 marginTop: 10
}}> }}>
{/* <div className='formItemOne' style={{}}> {/* <div className='formItemOne' style={{}}>
@ -678,7 +733,8 @@ export default function ProjNew() {
locale={locale} locale={locale}
// style={{ width: '100%' }} // style={{ width: '100%' }}
style={{ style={{
height: '50px', width: '310px', fontSize: 16, height: '42px', width: '310px',
// fontSize: 16,
// background: '#eeeeee', // background: '#eeeeee',
}} }}
disabledDate={(current) => current && current > dayjs().endOf('day')} disabledDate={(current) => current && current > dayjs().endOf('day')}
@ -725,7 +781,8 @@ export default function ProjNew() {
className="custom-input" className="custom-input"
style={{ style={{
// background: '#eeeeee', // background: '#eeeeee',
fontSize: 16, width: '310px', height: '50px', color: '#3B3B3B' // fontSize: 16,
width: '310px', height: '42px', color: '#3B3B3B'
}} placeholder={packList.length > 0 ? '请选择套餐包' : '暂无套餐包'} }} placeholder={packList.length > 0 ? '请选择套餐包' : '暂无套餐包'}
disabled disabled
/> />
@ -768,7 +825,7 @@ export default function ProjNew() {
</div> </div>
<div style={{ <div style={{
display: 'flex', display: 'flex',
marginTop: 30 marginTop: 10
}}> }}>
<div style={{ display: couponShow ? 'unset' : 'none' }}> <div style={{ display: couponShow ? 'unset' : 'none' }}>
@ -780,7 +837,11 @@ export default function ProjNew() {
name="coupon" name="coupon"
// rules={[{ required: true, message: '请选择优惠券' }]} // rules={[{ required: true, message: '请选择优惠券' }]}
> >
<Input style={{ background: '#eeeeee', fontSize: 16, width: '310px', height: '50px', color: '#3B3B3B' }} placeholder={hasCoupon ? '请选择优惠券' : '暂无可用优惠券'} disabled /> <Input style={{
background: '#eeeeee',
// fontSize: 16,
width: '310px', height: '42px', color: '#3B3B3B'
}} placeholder={hasCoupon ? '请选择优惠券' : '暂无可用优惠券'} disabled />
</Form.Item> </Form.Item>
<div style={{ <div style={{
@ -820,22 +881,23 @@ export default function ProjNew() {
color: 'green', color: 'green',
fontWeight: 'bold', fontWeight: 'bold',
}}>知识产权选择 : </div> */} }}>知识产权选择 : </div> */}
<div style={{ {/* <div style={{
height: 2, height: 2,
background: '#E9E9E9', background: '#E9E9E9',
// width: 900, // width: 900,
marginLeft: 50, marginLeft: 50,
marginTop: 20, marginTop: 20,
marginBottom: 20, marginBottom: 20,
}}></div> }}></div> */}
<div style={{ {/* <div style={{
width: 800, width: 800,
marginLeft: 130, marginLeft: 130,
display: 'flex', display: 'flex',
justifyContent: 'center', justifyContent: 'center',
marginBottom: 30, marginBottom: 30,
fontWeight: 'bold', fontWeight: 'bold',
fontSize: 16 fontSize: 18,
marginTop: 20
}}> }}>
<img src={homes} width={19} height={19} style={{ <img src={homes} width={19} height={19} style={{
marginTop: 4, marginTop: 4,
@ -843,57 +905,8 @@ export default function ProjNew() {
}} alt="" /> }} alt="" />
<div> 知识产权</div> <div> 知识产权</div>
</div> </div> */}
<div style={{
display: 'flex',
}}>
<div className='formItemOne' style={{ position: 'relative' }}>
<div className='formItem-title ' style={{
// position: 'relative',
// background: 'pink',
}}>
产权所属者*
</div>
<Form.Item<ProjInfo>
name="belongPeople"
rules={[{ required: true, message: '请选择/创建知识产权所属者' }]}
>
<Input style={{ background: '#eeeeee', width: '310px', height: '50px', fontSize: '16px', color: '#3B3B3B' }} placeholder="请选择/创建知识产权所属者" disabled />
</Form.Item>
<div style={{
position: 'absolute', right: 20, fontSize: 16, color: " #1F79FF", cursor: 'pointer',
// background:'pink',
width: 290,
textAlign: 'right',
}} onClick={() => {
setBelongModal(true)
}}>选择</div>
</div>
<div className='formItemOne' style={{ position: 'relative' }}>
<div className='formItem-title '>
产权联系人*
</div>
<Form.Item<ProjInfo>
name="contacts"
rules={[{ required: true, message: '请选择/创建知识产权联系人' }]}
>
<Input style={{ background: '#eeeeee', width: '310px', height: '50px', fontSize: '16px', color: '#3B3B3B' }} placeholder="请选择/创建知识产权联系人" disabled />
</Form.Item>
<div style={{
position: 'absolute', right: 20, fontSize: 16, color: " #1F79FF", cursor: 'pointer',
width: 290,
textAlign: 'right',
}} onClick={() => {
setConcatModal(true)
}}>选择</div>
</div>
</div>
<div className='software-protocol'> <div className='software-protocol'>
<Form.Item <Form.Item
name="agreement" name="agreement"

8
src/route/proj/proj-new.css
View File

@ -29,20 +29,20 @@
/* background-color: red; */ /* background-color: red; */
display: flex; display: flex;
/* align-items: center; */ /* align-items: center; */
line-height: 50px; line-height: 42px;
height: 50px; height: 42px;
} }
.formItem-title { .formItem-title {
font-family: Microsoft YaHei UI; font-family: Microsoft YaHei UI;
font-weight: bold; font-weight: bold;
font-size: 18px; font-size: 16px;
color: #474747; color: #474747;
/* color: #eeeeee; */ /* color: #eeeeee; */
width: 150px; width: 150px;
text-align: right; text-align: right;
/* background-color: red; */ /* background-color: red; */
margin-right: 33px; margin-right: 10px;
} }

5
src/util/AjaxUtils.ts
View File

@ -27,6 +27,7 @@ type Req<T> = {
onBefore?(): void; onBefore?(): void;
onSuccess(data: AxiosResponse<T>): void; onSuccess(data: AxiosResponse<T>): void;
onFinally?(): void; onFinally?(): void;
// onError?: (error: any) => void; // 添加 onError 属性
} }
export interface IDictionary { export interface IDictionary {
@ -128,7 +129,7 @@ export function getUseUrl() {
export function post<T>(req: Req<T>) { export function post<T>(req: Req<T>) {
req.onBefore?.(); req.onBefore?.();
Axios.post<T>(req.url, req.body, req.config).then(res => { Axios.post<T>(req.url, req.body ? req.body : {}, req.config).then(res => {
req.onSuccess(res); req.onSuccess(res);
}).catch(error => { }).catch(error => {
if (error.response) { if (error.response) {
@ -147,7 +148,7 @@ export function post<T>(req: Req<T>) {
export function put<T>(req: Req<T>) { export function put<T>(req: Req<T>) {
req.onBefore?.(); req.onBefore?.();
Axios.put<T>(req.url, req.body, req.config).then(res => { Axios.put<T>(req.url, req.body ? req.body : {}, req.config).then(res => {
req.onSuccess(res); req.onSuccess(res);
}).catch(error => { }).catch(error => {
if (error.response) { if (error.response) {