diff --git a/static/js/api/items.js b/static/js/api/items.js index 6483149..4f745e8 100644 --- a/static/js/api/items.js +++ b/static/js/api/items.js @@ -90,3 +90,10 @@ var base64Upload = '/common/base64Attach'//上传凭证 id: 主键ID */ var needProject = '/transaction/website/needProject/'//需求详情 + +/* +@purl /transaction/outproject/updateLimitDelay +@param + id: 主键ID +*/ +var updateLimitDelay = '/transaction/outproject/updateLimitDelay'//延时周期 diff --git a/static/js/common/main.js b/static/js/common/main.js index 54f0a08..10fd75f 100644 --- a/static/js/common/main.js +++ b/static/js/common/main.js @@ -83,15 +83,16 @@ requirejs.config({ //所有页面都需要的js，先行加载 require(['jquery', 'addressApi']); -require(["jquery", "nprogress"], function ($, nprogress) { +// require(["jquery", "nprogress"], function ($, nprogress) { +require(["jquery"], function ($) { //ajax加载页面跳转 - $(document).ajaxStart(function () { - // $('.loading').show(); - nprogress.start(); - }).ajaxStop(function () { - // $('.loading').hide(); - nprogress.done(); - }); + // $(document).ajaxStart(function () { + // // $('.loading').show(); + // // nprogress.start(); + // }).ajaxStop(function () { + // // $('.loading').hide(); + // // nprogress.done(); + // }); //根据条件加载不同js文件 var currentPage = $("#require-page").attr("current-page"); var targetModule = $("#require-page").attr("target-module"); diff --git a/static/js/project/listingItems/bond.js b/static/js/project/listingItems/bond.js index 1c4d0ee..0060ecd 100644 --- a/static/js/project/listingItems/bond.js +++ b/static/js/project/listingItems/bond.js @@ -35,8 +35,9 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi',"cupload"], function module.bankType = function (data) { if (data.code == 200) { var content = data.data; - if(tools.getCookie('bankType') != undefined){ - var bankType = content.filter(function (e) { return e.dictValue == tools.getCookie('bankType'); })[0].dictLabel; + var bankType = '' + if(tools.getCookie('bankType') != undefined && tools.getCookie('bankType') != 'null' && tools.getCookie('bankType') != ''){ + bankType = content.filter(function (e) { return e.dictValue == tools.getCookie('bankType'); })[0].dictLabel; document.getElementById('bankType').value = bankType; } } @@ -147,6 +148,9 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi',"cupload"], function var content = data.data; $("#projectTitle").html('项目名称：'+content.projectName); $("#projectNum").html('需缴纳保证新：'+content.deposit+'元'); + $("#payAccount").html('保证金缴纳账号：'+content.payAccount); + $("#accountName").html('账户名称：'+content.accountName); + $("#bankName").html('开户银行：'+content.bankName); var cupload2 = new Cupload ({ ele: '#cupload-3', num: 5, diff --git a/static/js/project/listingItems/items.js b/static/js/project/listingItems/items.js index 655a3b1..7504dfa 100644 --- a/static/js/project/listingItems/items.js +++ b/static/js/project/listingItems/items.js @@ -8,7 +8,9 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function //焦点图数据 focusListTop: [], showImgInformationDetail:'', - loginNow:'' + loginNow:'', + timer:null, + biddinglistInformationDetailLength:0, }, }; var tools = new Tools(); @@ -130,7 +132,6 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function biddingStartTime=biddingBeginTimes[1]+'/'+biddingBeginTimes[2]+'/'+biddingBeginTimes[0]+' '+biddingStartTime.substring(10,19); biddingStopTime=biddingEndTimes[1]+'/'+biddingEndTimes[2]+'/'+biddingEndTimes[0]+' '+biddingStopTime.substring(10,19); - //时间差 var leftTime = Date.parse(biddingStopTime)-nowTime; //报名开始时间差 @@ -153,6 +154,9 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function }else if (nowTime>Date.parse(biddingStopTime)){ //竞价结束 $('#countDown').html('竞价结束') + document.getElementById('swiperType').style.display = 'none'; + document.getElementById('biddingTable').style.display = 'table-block'; + document.getElementById('biddingTitle').style.display = 'none'; module.data.biddingTimeType = 2; }else if (nowTime距竞价结束还有：0天0时'+m+'分'+s+'秒') + //挂牌项目竞价记录 + tools.doGet(biddinglist, {projectId:getQueryVariable('id')}, module.biddinglistInformationNew,true); + + if(module.data.outProjectInformationDetail.biddingType != '拍卖' && module.data.biddingTimeType != 2){ + document.getElementById('biddingTable').style.display = 'none'; + document.getElementById('biddingTitle').style.display = 'block'; + } + }else{ + module.dataCompare(signupStartTime,signupStopTime,biddingStartTime,biddingStopTime); + } + + },1000) for(var i = 0 ; i < content.fileUrlList.length ; i++){ content.fileUrlList[i].fileUrl = serverApi+content.fileUrlList[i].fileUrl; @@ -308,6 +344,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function } console.log(content) module.data.biddinglistInformationDetail = content; + module.data.biddinglistInformationDetailLength = content.length; var biddinglistInformationData = template('biddinglistInformationData', module.data); $("#tabDetail4").html(biddinglistInformationData); console.log(module.data.biddingTimeType) @@ -315,6 +352,26 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function } } + //竞价记录 + module.biddinglistInformationNew = function (data) { + if (data.code == 200) { + var content = data.rows; + console.log(module.data.biddinglistInformationDetail.length+'----------------------'+content.length) + if (module.data.biddinglistInformationDetailLength$('#money').val()){ - tools.initError('出价不能低于挂牌价'); - return; - } - }else{ + if(module.data.outProjectInformationDetail.price>$('#money').val()){ + tools.initError('出价不能低于挂牌价'); + return; + } + if (module.data.outProjectInformationDetail.biddingType=='拍卖'||module.data.outProjectInformationDetail.biddingType=='阶梯竞价'){ if(module.data.biddinglistInformationDetail[0].money>$('#money').val()){ tools.initError('出价不能低于当前出价最低价格'); return; diff --git a/static/js/project/user/index.js b/static/js/project/user/index.js index d8a38da..5c951dc 100644 --- a/static/js/project/user/index.js +++ b/static/js/project/user/index.js @@ -131,7 +131,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor", } } - //底部友情链接 + //账户类型 module.accountType = function (data) { if (data.code == 200) { var content = data.data; @@ -709,7 +709,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor", tools.setCookie('bankAddress',bankAddress,24 * 60 * 60) tools.setCookie('bankType',bankType,24 * 60 * 60) tools.setCookie('accountType',accountType,24 * 60 * 60) - tools.setCookie('payeePaymentLines',accountType,24 * 60 * 60) + tools.setCookie('payeePaymentLines',payeePaymentLines,24 * 60 * 60) } //data['password'] = password; data['id'] = module.data.memberId; diff --git a/static/js/project/user/registerFrom.js b/static/js/project/user/registerFrom.js index 2d6fd0a..2f24fe1 100644 --- a/static/js/project/user/registerFrom.js +++ b/static/js/project/user/registerFrom.js @@ -113,6 +113,7 @@ define(['jquery', "template", "Tools", "echarts", 'register', 'swiper'], functio data['idCardNum'] = idCardNum; data['address'] = address; data['economicType'] = 1; + data['accountType'] = 2; } if (module.data.type == 2){ var phone = $('#phone').val(); @@ -137,6 +138,7 @@ define(['jquery', "template", "Tools", "echarts", 'register', 'swiper'], functio data['companyLicense'] = companyLicense; data['companyCode'] = companyCode; data['economicType'] = economicType; + data['accountType'] = 1; } data['memberType'] = module.data.type; tools.doPost(userRegister, data, module.registerData, true) diff --git a/view/announcement/announcementDetail.html b/view/announcement/announcementDetail.html index c36edf6..82e3806 100644 --- a/view/announcement/announcementDetail.html +++ b/view/announcement/announcementDetail.html @@ -4,7 +4,7 @@ - 农燊高科-项目公告 + 农燊高科-公示公告 @@ -125,7 +125,7 @@
  • 首页
    • -
  • 挂牌项目
    • +
  • 交易项目
  • 竞价大厅
  • 公示公告
  • 个人供求
    • diff --git a/view/bidding/biddingList.html b/view/bidding/biddingList.html index 3918aa6..f39693e 100644 --- a/view/bidding/biddingList.html +++ b/view/bidding/biddingList.html @@ -4,7 +4,7 @@ - 农燊高科-新闻列表 + 农燊高科-竞价大厅 diff --git a/view/listingItems/bond.html b/view/listingItems/bond.html index ab5a790..61a1f21 100644 --- a/view/listingItems/bond.html +++ b/view/listingItems/bond.html @@ -4,7 +4,7 @@ - 农燊高科-新闻详情 + 农燊高科-保证金 @@ -125,9 +125,9 @@
    • 首页
      • -
    • 挂牌项目
      • +
    • 交易项目
    • 竞价大厅
      • -
    • 项目公告
      • +
    • 公示公告
    • 个人供求
    • 新闻资讯
    • 政策法规
      • @@ -137,7 +137,10 @@

      -

      +

      +

      +

      +

      1.竞买人请确认以下事项并勾选

      @@ -146,7 +149,7 @@

      · 已阅读并知晓：如您报名成功，您的姓名、证件号码、手机号、联系地址等信息将披露给资产处置单位及相关服务提供方，用于核实竞买人的真是身份、竞买资格及相关服务提供

      · 已阅读并知晓：竞买人如果没有进行实地看样，视为接受标的所有瑕疵等细则

      · 已阅读并知晓：已阅读并同意《竞拍服务协议》

      -

      本人已知晓并同意以上所有事项

      +

      本人已知晓并同意以上所有事项

      竞买人身份确认说明：

      diff --git a/view/listingItems/itemsDetail.html b/view/listingItems/itemsDetail.html index 5422bfe..3c19009 100644 --- a/view/listingItems/itemsDetail.html +++ b/view/listingItems/itemsDetail.html @@ -4,7 +4,7 @@ - 农燊高科-新闻列表 + 农燊高科-项目详情 @@ -395,7 +395,7 @@ {{outProjectInformationDetail.email}} - 转出项目
      基本情况 + 转出项目
      基本情况 项目类型* {{outProjectInformationDetail.projectNumber}} @@ -524,6 +524,18 @@ 缴纳形式 {{outProjectInformationDetail.depositPaymentType}} + + 保证金缴纳账号 + {{outProjectInformationDetail.payAccount}} + + + 账户名称 + {{outProjectInformationDetail.accountName}} + + + 开户银行 + {{outProjectInformationDetail.bankName}} + 保证金金额* {{outProjectInformationDetail.deposit}}元 diff --git a/view/listingItems/itemsList.html b/view/listingItems/itemsList.html index aba4c81..4d8d649 100644 --- a/view/listingItems/itemsList.html +++ b/view/listingItems/itemsList.html @@ -4,7 +4,7 @@ - 农燊高科-挂牌项目 + 农燊高科-交易项目