From a35e6c57e319424f8e6e9d47a987f21b0cc0ae12 Mon Sep 17 00:00:00 2001 From: lyp Date: Tue, 27 May 2025 15:49:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=89=93=E5=BC=80=E6=8D=A2=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/route/Correction/Correction.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/route/Correction/Correction.tsx b/src/route/Correction/Correction.tsx index 78961da..fd9f4a8 100644 --- a/src/route/Correction/Correction.tsx +++ b/src/route/Correction/Correction.tsx @@ -1136,7 +1136,7 @@ export default function Correction() { } - {/* 换名 - */} + 撤销补正 -
项目已关闭
-
+
Date: Fri, 30 May 2025 14:39:05 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8D=A2=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/route/Correction/Correction.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/route/Correction/Correction.tsx b/src/route/Correction/Correction.tsx index fd9f4a8..96ba272 100644 --- a/src/route/Correction/Correction.tsx +++ b/src/route/Correction/Correction.tsx @@ -1136,7 +1136,7 @@ export default function Correction() { }
- 换名 - + */} Date: Fri, 30 May 2025 17:40:42 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=95=86=E5=9F=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/route/index/Index.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/route/index/Index.tsx b/src/route/index/Index.tsx index 322637b..a16c1bd 100644 --- a/src/route/index/Index.tsx +++ b/src/route/index/Index.tsx @@ -19,7 +19,7 @@ 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"; @@ -2138,7 +2138,7 @@ export default function Index() { ) : ( <> - )} + )} */} {THEME == 'mzw' ? ( ) : ( <> - )} */} + )} {/* Date: Fri, 30 May 2025 17:47:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=95=86=E5=9F=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/route/index/Index.tsx | 55 ++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/src/route/index/Index.tsx b/src/route/index/Index.tsx index a16c1bd..98d70a5 100644 --- a/src/route/index/Index.tsx +++ b/src/route/index/Index.tsx @@ -19,7 +19,7 @@ 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"; @@ -57,7 +57,8 @@ import { } from '../../util/AjaxUtils.ts' import { // getLanguageList, getSoftTypeList - appGoodsList, buyAppGoods, appOrderList + // appGoodsList, + buyAppGoods, appOrderList } from '../../request/api' import { setMenuActive, @@ -91,8 +92,8 @@ interface DataType { // 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' +// import topblack from '../../static/appimgs/topblack.png' +// import topblue from '../../static/appimgs/topblue.png' import right from '../../static/trademark/right.png' import yes from '../../static/trademark/yes.png' @@ -983,7 +984,7 @@ export default function Index() { const [showAppkeyWords, setShowAppkeyWords] = useState('') // 电子软著搜索关键字显示 const [appModal, setAppModal] = useState(false) // 申请电子软著弹窗 const [toEditsModal, setToEditsModal] = useState(false) // 电子软著编辑弹窗 - const [appGoodsArray, setAppGoodsArray] = useState([]) // 电子软著可选商品列表 + // const [appGoodsArray, setAppGoodsArray] = useState([]) // 电子软著可选商品列表 const [buyLoading, setBuyLoading] = useState(false) // 购买loading const [appOrderId, setAppOrderId] = useState() // 电子软著订单id const [appExamineStatus, setAppExamineStatus] = useState(null) // 电子软著审核状态 @@ -1050,24 +1051,24 @@ export default function Index() { }, [appKeyWords, appExamineStatus, appApplyStatus]) // 获取电子软著可选商品列表 - const getAppGoodsList = async () => { - try { - const res = await appGoodsList() - // console.log('电子软著可选商品列表', res); - setAppGoodsArray(res) - } catch (error: any) { + // const getAppGoodsList = async () => { + // try { + // const res = await appGoodsList() + // // console.log('电子软著可选商品列表', res); + // setAppGoodsArray(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) - } - } - } + // 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) + // } + // } + // } // ----------------------------------------------------------------------------------------------- @@ -1800,7 +1801,7 @@ export default function Index() { // getLanguageListDate() // getSoftTypeListDate() - getAppGoodsList() + // getAppGoodsList() }, []); useEffect(() => { // loactionStorage里的activeMenu @@ -2139,7 +2140,7 @@ export default function Index() { ) : ( <> )} */} - {THEME == 'mzw' ? ( + {/* {THEME == 'mzw' ? ( ) : ( <> - )} + )} */} {/* - {appGoodsArray.map((item: any, index: number) => { + {/* {appGoodsArray.map((item: any, index: number) => { return (
) - })} + })} */}
From 6a5b4048759749eccdac2b5a76fd86537e706426 Mon Sep 17 00:00:00 2001 From: lyp Date: Wed, 4 Jun 2025 09:47:56 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 3 ++- src/route/ProductRelease/ProductRelease.tsx | 9 +++++++-- src/route/index/Index.tsx | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.env.dev b/.env.dev index e71d70a..5a4483b 100644 --- a/.env.dev +++ b/.env.dev @@ -3,11 +3,12 @@ VITE_BASE_URL=http://${VITE_HOST} VITE_COPY_BASE_URL=${VITE_BASE_URL}:7025 VITE_OPERATOR_BASE_URL=${VITE_BASE_URL}:8091 VITE_OPERATOR_PLUGIN_BASE_URL=${VITE_BASE_URL}:8099 -VITE_AI_SHOP_BASE_URL=http://192.168.0.15:8081 +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=e3e40f95-7a3f-4b53-a1a0-51dd4e881d74 +# VITE_USERID=5cc90b84-905e-4027-9f6c-ab47e9c320a1 # VITE_CURRENT_THEME=fzkj VITE_CURRENT_THEME=mzw # VITE_HOST=121.36.71.250:58038 diff --git a/src/route/ProductRelease/ProductRelease.tsx b/src/route/ProductRelease/ProductRelease.tsx index d513d5e..0acac58 100644 --- a/src/route/ProductRelease/ProductRelease.tsx +++ b/src/route/ProductRelease/ProductRelease.tsx @@ -594,14 +594,19 @@ export default function ProductRelease() {
正在交易中...
+
+ 已完成 +
diff --git a/src/route/index/Index.tsx b/src/route/index/Index.tsx index 98d70a5..b52b3ab 100644 --- a/src/route/index/Index.tsx +++ b/src/route/index/Index.tsx @@ -19,7 +19,7 @@ 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"; @@ -2140,7 +2140,7 @@ export default function Index() { ) : ( <> )} */} - {/* {THEME == 'mzw' ? ( + {THEME == 'mzw' ? ( ) : ( <> - )} */} + )} {/*