From 6cbca77a237e335ae08d288552bf4d92eea41303 Mon Sep 17 00:00:00 2001 From: lyp Date: Wed, 4 Jun 2025 09:25:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/route/Correction/Correction.tsx | 4 +- src/route/TrademarkMall/TrademarkAiEdit.tsx | 145 ++++++++++++++++ .../TrademarkMall/TrademarkExpertEdit.tsx | 147 +++++++++++++++- .../components/EditFive/EditFive.tsx | 50 ++++++ .../components/EditFour/EditFour.tsx | 50 ++++++ .../components/EditOne/EditOne.css | 41 +++++ .../components/EditOne/EditOne.tsx | 158 ++++++++++++++++++ .../components/EditSix/EditSix.tsx | 50 ++++++ .../components/EditThree/EditThree.tsx | 50 ++++++ .../components/EditTwo/EditTwo.tsx | 50 ++++++ src/route/TrademarkMall/trademark-edit.css | 58 +++++++ src/route/index/Index.tsx | 32 ++-- src/route/router.tsx | 5 + src/util/AjaxUtils.ts | 2 +- 14 files changed, 826 insertions(+), 16 deletions(-) create mode 100644 src/route/TrademarkMall/TrademarkAiEdit.tsx create mode 100644 src/route/TrademarkMall/components/EditFive/EditFive.tsx create mode 100644 src/route/TrademarkMall/components/EditFour/EditFour.tsx create mode 100644 src/route/TrademarkMall/components/EditOne/EditOne.css create mode 100644 src/route/TrademarkMall/components/EditOne/EditOne.tsx create mode 100644 src/route/TrademarkMall/components/EditSix/EditSix.tsx create mode 100644 src/route/TrademarkMall/components/EditThree/EditThree.tsx create mode 100644 src/route/TrademarkMall/components/EditTwo/EditTwo.tsx diff --git a/src/route/Correction/Correction.tsx b/src/route/Correction/Correction.tsx index 1d7bc4d..78961da 100644 --- a/src/route/Correction/Correction.tsx +++ b/src/route/Correction/Correction.tsx @@ -1136,7 +1136,7 @@ export default function Correction() { } - 换名 - + */} +
+
+
= 1 ? '#3B60E8' : '', + color: editProcess >= 1 ? '#fff' : '#B1B1B1', + borderColor: editProcess >= 1 ? '' : '#B1B1B1' + }} + >1
+
= 1 ? '#353535' : '#878787', + fontWeight: editProcess >= 1 ? 'bold' : 'normal' + }} + >填写基础信息
+
+
+
+
= 2 ? '#3B60E8' : '', + color: editProcess >= 2 ? '#fff' : '#B1B1B1', + borderColor: editProcess >= 2 ? '' : '#B1B1B1' + }}>2
+
= 2 ? '#353535' : '#878787', + fontWeight: editProcess >= 2 ? 'bold' : 'normal' + }} + >选择商标类别
+
+
+
+
= 3 ? '#3B60E8' : '', + color: editProcess >= 3 ? '#fff' : '#B1B1B1', + borderColor: editProcess >= 3 ? '' : '#B1B1B1' + }}>3
+
= 3 ? '#353535' : '#878787', + fontWeight: editProcess >= 3 ? 'bold' : 'normal' + }} + >选择所属者
+
+
+
+
= 4 ? '#3B60E8' : '', + color: editProcess >= 4 ? '#fff' : '#B1B1B1', + borderColor: editProcess >= 4 ? '' : '#B1B1B1' + }}>4
+
= 4 ? '#353535' : '#878787', + fontWeight: editProcess >= 4 ? 'bold' : 'normal' + }} + > + 订单支付 +
+
+
+
+
= 5 ? '#3B60E8' : '', + color: editProcess >= 5 ? '#fff' : '#B1B1B1', + borderColor: editProcess >= 5 ? '' : '#B1B1B1' + }}>5
+
= 5 ? '#353535' : '#878787', + fontWeight: editProcess >= 5 ? 'bold' : 'normal' + }} + >上传委托书
+
+
+
+
= 6 ? '#3B60E8' : '', + color: editProcess >= 6 ? '#fff' : '#B1B1B1', + borderColor: editProcess >= 6 ? '' : '#B1B1B1' + }}>6
+
= 6 ? '#353535' : '#878787', + fontWeight: editProcess >= 6 ? 'bold' : 'normal' + }} + >上传商标局
+
+ + +
+
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + ) +} diff --git a/src/route/TrademarkMall/TrademarkExpertEdit.tsx b/src/route/TrademarkMall/TrademarkExpertEdit.tsx index 1ccf5d1..1f66947 100644 --- a/src/route/TrademarkMall/TrademarkExpertEdit.tsx +++ b/src/route/TrademarkMall/TrademarkExpertEdit.tsx @@ -1,10 +1,151 @@ -import React from 'react' +import { useEffect, useState } from 'react' import './trademark-edit.css' +import { useLocation } from 'react-router-dom'; +import { + Form, + Input, Button, + Modal +} from 'antd'; +const { TextArea } = Input; export default function TrademarkExpertEdit() { + const { state } = useLocation() const height = window.innerHeight - 180; + const [form] = Form.useForm(); + const [modal, setModal] = useState(false) + const onFinish = (values: any) => { + console.log(values); + setModal(true) + } + useEffect(() => { + console.log('state', state); + }, []) return ( -
- +
+
+
+
+ ! +
+
+ 支付完成后会有商标专家联系您并为您服务，请确保填写的手机号真实准确。填写的商标信息后续可以修改，请您放心填写。 +
+
+
+
+
+
+ ! +
+
+
至尊无忧注册由专业商标顾问团队为您全程代办商标申请和递交流程，
+
指定类目至尊无忧注册，指定类目被驳回可全额赔付，非指定类目驳回不支持赔付;
+
全部小类至尊无忧注册，商标局下发《商标驳回通知书》可全额赔付，包含部分驳回和全部驳回通知书。
+
+
+
+
+ +
+
+
+ 商标名称* ： +
+
+ + + + + + + + +
+
+
+
+ 需求描述 ： +
+
+ + + + + + + +
+
+
在您提交商标申请咨询单后，工作日期间专业顾问会在1小时内与您联系，非工作日时间会在下一个工作日与您取得联系。
+
本网站会保护您的个人信息，仅有本网站及其授权委托机构可以看到您提交的信息，请放心提供。
+ + + + +
+ +
+ +
+ +
+ { setModal(false) }} + okText='确定' + cancelText='取消' + > + 该操作会扣除{state.price}元，确定操作吗？ +
) } diff --git a/src/route/TrademarkMall/components/EditFive/EditFive.tsx b/src/route/TrademarkMall/components/EditFive/EditFive.tsx new file mode 100644 index 0000000..9afd416 --- /dev/null +++ b/src/route/TrademarkMall/components/EditFive/EditFive.tsx @@ -0,0 +1,50 @@ +import React from 'react' +import { Button } from 'antd' +export default function editFive(props: any) { + const height = window.innerHeight - 350; + const handleSubmit = () => { + // console.log(form); + props.setEditProcess(6); + // 调用表单实例的 submit 方法 + // form.submit(); + + }; + return ( +
+
+
+
+
+ + +
+
+ ) +} diff --git a/src/route/TrademarkMall/components/EditFour/EditFour.tsx b/src/route/TrademarkMall/components/EditFour/EditFour.tsx new file mode 100644 index 0000000..2bf42de --- /dev/null +++ b/src/route/TrademarkMall/components/EditFour/EditFour.tsx @@ -0,0 +1,50 @@ +import React from 'react' +import { Button } from 'antd' +export default function editFour(props: any) { + const height = window.innerHeight - 350; + const handleSubmit = () => { + // console.log(form); + props.setEditProcess(5); + // 调用表单实例的 submit 方法 + // form.submit(); + + }; + return ( +
+
+
+
+
+ + +
+
+ ) +} diff --git a/src/route/TrademarkMall/components/EditOne/EditOne.css b/src/route/TrademarkMall/components/EditOne/EditOne.css new file mode 100644 index 0000000..6a4a3cf --- /dev/null +++ b/src/route/TrademarkMall/components/EditOne/EditOne.css @@ -0,0 +1,41 @@ +.topLine { + width: 100%; + height: 10px; + background: #F3F3F3; +} + +.editFormBox { + /* padding: 10px; + box-sizing: border-box; */ +} + +.editFormTitle { + font-size: 18px; + margin-bottom: 20px; + /* height: 46px; */ + /* background: pink; */ +} + +.editFormItem { + display: flex; + /* align-items: center; */ + height: 46px; + /* background-color: pink; */ + line-height: 46px; + /* width: 200px; */ +} + +.firstItem { + /* background: skyblue; */ + align-items: center; + +} + +.editFormItemTitle { + font-size: 16px; + /* width: 120px; */ +} + +.redTitle { + color: red; +} \ No newline at end of file diff --git a/src/route/TrademarkMall/components/EditOne/EditOne.tsx b/src/route/TrademarkMall/components/EditOne/EditOne.tsx new file mode 100644 index 0000000..ac0d27f --- /dev/null +++ b/src/route/TrademarkMall/components/EditOne/EditOne.tsx @@ -0,0 +1,158 @@ +import { useState } from 'react' +import { Button, Radio, Form, Input } from 'antd' +import './EditOne.css' +const { TextArea } = Input; +export default function EditOne(props: any) { + const [form] = Form.useForm(); + const height = window.innerHeight - 350; + const [goodsType, setGoodsType] = useState('a') + const handleSubmit = () => { + // console.log(form); + // props.setEditProcess(2); + // 调用表单实例的 submit 方法 + form.submit(); + + }; + const onFinish = (values: any) => { + console.log(values); + props.setEditProcess(2); + + } + const onChange = (e: any) => { + setGoodsType(e.target.value) + }; + return ( +
+
+
+
+ 基本信息 +
+
+
+ 商标类型*： +
+
+ + 文字商标 + 图形商标 + 文字图形组合商标 + +
+ 如何选择? +
+
+
+
+
+ 商标名称*： +
+ + + + + + + + + + +
+
+
+ 商标说明*： +
+ + + + + + + + + +
+ + + + + {/* +
+ +
+ */} +
+
+ + + +
+
+
+ +
+
+ ) +} diff --git a/src/route/TrademarkMall/components/EditSix/EditSix.tsx b/src/route/TrademarkMall/components/EditSix/EditSix.tsx new file mode 100644 index 0000000..57a7be4 --- /dev/null +++ b/src/route/TrademarkMall/components/EditSix/EditSix.tsx @@ -0,0 +1,50 @@ +import React from 'react' +import { Button } from 'antd' +export default function editSix(props: any) { + const height = window.innerHeight - 350; + const handleSubmit = () => { + // console.log(form); + // 调用表单实例的 submit 方法 + // form.submit(); + alert('提交成功') + + }; + return ( +
+
+
+
+
+ + +
+
+ ) +} diff --git a/src/route/TrademarkMall/components/EditThree/EditThree.tsx b/src/route/TrademarkMall/components/EditThree/EditThree.tsx new file mode 100644 index 0000000..bb5c6fd --- /dev/null +++ b/src/route/TrademarkMall/components/EditThree/EditThree.tsx @@ -0,0 +1,50 @@ +import React from 'react' +import { Button } from 'antd' +export default function editThree(props: any) { + const height = window.innerHeight - 350; + const handleSubmit = () => { + // console.log(form); + props.setEditProcess(4); + // 调用表单实例的 submit 方法 + // form.submit(); + + }; + return ( +
+
+
+
+
+ + +
+
+ ) +} diff --git a/src/route/TrademarkMall/components/EditTwo/EditTwo.tsx b/src/route/TrademarkMall/components/EditTwo/EditTwo.tsx new file mode 100644 index 0000000..9cec126 --- /dev/null +++ b/src/route/TrademarkMall/components/EditTwo/EditTwo.tsx @@ -0,0 +1,50 @@ +import React from 'react' +import { Button } from 'antd' +export default function editTwo(props: any) { + const height = window.innerHeight - 350; + const handleSubmit = () => { + // console.log(form); + props.setEditProcess(3); + // 调用表单实例的 submit 方法 + // form.submit(); + + }; + return ( +
+
+
+
+
+ + +
+
+ ) +} diff --git a/src/route/TrademarkMall/trademark-edit.css b/src/route/TrademarkMall/trademark-edit.css index a64b9da..e538bd5 100644 --- a/src/route/TrademarkMall/trademark-edit.css +++ b/src/route/TrademarkMall/trademark-edit.css @@ -5,4 +5,62 @@ box-sizing: border-box; padding: 30px 45px 0 45px; box-sizing: border-box; +} + +.trademarkAiBox { + margin-top: 18px; + background-color: rgb(255, 255, 255); + padding: 0px 19px 0px 19px; + box-sizing: border-box; + padding: 30px 45px 0 45px; + box-sizing: border-box; +} + +.trademarkTop { + padding: 5px 10px; + box-sizing: border-box; + background-color: #fff4e6; + display: flex; + /* line-height: 20px; */ +} + +.trademarkTopL { + width: 20px; + height: 20px; + border-radius: 10px; + background-color: #ff9326; + text-align: center; + line-height: 20px; + color: #ffffff; + margin-right: 5px; +} + +.trademarkForm { + margin-left: 100px; + /* display: flex; */ + /* align-items: center; */ + /* justify-content: center; */ +} + +.trademarkForm-item { + + display: flex; + /* background-color: pink; */ + +} + +.trademarkForm-title { + width: 120px; + height: 46px; + line-height: 46px; + /* background-color: pink; */ + font-size: 16px; + text-wrap: nowrap; +} + +.trademark-btn { + /* background-color: pink; */ + display: flex; + justify-content: center; + margin-top: 50px; } \ No newline at end of file diff --git a/src/route/index/Index.tsx b/src/route/index/Index.tsx index 322637b..3042cf8 100644 --- a/src/route/index/Index.tsx +++ b/src/route/index/Index.tsx @@ -19,11 +19,11 @@ import RefunModal from '../../components/RefunModal/RefunModal.tsx' import CorrectionModal from '../../components/CorrectionModal/CorrectionModal.tsx' import ReplaceModal from '../../components/ReplaceModal/ReplaceModal.tsx' import ContractModal from '../../components/ContractModal/ContractModal.tsx' -// import MenuWithBottomButtom from '../../components/menu/MenuWithBottomButton.tsx' +import MenuWithBottomButtom from '../../components/menu/MenuWithBottomButton.tsx' // import MenuTreeWithTopButton from "../../components/menu/MenuTreeWithTopButton.tsx"; // import ListProj from "../../components/list/ListProj.tsx"; // import ListProjAgent from "../../components/list/ListProjAgent.tsx"; -// import { getMenuActive } from '../../util/cache.ts' +import { getMenuActive } from '../../util/cache.ts' import { @@ -86,10 +86,10 @@ interface DataType { } -// import app from '../../static/left/app.png' -// import appnew from '../../static/left/appnew.png' -// import tra from '../../static/left/tra.png' -// import tranew from '../../static/left/tranew.png' +import app from '../../static/left/app.png' +import appnew from '../../static/left/appnew.png' +import tra from '../../static/left/tra.png' +import tranew from '../../static/left/tranew.png' import topblack from '../../static/appimgs/topblack.png' import topblue from '../../static/appimgs/topblue.png' @@ -2065,7 +2065,7 @@ export default function Index() { list={agentMenu.list} handleListItem={agentMenu.handleListItem} /> */} - {/* {THEME == 'mzw' ? ( + {THEME == 'mzw' ? ( <>
) : ( <> - )} */} + )} {/* { - console.log(item.nowprice); + console.log(item); setTrademarkModal(false) - nav('/trademark-expert-edit') + nav('/trademark-expert-edit', { + state: { + title: item.title, + price: item.nowprice + } + }) console.log('简单'); @@ -4358,6 +4363,13 @@ export default function Index() { onClick={() => { console.log(item.nowprice); console.log('复杂'); + setTrademarkModal(false) + nav('/trademark-ai-edit', { + state: { + title: item.title, + price: item.nowprice + } + }) }} >开始编辑
diff --git a/src/route/router.tsx b/src/route/router.tsx index 4bab0d4..f4c184b 100644 --- a/src/route/router.tsx +++ b/src/route/router.tsx @@ -5,6 +5,7 @@ import AppElectron from '../route/AppElectron/AppElectron.tsx' import AppEdit from '../route/AppElectron/AppEdit.tsx' import TrademarkMall from '../route/TrademarkMall/TrademarkMall.tsx' import TrademarkExpertEdit from '../route/TrademarkMall/TrademarkExpertEdit.tsx' +import TrademarkAiEdit from '../route/TrademarkMall/TrademarkAiEdit.tsx' import TransactionOrder from '../route/TransactionOrder/TransactionOrder.tsx' import CopyrightGgoods from '../route/CopyrightGgoods/CopyrightGgoods.tsx' import TradingGoods from '../route/TradingGoods/TradingGoods.tsx' @@ -238,6 +239,10 @@ export const router = createHashRouter( { path:'/trademark-expert-edit', element: + }, + { + path:'/trademark-ai-edit', + element: }, { path: '/transaction-order', diff --git a/src/util/AjaxUtils.ts b/src/util/AjaxUtils.ts index 52d030e..6b0f683 100644 --- a/src/util/AjaxUtils.ts +++ b/src/util/AjaxUtils.ts @@ -153,7 +153,7 @@ export function getUseUrl() { } // 购买协议 export function getBuyUrl() { - axios.get(`${baseUrl}/operator/app/agreementportal/getrelease/0542d435-dc22-459b-bf4a-28a61afe400b `) + axios.get(`${baseUrl}/operator/app/agreementportal/getrelease/0542d435-dc22-459b-bf4a-28a61afe400b`) .then((data:any) => { window.open(`${baseUrl}/operator/route/agreementportal/view?agreementId=${data.data.agreementId}&title=${data.data.title}`) })