diff --git a/src/components/card/CardProj.tsx b/src/components/card/CardProj.tsx
index a8bee66..8a0ccdd 100644
--- a/src/components/card/CardProj.tsx
+++ b/src/components/card/CardProj.tsx
@@ -15,7 +15,8 @@ import {
RedoOutlined,
CloseOutlined
} from '@ant-design/icons';
-import { Button, Tag, Modal, Carousel } from 'antd';
+import { Button, Tag, Modal, Carousel, Dropdown } from 'antd';
+import type { MenuProps } from 'antd';
import { GenerateStatus } from "../../interfaces/proj/IProj.ts";
import { useNavigate } from "react-router-dom";
import { Axios, post, downloadUrl, get, del } from "../../util/AjaxUtils.ts";
@@ -229,7 +230,7 @@ export default function CardProj(props: any) {
messageApi.error('演示视频打包失败,点击重新打包');
setShowBuyPicError(true)
setShowBuyVideoIng(false)
- }else{
+ } else {
messageApi.error('演示视频正在生成,请稍后');
}
}
@@ -450,7 +451,108 @@ export default function CardProj(props: any) {
}
}
+ const applyItems: MenuProps['items'] = [
+ {
+ key: '1',
+ label: (
+
{
+ window.open(`${Axios.defaults?.baseURL}/route/proj/download/apply/${data.projId}`)
+ }}
+ style={{ maxWidth: 200, whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}
+ >
+ Word
+
+
+ ),
+ },
+ {
+ key: '2',
+ label: (
+ {
+ window.open(`${Axios.defaults?.baseURL}/route/proj/download/apply-txt/${data.projId}`)
+ }}
+ style={{ maxWidth: 200, whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}
+
+ >
+ TxT
+
+ ),
+
+ },
+
+
+ ]
+ const manualItems: MenuProps['items'] = [
+ {
+ key: '1',
+ label: (
+ {
+ window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/${data.projId}`)
+ }}
+ style={{ maxWidth: 200, whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}
+
+ >
+ Word
+
+
+ ),
+ },
+ {
+ key: '2',
+ label: (
+ {
+ window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/pdf/${data.projId}`)
+ }}
+ style={{ maxWidth: 200, whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}
+
+ >
+ Pdf
+
+ ),
+
+ },
+
+
+ ]
+ const codeItems: MenuProps['items'] = [
+ {
+ key: '1',
+ label: (
+ {
+ window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/${data.projId}`)
+ }}
+ style={{ maxWidth: 200, whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}
+
+ >
+ Word
+
+
+ ),
+ },
+ {
+ key: '2',
+ label: (
+ {
+ window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/pdf/${data.projId}`)
+ }}
+ style={{ maxWidth: 200, whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}
+
+ >
+ Pdf
+
+ ),
+
+ },
+
+
+ ]
useEffect(() => {
// 修改
// const charge = props.item.pay.charge.split(':')[0];
@@ -632,7 +734,7 @@ export default function CardProj(props: any) {
>
{/* {data.pay.payment / 100} */}
- {data.pay.servicePackageId?0: data.pay.payment/ 100}
+ {data.pay.servicePackageId ? 0 : data.pay.payment / 100}
{/* 2000.00 */}
@@ -761,14 +863,25 @@ export default function CardProj(props: any) {
{
data.generate.generateStatus == GenerateStatus.SUCCESS ? (
-
{
+ {/* {
window.open(`${Axios.defaults?.baseURL}/route/proj/download/apply/${data.projId}`)
- }}> 申请表
+ }}> 申请表 */}
+
+
+ 申请表
+
+
-
-
+ {/*
*/}
+ {/*
操作手册
@@ -780,8 +893,20 @@ export default function CardProj(props: any) {
onClick={() => {
window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/pdf/${data.projId}`)
}}> pdf
+
*/}
+
+ 操作手册
+
+
-
+
+ {/*
*/}
{/* {
isShow &&
{
window.open(`${Axios.defaults?.baseURL}/route/proj/download/code-zip/${data.projId}`)
@@ -794,21 +919,33 @@ export default function CardProj(props: any) {
{/* {
window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/${data.projId}`)
}}> 源代码 */}
-
-
- 源代码
-
-
- {
- window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/${data.projId}`)
- }}> word
- {
- window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/pdf/${data.projId}`)
- }}> pdf
-
+ {/*
*/}
+ {/*
+ 源代码
+
+ {
+ window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/${data.projId}`)
+ }}> word
+ {
+ window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/pdf/${data.projId}`)
+ }}> pdf
+
*/}
+
+ 源代码
+
+
+
+
+ {/*
*/}
{
// window.open(`${Axios.defaults?.baseURL}/route/proj/download/all/${data.projId}`)
downAll(data.projId, data.projName)
diff --git a/src/components/payment/Payment.tsx b/src/components/payment/Payment.tsx
index 0410b91..31f1e63 100644
--- a/src/components/payment/Payment.tsx
+++ b/src/components/payment/Payment.tsx
@@ -905,7 +905,7 @@ export default function Payment(props: IPaymentProps) {
marginRight: 10,
marginLeft: 25
}}>
- 服务包:
+ 套餐包:
+ style={{
+ // background: '#eeeeee',
+ width: '310px', height: '50px', fontSize: '16px'
+ }} placeholder="请输入系统版本 (注:默认版本为v1.0)" />
@@ -656,7 +659,10 @@ export default function ProjNew() {
format={dateFormat}
locale={locale}
// style={{ width: '100%' }}
- style={{ height: '50px', width: '310px', fontSize: 16, background: '#eeeeee', }}
+ style={{
+ height: '50px', width: '310px', fontSize: 16,
+ // background: '#eeeeee',
+ }}
disabledDate={(current) => current && current > dayjs().endOf('day')}
/>
@@ -697,10 +703,23 @@ export default function ProjNew() {
}}
>
*/}
- 0 ? '请选择套餐包' : '暂无套餐包'} disabled />
+ 0 ? '请选择套餐包' : '暂无套餐包'}
+ disabled
+ />
- {
+
{
if (packList.length > 0) {
setPackModal(true)
setPage(1)
@@ -722,6 +741,7 @@ export default function ProjNew() {
setcouponShow(true)
// setShowPrice(location.state.price)
}}>取消
+
@@ -743,7 +763,10 @@ export default function ProjNew() {
-