Compare commits

...

3 Commits

Author SHA1 Message Date
lyp
4fae300362 去除打印 2025-07-09 14:01:47 +08:00
lyp
673c4e0e31 Merge branch 'devbra' into dev 2025-07-09 12:01:07 +08:00
lyp
1c87154b39 全托管退款 2025-06-23 15:07:40 +08:00
11 changed files with 42 additions and 42 deletions

View File

@ -223,7 +223,7 @@ export default function AppElectron() {
}} }}
onClick={() => { onClick={() => {
console.log(record.appOrderResultFile); // console.log(record.appOrderResultFile);
window.open(showImage(record.appOrderResultFile, false)); window.open(showImage(record.appOrderResultFile, false));
}} }}

View File

@ -76,7 +76,7 @@ export default function AppCompany(props: any) {
// setLoading(false); // setLoading(false);
// setImageUrl(url); // setImageUrl(url);
// }); // });
console.log(info.file.response.data.fileId); // console.log(info.file.response.data.fileId);
setLoading(false); setLoading(false);
const fileId = info.file.response.data.fileId; const fileId = info.file.response.data.fileId;
const url = showImage(fileId, false); const url = showImage(fileId, false);

View File

@ -61,7 +61,7 @@ export default function EditAppDes(props: any) {
} }
const onFinish = (values: any) => { const onFinish = (values: any) => {
// 处理表单提交逻辑 // 处理表单提交逻辑
console.log('表单提交成功', values); // console.log('表单提交成功', values);
submitInfo(values) submitInfo(values)
}; };
return ( return (

View File

@ -32,7 +32,7 @@ export default function EditBelongPeople(props: any) {
} }
const onFinish = (values: any) => { const onFinish = (values: any) => {
// 处理表单提交逻辑 // 处理表单提交逻辑
console.log('表单提交成功', values); // console.log('表单提交成功', values);
submitInfo(values) submitInfo(values)
}; };

View File

@ -25,13 +25,13 @@ export default function TrademarkExpertEdit() {
const [trademarkName, setTrademarkName] = useState('') //名称 const [trademarkName, setTrademarkName] = useState('') //名称
const [trademarkContent, setTrademarkContent] = useState('') //描述 const [trademarkContent, setTrademarkContent] = useState('') //描述
const onFinish = (values: any) => { const onFinish = (values: any) => {
console.log(values); // console.log(values);
setTrademarkName(values.trademarkName) setTrademarkName(values.trademarkName)
setTrademarkContent(values.trademarkContent ? values.trademarkContent : '') setTrademarkContent(values.trademarkContent ? values.trademarkContent : '')
setModal(true) setModal(true)
} }
useEffect(() => { useEffect(() => {
console.log('state', state); // console.log('state', state);
}, []) }, [])
return ( return (
<Spin tip="正在提交,请稍后..." size="small" spinning={upLodaing}> <Spin tip="正在提交,请稍后..." size="small" spinning={upLodaing}>

View File

@ -21,7 +21,7 @@ export default function TrademarkMall() {
const res: any = await getFileTypeByIds({ const res: any = await getFileTypeByIds({
ids: ids ids: ids
}) })
console.log(res); // console.log(res);
const newUpFile = res.map((item: any) => { const newUpFile = res.map((item: any) => {
return { return {
uid: item.fileId, uid: item.fileId,
@ -519,7 +519,7 @@ export default function TrademarkMall() {
const getSupplementDetail = async (id: string) => { const getSupplementDetail = async (id: string) => {
try { try {
const res: any = await supplementDetail(id) const res: any = await supplementDetail(id)
console.log(res); // console.log(res);
setDetailData(res) setDetailData(res)
if (res.correctionFiles) { if (res.correctionFiles) {
await getFileTypeByIdsArray(res.correctionFiles) await getFileTypeByIdsArray(res.correctionFiles)
@ -630,7 +630,7 @@ export default function TrademarkMall() {
width: 100, width: 100,
render: (record: any) => ( render: (record: any) => (
<span className='transaction-order-table-btn' onClick={() => { <span className='transaction-order-table-btn' onClick={() => {
console.log(record); // console.log(record);
setCorrectionReply(record.correctionReply) setCorrectionReply(record.correctionReply)
// console.log(record.correctionId); // console.log(record.correctionId);
setCorrectionId(record.correctionId) setCorrectionId(record.correctionId)

View File

@ -25,8 +25,8 @@ export default function EditFour(props: any) {
setModal(false) setModal(false)
setPayLodaing(true) setPayLodaing(true)
const res = await orderPay(props.trademarkId) await orderPay(props.trademarkId)
console.log(res); // console.log(res);
reloadUser(messageApi, globalDispatchContext).then(() => { reloadUser(messageApi, globalDispatchContext).then(() => {
message.success('付款成功'); message.success('付款成功');

View File

@ -181,7 +181,7 @@ export default function EditOne(props: any) {
// 上传商标文字图片 // 上传商标文字图片
const [textLodaing, setTextLodaing] = useState(false) const [textLodaing, setTextLodaing] = useState(false)
const upImgHandleChange: UploadProps['onChange'] = (info) => { const upImgHandleChange: UploadProps['onChange'] = (info) => {
console.log(info.file.status); // console.log(info.file.status);
if (info.file.status === 'uploading') { if (info.file.status === 'uploading') {
@ -190,14 +190,14 @@ export default function EditOne(props: any) {
return; return;
} }
if (info.file.status === 'done') { if (info.file.status === 'done') {
console.log(info); // console.log(info);
setTextLodaing(false) setTextLodaing(false)
// const fileId = info.file.response.data.fileId; // const fileId = info.file.response.data.fileId;
// // console.log(downloadUrl(fileId)); // // console.log(downloadUrl(fileId));
// const url = showImage(fileId, false); // const url = showImage(fileId, false);
console.log(info.file.response.data.fileId); // console.log(info.file.response.data.fileId);
setImgList([ setImgList([
{ {
@ -276,7 +276,7 @@ export default function EditOne(props: any) {
nav(`/trademark-ai-edit/${res.data}`) nav(`/trademark-ai-edit/${res.data}`)
} }
console.log('结果', res); // console.log('结果', res);
} catch (error: any) { } catch (error: any) {
setUpLoading(false) setUpLoading(false)
if (error.response) { if (error.response) {
@ -298,8 +298,8 @@ export default function EditOne(props: any) {
const onFinishB = async (values: any) => { const onFinishB = async (values: any) => {
console.log(values); //trademarkDescription trademarkPhoto // console.log(values); //trademarkDescription trademarkPhoto
console.log(upImglist); //商标图样 // console.log(upImglist); //商标图样
const dataInfo = { const dataInfo = {
...values, ...values,
trademarkType: goodsType, // 商标类型 trademarkType: goodsType, // 商标类型
@ -309,8 +309,8 @@ export default function EditOne(props: any) {
trademarkPhotoType: '2', // 1 自动生成 2 手动上传 trademarkPhotoType: '2', // 1 自动生成 2 手动上传
trademarkName: '', trademarkName: '',
} }
console.log(dataInfo); // console.log(dataInfo);
console.log(props.editOneData); // console.log(props.editOneData);
// 去除 trademarkName 项 // 去除 trademarkName 项
// return; // return;
@ -370,7 +370,7 @@ export default function EditOne(props: any) {
const [imgLodaingC, setImgLodaingC] = useState(false) const [imgLodaingC, setImgLodaingC] = useState(false)
const [upImglistC, setUpImglistC] = useState<any>([]) const [upImglistC, setUpImglistC] = useState<any>([])
const onFinishC = async (values: any) => { const onFinishC = async (values: any) => {
console.log(values); // console.log(values);
// props.setEditProcess(2); // props.setEditProcess(2);
// console.log(upImglistC); //商标图样 // console.log(upImglistC); //商标图样
// console.log(fileListC); // 上传的授权声明书模板 // console.log(fileListC); // 上传的授权声明书模板
@ -384,8 +384,8 @@ export default function EditOne(props: any) {
// trademarkId: props.trademarkId ? props.trademarkId : '', // 商标id // trademarkId: props.trademarkId ? props.trademarkId : '', // 商标id
} }
console.log(dataInfo); // console.log(dataInfo);
console.log(props.editOneData); // console.log(props.editOneData);
if (deepCompareObjects(dataInfo, props.editOneData)) { if (deepCompareObjects(dataInfo, props.editOneData)) {
props.setEditProcess(2); props.setEditProcess(2);
return; return;
@ -1349,7 +1349,7 @@ export default function EditOne(props: any) {
// // console.log(downloadUrl(fileId)); // // console.log(downloadUrl(fileId));
// const url = showImage(fileId, false); // const url = showImage(fileId, false);
console.log(info.file.response.data.fileId); // console.log(info.file.response.data.fileId);
setUpImglist([ setUpImglist([
{ {
@ -1747,7 +1747,7 @@ export default function EditOne(props: any) {
// // console.log(downloadUrl(fileId)); // // console.log(downloadUrl(fileId));
// const url = showImage(fileId, false); // const url = showImage(fileId, false);
console.log(info); // console.log(info);
// console.log(info.file.response.data.fileId); // console.log(info.file.response.data.fileId);
setUpImglistC([ setUpImglistC([
@ -2257,7 +2257,7 @@ export default function EditOne(props: any) {
}} }}
fileList={fileCName} fileList={fileCName}
onChange={(info) => { onChange={(info) => {
console.log(info.file.status); // console.log(info.file.status);
if (info.file.status === 'uploading') { if (info.file.status === 'uploading') {
const { fileList } = info; const { fileList } = info;

View File

@ -45,7 +45,7 @@ export default function EditSix(props: any) {
const getTrademarkFile = async (id: string) => { const getTrademarkFile = async (id: string) => {
try { try {
const res: any = await fileDetail(id) const res: any = await fileDetail(id)
console.log('姓名授权书详情', res); // console.log('姓名授权书详情', res);
setTrademarkFile(res[0]) setTrademarkFile(res[0])
} catch (error: any) { } catch (error: any) {
if (error.response) { if (error.response) {
@ -59,7 +59,7 @@ export default function EditSix(props: any) {
const getTrademarkFile1 = async (id: string) => { const getTrademarkFile1 = async (id: string) => {
try { try {
const res: any = await fileDetail(id) const res: any = await fileDetail(id)
console.log('肖像授权书详情', res); // console.log('肖像授权书详情', res);
setTrademarkFile1(res[0]) setTrademarkFile1(res[0])
} catch (error: any) { } catch (error: any) {
if (error.response) { if (error.response) {
@ -73,7 +73,7 @@ export default function EditSix(props: any) {
const getTrademarkFile2 = async (id: string) => { const getTrademarkFile2 = async (id: string) => {
try { try {
const res: any = await fileDetail(id) const res: any = await fileDetail(id)
console.log('期刊详情', res); // console.log('期刊详情', res);
setTrademarkFile2(res[0]) setTrademarkFile2(res[0])
} catch (error: any) { } catch (error: any) {
if (error.response) { if (error.response) {
@ -109,7 +109,7 @@ export default function EditSix(props: any) {
if (props.editOneData.trademarkFile2) { if (props.editOneData.trademarkFile2) {
getTrademarkFile2(props.editOneData.trademarkFile2) getTrademarkFile2(props.editOneData.trademarkFile2)
} }
console.log('最终信息接收', props); // console.log('最终信息接收', props);
}, [props]) }, [props])
return ( return (

View File

@ -39,7 +39,7 @@ export default function EditThree(props: any) {
const getContactDetails = async (trademarkUserId: string) => { const getContactDetails = async (trademarkUserId: string) => {
try { try {
const res: any = await trademarkApplicantDetails(trademarkUserId) const res: any = await trademarkApplicantDetails(trademarkUserId)
console.log(res); // console.log(res);
if (res.type == '1') { if (res.type == '1') {
setApplicantType('1') setApplicantType('1')
setQualifications(res.subType) setQualifications(res.subType)
@ -353,8 +353,8 @@ export default function EditThree(props: any) {
const [formA] = Form.useForm<any>(); const [formA] = Form.useForm<any>();
const [addLoading, setAddLoading] = useState(false) const [addLoading, setAddLoading] = useState(false)
const onFinishA = async (values: any) => { const onFinishA = async (values: any) => {
console.log(values); // console.log(values);
console.log(qualifications); // console.log(qualifications);
if (trademarkUserId) { if (trademarkUserId) {
try { try {
setAddLoading(true) setAddLoading(true)
@ -426,7 +426,7 @@ export default function EditThree(props: any) {
} }
const [formB] = Form.useForm<any>(); const [formB] = Form.useForm<any>();
const onFinishB = async (values: any) => { const onFinishB = async (values: any) => {
console.log(values); // console.log(values);
if (trademarkUserId) { if (trademarkUserId) {
// alert('编辑') // alert('编辑')
try { try {
@ -514,7 +514,7 @@ export default function EditThree(props: any) {
// 个人身份证图片信息 // 个人身份证图片信息
const [personalIdCard, setPersonalIdCard] = useState<any>([]) const [personalIdCard, setPersonalIdCard] = useState<any>([])
const personalIdCardChange = (info: any) => { const personalIdCardChange = (info: any) => {
console.log(info.file.status); // console.log(info.file.status);
if (info.file.status === 'uploading') { if (info.file.status === 'uploading') {
@ -523,14 +523,14 @@ export default function EditThree(props: any) {
return; return;
} }
if (info.file.status === 'done') { if (info.file.status === 'done') {
console.log(info); // console.log(info);
setUpLoading(false) setUpLoading(false)
// const fileId = info.file.response.data.fileId; // const fileId = info.file.response.data.fileId;
// // console.log(downloadUrl(fileId)); // // console.log(downloadUrl(fileId));
// const url = showImage(fileId, false); // const url = showImage(fileId, false);
console.log(info.file.response.data.fileId); // console.log(info.file.response.data.fileId);
setPersonalIdCard([ setPersonalIdCard([
{ {
@ -563,14 +563,14 @@ export default function EditThree(props: any) {
return; return;
} }
if (info.file.status === 'done') { if (info.file.status === 'done') {
console.log(info); // console.log(info);
setUpPersonalLicenseLoading(false) setUpPersonalLicenseLoading(false)
// const fileId = info.file.response.data.fileId; // const fileId = info.file.response.data.fileId;
// // console.log(downloadUrl(fileId)); // // console.log(downloadUrl(fileId));
// const url = showImage(fileId, false); // const url = showImage(fileId, false);
console.log(info.file.response.data.fileId); // console.log(info.file.response.data.fileId);
setPersonalLicense([ setPersonalLicense([
{ {
@ -604,14 +604,14 @@ export default function EditThree(props: any) {
return; return;
} }
if (info.file.status === 'done') { if (info.file.status === 'done') {
console.log(info); // console.log(info);
setUpEnterpriseLicenseLoading(false) setUpEnterpriseLicenseLoading(false)
// const fileId = info.file.response.data.fileId; // const fileId = info.file.response.data.fileId;
// // console.log(downloadUrl(fileId)); // // console.log(downloadUrl(fileId));
// const url = showImage(fileId, false); // const url = showImage(fileId, false);
console.log(info.file.response.data.fileId); // console.log(info.file.response.data.fileId);
setEnterpriseLicense([ setEnterpriseLicense([
{ {
@ -672,7 +672,7 @@ export default function EditThree(props: any) {
// props.setEditProcess(4); // props.setEditProcess(4);
// console.log(confirmSelectPeopleData); // console.log(confirmSelectPeopleData);
if (confirmSelectPeopleData.name) { if (confirmSelectPeopleData.name) {
console.log(confirmSelectPeopleData); // console.log(confirmSelectPeopleData);
try { try {
setSubLoading(true) setSubLoading(true)
await submitTrademarkApplicant(props.trademarkId, { await submitTrademarkApplicant(props.trademarkId, {

View File

@ -187,7 +187,7 @@ export default function EditTwo(props: any) {
const getTrademarkSchemeList = async () => { const getTrademarkSchemeList = async () => {
try { try {
const res: any = await trademarkSchemeList() const res: any = await trademarkSchemeList()
console.log('我得列表', res); // console.log('我得列表', res);
setOptions(res.map((item: any) => { setOptions(res.map((item: any) => {
return { return {
value: item.typesId, value: item.typesId,