From c670f50db01703751ebc9033202ecd61d3133c93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Tue, 26 Sep 2023 14:19:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/js/api/user.js | 6 ++++ static/js/common/tools.js | 3 ++ static/js/project/listingItems/items.js | 13 ++++++-- static/js/project/user/index.js | 36 ++++++++++++++++++++- view/user/user.html | 43 +++++++++++++++++++++++-- 5 files changed, 95 insertions(+), 6 deletions(-) diff --git a/static/js/api/user.js b/static/js/api/user.js index 5fd0a21..e903f62 100644 --- a/static/js/api/user.js +++ b/static/js/api/user.js @@ -44,6 +44,12 @@ var userConsulting = '/transaction/communicate/communicateList/member' //我的 */ var userBidding = '/transaction/outproject/biddinglist/member' //我的竞价类接口 +/* +@purl /transaction/signup/getSignupByMemberId +@param +*/ +var getSignupByMemberId = '/transaction/signup/getSignupByMemberId' //我的报名类接口 + /* @purl /transaction/outproject/biddinglist/member @param diff --git a/static/js/common/tools.js b/static/js/common/tools.js index ca74b18..076ddbf 100644 --- a/static/js/common/tools.js +++ b/static/js/common/tools.js @@ -2,6 +2,7 @@ var serverApi = ''; var friendsLinksList = []; var themeColor = ''; var logo = ''; +var lastTime = 0.00; define(['jquery', 'dialog','jsencrypt'], function ($, dialog,JSEncrypt) { // 工具类 function Tool() { @@ -502,6 +503,8 @@ define(['jquery', 'dialog','jsencrypt'], function ($, dialog,JSEncrypt) { $("#webConfigAddress").html(content[0].configValue + '' + content[3].configValue); serverApi = content[11].configValue; + lastTime = parseFloat(content[8].configValue); + } }, /** diff --git a/static/js/project/listingItems/items.js b/static/js/project/listingItems/items.js index 9b7642a..7ca7ffc 100644 --- a/static/js/project/listingItems/items.js +++ b/static/js/project/listingItems/items.js @@ -13,7 +13,8 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function timer:null, biddinglistInformationDetailLength:-1, biddingTimeType:0, - biddinglistInformationDetail:[] + biddinglistInformationDetail:[], + timeConfig:0.00 }, }; var tools = new Tools(); @@ -99,7 +100,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function var content = data.data; console.log(content) //document.getElementById('time').innerHTML = '延时周期：'+content[8].configValue+content[8].remark+'?' - module.data.timeConfig = content[8].configValue; + module.data.timeConfig = parseFloat(content[8].configValue); module.data.titleConfig = content[9].configValue; module.data.importantTitle = content[7].configName+':'+ content[7].configValue.substr(3).substr(0,(content[7].configValue.substr(3).length-4)); module.data.know = content[6].configValue; @@ -118,12 +119,14 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function } } module.dataCompare = function(signupStartTime,signupStopTime,biddingStartTime,biddingStopTime){ + var signupStartTime = signupStartTime; var signupStopTime = signupStopTime; var biddingStartTime = biddingStartTime; var biddingStopTime = biddingStopTime; var nowTime = Date.parse(new Date()); + var beginTimes=signupStartTime.substring(0,10).split('-'); var endTimes=signupStopTime.substring(0,10).split('-'); @@ -348,7 +351,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function let biddingStopTime = content.biddingStopTime; var nowTime = Date.parse(new Date()); var difference = Date.parse(biddingStopTime)-nowTime; - var centerTime = 2 * 60 * 1000 + var centerTime = module.data.timeConfig * 60 * 1000 if ( 0 < difference&&difference <= centerTime){ console.log("竞价最后两分钟") //正在竞价 @@ -367,6 +370,10 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function document.getElementById('biddingTitle').style.display = 'block'; } }else{ + if (!signupStartTime){console.log('缺失报名开始时间');return;} + if (!signupStopTime){console.log('缺失报名结束时间');return;} + if (!biddingStartTime){console.log('缺失竞价开始时间');return;} + if (!biddingStopTime){console.log('缺失竞价结束时间');return;} module.dataCompare(signupStartTime,signupStopTime,biddingStartTime,biddingStopTime); } },1000) diff --git a/static/js/project/user/index.js b/static/js/project/user/index.js index 069281b..f394d1b 100644 --- a/static/js/project/user/index.js +++ b/static/js/project/user/index.js @@ -306,6 +306,8 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor", tools.doGet(userConsulting, {memberId:content.id,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.consulting); //我的竞价 tools.doGet(userBidding, {memberId:content.id,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.bidding); + //我的报名 + tools.doGet(getSignupByMemberId, {memberId:content.id,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.application); tools.doPost(listHistory, {processInstanceId:content.instanceId}, module.listHistory); //个人资料提交 @@ -629,6 +631,33 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor", } } + //个人中心我的报名 + module.application = function(data){ + if (data.code == 200) { + var content = data.rows; + //console.log(content) + var pageCount = (data.total/module.data.pageSize).toFixed(0); + if (pageCount < 1){ + pageCount = 1; + } + if(module.data.biddingInformationList == '') { + // 初始化 分页器 + var page_s1=createPage('.page_s4'); + // 设置分页 + setPage(page_s1, { + pageTotal: data.total, // 数据总条数 + pageSize: module.data.pageSize, // 每页显示条数 + pageCurrent: 1, // 当前页 + maxBtnNum: 5, // 最多按钮个数（最少5个） + }) + $('#page_s4').html('共' + pageCount + '页') + } + module.data.applicationInformationList = content; + var applicationInformationData = template('applicationInformationData', module.data); + $("#applicationInformationContent").html(applicationInformationData); + } + } + tabCheck = function(type){ document.getElementById('user').className = ''; // document.getElementById('bank').className = ''; @@ -660,7 +689,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor", } tabLeftCheck = function(type){ - for (var i = 1 ; i < 5 ; i++){ + for (var i = 1 ; i < 6 ; i++){ document.getElementById('icon-list'+i).className = ''; } document.getElementById(type).className = 'active'; @@ -668,6 +697,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor", document.getElementById('supplyInformation').style.display = 'none'; document.getElementById('consultingInformation').style.display = 'none'; document.getElementById('biddingInformation').style.display = 'none'; + document.getElementById('applicationInformation').style.display = 'none'; document.getElementById('releaseSupply').style.display = 'none'; document.getElementById('release').style.display = 'none'; @@ -697,6 +727,10 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor", document.getElementById('biddingInformation').style.display = 'block'; module.data.clickType = 'bidding'; } + if(type == 'icon-list5'){ + document.getElementById('applicationInformation').style.display = 'block'; + module.data.clickType = 'application'; + } module.data.pageNum = 1 ; } diff --git a/view/user/user.html b/view/user/user.html index cb92db0..cf06bcf 100644 --- a/view/user/user.html +++ b/view/user/user.html @@ -161,6 +161,11 @@

我的竞价

+
  • + +

    我的报名

    +
    +
    • @@ -178,7 +183,7 @@

    {{userInformationDetail.phone}}

    - {{userInformationDetail.activitiStatus == '1' ? '待审':userInformationDetail.activitiStatus == '2' ? '驳回':userInformationDetail.activitiStatus == '3' ? '通过':''}} + {{userInformationDetail.activitiStatus == '1' ? '待审(点击查看)':userInformationDetail.activitiStatus == '2' ? '驳回':userInformationDetail.activitiStatus == '3' ? '通过':''}}

    @@ -236,7 +241,7 @@

    {{userInformationDetail.phone}}

    - {{userInformationDetail.activitiStatus == '1' ? '待审':userInformationDetail.activitiStatus == '2' ? '驳回':userInformationDetail.activitiStatus == '3' ? '通过':''}} + {{userInformationDetail.activitiStatus == '1' ? '待审(点击查看)':userInformationDetail.activitiStatus == '2' ? '驳回':userInformationDetail.activitiStatus == '3' ? '通过':''}}

    @@ -690,6 +695,40 @@ + + +