修改

.env.dev

@@ -6,9 +6,9 @@ VITE_OPERATOR_PLUGIN_BASE_URL=${VITE_BASE_URL}:8099
 VITE_AI_SHOP_BASE_URL=http://192.168.0.115:8081
 VITE_WEBSOCKET_BASE_URL=ws://${VITE_HOST}:7025/copyright
 # 18634604067
-# VITE_USERID=80d3365e-0597-4988-979e-18ef1c3ec671   
+VITE_USERID=80d3365e-0597-4988-979e-18ef1c3ec671   
 # VITE_USERID=e3e40f95-7a3f-4b53-a1a0-51dd4e881d74   
-VITE_USERID=5cc90b84-905e-4027-9f6c-ab47e9c320a1
+# VITE_USERID=5cc90b84-905e-4027-9f6c-ab47e9c320a1
 # VITE_CURRENT_THEME=fzkj
 VITE_CURRENT_THEME=mzw
 # VITE_HOST=121.36.71.250:58038

src/components/OrderDetailModal/OrderDetailModal.tsx

@@ -187,7 +187,7 @@ export default function OrderDetailModal(props: any) {
                         <Authorize authorizeInfo={authorizeInfo} ></Authorize>
                     </div>
                     <div style={{ display: activeKey == 'file' ? 'block' : 'none' }}>
-                        <File user={props.user} orderId={props.orderId}></File>
+                        <File user={props.user} upData={props.upData} orderId={props.orderId}></File>
                     </div>
                     {/* <div style={{ display: activeKey == 'result' ? 'block' : 'none' }}>
                     <Result ></Result>

src/components/OrderDetailModal/components/File/File.tsx

@@ -12,7 +12,7 @@ export default function File(props: any) {
     // 自定义验证函数
     const validateContentOrFile = (_rule: any, _value: any, callback: (error?: string) => void, form: any) => {
         const { upCorrectionRemark, upFile } = form.getFieldsValue();
-        if (upCorrectionRemark || (upFile && Array.isArray(upFile.fileList) && upFile.fileList.length > 0)) {
+        if (upCorrectionRemark || upFile) {
             callback();
         } else {
             callback('内容和附件至少需要填写或上传一项');
@@ -126,6 +126,8 @@ export default function File(props: any) {
             const res: any = await getFileTypeByIds({
                 ids: ids
             })
+            // console.log(res);
+
             setFileList(res)
 
         } catch (error: any) {
@@ -141,14 +143,99 @@ export default function File(props: any) {
             }
         }
     }
+    // 获取上传过的文件类型
+    const getUpFileTypeByIdsArray = async (ids: string) => {
+        try {
+            const res: any = await getFileTypeByIds({
+                ids: ids
+            })
+            console.log(res);
+            const newUpFile = res.map((item: any) => {
+                return {
+                    uid: item.fileId,
+                    name: item.fileName,
+                    status: 'done',
+                    url: showImage(item.fileId, false)
+                }
+            })
+            // console.log(newUpFile, 'newUpFile');
+            setUpFileArray(newUpFile)
+
+        } 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 [detailData, setDetailData] = useState<any>({})
+    const [disabled, setDisabled] = useState(false) // 是否禁用
     const getSupplementDetail = async (id: string) => {
         try {
             const res: any = await supplementDetail(id)
             // console.log(res);
+            // 给表单赋值
+            // form.setFieldsValue({
+            //     upCorrectionRemark: res.correctionRemark, // 内容
+            //     upFile:'1111'
+            // })
+            // 给上传列表赋值
+            // setUpFileArray([{
+            //     uid: '1111',
+            //     name: '嘻嘻',
+            //     status: 'done',
+            //     url: 'www.baidu.com'
+            // }])
+
+
             setDetailData(res)
             await getFileTypeByIdsArray(res.correctionFiles)
+            // console.log(props.user, 'user');
+            const userId = props.user == 'sell' ? res.sellId : res.buyId;
+            // console.log(userId, 'userId');
+            if (userId) {
+                console.log('已补充');
+                setDisabled(true)
+                const newData: any = await supplementDetail(userId)
+                console.log('以补充材料', newData);
+                form.setFieldsValue({
+                    upCorrectionRemark: newData.correctionRemark, // 内容
+
+                })
+                if (newData.correctionFiles) {
+                    getUpFileTypeByIdsArray(newData.correctionFiles)
+                    // const newArray:any = getFileTypeByIds({
+                    //     ids: newData.correctionFiles
+                    // })
+                    // console.log(newArray, 'newArray');
+                    // console.log('有补充资料');
+                    // // 循环newArray 形成新
+                    // const newUpFile =  newArray.map((item:any)=>{
+                    //     return {
+                    //         uid: item.fileId,
+                    //         name: item.fileName,
+                    //         status: 'done',
+                    //         url: 'www.baidu.com'
+                    //     }
+                    // })
+                    // console.log(newUpFile, 'newUpFile');
+
+
+                }
+
+
+
+            } else {
+                setDisabled(false)
+            }
+
 
         } catch (error: any) {
 
@@ -254,6 +341,8 @@ export default function File(props: any) {
                                 setCorrectionId(record.correctionId)
                                 getSupplementDetail(record.correctionId)
                                 setIsModalVisible(true)
+                                // 清空上传的文件数组
+                                setUpFileArray([])
                                 // 清空表单
                                 form.resetFields();
                                 // setCorrectionType(record.correctionType)
@@ -263,7 +352,7 @@ export default function File(props: any) {
                     )}
                 />
             </Table>
-            <Modal title={'补充'}
+            <Modal title={disabled?'查看':'补充'}
                 destroyOnClose={true}
                 open={isModalVisible}
                 footer={null} // 将 footer 设置为 null 来隐藏自带按钮
@@ -354,7 +443,7 @@ export default function File(props: any) {
 
                         onFinish={(value) => {
 
-                            // console.log(value);
+                            console.log(value);
                             // if (value.upFile && Array.isArray(value.upFile.fileList)) {
                             //     const uids = value.upFile.fileList.map((file: any) => file.uid);
                             //     const uidString = uids.join(',');
@@ -366,18 +455,20 @@ export default function File(props: any) {
 
                             // console.log('提取的 uid 字符串:', uids);
 
+                            submitData({
+                                correctionFiles: value.upFile ? value.upFile : '',
+                                correctionRemark: value.upCorrectionRemark ? value.upCorrectionRemark : '',
+                            })
+                            // console.log(upFileArray);
+                            // 将upFileArray 数组里的uid 提取出来
+                            // const uids = upFileArray.map((file: any) => file.uid).join(',');
+
+                            // const uids = upFileArray.map((file: any) => file.response.data.fileId).join(',');
+                            // console.log('提取的 uid 字符串:', uids);
                             // submitData({
                             //     correctionFiles: uids,
                             //     correctionRemark: value.upCorrectionRemark,
                             // })
-                            // console.log(upFileArray);
-                            // 将upFileArray 数组周末和每项的response里的data 里的 fileId 拼接成一个字符串，用逗号隔开
-                            const uids = upFileArray.map((file: any) => file.response.data.fileId).join(',');
-                            // console.log('提取的 uid 字符串:', uids);
-                            submitData({
-                                correctionFiles: uids,
-                                correctionRemark: value.upCorrectionRemark,
-                            })
 
 
                         }}
@@ -408,6 +499,7 @@ export default function File(props: any) {
                                     width: 900,
 
                                 }}
+                                    disabled={disabled}
                                     placeholder='请输入需要补充内容'
                                 ></TextArea>
                             </Form.Item>
@@ -435,12 +527,35 @@ export default function File(props: any) {
                                 >
 
                                     <Upload
+                                        disabled={disabled}
                                         name="file"
                                         action={uploadFileUrl()}
-                                        defaultFileList={upFileArray}
+                                        fileList={upFileArray}
                                         onChange={(info) => {
-                                            setUpFileArray(info.fileList) 
+                                            // console.log(info.file.status);
-                                            // console.log(info.fileList);
+                                            // setUpFileArray(info.fileList)
+                                            const { fileList } = info;
+                                            const newFileArray = fileList.map((file) => {
+                                                if (file.status === 'done' && file.response) {
+                                                    return {
+                                                        uid: file.response.data.fileId,
+                                                        name: file.response.data.fileName,
+                                                        status: 'done',
+                                                        url: showImage(file.response.data.fileId, false)
+                                                    };
+                                                }
+                                                return file;
+                                            });
+                                            setUpFileArray(newFileArray);
+                                            // console.log(newFileArray);
+                                            const uids = newFileArray.map((file: any) => file.uid).join(',');
+                                            // console.log(uids);
+
+                                            //  给form 赋值
+                                            form.setFieldsValue({
+                                                upFile: uids,
+                                            })
+
 
                                         }}
 
@@ -464,12 +579,16 @@ export default function File(props: any) {
                                 justifyContent: 'flex-end',
                                 gap: 10,
                                 // marginTop: 20
+                            }}>
+                                <div style={{
+                                    display: disabled ? 'none' : 'unset',
                                 }}>
                                     <Button onClick={() => {
                                         setIsModalVisible(false)
                                         form.resetFields();
                                     }}>取消</Button>
-                                <Button type="primary" htmlType="submit" >确定</Button>
+                                    <Button type="primary" htmlType="submit" style={{ marginLeft: 10 }} >确定</Button>
+                                </div>
                             </div>
                         </Form.Item>
 

src/components/menu/MenuWithTopButton.tsx

@@ -94,7 +94,11 @@ export default function MenuWithTopButton(props: IMenuWithTopButton) {
                 if (item.id == 'REPLACENAME') {
                     // props.disableBelongpeople()
                     navugate('/replace', {
-                   
+                        state: {
+                            keywords: props.replaceKeyWords,
+                            applyStatus: props.replaceStatus,
+                            authorId: props.authorId
+                        }
                     })
                 }
 

src/interfaces/menu/IMenuWithTopButton.ts

@@ -59,4 +59,8 @@ export interface IMenuWithTopButton {
     tradingEndTime?: any,
     tradingStatus?: any,
 
+    
+    replaceKeyWords?: any,
+    replaceStatus?: any,
+
 }

src/route/Correction/Correction.tsx

@@ -883,6 +883,7 @@ export default function Correction() {
 
     useEffect(() => {
         // getData(1)
+        // console.log(state);
         
         getData(1)
         setPage(1)

src/route/Replace/Replace.tsx

@@ -234,6 +234,7 @@ export default function Replcae() {
 
     useEffect(() => {
         // getData(1)
+        // console.log(state);
         
         getData(1)
         setPage(1)

src/route/TrademarkMall/TrademarkAiEdit.tsx

@@ -112,34 +112,45 @@ export default function TrademarkAiEdit() {
                     display: editProcess == 1 ? 'block' : 'none'
                 }}>
                     <EditOne
+                        key={editProcess}
                         setEditProcess={setEditProcess}
                     ></EditOne>
                 </div>
                 <div style={{
                     display: editProcess == 2 ? 'block' : 'none'
                 }}>
-                    <EditTwo setEditProcess={setEditProcess}></EditTwo>
+                    <EditTwo
+                        key={editProcess}
+                        setEditProcess={setEditProcess}></EditTwo>
 
                 </div>
                 <div style={{
                     display: editProcess == 3 ? 'block' : 'none'
                 }}>
-                    <EditThree setEditProcess={setEditProcess}></EditThree>
+                    <EditThree
+                        key={editProcess}
+                        setEditProcess={setEditProcess}></EditThree>
                 </div>
                 <div style={{
                     display: editProcess == 4 ? 'block' : 'none'
                 }}>
-                    <EditFour setEditProcess={setEditProcess}></EditFour>
+                    <EditFour
+                        key={editProcess}
+                        setEditProcess={setEditProcess}></EditFour>
                 </div>
                 <div style={{
                     display: editProcess == 5 ? 'block' : 'none'
                 }}>
-                    <EditFive setEditProcess={setEditProcess}></EditFive>
+                    <EditFive
+                        key={editProcess}
+                        setEditProcess={setEditProcess}></EditFive>
                 </div>
                 <div style={{
                     display: editProcess == 6 ? 'block' : 'none'
                 }}>
-                    <EditSix setEditProcess={setEditProcess}></EditSix>
+                    <EditSix
+                        key={editProcess}
+                        setEditProcess={setEditProcess}></EditSix>
                 </div>
             </div>
         </div>

src/route/TrademarkMall/components/EditOne/EditOne.tsx

@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { Button, Radio, Form, Input, Upload, message, Image } from 'antd'
+import { Button, Radio, Form, Input, Upload, message, Image, Spin } from 'antd'
 import './EditOne.css'
 import { uploadFileUrl, showImage } from '../../../../request/request'
 import {
@@ -64,20 +64,25 @@ export default function EditOne(props: any) {
   // 自动生成的img
   const [generateImgId, setGenerateImgId] = useState<any>('')
   const [imgList, setImgList] = useState<any>([])
+  // 上传商标文字图片
+  const [textLodaing, setTextLodaing] = useState(false)
   const upImgHandleChange: UploadProps['onChange'] = (info) => {
     console.log(info.file.status);
 
 
     if (info.file.status === 'uploading') {
       // setFileList([])
+      setTextLodaing(true)
       return;
     }
     if (info.file.status === 'done') {
-
+      setTextLodaing(false)
       // const fileId = info.file.response.data.fileId;
       // // console.log(downloadUrl(fileId));
 
       // const url = showImage(fileId, false);
+      console.log(info.file.response.data.fileId);
+      
       setImgList([
         {
           uid: info.file.response.data.fileId,
@@ -86,22 +91,24 @@ export default function EditOne(props: any) {
           url: showImage(info.file.response.data.fileId, false)
         }
       ])
+      formA.setFieldsValue({ imgUrl: info.file.response.data.fileId })
 
       return;
     }
     if (info.file.status === 'error') {
+      setTextLodaing(false)
       message.error(`上传失败`);
       return;
     }
   };
   const onFinishA = (values: any) => {
     console.log(values);
-    props.setEditProcess(2);
+    // props.setEditProcess(2);
 
   }
   const onFinishB = (values: any) => {
     console.log(values);
-    props.setEditProcess(2);
+    // props.setEditProcess(2);
 
   }
   const onChange = (e: any) => {
@@ -367,7 +374,7 @@ export default function EditOne(props: any) {
                     color: 'black',
                     resize: 'none'
                   }}
-                    value={generateType == '1' ? generateImgId : imgList[0]?.uid}
+                    // value={generateType == '1' ? generateImgId : imgList[0]?.uid}
                     placeholder="商标说明"
                   >
                   </TextArea>
@@ -389,6 +396,7 @@ export default function EditOne(props: any) {
                 }}>
                   暂无图片
                 </div>
+                {/* 自动生成图片 */}
                 <div style={{
                   display: generateType == '1' && generateImgId != '' ? 'unset' : 'none',
                   width: 200,
@@ -415,8 +423,9 @@ export default function EditOne(props: any) {
                     <Image src={generateImgId} height={100} style={{ maxWidth: 200, height: '100%' }}  ></Image>
                   </div>
                 </div>
+                {/* 手动上传图片 */}
                 <div style={{
-                  display: generateType == '2' ? 'unset' : 'none',
+                  display: generateType == '2' && imgList.length > 0 ? 'unset' : 'none',
                   width: 200,
                   height: 100,
                   background: 'white',
@@ -429,6 +438,53 @@ export default function EditOne(props: any) {
                   fontSize: '20px',
                   border: '1px dashed #d6d6d6',
                 }}>
+
+                  <div style={{
+                    width: '100%',
+                    height: '100%',
+                    // background:'pink',
+                    overflow: 'hidden',
+                    display: 'flex',
+                    justifyContent: 'center',
+                    alignItems: 'flex-start',
+                  }}>
+                    <Image src={imgList[0]?.url} height={100} style={{ maxWidth: 200, height: '100%' }}  ></Image>
+                  </div>
+                  <div style={{
+                    position: 'absolute',
+                    bottom: 0,
+                    right: -50,
+                    fontSize: '16px',
+                    lineHeight:'16px',
+                    // background:'pink',
+                    cursor:'pointer',
+                    padding:'5px',
+                    color:'red'
+                  }}
+                    onClick={()=>{
+                      setImgList([])
+                      formA.setFieldsValue({ imgUrl: '' })
+                    }}
+                  >删除</div>
+
+                </div>
+
+
+                <div style={{
+                  display: generateType == '2' && imgList.length <= 0 ? 'unset' : 'none',
+                  width: 200,
+                  height: 100,
+                  background: 'white',
+                  color: 'black',
+                  position: 'absolute',
+                  top: 0,
+                  left: 0,
+                  lineHeight: '100px',
+                  textAlign: 'center',
+                  fontSize: '20px',
+                  border: '1px dashed #d6d6d6',
+                }}>
+                  <Spin tip="正在处理，请稍后..." size="small" spinning={textLodaing}>
                     <Upload
                       name="file"
                       maxCount={1}
@@ -462,12 +518,17 @@ export default function EditOne(props: any) {
                         上传图片
                       </div>
                     </Upload>
+                  </Spin>
                 </div>
 
               </div>
               <Button type="primary"
                 onClick={() => {
                   setGenerateImgId('http://gips2.baidu.com/it/u=1674525583,3037683813&fm=3028&app=3028&f=JPEG&fmt=auto?w=1024&h=1024')
+                  // 给FormA表单的imgUrl赋值
+                  formA.setFieldsValue({
+                    imgUrl: 'http://gips2.baidu.com/it/u=1674525583,3037683813&fm=3028&app=3028&f=JPEG&fmt=auto?w=1024&h=1024'
+                  })
                 }}
                 style={{
                   marginTop: '70px',

src/route/TradingGoods/TradingGoods.tsx

@@ -504,7 +504,9 @@ export default function TradingGoods() {
           justifyContent: 'center',
           height: `${height}px`,
         }}>
-        <OrderDetail orderId={orderId} user={'buy'}></OrderDetail>
+        <OrderDetail orderId={orderId} user={'buy'} upData={() => {
+          getDataList(page)
+        }}></OrderDetail>
       </Modal>
       <Modal
         title="补充资料"

src/route/index/Index.tsx

@@ -2006,6 +2006,10 @@ export default function Index() {
                                     correctionType={correctionType ? correctionType : ''}
                                     correctionApplyStatus={correctionApplyStatus ? correctionApplyStatus : ''}
                                     tagCor={tagCor ? tagCor : ''}
+
+                                    // 换名
+                                    replaceKeyWords={replaceKeyWords? replaceKeyWords : ''}
+                                    replaceStatus={replaceStatus? replaceStatus : ''}
                                 // enableBelongpeople = {()=>{setClickBelongpeople(true)}}
                                 />
 
@@ -2145,6 +2149,7 @@ export default function Index() {
                                         button={sellMenu.button}
                                         list={sellMenu.list}
                                         handleListItem={sellMenu.handleListItem}
+
                                         sellKeywords={sellKeywords}
                                         sellBelongType={sellBelongType}
                                         sellDate={sellDate}
@@ -2155,6 +2160,22 @@ export default function Index() {
                                         sellEndTime={sellEndTime}
                                         sellOrderStatus={sellOrderStatus}
                                         sellOrderKeywords={sellOrderKeywords}
+
+                                        copyrightKeywords={copyrightKeywords}
+                                        minPrice={minPrice}
+                                        maxPrice={maxPrice}
+                                        sort={sort}
+                                        copyrightDate={copyrightDate}
+                                        copyrightLanguage={copyrightLanguage}
+                                        copyrightType={copyrightType}
+
+                                        tradingKeywords={tradingKeywords}
+                                        tradingStartTime={tradingStartTime}
+                                        tradingEndTime={tradingEndTime}
+                                        tradingStatus={tradingStatus}
+
+
+
                                     />
                                 ) : (
                                     <></>