diff --git a/src/components/OrderDetailModal/OrderDetailModal.tsx b/src/components/OrderDetailModal/OrderDetailModal.tsx index 03d6f00..62e56c9 100644 --- a/src/components/OrderDetailModal/OrderDetailModal.tsx +++ b/src/components/OrderDetailModal/OrderDetailModal.tsx @@ -1,63 +1,65 @@ import React, { useState, useEffect } from 'react' import './order-detail-modal.css' -import { Input, Rate } from "antd"; +import OrderInfo from '../../components/OrderDetailModal/components/OrderInfo/OrderInfo' +import GoodsInfo from '../../components/OrderDetailModal/components/GoodsInfo/GoodsInfo' +import Copyright from '../../components/OrderDetailModal/components/Copyright/Copyright' +import Authorize from '../../components/OrderDetailModal/components/Authorize/Authorize' +import File from '../../components/OrderDetailModal/components/File/File' +import Result from '../../components/OrderDetailModal/components/Result/Result' export default function OrderDetailModal() { const height = window.innerHeight - 180; const [activeKey, setActiveKey] = useState('roder') //tap栏选项 默认选第一个 - const [orderPrice, setOrderPrice] = useState('') //订单金额 - const [orderStatus, setOrderStatus] = useState('') //订单状态 - const [orderTime, setOrderTime] = useState('') //下单时间 - const [payTime, setPayTime] = useState('') //付款时间 - const [cardTime, setCardTime] = useState('') //下证时间 - const [evaluateTime, setEvaluateTime] = useState('') //评价时间 - const [orderRate, setOrderRate] = useState(0) //订单评价星星数量 - const [rateText,setOrderText] = useState('') + // tab栏 标题数组 const tapTitleArray = [ { key: 'roder', title: '订单信息', - className: activeKey == 'roder' ? 'orderDetailTop-tetle tapActive' : 'orderDetailTop-tetle' + className: activeKey == 'roder' ? 'orderDetailTop-title tapActive' : 'orderDetailTop-title' }, { key: 'goodsInfo', title: '著作权商品信息', - className: activeKey == 'goodsInfo' ? 'orderDetailTop-tetle tapActive' : 'orderDetailTop-tetle' + className: activeKey == 'goodsInfo' ? 'orderDetailTop-title tapActive' : 'orderDetailTop-title' }, { key: 'copyright', title: ' 著作权人信息', - className: activeKey == 'copyright' ? 'orderDetailTop-tetle tapActive' : 'orderDetailTop-tetle' + className: activeKey == 'copyright' ? 'orderDetailTop-title tapActive' : 'orderDetailTop-title' }, { key: 'authorize', title: '受权人信息', - className: activeKey == 'authorize' ? 'orderDetailTop-tetle tapActive' : 'orderDetailTop-tetle' + className: activeKey == 'authorize' ? 'orderDetailTop-title tapActive' : 'orderDetailTop-title' }, { key: 'file', title: '资料补充', - className: activeKey == 'file' ? 'orderDetailTop-tetle tapActive' : 'orderDetailTop-tetle' + className: activeKey == 'file' ? 'orderDetailTop-title tapActive' : 'orderDetailTop-title' }, { key: 'result', title: '过户结果', - className: activeKey == 'result' ? 'orderDetailTop-tetle tapActive borderRight' : 'orderDetailTop-tetle borderRight' + className: activeKey == 'result' ? 'orderDetailTop-title tapActive borderRight' : 'orderDetailTop-title borderRight' }, ] + // 订单信息 + const orderInfo = { + orderPrice: '11', //订单金额 + orderStatus: '过户已完成', //订单状态 + orderTime: '2024-04-25 15:34:10', //下单时间 + payTime: '2024-04-25 15:34:10', //付款时间 + cardTime: '2024-04-25 15:34:10', //下证时间 + evaluateTime: '2024-04-25 15:34:10',//评价时间 + orderRate: 3, //评价星级 + rateText: '喜喜喜喜喜喜喜喜喜喜哈哈哈哈' //评价内容 + } useEffect(() => { - // 发起请求获取订单信息 - setOrderPrice('556') - setOrderStatus('已过户完成') - setOrderTime('2024-04-25 15:34:10') - setPayTime('2024-04-25 15:50:10') - setCardTime('2024-05-25 15:50:10') - setEvaluateTime('2024-05-25 15:50:10') - setOrderRate(3) - setOrderText('嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻') + // 发起请求获取订单信息 发送给其他组件 + }, []) return ( -
+
{tapTitleArray.map((item) => { return ( @@ -71,94 +73,22 @@ export default function OrderDetailModal() {
-
-
-
订单金额
- -
-
-
订单状态
- -
-
-
下单时间
- -
-
-
付款时间
- -
-
-
下证时间
- -
-
-
评价时间
- -
-
-
订单评价
- - -
- -
-
-
-
评价内容
- -
-
- + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
diff --git a/src/components/OrderDetailModal/components/Authorize/Authorize.tsx b/src/components/OrderDetailModal/components/Authorize/Authorize.tsx new file mode 100644 index 0000000..8f72de9 --- /dev/null +++ b/src/components/OrderDetailModal/components/Authorize/Authorize.tsx @@ -0,0 +1,104 @@ + +import { Input } from "antd"; +export default function Authorize() { + return ( +
+
+
+ 类别 +
+ +
+
+
+ 姓名或名称 +
+ +
+
+
+ 所在城市 +
+ +
+
+
+ 联系电话 +
+ +
+
+
+ 证件类型 +
+ +
+
+
+ 证件号码 +
+ +
+
+ ) +} diff --git a/src/components/OrderDetailModal/components/Copyright/Copyright.tsx b/src/components/OrderDetailModal/components/Copyright/Copyright.tsx new file mode 100644 index 0000000..d7ab4b4 --- /dev/null +++ b/src/components/OrderDetailModal/components/Copyright/Copyright.tsx @@ -0,0 +1,105 @@ + +import './copyright.css' +import { Input } from "antd"; +export default function Copyright() { + return ( +
+
+
+ 类别 +
+ +
+
+
+ 姓名或名称 +
+ +
+
+
+ 所在城市 +
+ +
+
+
+ 联系电话 +
+ +
+
+
+ 证件类型 +
+ +
+
+
+ 证件号码 +
+ +
+
+ ) +} diff --git a/src/components/OrderDetailModal/components/Copyright/copyright.css b/src/components/OrderDetailModal/components/Copyright/copyright.css new file mode 100644 index 0000000..43791a3 --- /dev/null +++ b/src/components/OrderDetailModal/components/Copyright/copyright.css @@ -0,0 +1,22 @@ +.copyright{ + width: 1100px; + margin-left: 20px; + display: flex; + justify-content: space-between; + flex-wrap: wrap; +} +.copyright-input{ + display: flex; + align-items: center; + margin-bottom: 29px; +} +.copyright-title{ + font-size: 16px; + color: #222222; + line-height: 42px; + /* background-color: red; */ + width: 80px; + text-align: right; + /* background-color: red; */ + margin-right: 20px; +} \ No newline at end of file diff --git a/src/components/OrderDetailModal/components/File/File.tsx b/src/components/OrderDetailModal/components/File/File.tsx new file mode 100644 index 0000000..a02f94e --- /dev/null +++ b/src/components/OrderDetailModal/components/File/File.tsx @@ -0,0 +1,121 @@ +// import React from 'react' +import { Table, Space } from "antd" +const { Column } = Table; +export default function File() { + const data = [ + { + id:'123', + fileTitle:'嘻嘻嘻嘻嘻嘻嘻', + fileConent:'资料内容', + time:'2024-05-14 15:05:56', + status:'卖家待补充/买家待补充', + }, + { + id:"012", + fileTitle:'哈哈哈哈', + fileConent:'资料内容', + time:'2024-05-14 15:05:56', + status:'卖家待补充/买家待补充', + }, + { + + fileTitle:'嘎嘎嘎嘎嘎嘎嘎嘎嘎嘎1', + fileConent:'资料内容', + time:'2024-05-14 15:05:56', + status:'卖家待补充/买家待补充', + }, + { + fileTitle:'嘎嘎嘎嘎嘎嘎嘎嘎嘎嘎2', + fileConent:'资料内容', + time:'2024-05-14 15:05:56', + status:'卖家待补充/买家待补充', + }, + { + fileTitle:'嘎嘎嘎嘎嘎嘎嘎嘎嘎嘎3', + fileConent:'资料内容', + time:'2024-05-14 15:05:56', + status:'卖家待补充/买家待补充', + }, + { + fileTitle:'嘎嘎嘎嘎嘎嘎嘎嘎嘎嘎4', + fileConent:'资料内容', + time:'2024-05-14 15:05:56', + status:'卖家待补充/买家待补充', + }, + { + fileTitle:'嘎嘎嘎嘎嘎嘎嘎嘎嘎嘎5', + fileConent:'资料内容', + time:'2024-05-14 15:05:56', + status:'卖家待补充/买家待补充', + }, + { + fileTitle:'嘎嘎嘎嘎嘎嘎嘎嘎嘎嘎6', + fileConent:'资料内容', + time:'2024-05-14 15:05:56', + status:'卖家待补充/买家待补充', + }, + + + ] + return ( +
+ + ( + index + 1 + )} align="center" /> + ( + // {text} + // )} + /> + + + ( + {text} + )} + /> + + {/* */} + ( + + { + console.log(record); + }}>查看内容 + + + )} + /> +
+
+ ) +} diff --git a/src/components/OrderDetailModal/components/GoodsInfo/GoodsInfo.css b/src/components/OrderDetailModal/components/GoodsInfo/GoodsInfo.css new file mode 100644 index 0000000..cbf63ec --- /dev/null +++ b/src/components/OrderDetailModal/components/GoodsInfo/GoodsInfo.css @@ -0,0 +1,49 @@ +.goodsInfo { + /* margin-top: 42px; */ + display: flex; + padding: 0px 23px; +} + +.goodsInfo-left { + width: 321px; + height: 565px; + background: #F5F5F9; + border: 1px solid #DBDAE1; + padding: 22px; + box-sizing: border-box; +} +.goodsInfo-img{ + width: 276px; + height: 367px; + background: #DFDFDF; +} +.tips{ + color: #828282; + /* background-color: pink; */ + text-align: center; + margin-top: 21px; + font-size: 14px; +} + +.goodsInfo-right { + width: 100%; + height: 600px; + display: flex; + flex-wrap: wrap; + margin-left: 52px; + /* background-color: pink; */ + justify-content: space-between; + +} + +.goodsInfo-input { + display: flex; +} + +.goodsinfo-title { + font-size: 16px; + color: #222222; + line-height: 42px; + /* margin-right: 17px; */ + width: 80px; +} \ No newline at end of file diff --git a/src/components/OrderDetailModal/components/GoodsInfo/GoodsInfo.tsx b/src/components/OrderDetailModal/components/GoodsInfo/GoodsInfo.tsx new file mode 100644 index 0000000..9c2b9b9 --- /dev/null +++ b/src/components/OrderDetailModal/components/GoodsInfo/GoodsInfo.tsx @@ -0,0 +1,168 @@ +import './GoodsInfo.css' +import { Input, Image } from "antd"; +import testImg from '../../../../static/test.jpg' +const { TextArea } = Input; + +export default function GoodsInfo() { + return ( +
+
+
+ 点击放大软著证书
, + }}> +
+
+ 点击放大软著证书 +
+
+
+
+
+ 软著名称 +
+ +
+
+
+ 软著简称 +
+ +
+
+
+ 软著证号 +
+ +
+
+
+ 软著版本 +
+ +
+
+
+ 取得时间 +
+ +
+
+
+ 开发语言 +
+ +
+
+
+ 获取方式 +
+ +
+
+
+ 售卖价格 +
+ +
+
+
+ 上架时间 +
+ +
+ +
+
+ 软著详情 +
+ +
+
+
+ ) +} diff --git a/src/components/OrderDetailModal/components/OrderInfo/OrderInfo.tsx b/src/components/OrderDetailModal/components/OrderInfo/OrderInfo.tsx new file mode 100644 index 0000000..81e27dc --- /dev/null +++ b/src/components/OrderDetailModal/components/OrderInfo/OrderInfo.tsx @@ -0,0 +1,111 @@ +import './Orderinfo.css' +import { Input, Rate } from "antd"; +const { TextArea } = Input; + +export default function OrderInfo(props: any) { + // const [orderPrice, setOrderPrice] = useState('') //订单金额 + // const [orderStatus, setOrderStatus] = useState('') //订单状态 + // const [orderTime, setOrderTime] = useState('') //下单时间 + // const [payTime, setPayTime] = useState('') //付款时间 + // const [cardTime, setCardTime] = useState('') //下证时间 + // const [evaluateTime, setEvaluateTime] = useState('') //评价时间 + // const [orderRate, setOrderRate] = useState(0) //订单评价星星数量 + // const [rateText, setOrderText] = useState('') + const orderInfo = props.orderInfo + return ( +
+
+
+
订单金额
+ +
+
+
订单状态
+ +
+
+
下单时间
+ +
+
+
付款时间
+ +
+
+
下证时间
+ +
+
+
评价时间
+ +
+
+
订单评价
+ +
+ +
+
+
评价内容
+ +
+
+ ) +} diff --git a/src/components/OrderDetailModal/components/OrderInfo/Orderinfo.css b/src/components/OrderDetailModal/components/OrderInfo/Orderinfo.css new file mode 100644 index 0000000..c59bd1a --- /dev/null +++ b/src/components/OrderDetailModal/components/OrderInfo/Orderinfo.css @@ -0,0 +1,33 @@ +.orderDetailBot-order { + display: flex; + justify-content: space-between; + width: 1100px; + /* background-color: red; */ + flex-wrap: wrap; + /* margin-top: 42px; */ + margin-left: 20px; +} + +.orderInfo { + display: flex; + margin-bottom: 29px; + /* position: relative; */ + /* align-items: center; */ +} +.orderInfoRate{ + display: flex; + align-items: center; +} +.orderInfo-rate{ + position: absolute; + left: 110px; + top: 12px; +} + +.orderInfo-title { + font-size: 16px; + color: #222222; + line-height: 42px; + /* background-color: red; */ + width: 100px; +} \ No newline at end of file diff --git a/src/components/OrderDetailModal/components/Result/Result.tsx b/src/components/OrderDetailModal/components/Result/Result.tsx new file mode 100644 index 0000000..a7b638a --- /dev/null +++ b/src/components/OrderDetailModal/components/Result/Result.tsx @@ -0,0 +1,24 @@ +import React from 'react' +import './result.css' +import { Image } from "antd"; +import { + DownloadOutlined +} from '@ant-design/icons'; +import testImg from '../../../../static/test.jpg' +export default function Result() { + return ( +
+
+ 点击放大软著过户后的电子版
, + }}> +
+
+
点击放大软著过户后的电子版
+
{ + // window.open(`${Axios.defaults?.baseURL}/route/proj/download/apply/${pathParams.projId}`) + }}>下载
+
+ + ) +} diff --git a/src/components/OrderDetailModal/components/Result/result.css b/src/components/OrderDetailModal/components/Result/result.css new file mode 100644 index 0000000..c035c7b --- /dev/null +++ b/src/components/OrderDetailModal/components/Result/result.css @@ -0,0 +1,28 @@ +.result { + height: 560px; + background: #F5F5F9; + border: 1px solid #DBDAE1; + display: flex; + flex-direction: column; + /* justify-content: center; */ + align-items: center; +} + +.result-img { + width: 350px; + height: 480px; + background-color: pink; + margin-top: 22px; +} + +.result-text { + display: flex; + /* background-color: red; */ + width: 350px; + justify-content: space-between; + color: #888888; + margin-top: 18px; +} +.result-down{ + cursor: pointer; +} \ No newline at end of file diff --git a/src/components/OrderDetailModal/order-detail-modal.css b/src/components/OrderDetailModal/order-detail-modal.css index 106a281..248ae75 100644 --- a/src/components/OrderDetailModal/order-detail-modal.css +++ b/src/components/OrderDetailModal/order-detail-modal.css @@ -6,7 +6,7 @@ border-bottom: 1px solid #EFE8E2; } -.orderDetailTop-tetle { +.orderDetailTop-title { /* background-color: pink; */ line-height: 45px; padding: 0 16px 0 16px; @@ -27,33 +27,9 @@ color: #3168EC; } -.orderDetailBot {} - -.orderDetailBot-order { - display: flex; - justify-content: space-between; - width: 1100px; +.orderDetailBot { + margin-top: 30px; + height: calc(100% - 120px); /* background-color: red; */ - flex-wrap: wrap; - margin-top: 42px; - margin-left: 20px; -} - -.orderInfo { - display: flex; - margin-bottom: 29px; - position: relative; -} -.orderInfo-rate{ - position: absolute; - left: 110px; - top: 12px; -} - -.orderInfo-title { - font-size: 16px; - color: #222222; - line-height: 44px; - /* background-color: red; */ - width: 100px; + overflow: auto; } \ No newline at end of file diff --git a/src/route/CopyrightGgoods/CopyrightGgoods.tsx b/src/route/CopyrightGgoods/CopyrightGgoods.tsx index 8c8ef48..e209d48 100644 --- a/src/route/CopyrightGgoods/CopyrightGgoods.tsx +++ b/src/route/CopyrightGgoods/CopyrightGgoods.tsx @@ -277,15 +277,7 @@ export default function CopyrightGgoods() {
+
{contextHolder} {/* */} -
+
{ nav(-1); }}>返回 @@ -742,6 +742,6 @@ export default function ProjEdit() { > - +
) } \ No newline at end of file