diff --git a/src/request/api.ts b/src/request/api.ts index 35a27c7..385619f 100644 --- a/src/request/api.ts +++ b/src/request/api.ts @@ -205,8 +205,24 @@ export const updateTrademarkApplicant = (trademarkUserId:any,params:any) => aiSh export const submitTrademarkApplicant = (trademarkId:any,params:any) => aiShopRequest.post(`/aishop/api/trademark/save3/${trademarkId}`,params) // 第四步 +// 获取支付订单 +export const getOrder = (trademarkId:any) => aiShopRequest.get(`/aishop/api/trademark/get-pay-data/${trademarkId}`) + // 订单支付 export const orderPay = (trademarkId:any) => aiShopRequest.post(`/aishop/api/trademark/save4/${trademarkId}`) + + +// 第五步 +// 生成委托书 +export const generateDepute = (trademarkId:any) => aiShopRequest.get(`/aishop/api/trademark/create-xieyi/SHOP06/${trademarkId}`) +// 上传委托书 +export const uploadDepute = (trademarkId:any,params:any) => aiShopRequest.post(`/aishop/api/trademark/save5/${trademarkId}`,params) + + +// 第六步上传 +export const uploadSix = (trademarkId:any) => aiShopRequest.post(`/aishop/api/trademark/save6/${trademarkId}`) + + // ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ diff --git a/src/request/request.ts b/src/request/request.ts index 304f090..14a6ef5 100644 --- a/src/request/request.ts +++ b/src/request/request.ts @@ -206,6 +206,7 @@ export const downloadAuthBookUrl = () => { export const uploadImageUrl = () => { return `${aiShopBaseUrl}/aishop/api/file/v2/upload-image` } + // // 下载 预览文件 买卖功能 // export const downloadUrl = (fileId: string, isDownload?: boolean) => { // return `${aiShopBaseUrl}/aishop/route/file/v2/download/${isDownload == false}/${fileId}` @@ -219,9 +220,13 @@ export const uploadFileUrl = () => { export const uploadDeputeFileUrl = (type:string) => { return `${aiShopBaseUrl}/aishop/api/trademark/upload-depute-file?type=${type}` } -// 上传图片 家条件 限制大小等 name="file" +// 上传图片 加条件 限制大小等 name="file" export const uploadImageAddUrl = () => { return `${aiShopBaseUrl}/aishop/api/trademark/upload-file` } +// 上传委托书 +export const uploadDeputeUrl = () => { + return `${aiShopBaseUrl}/aishop/api/trademark/upload-weituo-file ` +} export { request,aiShopRequest,phoneRequest,newRequest}; diff --git a/src/route/TrademarkMall/TrademarkAiEdit.tsx b/src/route/TrademarkMall/TrademarkAiEdit.tsx index d338a94..1f2f8b1 100644 --- a/src/route/TrademarkMall/TrademarkAiEdit.tsx +++ b/src/route/TrademarkMall/TrademarkAiEdit.tsx @@ -10,11 +10,29 @@ import EditFour from './components/EditFour/EditFour'; import EditFive from './components/EditFive/EditFive'; import EditSix from './components/EditSix/EditSix'; import { useLocation, useParams } from 'react-router-dom'; -import { trademarkDetail, } from '../../request/api' +import { trademarkDetail, getOrder } from '../../request/api' import { message, Spin } from 'antd'; export default function TrademarkAiEdit() { + const [orderList, setOrderList] = useState([]) + const getOrderList = async () => { + try { + const res = await getOrder(trademarkId) + console.log('订单详情列表', res); + setOrderList(res) + } catch (error: any) { + if (error.response) { + const data = error.response.data; + messageApi.open({ + type: 'error', + content: data.msg ? data.msg : `${data.path}(${data.status})`, + }); + } else { + console.error(error) + } + } + } const pathParams = useParams(); // const trademarkId = pathParams.trademarkId == 'NEW'?'':pathParams.trademarkId; const [trademarkId, setTrademarkId] = useState(pathParams.trademarkId == 'NEW' ? '' : pathParams.trademarkId) @@ -26,6 +44,7 @@ export default function TrademarkAiEdit() { const [trademarkMode, setTrademarkMode] = useState(state?.trademarkMode); const [trademarkModeName, setTrademarkModeName] = useState(state?.trademarkModeName); const [trademarkModePrice, setTrademarkModePrice] = useState(0) + // const [trademarkStatus, setTrademarkStatus] = useState('') const [editOneData, setEditOneData] = useState({ trademarkType: '', //商标类型 text 文字 image 图形 text-image 图文 trademarkName: '', //商标名称 @@ -43,11 +62,18 @@ export default function TrademarkAiEdit() { }) const [editThreeData, setEditThreeData] = useState({ trademarkUserId: '', - name:'' + name: '' }) - useEffect(()=>{ + const [editFiveData, setEditFiveData] = useState({ + trademarkFileDepute: '' + }) + const [trademarkStatus, setTrademarkStatus] = useState('') + useEffect(() => { + if (trademarkId) { + getOrderList() + } + }, [trademarkId]) - },[]) // const [trademarkId, setTrademarkId] = useState(state.trademarkId?state.trademarkId:''); const [loading, setLoading] = useState(false) const getTrademarkDetail = async (trademarkId: string) => { @@ -55,7 +81,12 @@ export default function TrademarkAiEdit() { setLoading(true) const res: any = await trademarkDetail(trademarkId) console.log('详情', res); - setEditProcess(res.trademarkProgress + 1) + if (res.trademarkProgress < 6) { + setEditProcess(res.trademarkProgress + 1) + + } else { + setEditProcess(res.trademarkProgress) + } setTrademarkMode(res.trademarkMode) setTrademarkModeName(res.trademarkModeName) setTrademarkModePrice(res.trademarkModePrice / 100) @@ -69,6 +100,7 @@ export default function TrademarkAiEdit() { trademarkPhotoType: res.trademarkPhotoType, //商标图样类型 1 自动生成 2 手动上传 trademarkPhoto: res.trademarkPhoto, //商标图样 }) + setTrademarkStatus(res.trademarkStatus) setEditTwoData({ trademarkTypeDTOS: res.trademarkTypeDTOS, trademarkTypeIds: res.trademarkTypeIds @@ -77,6 +109,9 @@ export default function TrademarkAiEdit() { trademarkUserId: res.trademarkUserDTO.trademarkUserId, name: res.trademarkUserDTO.name }) + setEditFiveData({ + trademarkFileDepute: res.trademarkFileDepute + }) } catch (error: any) { setLoading(false) @@ -232,6 +267,7 @@ export default function TrademarkAiEdit() { display: editProcess == 2 ? 'block' : 'none' }}> @@ -265,13 +304,24 @@ export default function TrademarkAiEdit() { }}>
diff --git a/src/route/TrademarkMall/TrademarkExpertEdit.tsx b/src/route/TrademarkMall/TrademarkExpertEdit.tsx index 3ef337b..44d6d3f 100644 --- a/src/route/TrademarkMall/TrademarkExpertEdit.tsx +++ b/src/route/TrademarkMall/TrademarkExpertEdit.tsx @@ -144,7 +144,7 @@ export default function TrademarkExpertEdit() { okText='确定' cancelText='取消' > - 该操作会扣除{state.price}元，确定操作吗？ + 该操作会扣除{state.price}元，且提交后无法撤销，确定操作吗？ ) diff --git a/src/route/TrademarkMall/TrademarkMall.tsx b/src/route/TrademarkMall/TrademarkMall.tsx index 37b6120..81d68cd 100644 --- a/src/route/TrademarkMall/TrademarkMall.tsx +++ b/src/route/TrademarkMall/TrademarkMall.tsx @@ -99,10 +99,49 @@ export default function TrademarkMall() { color: 'green', }} >已付款 - : - 未知 + : text == '2' ? + 已提交 + : text == '3' ? + 不予受理 + : text == '4' ? + 已受理 + : text == '5' ? + 已发初审公告 + : text == '6' ? + 部分驳回 + : text == '7' ? + 全部驳回 + : '未知' } ) @@ -161,7 +200,7 @@ export default function TrademarkMall() {
{ nav(`/trademark-ai-edit/${record.trademarkId}`, { @@ -175,7 +214,9 @@ export default function TrademarkMall() { // console.log(record.checkStatus); - }}>编辑
+ }}>{ + record.trademarkStatus == '2' ? '查看' : '编辑' + } ) @@ -189,6 +230,7 @@ export default function TrademarkMall() { const getTrademarkList = async (page: any) => { try { setLoading(true) + setData([]) const res: any = await trademarkList({ keywords: state && state.keywords ? state.keywords : '', rows: 10, diff --git a/src/route/TrademarkMall/components/EditFive/EditFive.css b/src/route/TrademarkMall/components/EditFive/EditFive.css new file mode 100644 index 0000000..30f0afa --- /dev/null +++ b/src/route/TrademarkMall/components/EditFive/EditFive.css @@ -0,0 +1,27 @@ +.editFiveUpBox { + width: 300px; + height: 150px; + border: 1px dashed #979797; + color: #979797; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + cursor: pointer; + background-color: white; +} + +.showImg { + width: 190px; + height: 150px; + border: 1px dashed #979797; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + margin-left: 120px; + position: relative; +} +.tipsRed{ + color: red; +} \ No newline at end of file diff --git a/src/route/TrademarkMall/components/EditFive/EditFive.tsx b/src/route/TrademarkMall/components/EditFive/EditFive.tsx index ade96a6..b874e4c 100644 --- a/src/route/TrademarkMall/components/EditFive/EditFive.tsx +++ b/src/route/TrademarkMall/components/EditFive/EditFive.tsx @@ -1,7 +1,12 @@ -import { useState } from 'react' -import { Button, Form, message, Upload, Input } from 'antd' -import { UploadOutlined } from '@ant-design/icons'; -import { uploadFileUrl, showImage } from '../../../../request/request' +import { useEffect, useState } from 'react' +import { Button, Form, message, Upload, Input, Spin, Image } from 'antd' +import { showImage, uploadDeputeUrl } from '../../../../request/request' +import { generateDepute, uploadDepute } from '../../../../request/api' +import './EditFive.css' +import { + PlusOutlined +} from '@ant-design/icons'; +import file from '../../../../static/editFive/file.png' export default function EditFive(props: any) { const token = sessionStorage.getItem('token') const [form] = Form.useForm(); @@ -9,13 +14,16 @@ export default function EditFive(props: any) { form.submit(); - props.setEditProcess(6); + // props.setEditProcess(6); }; // const [imgList, setImgList] = useState([]) + const [upFileLoading, setUpFileLoading] = useState(false) //上传文件 + const [createLoading, setCreateLoading] = useState(false) //生成委托书 + const [upLoading, setUpLoading] = useState(false) //提交 const [upFileArray, setUpFileArray] = useState([]) // 定义允许上传的文件格式 - const ALLOWED_FILE_TYPES = ['.pdf', '.jpg', '.jpeg', '.png', '.bmp']; + const ALLOWED_FILE_TYPES = ['.jpg', '.jpeg',]; const beforeUpload = (file: File) => { const fileExt = file.name.slice(file.name.lastIndexOf('.')).toLowerCase(); if (!ALLOWED_FILE_TYPES.includes(fileExt)) { @@ -24,148 +32,265 @@ export default function EditFive(props: any) { } return true; }; - // const [textLodaing, setTextLodaing] = useState(false) - // const upImgHandleChange: UploadProps['onChange'] = (info) => { + useEffect(() => { + if (props.editFiveData.trademarkFileDepute) { + form.setFieldValue('file', props.editFiveData.trademarkFileDepute) + setUpFileArray([ + { + uid: props.editFiveData.trademarkFileDepute, + name: props.editFiveData.trademarkFileDepute, + status: 'done', + url: showImage(props.editFiveData.trademarkFileDepute, false) + } + ]) + } + }, [props.editFiveData]) + const onFinish = async (values: any) => { + // console.log('Success:', values); + // props.setEditProcess(6); + if (values.file == props.editFiveData.trademarkFileDepute) { + props.setEditProcess(6); + return + } + try { + setUpLoading(true) + await uploadDepute(props.trademarkId, { + trademarkFileDepute: values.file + }) + setUpLoading(false) + props.setEditFiveData({ + trademarkFileDepute: values.file + }) + props.setEditProcess(6); + } + catch (error: any) { + if (error.response) { + setUpLoading(false) - // if (info.file.status === 'uploading') { - - // setTextLodaing(true) - // return; - // } - // if (info.file.status === 'done') { - // setTextLodaing(false) - - - // setImgList([ - // { - // uid: info.file.response.data.fileId, - // name: info.file.response.data.fileName, - // status: 'done', - // url: showImage(info.file.response.data.fileId, false) - // } - // ]) - // form.setFieldsValue({ imgUrl: info.file.response.data.fileId }) - - // return; - // } - // if (info.file.status === 'error') { - // setTextLodaing(false) - // message.error(`上传失败`); - // return; - // } - // }; - const onFinish = (values: any) => { - console.log('Success:', values); - props.setEditProcess(6); + const data = error.response.data; + message.error(data.msg ? data.msg : `${data.path}(${data.status})`) + } else { + console.error(error) + } + } + finally { + setUpLoading(false) + } }; const height = window.innerHeight - 350; return ( -
-
-
-
{ - errorInfo.errorFields.forEach((field) => { - if (field.errors.length > 0) { - // 显示每条错误信息 - message.error(field.errors[0]); - } - }); - }} - > + +
+ +
+
-
上传委托书* ：
-
- - - - - - + { + errorInfo.errorFields.forEach((field) => { + if (field.errors.length > 0) { + // 显示每条错误信息 + message.error(field.errors[0]); + } + }); + }} + >
- { - const { fileList } = info; - setUpFileArray(fileList); - if (info.file.status === 'uploading') { +
上传委托书* ：
+
- return; - } - if (info.file.status === 'done') { - // console.log(info.file.response.data); - setUpFileArray([ - { - uid: info.file.response.data.fileId, - name: info.file.response.data.fileName, - status: 'done', - url: showImage(info.file.response.data.fileId, false) + + + + + + +
0 && upFileArray[0].url ? 'none' : 'unset' + }}> + { + + if (info.file.status === 'uploading') { + setUpFileLoading(true) + // const { fileList } = info; + // setUpFileArray(fileList); + return; } - ]) + if (info.file.status === 'done') { + // console.log(info.file.response.data); + setUpFileLoading(false) + setUpFileArray([ + { + uid: info.file.response.data.fileId, + name: info.file.response.data.fileName, + status: 'done', + url: showImage(info.file.response.data.fileId, false) + } + ]) - form.setFieldsValue({ - file: info.file.response.data.fileId, - }); - } - if (info.file.status === 'error') { - // 显示错误提示 - message.error(`上传失败,请重新上传`); - setUpFileArray([]) + form.setFieldsValue({ + file: info.file.response.data.fileId, + }); + } + if (info.file.status === 'error') { + setUpFileLoading(false) + // 显示错误提示 + // message.error(`上传失败,请重新上传`); + message.error(info.file.response.msg ? info.file.response.msg : '上传失败'); + setUpFileArray([]) - } - // console.log(upCodeArray); + } + // console.log(upCodeArray); - }} - onRemove={() => { - setUpFileArray([]) - form.setFieldsValue({ - file: '', // 清除表单值 - }); - }} - beforeUpload={beforeUpload} - // onPreview={handlePreview} - // onChange={handleUploadChange} - headers={{ 'Auth': `Bearer ${token}` }} - > - - -
-
上传委托书 */} + + +
+
+
上传委托书
+
+ + + +
+
0 && upFileArray[0].url ? 'unset' : 'none' + + }} + > +
+ 0 ? upFileArray[0].url : ''} style={{ + maxWidth: 300, + height: 150, + }} /> +
{ + setUpFileArray([]) + form.setFieldsValue({ + file: '', // 清除表单值 + }); + }} + >删除
+
+ + +
+
+
+ 重要提示： +
+
+ -上传委托书只需在右下角签字，请勿盖章确保签字工整清晰; +
+
+ -委托书上的信息 不能手动修改或添加信息; +
+
+ -委托书模板图片大小不能超过1.5M，格式为JPG格式图片; +
+
+ -扫描(推荐)或拍照前，请确保委托书模板纸面工整顺平，不能有褶皱、反光等; +
+
+ -请确保上传的委托书字迹工整、清晰; +
+
+ -当申请人信息修改后，请重新下载委托书签字上传审核。 +
+
+ + {/*
{ window.open('https://www.baidu.com') }} - >[ 下载模板 ]
+ >[ 下载模板 ]
*/} +
+
+ + + + +
+ +
+ 示例图片 +
+
{ + // window.open(downloadDeputeUrl(props.trademarkId)) + try { + setCreateLoading(true) + const res: any = await generateDepute(props.trademarkId) + // console.log(res); + window.open(showImage(res.fileId)) + + setCreateLoading(false) + } catch (error: any) { + if (error.response) { + setCreateLoading(false) + + const data = error.response.data; + message.error(data.msg ? data.msg : `${data.path}(${data.status})`) + } else { + console.error(error) + } + } finally { + setCreateLoading(false) + + } + }} + > + [ 下载模板 ] +
+
- - +
+
+
+ + +
-
-
-
- - -
-
+
+ ) } diff --git a/src/route/TrademarkMall/components/EditFour/EditFour.tsx b/src/route/TrademarkMall/components/EditFour/EditFour.tsx index 8e274a8..437f5c3 100644 --- a/src/route/TrademarkMall/components/EditFour/EditFour.tsx +++ b/src/route/TrademarkMall/components/EditFour/EditFour.tsx @@ -1,7 +1,7 @@ -import { useState, useContext } from 'react' +import { useState, useContext, useEffect } from 'react' import './edit-four.css' import { Button, Table, Modal, message, Spin } from 'antd' -import { orderPay } from '../../../../request/api' +import { orderPay, getOrder } from '../../../../request/api' // import { GlobalDispatchContext, reloadUser } from "../../context/GlobalContext.ts"; import { GlobalDispatchContext, reloadUser } from "../../../../context/GlobalContext"; import type { TableProps } from 'antd'; @@ -32,6 +32,8 @@ export default function EditFour(props: any) { message.success('付款成功'); }); + props.setTrademarkStatus('1') + props.setEditProcess(5) setPayLodaing(false) } catch (error: any) { @@ -52,13 +54,15 @@ export default function EditFour(props: any) { } } + + const columns: TableProps['columns'] = [ { align: 'center', title: '付费方式', - dataIndex: 'type', - key: 'type', - render: () => '预付费', + dataIndex: 'payType', + key: 'payType', + // render: () => '预付费', width: 100, }, { @@ -66,25 +70,30 @@ export default function EditFour(props: any) { width: 100, title: '服务名称', - dataIndex: 'name', - key: 'name', - render: () => '商标申请', + dataIndex: 'serverName', + key: 'serverName', + // render: () => '商标申请', }, { align: 'center', width: 150, ellipsis: true, title: '类别', - dataIndex: 'category', - key: 'category', + dataIndex: 'typeName', + key: 'typeName', }, { align: 'center', width: 300, ellipsis: true, title: '指定商品或服务', - dataIndex: 'goods', - key: 'goods', + dataIndex: 'subNames', + key: 'subNames', + render: (text) => { + return ( + {text.split(',').length} + ) + }, }, { align: 'center', @@ -98,42 +107,48 @@ export default function EditFour(props: any) { width: 100, title: '单价', - dataIndex: 'price', - key: 'price', + dataIndex: 'money', + key: 'money', + render: (text) => text / 100, }, { align: 'center', width: 100, title: '数量', - dataIndex: 'num', - key: 'num', + render: () => '1', }, ]; - const data: DataType[] = [ - { - id: '1', - type: '预付费', //付费方式 - name: '商标申请',//服务名称 - category: '第35类 广告销售', //类别 - goods: '共10项:喜喜喜喜喜喜,哈哈哈啊哈哈哈哈,呵呵呵呵呵,嘎嘎嘎嘎嘎嘎嘎,的爱德华八克很大空间和大开杀空间,按时间打假打私', //服务 - goodsType: '文字和图案', //商标类型 - price: '630.66', //单价 - num: '1', //数量 - }, - { - id: '2', - type: '预付费', //付费方式 - name: '商标申请',//服务名称 - category: '第35类 广告销售', //类别 - goods: '共10项:喜喜喜喜喜喜,哈哈哈啊哈哈哈哈,呵呵呵呵呵,嘎嘎嘎嘎嘎嘎嘎,的爱德华八克很大空间和大开杀空间,按时间打假打私', //服务 - goodsType: '文字和图案', //商标类型 - price: '10000.66', //单价 - num: '1', //数量 - }, + const [data, setData] = useState([]) + useEffect(() => { + if (props.orderList.length > 0) { + setData(props.orderList) + } + }, [props.orderList]) + // const data: DataType[] = [ + // { + // id: '1', + // type: '预付费', //付费方式 + // name: '商标申请',//服务名称 + // category: '第35类 广告销售', //类别 + // goods: '共10项:喜喜喜喜喜喜,哈哈哈啊哈哈哈哈,呵呵呵呵呵,嘎嘎嘎嘎嘎嘎嘎,的爱德华八克很大空间和大开杀空间,按时间打假打私', //服务 + // goodsType: '文字和图案', //商标类型 + // price: '630.66', //单价 + // num: '1', //数量 + // }, + // { + // id: '2', + // type: '预付费', //付费方式 + // name: '商标申请',//服务名称 + // category: '第35类 广告销售', //类别 + // goods: '共10项:喜喜喜喜喜喜,哈哈哈啊哈哈哈哈,呵呵呵呵呵,嘎嘎嘎嘎嘎嘎嘎,的爱德华八克很大空间和大开杀空间,按时间打假打私', //服务 + // goodsType: '文字和图案', //商标类型 + // price: '10000.66', //单价 + // num: '1', //数量 + // }, - ]; + // ]; const [modal, setModal] = useState(false) const height = window.innerHeight - 350; const handleSubmit = () => { @@ -176,34 +191,71 @@ export default function EditFour(props: any) {
- - +
+ + +
+
+
+
+
+ 已完成付款 +
+ +
- - 该操作会扣除999元，付款后无法修改,确定操作吗？ + 该操作会扣除999元，付款后无法修改,确定操作吗？ diff --git a/src/route/TrademarkMall/components/EditOne/EditOne.tsx b/src/route/TrademarkMall/components/EditOne/EditOne.tsx index 49438fe..e502b2c 100644 --- a/src/route/TrademarkMall/components/EditOne/EditOne.tsx +++ b/src/route/TrademarkMall/components/EditOne/EditOne.tsx @@ -823,7 +823,7 @@ export default function EditOne(props: any) { onClick={() => { setUpFileAModal(true) }} - >上传文件A + >上传文件 ({fileA.length}/3) @@ -1545,7 +1545,7 @@ export default function EditOne(props: any) { */} { setUpFileCModal(true) - }}>上传文件C + }}>上传文件 ({fileC.length}/3) diff --git a/src/route/TrademarkMall/components/EditSix/EditSix.css b/src/route/TrademarkMall/components/EditSix/EditSix.css new file mode 100644 index 0000000..0ea6f00 --- /dev/null +++ b/src/route/TrademarkMall/components/EditSix/EditSix.css @@ -0,0 +1,74 @@ +.editSixBox { + /* WebKit 浏览器（Chrome、Safari 等） */ + scrollbar-width: thin; + /* Firefox */ + scrollbar-color: #888 #f1f1f1; + /* Firefox */ +} +/* WebKit 浏览器（Chrome、Safari 等） */ +.editSixBox::-webkit-scrollbar { + width: 8px; + /* 垂直滚动条宽度 */ +} + +.editSixBox::-webkit-scrollbar-track { + background: #f1f1f1; + /* 滚动条轨道背景颜色 */ +} + +.editSixBox::-webkit-scrollbar-thumb { + background: #888; + /* 滚动条滑块颜色 */ + border-radius: 4px; + /* 滚动条滑块圆角 */ +} + +.editSixBox::-webkit-scrollbar-thumb:hover { + background: #555; + /* 鼠标悬停时滚动条滑块颜色 */ +} + + +.editSixTop { + font-size: 20px; + /* background-color: skyblue; */ + text-align: center; + margin-top: 10px; + margin-bottom: 20px; + +} + +.editSixContent { + display: flex; + font-size: 18px; + margin-bottom: 20px; +} + +.editSixTitle { + width: 300px; + text-align: right; + margin-right: 10px; +} + +.editSixText { + width: calc(100% - 400px); +} + +.editSixImage { + width: 300px; + height: 150px; + border: 1px dashed #bdbdbd; + display: flex; + justify-content: center; + align-items: center; +} +.editSixGoods{ + width: calc(100% - 400px); +} +.editSixGoodsBoxItem{ + /* background-color: skyblue; */ + margin-bottom: 10px; +} +.editSixGoodsBoxChildItem{ + font-size: 14px; +} \ No newline at end of file diff --git a/src/route/TrademarkMall/components/EditSix/EditSix.tsx b/src/route/TrademarkMall/components/EditSix/EditSix.tsx index d29fc49..4f438ca 100644 --- a/src/route/TrademarkMall/components/EditSix/EditSix.tsx +++ b/src/route/TrademarkMall/components/EditSix/EditSix.tsx @@ -1,5 +1,8 @@ -import { useState } from 'react' -import { Button, Modal } from 'antd' +import { useState, useEffect } from 'react' +import { Button, Modal, Image, message, Spin } from 'antd' +import { showImage } from '../../../../request/request' +import { uploadSix } from '../../../../request/api' +import './EditSix.css' export default function EditSix(props: any) { const height = window.innerHeight - 350; const [modal, setModal] = useState(false) @@ -11,57 +14,289 @@ export default function EditSix(props: any) { setModal(true) }; + const [upLodaing, setUpLodaing] = useState(false) + const [editOneData, setEditOneData] = useState({ + trademarkType: '', //商标类型 text 文字 image 图形 text-image 图文 + trademarkName: '', //商标名称 + trademarkDescription: '', //商标描述 + trademarkFile: '', //姓名授权 + trademarkFile1: '', //肖像授权声明书 + trademarkFile2: '', //期刊 + trademarkPhotoType: '', //商标图样类型 1 自动生成 2 手动上传 + trademarkPhoto: '', //商标图样 + + }) + const [editTwoData, setEditTwoData] = useState({ + trademarkTypeDTOS: [], + trademarkTypeIds: [] + + }) + const [editThreeData, setEditThreeData] = useState({ + trademarkUserId: '', + name: '' + }) + + const [editFiveData, setEditFiveData] = useState({ + trademarkFileDepute: '', + }) + useEffect(() => { + if (props.editOneData) { + setEditOneData(props.editOneData) + } + if (props.editTwoData) { + setEditTwoData(props.editTwoData) + } + if (props.editThreeData) { + setEditThreeData(props.editThreeData) + } + if (props.editFiveData) { + setEditFiveData(props.editFiveData) + } + console.log('最终信息接收', props); + + }, [props]) return ( -
-
-
- 显示商标信息 + +
+
+
+
+ 商标信息 +
+
+
商标类型 :
+
{editOneData.trademarkType == 'text' ? '文字' : editOneData.trademarkType == 'image' ? '图形' : '图文'}
+
+
+
+
商标名称 :
+
{editOneData.trademarkName}
+
+
+
+
商标图样 :
+
+ +
+
+
+
商标描述 :
+
{editOneData.trademarkDescription}
+
+
+
+
姓名授权书 :
+
+ +
+
+
+
+
+
肖像授权书 :
+
+ +
+
+
+
+
+
期刊证明 :
+
+ +
+
+
+
+
商标类别 :
+
+ {/*
{editTwoData.trademarkTypeIds}
*/} + {editTwoData.trademarkTypeDTOS.map((item: any) => { + return ( +
+
+
+ +
+ 第{item.code}类 {item.name} +
+
+ +
+
+ {item.children.map((child: any) => { + return ( +
+
+
{child.code}类 :
+
+ {child.children.map((children: any) => { + return ( +
+ {children.code}-{children.name} +
+ ) + })} + +
+
+
+ ) + })}
+
+ + ) + })} +
+
+
+
申请人 :
+
{editThreeData.name}
+
+
+
委托书 :
+
+ +
+
+
+
+
+
+ + +
+
+
+
+ 正在审核... +
+ +
+ { + try { + setUpLodaing(true) + await uploadSix(props.trademarkId) + setUpLodaing(false) + message.success('上传成功') + props.setTrademarkStatus('2') + setModal(false) + } catch (error: any) { + setUpLodaing(false) + if (error.response) { + const data = error.response.data; + message.error(data.msg ? data.msg : `${data.path}(${data.status})`) + } else { + console.error(error) + } + } finally { + setUpLodaing(false) + } + }} + onCancel={() => { setModal(false) }} + okText="确定" + cancelText="取消" + > + 注:上传后无法撤回，是否继续上传？ +
-
-
- - -
- { setModal(false) }} - onCancel={() => { setModal(false) }} - okText="确定" - cancelText="取消" - > - 注:上传后无法撤回，是否继续上传？ - -
+ ) } diff --git a/src/route/TrademarkMall/components/EditTwo/EditTwo.tsx b/src/route/TrademarkMall/components/EditTwo/EditTwo.tsx index be7675d..3086121 100644 --- a/src/route/TrademarkMall/components/EditTwo/EditTwo.tsx +++ b/src/route/TrademarkMall/components/EditTwo/EditTwo.tsx @@ -70,6 +70,7 @@ export default function EditTwo(props: any) { props.setEditTwoArray(checkedIds) setLoading(false) props.setEditProcess(3); + // props.getOrderList() } catch (error: any) { setLoading(false) diff --git a/src/static/editFive/file.png b/src/static/editFive/file.png new file mode 100644 index 0000000..de6d946 Binary files /dev/null and b/src/static/editFive/file.png differ