From 6eac1015466814b216eee18199ee92a658bd8937 Mon Sep 17 00:00:00 2001 From: lyp Date: Thu, 22 May 2025 11:31:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AiShopDetail/AiShopDetail.tsx | 2 + .../components/AppInfo/AppInfo.tsx | 3 + .../components/EditAppFiles/EditAppFiles.tsx | 172 +++++++++--------- src/route/CopyrightGgoods/CopyrightGgoods.tsx | 29 ++- src/route/ProductRelease/ProductRelease.tsx | 41 +++-- src/route/ProductRelease/product-release.css | 62 ++++--- .../TransactionOrder/TransactionOrder.tsx | 1 + src/route/index/Index.tsx | 30 ++- src/static/fir.png | Bin 0 -> 1369 bytes src/static/noFir.png | Bin 0 -> 1081 bytes src/util/AjaxUtils.ts | 10 + 11 files changed, 215 insertions(+), 135 deletions(-) create mode 100644 src/static/fir.png create mode 100644 src/static/noFir.png diff --git a/src/components/AiShopDetail/AiShopDetail.tsx b/src/components/AiShopDetail/AiShopDetail.tsx index 2f4ae7e..36550f8 100644 --- a/src/components/AiShopDetail/AiShopDetail.tsx +++ b/src/components/AiShopDetail/AiShopDetail.tsx @@ -13,6 +13,7 @@ import { goodsDetail, createOrder, confirmPayment } from '../../request/api' import { showImage } from '../../request/request' import { useState, useEffect, useContext } from 'react'; import useMessage from "antd/es/message/useMessage"; +import { getBuyUrl } from '../../util/AjaxUtils.ts' // const { TextArea } = Input; export default function AiShopDetail(props: any) { const globalDispatchContext = useContext(GlobalDispatchContext); @@ -261,6 +262,7 @@ export default function AiShopDetail(props: any) { marginLeft: 10, }}>我同意平台 { // window.open('https://www.aimzhu.com/Seda.html') + getBuyUrl() }}>《购买协议》
鉴别材料
+
源码文档 :
asdkaksd.png
+ +
软件文档 :
asdkaksd.png
diff --git a/src/route/AppElectron/components/EditAppFiles/EditAppFiles.tsx b/src/route/AppElectron/components/EditAppFiles/EditAppFiles.tsx index c082ec8..440a9a3 100644 --- a/src/route/AppElectron/components/EditAppFiles/EditAppFiles.tsx +++ b/src/route/AppElectron/components/EditAppFiles/EditAppFiles.tsx @@ -16,9 +16,9 @@ export default function EditAppFiles(props: any) { }; // 处理文件点击预览 const handlePreview = (file: any) => { - console.log(file); - - + console.log(file); + + }; // 上传文件源码文档列表 const [upCodeArray, setUpCodeArray] = useState([]) @@ -134,92 +134,98 @@ export default function EditAppFiles(props: any) { width: '600px', // background: 'pink' }}> -
-
源码文档*：
-
+
- - { - console.log(fileList); - // console.log(upCodeArray); +
源码文档*：
+
+ + { + console.log(fileList); + // console.log(upCodeArray); - }} - onRemove={() => { - setUpCodeArray([]) - setCodeDis(false) - }} - beforeUpload={beforeUpload} - onPreview={handlePreview} - // onChange={handleUploadChange} - headers={{ 'Auth': `Bearer ${token}` }} - > - - - + }} + onRemove={() => { + setUpCodeArray([]) + setCodeDis(false) + }} + beforeUpload={beforeUpload} + onPreview={handlePreview} + // onChange={handleUploadChange} + headers={{ 'Auth': `Bearer ${token}` }} + > + + + +
+ [ 下载 ]
- [ 下载 ] + 源码文档说明
-
-
软件文档*：
-
+
- - { - console.log(fileList); - }} - onRemove={() => { - setUpSoftArray([]) - setSoftDis(false) - }} - beforeUpload={beforeUpload} - // onChange={handleUploadChange} - headers={{ 'Auth': `Bearer ${token}` }} - > - - - +
软件文档*：
+
+ + { + console.log(fileList); + }} + onRemove={() => { + setUpSoftArray([]) + setSoftDis(false) + }} + beforeUpload={beforeUpload} + // onChange={handleUploadChange} + headers={{ 'Auth': `Bearer ${token}` }} + > + + + +
+ [ 下载 ]
- [ 下载 ] + 软件文档说明
diff --git a/src/route/CopyrightGgoods/CopyrightGgoods.tsx b/src/route/CopyrightGgoods/CopyrightGgoods.tsx index 9035740..79216cf 100644 --- a/src/route/CopyrightGgoods/CopyrightGgoods.tsx +++ b/src/route/CopyrightGgoods/CopyrightGgoods.tsx @@ -61,6 +61,7 @@ export default function CopyrightGgoods() { const copyrightDate = state ? state.copyrightDate : ''; // 版权日期 const copyrightLanguage = state ? state.copyrightLanguage : ''; // 开发语言 // const copyrightType = state ? state.copyrightType : ''; // 软著类型 + const goodsFlag = state ? state.goodsFlag : ''; // 商品特价标识 const [data, setData] = useState([]); // 表格数据 @@ -121,6 +122,7 @@ export default function CopyrightGgoods() { goodsDevelop: copyrightLanguage ? copyrightLanguage : '', // 开发语言 // goodsType: copyrightType ? copyrightType.join(',') : '', // 软著类型 goodsType: selectTypeArray.length > 0 ? selectTypeArray.join(',') : '', + goodsFlag: goodsFlag ? goodsFlag : '' // 商品特价标识 }) // console.log(res); @@ -214,8 +216,11 @@ export default function CopyrightGgoods() { }, []) useEffect(() => { getBuyGoodsList(page) - }, [page, selectTypeArray]) - + }, [page]) + useEffect(() => { + setPage(1) + getBuyGoodsList(1) + }, [selectTypeArray]) return (
@@ -261,7 +266,7 @@ export default function CopyrightGgoods() { {data.map((item: any) => { return (
{ @@ -277,8 +282,17 @@ export default function CopyrightGgoods() { preview={false} style={{ maxWidth: '100%' }} > +
特价
+
+ 截止日期 : {item.goodsLastTime} +
+
+
{item.goodsName}
+
-
-
特价
-
{item.goodsName}
-
-
- 截止日期 : {item.goodsLastTime} -
+ + {/*
+
+ {/*
特价
*/} +
{item.goodsName}
+
-
- {/*
特价
*/} -
{item.goodsName}
-
-
- 截止日期 : {item.goodsLastTime} -
+ +
diff --git a/src/route/ProductRelease/product-release.css b/src/route/ProductRelease/product-release.css index d1d46e1..fa8e725 100644 --- a/src/route/ProductRelease/product-release.css +++ b/src/route/ProductRelease/product-release.css @@ -88,7 +88,7 @@ thead { /* 使用 grid 布局 */ display: grid; /* 自动填充列，每列最小宽度 183px，最大宽度 1fr */ - grid-template-columns: repeat(auto-fill, minmax(183px, 1fr)); + grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); /* 行间距 10px */ row-gap: 20px; /* 列间距 10px */ @@ -152,19 +152,49 @@ thead { .goodsImg { width: 100%; - height: 183px; + height: 245px; object-fit: cover; /* background: pink; */ padding: 15px 9px 0px 9px; box-sizing: border-box; overflow: hidden; + position: relative; +} + +.goodsTime { + font-size: 14px; + color: #e6e6e6; + /* margin-top: 10px; */ + position: absolute; + /* background-color: skyblue; */ + height: 33px; + background: rgba(11, 70, 75, 0.41); + width: 100%; + left: 0; + bottom: 0; + text-align: center; + line-height: 33px; +} + +.tipsPrice { + width: 63px; + height: 32px; + background: #FF9F08; + border-radius: 0px 0px 0px 10px; + color: white; + font-size: 18px; + text-align: center; + line-height: 32px; + position: absolute; + right: 0; + top: 0; } .goodsBot { padding: 10px 5px 10px 5px; box-sizing: border-box; /* height: 157px; */ - /* background-color: rgb(167, 167, 167); */ + /* background-color: rgb(175, 64, 64); */ } .goodsPrice { @@ -188,22 +218,12 @@ thead { margin-top: 10px; } -.tipsPrice { - width: 38px; - height: 23px; - background: #FF9600; - border-radius: 5px; - color: white; - font-size: 12px; - text-align: center; - line-height: 23px; - margin-right: 6px; -} + .goodsName { width: calc(100% - 29px); /* background-color: #1bd258; */ - font-weight: bold; + /* font-weight: bold; */ font-size: 20px; overflow: hidden; text-overflow: ellipsis; @@ -211,15 +231,12 @@ thead { /* cursor: pointer; */ } -.goodsTime { - font-size: 14px; - color: #707070; - margin-top: 10px; -} + .goodsBtnBox { display: flex; margin-top: 10px; + } .goodsBtn { @@ -268,9 +285,10 @@ thead { .goodsTypeArray { display: flex; font-size: 18px; - flex-wrap: wrap; + flex-wrap: wrap; } -.typeName{ + +.typeName { margin-left: 10px; margin-bottom: 5px; /* background-color: pink; */ diff --git a/src/route/TransactionOrder/TransactionOrder.tsx b/src/route/TransactionOrder/TransactionOrder.tsx index 7b7c0a6..34d3e12 100644 --- a/src/route/TransactionOrder/TransactionOrder.tsx +++ b/src/route/TransactionOrder/TransactionOrder.tsx @@ -156,6 +156,7 @@ export default function TransactionOrder() { width={110} render={(text) => ( {text.goodsPrice} + // 1 )} /> { setCopyrightKeywords(copyrightNewKeywords) } + const [specialPrice,setSpecialPrice] = useState(false) //商品特价标识 const copyrightInit = () => { setMinPrice(null) setMaxPrice(null) @@ -886,7 +888,10 @@ export default function Index() { setCopyrightType(null) setCopyrightNewKeywords('') setCopyrightKeywords('') + // 清除特价标识 + setSpecialPrice(false) } + useEffect(() => { if (location.pathname == '/copyright-goods') { nav('/copyright-goods', { @@ -898,10 +903,12 @@ export default function Index() { copyrightDate: copyrightDate, copyrightLanguage: copyrightLanguage, copyrightType: copyrightType, + // 新增特价标识 + goodsFlag:specialPrice?'特价':'' } }) } - }, [copyrightKeywords, minPrice, maxPrice, sort, copyrightDate, copyrightLanguage, copyrightType]) + }, [copyrightKeywords, minPrice, maxPrice, sort, copyrightDate, copyrightLanguage, copyrightType,specialPrice]) // ---------------------------------------------------------------------------------------------- @@ -3084,6 +3091,21 @@ export default function Index() { options={[]} value={copyrightType} /> + -
- 今日特价! -
+
diff --git a/src/static/fir.png b/src/static/fir.png new file mode 100644 index 0000000000000000000000000000000000000000..8eaa497aace627b31a14573eea3f56090c8c0105 GIT binary patch literal 1369 zcmV-f1*ZCmP)Px)6G=otR9HvFn0aheRTPK6Gu@z|HL?fnv4QV41xYQ;tx31AF}29eq#1QZMuC{8=?$eWqY#nq1V-fb<5H#S8pBoNgZEg{Y>l549o zt=8$4z?l|Q4He11R`*;L5kZ563kk%g+1b&uY?;UGrPj5`A3!^hC!=I(Ngco~15usc z8MWt&W%*McknDb_?gLtZd?S`+Bh3Fy2=n`vL_}+{W}{?E^os6o5L?z1V5RBlcxJbE zm6oe3LXCz4I+#9mw6J=r0bG;VRW04EuAWv3`nX3!3nX@RS}>aa?*s=@HTi8+<~b_Y z#KcLPC71N_o|luP^+qFJcy3TS5Nd(z>Px4i$;zcV{YyLG1 z9Uxj{9g0v4v~Y_kD`m{iEZt@O2<7#gh)VrcEP$C7p-8Mdlg%Gakgd<<0n`2Z6YRA; zh>UE9syWg*0I^|k&Hd(93Z+W zu@g0xzZx*f0_g?n7qO;eNk*}IjEb&FoQbfoepxwzg>(!pYr3^x=fAku3uNVp?I?}` zQ*Tijh3HOm6$vMdWPR-gvSj!#sP=5c;5WcrBOVJU2zGlfnX&JfbBru};w0*ohU<5_ z3dDvLL`jud-)(V%%pY8aGAOJDL5t~3d9&oExE33 zkyq`&2drmft*Ei;`rSu|;4hyVU=r*gbNH`%k(5vy=*@bYtixzaMC23Px&^GQTOR9HvFm|3V*RT#&A|0WtK$R=sBB1<0{3>yfc5ejXB1PgjdD8xd@q97`x zIkE>UGlB@BuzD~P0}CQ5N)W1tMw+vMqKu3}GW)l_)7sa4cW2o9oOAD8FZ^jD$O_D0|bV3wpUrT3ELx^PWF z7D{@gq-;;%3t&Is3`wuqZUGd}p@Y~y7~8k5!-Q#@Qrx>(F7vzJxWseRYcdhz`AsqrzBm`6eJ?# zo|LT41lINeGGEdY8RTW)oLmN`OZv5)y#HCm_FQ1Oq)91H-ue0Qn<)=_{v-P zeAkE?1!DVf;B8=&r0KTr1tOz1U8^NsWc$lh7D8sRmL&fv^3ljk+dEc4Rs$CR84pkj55eOzzJDt^cCmjvfem+dw@R#gr)Zdeg|es`nUyRdsYsyT}wh%NLpa~ z{uIJD^kJ1cM_RrV8w-$Sz_o2o9+R7%s2ydTex;378`(ro~aK(|{GZB@*3% zgJ>FuXrz12$!!$G&7Vz8_+64d=ys`|!fi)L$D|ft z1x^Bv$OHID4#*0&=HWa(?7a`fN1Sz%Y6ZZ*lvid{WS6dP00000NkvXXu0mjfVPgNI literal 0 HcmV?d00001 diff --git a/src/util/AjaxUtils.ts b/src/util/AjaxUtils.ts index b4fd8e4..52d030e 100644 --- a/src/util/AjaxUtils.ts +++ b/src/util/AjaxUtils.ts @@ -151,6 +151,16 @@ export function getUseUrl() { console.error("请求出错:", error); }); } +// 购买协议 +export function getBuyUrl() { + 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}`) + }) + .catch(error => { + console.error("请求出错:", error); + }); +} // 软件委托开发协议 export function getSoftUrl() { return `${baseUrl}/Seda.html`