diff --git a/src/pages/Auction/AuctionParticipateDetail/components/AuctionViewAuctions.tsx b/src/pages/Auction/AuctionParticipateDetail/components/AuctionViewAuctions.tsx index dc9e3c1..8a6138d 100644 --- a/src/pages/Auction/AuctionParticipateDetail/components/AuctionViewAuctions.tsx +++ b/src/pages/Auction/AuctionParticipateDetail/components/AuctionViewAuctions.tsx @@ -6,13 +6,13 @@ * @Description: In User Settings Edit * @FilePath: \ebtp-cloud-frontend\src\pages\Auction\AuctionViewAuctions\components\A.tsx */ -import { getURLInformation, isEmpty, isNotEmpty } from '@/utils/CommonUtils'; +import { getURLInformation, isEmpty } from '@/utils/CommonUtils'; import { Button, Col, Divider, Form, Input, message, Modal, Row, Spin, Tabs } from 'antd'; import React, { useEffect, useRef, useState } from 'react'; import ProTable from '@ant-design/pro-table'; import ExtendUpload from '@/utils/ExtendUpload'; import '../../AuctionViewAuctions/auctionParts.less'; -import { getProId, getSessionRoleData, getSessionUserData } from '@/utils/session'; +import { getProId, getSessionUserData } from '@/utils/session'; import { pictureDisplayPath } from '@/utils/DownloadUtils'; import { algebraicAddition, digitalConversionAmount } from '@/utils/NumberUtils'; import { getFilelist } from '@/services/download_'; @@ -59,11 +59,16 @@ const AuctionViewAuctions: React.FC = () => { const [delay, setDelay] = useState(); //是否结束 const [overFlag, setOverFlag] = useState(false); + //是否开始 + const [startFlag, setStartFlag] = useState(false); + //竞拍数据 + const [auctionData, setAuctionData] = useState(); //倒计时剩余时间 const [countDownTime, setCountDownTime] = useState(null); //结束时间 const [endTime, setEndTime] = useState(''); - + //开始时间 + const [startTime, setStartTime] = useState(''); const ref = useRef(); const overFlagRef = useRef(); @@ -197,6 +202,7 @@ const AuctionViewAuctions: React.FC = () => { setCurrentPrice(data.zgjg); setDelay(data.yscs); setCountDownTime(data.jssj); + setStartFlag(data.bidOpeningStatus != "0"); } /** * 倒计时结束 @@ -220,7 +226,6 @@ const AuctionViewAuctions: React.FC = () => { */ const [range, rangeSet] = useState(0)//加价幅度 const init = () => { - const roleID = getSessionRoleData().roleId; getAuctionViewAuctions(tpId).then(res => { if (res.code === 200) { let data = res.data; @@ -229,6 +234,8 @@ const AuctionViewAuctions: React.FC = () => { setOverFlag(data.yczt); overFlagRef.current = data.yczt; } + //项目是否开始 + setStartFlag(data.bidOpeningStatus != "0"); findFile(data.gg.auctionBdwxcdfzp) setProjectName(data.xm.auction.projectName); setCurrentPrice(data.inner02_04); @@ -243,9 +250,6 @@ const AuctionViewAuctions: React.FC = () => { 起拍价:¥{digitalConversionAmount(String(data.gg.auctionJpjg), 2)} 加价幅度:¥{digitalConversionAmount(String(data.gg.auctionJjfd), 2)} 延时周期:{data.gg.auctionYszq}分钟/次 - { - data.cprdm !== null && roleID === '20003' && 竞拍代码:{data.cprdm} - } ); rangeSet(Number(data.gg.auctionJjfd));//幅度 @@ -274,9 +278,11 @@ const AuctionViewAuctions: React.FC = () => { ) setEndTime(data.gg.auctionJpjssj); + setStartTime(data.gg.auctionJpkssj); setCountDownTime(data.jpjssjTime); + setAuctionData(data); //围观+1 - if (data.cprdm == null) { + if (data.cprdm == null && data.bidOpeningStatus != "0") {//开始后未报名的才算围观 updatetOnlookers(tpId).then(res => { }); @@ -380,7 +386,7 @@ const AuctionViewAuctions: React.FC = () => { insertBidders(fromData).then(res => { if (res != null && res.message == "success") { message.success("参与竞拍成功!"); - setViewStatus('1'); + init(); setIsModalVisible(false); } }).finally(() => { @@ -416,7 +422,7 @@ const AuctionViewAuctions: React.FC = () => {

{projectName}

{/* */} -
+
{ overFlag ? ( @@ -426,7 +432,7 @@ const AuctionViewAuctions: React.FC = () => {  结束时间:{endTime}(延时{delay}次) - ) : ( + ) : startFlag ? ( <> 正在进行 @@ -435,6 +441,13 @@ const AuctionViewAuctions: React.FC = () => { + ) : ( + <> + 未开始 + +  开始时间:{startTime} + + ) }

@@ -447,7 +460,7 @@ const AuctionViewAuctions: React.FC = () => { { (!overFlag && isParticipant()) && ( viewStatus === '1' ? ( -

+ startFlag &&
<> 请出价: { }
{startingPrice} + { + viewStatus === '1' && isParticipant() && startFlag && 竞拍代码:{auctionData?.cprdm} + }
diff --git a/src/pages/Auction/AuctionParticipateList/index.tsx b/src/pages/Auction/AuctionParticipateList/index.tsx index b295b76..43d1565 100644 --- a/src/pages/Auction/AuctionParticipateList/index.tsx +++ b/src/pages/Auction/AuctionParticipateList/index.tsx @@ -10,6 +10,8 @@ import { getProvince } from '../AuctionAnnouncementData/service'; import { getList, getSfbm } from './service'; import { saveDateTimeFormatter } from '@/utils/DateUtils'; import { isNotEmpty } from '@/utils/CommonUtils'; +import { pictureDisplayPath } from '@/utils/DownloadUtils'; +import { getFilelist } from '@/services/download_'; export default () => { //获取用户数据 @@ -54,8 +56,16 @@ export default () => { isNotEmpty(kssj.current) ? params['kssj'] = kssj.current : null; isNotEmpty(jssj.current) ? params['jssj'] = jssj.current : null; setLoading(true); - await getList(params).then(res => { + await getList(params).then(async res => { if (res?.code == 200) { + for (const ite of res?.data.records) { + await getFilelist([ite.dfzp]).then(response => {//获取主图 + if (response?.success && response?.data?.length > 0) { + const returnUrl = window.location.origin + pictureDisplayPath + '?filePath=' + response?.data[0].filePath; + ite["dfzpUrl"] = returnUrl; + } + }) + } setProductList(res?.data.records); } }).finally(() => { @@ -132,7 +142,6 @@ export default () => { } //点击商品进入详情 const cardClick = (id: string) => { - console.log('cardClick', id) let projectData = { id: id }; @@ -260,7 +269,8 @@ export default () => { example } onClick={() => cardClick(item.id)}