diff --git a/static/js/project/bidding/biddingList.js b/static/js/project/bidding/biddingList.js index dc9d24f..77b222f 100644 --- a/static/js/project/bidding/biddingList.js +++ b/static/js/project/bidding/biddingList.js @@ -159,7 +159,6 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT console.log(data) var content = data.rows; var pageCount = (data.total/module.data.pageSize).toFixed(0); - console.log(pageCount) if (pageCount < 1){ pageCount = 1; } @@ -255,7 +254,6 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT } turnThePage = function (pageNum) { - module.data.pageNum = pageNum; module.data.form.pageNum = pageNum ; tools.doGet(biddingList, module.data.form, module.biddingList,true); } @@ -311,7 +309,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT // module.data.form.signupStopTime= $('#signEndTimeStr').val(); // module.data.form.biddingStartTime= $('#auctionStartTimeStr').val(); // module.data.form.biddingStopTime= $('#endTimeStr').val(); - module.data.form.pageNum= module.data.pageNum; + module.data.form.pageNum= '1'; module.data.form.pageSize= module.data.pageSize; if (module.data.form.signupStartTime){ diff --git a/static/js/project/user/index.js b/static/js/project/user/index.js index 5ee20f2..62490be 100644 --- a/static/js/project/user/index.js +++ b/static/js/project/user/index.js @@ -669,18 +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'+res.id).innerHTML = '已结束' - // return; - // } - // document.getElementById('endTime'+res.id).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);