From 5aea79970dbe0dce8ec88b0152055003b24ee5a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Wed, 18 Oct 2023 17:05:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/js/project/listingItems/items2.js | 102 +++++++++++++++++++---- static/js/project/user/index.js | 32 +++---- view/listingItems/itemsDetail.html | 91 +++++++++----------- view/user/user.html | 4 +- 4 files changed, 146 insertions(+), 83 deletions(-) diff --git a/static/js/project/listingItems/items2.js b/static/js/project/listingItems/items2.js index ad290a5..708787e 100644 --- a/static/js/project/listingItems/items2.js +++ b/static/js/project/listingItems/items2.js @@ -157,7 +157,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function document.getElementById('biddingTitle').style.display = 'block'; document.getElementById('biddingTitle').innerHTML = '竞价进行中...'; } - document.getElementById('swiperType').style.display = 'block'; + // document.getElementById('swiperType').style.display = 'block'; d = Math.floor(leftTime/1000/60/60/24); h = Math.floor(leftTime/1000/60/60%24); m = Math.floor(leftTime/1000/60%60); @@ -169,8 +169,8 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function //竞价结束 $('#countType').html('') $('#countDown').html('竞价结束') - document.getElementById('swiperType').style.display = 'none'; - document.getElementById('biddingTable').style.display = 'table-block'; + // document.getElementById('swiperType').style.display = 'none'; + document.getElementById('biddingTable').style.display = 'table'; document.getElementById('biddingTitle').style.display = 'none'; module.data.biddingTimeType = 2; }else if (nowTime距报名开始还有：'+d+'天'+h+'时'+m+'分'+s+'秒') } + + //moneyText：出价输入框 + //moneyBtn：出价按钮 + //signYes：已报名显示文字 + //signNo：未报名显示文字 + //signBtn：已登录但未报名跳转报名按钮 + //signBtn2：未登录跳转登录按钮 + //noAction：未开始显示文字 + + if(module.data.loginNow){ //判断是否登录（已登录） + if(module.data.signup == 1){ //判断是否报名（已报名） + if( module.data.biddingTimeType == 1 ){ //判断当前竞价状态（竞价中） + document.getElementById('signYes').style.display = 'none'; + document.getElementById('signNo').style.display = 'none'; + document.getElementById('signBtn').style.display = 'none'; + document.getElementById('signBtn2').style.display = 'none'; + document.getElementById('noAction').style.display = 'none'; + + document.getElementById('moneyText').style.display = 'table-row'; + document.getElementById('moneyBtn').style.display = 'flex'; + }else if( module.data.biddingTimeType == 3 ){ //判断当前竞价状态（竞价未开始） + document.getElementById('moneyText').style.display = 'none'; + document.getElementById('moneyBtn').style.display = 'none'; + document.getElementById('signNo').style.display = 'none'; + document.getElementById('signBtn').style.display = 'none'; + document.getElementById('signBtn2').style.display = 'none'; + document.getElementById('noAction').style.display = 'none'; + + document.getElementById('signYes').style.display = 'block'; + }else{ //判断当前竞价状态（竞价结束） + $('.swiperInput').css('display','none'); + $('#timeDown').css('display','none'); + clearInterval(module.data.timeDown) + } + }else{ //判断是否报名（未报名） + if( module.data.signupTimeType == 1 ){ //判断当前报名状态（正在报名） + document.getElementById('moneyText').style.display = 'none'; + document.getElementById('moneyBtn').style.display = 'none'; + document.getElementById('signNo').style.display = 'none'; + document.getElementById('signBtn2').style.display = 'none'; + document.getElementById('noAction').style.display = 'none'; + document.getElementById('signYes').style.display = 'none'; + + document.getElementById('signBtn').style.display = 'block'; + }else if( module.data.signupTimeType == 3 ){ //判断当前报名状态（报名未开始） + document.getElementById('moneyText').style.display = 'none'; + document.getElementById('moneyBtn').style.display = 'none'; + document.getElementById('signBtn2').style.display = 'none'; + document.getElementById('signYes').style.display = 'none'; + document.getElementById('signBtn').style.display = 'none'; + document.getElementById('signNo').style.display = 'none'; + + document.getElementById('noAction').style.display = 'block'; + }else{ //判断当前报名状态（报名结束） + document.getElementById('moneyText').style.display = 'none'; + document.getElementById('moneyBtn').style.display = 'none'; + document.getElementById('signBtn2').style.display = 'none'; + document.getElementById('noAction').style.display = 'none'; + document.getElementById('signYes').style.display = 'none'; + document.getElementById('signBtn').style.display = 'none'; + + document.getElementById('signNo').style.display = 'block'; + } + } + }else{ //判断是否登录（未登录） + if( module.data.biddingTimeType == 2 ){//判断当前竞价状态（竞价结束） + $('.swiperInput').css('display','none') + }else{ + document.getElementById('signBtn2').style.display = 'block'; + } + } + if(module.data.outProjectInformationDetail.biddingType != '自由竞价' && module.data.biddingTimeType != 2){ - document.getElementById('biddingTable').style.display = 'table-block'; + document.getElementById('biddingTable').style.display = 'table'; document.getElementById('biddingTitle').style.display = 'none'; } } @@ -281,11 +353,11 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function module.data.timeDown = setInterval(function(){ // console.log($('#countType').html()) - if ($('#countType').html()!='竞价中'){ - clearInterval(module.data.timeDown) - document.getElementById('timeDown').style.display = 'none'; - return; - } + // if ($('#countType').html()!='竞价中'){ + // clearInterval(module.data.timeDown) + // document.getElementById('timeDown').style.display = 'none'; + // return; + // } timName.innerHTML = t+'秒后自动刷新'; t--; document.getElementById('timeDown').style.display = 'inline-block'; @@ -370,7 +442,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function document.getElementById('biddingTitle').style.display = 'block'; document.getElementById('biddingTitle').innerHTML = '竞价进行中...'; } - document.getElementById('swiperType').style.display = 'block'; + // document.getElementById('swiperType').style.display = 'block'; module.data.biddingTimeType = 1; m = Math.floor(difference/1000/60%60); s = Math.floor(difference/1000%60); @@ -391,8 +463,8 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function }else{ $('#countType').html('') $('#countDown').html('竞价结束') - document.getElementById('swiperType').style.display = 'none'; - document.getElementById('biddingTable').style.display = 'table-block'; + // document.getElementById('swiperType').style.display = 'none'; + document.getElementById('biddingTable').style.display = 'table'; document.getElementById('biddingTitle').style.display = 'none'; module.data.biddingTimeType = 2; return; @@ -679,8 +751,8 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function }else{ $('#countType').html('') $('#countDown').html('竞价结束') - document.getElementById('swiperType').style.display = 'none'; - document.getElementById('biddingTable').style.display = 'table-block'; + // document.getElementById('swiperType').style.display = 'none'; + document.getElementById('biddingTable').style.display = 'table'; document.getElementById('biddingTitle').style.display = 'none'; module.data.biddingTimeType = 2; return; diff --git a/static/js/project/user/index.js b/static/js/project/user/index.js index a55b1b9..5ee20f2 100644 --- a/static/js/project/user/index.js +++ b/static/js/project/user/index.js @@ -12,6 +12,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor", userSupplyInformationList:'', consultingInformationList:'', biddingInformationList:'', + applicationInformationList:'', //页码 pageNum: 1, //页码集合 @@ -655,7 +656,8 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor", if (pageCount < 1){ pageCount = 1; } - if(module.data.biddingInformationList == '') { + if(module.data.applicationInformationList == '') { + console.log('aaaaaa') // 初始化 分页器 var page_s1=createPage('.page_s4'); // 设置分页 @@ -667,19 +669,18 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor", }) $('#page_s4').html('共' + pageCount + '页') } - - content.forEach((res,index)=>{ - res.depositStatus = module.data.depositStatusOption.filter(function (e) { return e.dictValue == res.depositStatus; })[0].dictLabel; - - setInterval(()=>{ - res.endTime = new Date(res.biddingStopTime) - new Date(); - if (res.endTime <= 0){ - document.getElementById('endTime'+index).innerHTML = '已结束' - return; - } - document.getElementById('endTime'+index).innerHTML = TimeInterval(res.endTime) - },1000) - }) + // content.forEach((res,index)=>{ + // res.depositStatus = module.data.depositStatusOption.filter(function (e) { return e.dictValue == res.depositStatus; })[0].dictLabel; + // + // setInterval(()=>{ + // res.endTime = new Date(res.biddingStopTime) - new Date(); + // if (res.endTime <= 0){ + // document.getElementById('endTime'+res.id).innerHTML = '已结束' + // return; + // } + // document.getElementById('endTime'+res.id).innerHTML = TimeInterval(res.endTime) + // },1000) + // }) module.data.applicationInformationList = content; var applicationInformationData = template('applicationInformationData', module.data); @@ -828,6 +829,9 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor", if(module.data.clickType == 'bidding'){ tools.doGet(userBidding, {memberId:module.data.memberId,pageNum:pageNum,pageSize:module.data.pageSize}, module.bidding); } + if(module.data.clickType == 'application'){ + tools.doGet(getSignupByMemberId, {memberId:module.data.memberId,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.application); + } } //个人用户资料修改 diff --git a/view/listingItems/itemsDetail.html b/view/listingItems/itemsDetail.html index 53c5a45..252b3c7 100644 --- a/view/listingItems/itemsDetail.html +++ b/view/listingItems/itemsDetail.html @@ -238,66 +238,53 @@ {{/if}} -