diff --git a/static/js/project/listingItems/bond.js b/static/js/project/listingItems/bond.js index f0178b2..7c75b13 100644 --- a/static/js/project/listingItems/bond.js +++ b/static/js/project/listingItems/bond.js @@ -156,7 +156,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi',"cupload"], function module.upLoadOver = function(data){ tools.initError('提交申请,等待审核') setTimeout(function () { - tools.skip('itemsDetail.html?id='+getQueryVariable('id')) + window.location = 'itemsDetail.html?id='+getQueryVariable('id') },2000) } diff --git a/static/js/project/listingItems/items2.js b/static/js/project/listingItems/items2.js index 708787e..9074579 100644 --- a/static/js/project/listingItems/items2.js +++ b/static/js/project/listingItems/items2.js @@ -473,6 +473,68 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function },true); }else if(s%2 == 0&¢erTime!=0){ + 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'; + } + } tools.doGet(getBiddingStopTime+getQueryVariable('id'), {}, module.getBiddingStopTime,true); } }else{ @@ -543,19 +605,28 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function console.log(module.data.outProjectInformationDetail.biddingDirect) setTimeout(function(){ - if(module.data.outProjectInformationDetail.biddingType != '自由竞价'){ + if(module.data.outProjectInformationDetail.biddingType == '阶梯竞价'){ + if (module.data.outProjectInformationDetail.biddingDirect == '反向竞价'||module.data.outProjectInformationDetail.biddingDirect == '2'){ if (content.length>0){ - document.getElementById('money').value = parseFloat(parseFloat(content[0].money) - parseFloat(module.data.outProjectInformationDetail.ladderPrice)).toFixed(2); + if(content[0].money<=$('#money').val()) { + document.getElementById('money').value = parseFloat(parseFloat(content[0].money) - parseFloat(module.data.outProjectInformationDetail.ladderPrice)).toFixed(2); + } }else{ - document.getElementById('money').value = parseFloat(parseFloat(module.data.outProjectInformationDetail.price)).toFixed(2); + if(content[0].money<=$('#money').val()) { + document.getElementById('money').value = parseFloat(parseFloat(module.data.outProjectInformationDetail.price)).toFixed(2); + } // + parseFloat(module.data.outProjectInformationDetail.ladderPrice) } }else{ if (content.length>0){ - document.getElementById('money').value = parseFloat(parseFloat(content[0].money) + parseFloat(module.data.outProjectInformationDetail.ladderPrice)).toFixed(2); + if(content[0].money>=$('#money').val()){ + document.getElementById('money').value = parseFloat(parseFloat(content[0].money) + parseFloat(module.data.outProjectInformationDetail.ladderPrice)).toFixed(2); + } }else{ - document.getElementById('money').value = parseFloat(parseFloat(module.data.outProjectInformationDetail.price)).toFixed(2); + if(content[0].money>=$('#money').val()){ + document.getElementById('money').value = parseFloat(parseFloat(module.data.outProjectInformationDetail.price)).toFixed(2); + } // + parseFloat(module.data.outProjectInformationDetail.ladderPrice) } } diff --git a/view/listingItems/itemsDetail.html b/view/listingItems/itemsDetail.html index 252b3c7..c6eb18c 100644 --- a/view/listingItems/itemsDetail.html +++ b/view/listingItems/itemsDetail.html @@ -104,7 +104,7 @@
  • - 我的报名 + 我的报名