From eb6162cad07693dc1c5bd419bc9d5dce4fa59bd2 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, 27 Jun 2023 16:09:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93=E5=87=BA?= =?UTF-8?q?=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/css/listingItems/items.css | 5 ++ static/js/api/items.js | 6 ++ static/js/project/listingItems/items.js | 68 ++++++++++++++++------ view/listingItems/itemsDetail.html | 77 +++++++++++++------------ 4 files changed, 102 insertions(+), 54 deletions(-) diff --git a/static/css/listingItems/items.css b/static/css/listingItems/items.css index f0185f1..69922e2 100644 --- a/static/css/listingItems/items.css +++ b/static/css/listingItems/items.css @@ -663,4 +663,9 @@ input::-webkit-inner-spin-button { color: #ffffff; margin: 0 auto; border-radius: 50px; +} + +#timeDown{ + font-size: 14px; + margin-left: 15px; } \ No newline at end of file diff --git a/static/js/api/items.js b/static/js/api/items.js index 3fa0f44..ec6805e 100644 --- a/static/js/api/items.js +++ b/static/js/api/items.js @@ -117,3 +117,9 @@ var userData = '/getInfo' //修改用户信息类接口 @param */ var userMember = '/transaction/member/userId' //用户信息类接口 + +/* +@purl /transaction/website/member/{id} +@param +*/ +var projectNewBidMoney = '/transaction/website/projectNewBidMoney/' //用户信息类接口 diff --git a/static/js/project/listingItems/items.js b/static/js/project/listingItems/items.js index 8fcac37..d349806 100644 --- a/static/js/project/listingItems/items.js +++ b/static/js/project/listingItems/items.js @@ -145,6 +145,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function if(Date.parse(biddingStartTime)秒后自动刷新'; + t--; + document.getElementById('timeDown').style.display = 'inline-block'; + if(t<0){ + t = 10; + let biddingStartTime = content.biddingStartTime; + let biddingStopTime = content.biddingStopTime; + var nowTime = Date.parse(new Date()); + if(Date.parse(biddingStartTime)0){$("#nowMoney").html(content[0].money);} + + + } } @@ -481,7 +504,15 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function } //出价 - biddingSubmitMethod = function (data) { + module.biddingSubmitMethod = function (data) { + let newMoney; + if (data.msg&&data.code==200){ + console.log(data) + newMoney = data.msg; + }else{ + newMoney = module.data.outProjectInformationDetail.price; + } + if ($('#money').val()<=0){ tools.initError('请正常出价！'); return; @@ -495,9 +526,9 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function //判断当前竞价方式 if (module.data.outProjectInformationDetail.biddingType=='阶梯竞价' || module.data.outProjectInformationDetail.biddingType=='公开竞价'){ //判断当前是否有人出价 - if (module.data.biddinglistInformationDetail.length>1){ + if (data.msg){ //判断用户出价不能高于当前出价最低价格 - if(module.data.biddinglistInformationDetail[0].money < $('#money').val()){ + if(newMoney < $('#money').val()){ tools.initError('出价不能高于当前出价最低价格'); return; } @@ -512,9 +543,9 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function //判断当前竞价方式 if (module.data.outProjectInformationDetail.biddingType=='阶梯竞价' || module.data.outProjectInformationDetail.biddingType=='公开竞价'){ //判断当前是否有人出价 - if (module.data.biddinglistInformationDetail.length>1){ + if (data.msg){ //判断用户出价不能低于当前出价最高价格 - if(module.data.biddinglistInformationDetail[0].money > $('#money').val()){ + if(newMoney > $('#money').val()){ tools.initError('出价不能低于当前出价最高价格'); return; } @@ -682,6 +713,10 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function } } + changeProMoney = function(){ + tools.doGet(projectNewBidMoney+getQueryVariable('id'), {}, module.biddingSubmitMethod); + } + //向上加价 upMoney = function(){ if (module.data.outProjectInformationDetail.biddingDirect == '反向竞价'){ @@ -691,7 +726,6 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function return; } }else{ - if(module.data.biddinglistInformationDetail[0].money <= (parseInt($('#money').val())+parseInt(module.data.outProjectInformationDetail.ladderPrice))){ tools.initError('出价不能高于当前出价最低价格'); return; diff --git a/view/listingItems/itemsDetail.html b/view/listingItems/itemsDetail.html index b62e2c0..7378387 100644 --- a/view/listingItems/itemsDetail.html +++ b/view/listingItems/itemsDetail.html @@ -226,7 +226,10 @@ {{if outProjectInformationDetail.biddingType != '自由竞价' && biddinglistInformationDetail.length>0}} 当前价格 - {{biddinglistInformationDetail[0].money}} 元 + + {{biddinglistInformationDetail[0].money}} 元 + + {{/if}} @@ -256,7 +259,7 @@ {{if loginNow != ''}} {{if signup == 1}} {{if biddingTimeType == 1}} -
+

立即出价

{{/if}} @@ -401,7 +404,7 @@ {{outProjectInformationDetail.email}} - 转出项目
基本情况 + 转出项目
基本情况 项目类型* {{outProjectInformationDetail.projectNumber}} @@ -417,20 +420,20 @@ 坐落 {{outProjectInformationDetail.locationName}} - - 是否属再次转出* - - {{if outProjectInformationDetail.twoout == 'N'}} - 否 - {{else}} - 是 - {{/if}} - - - - 前次转出方式 - {{outProjectInformationDetail.oneout}} - + + + + + + + + + + + + + + 拟转出方式* {{outProjectInformationDetail.rollout}} @@ -488,26 +491,26 @@ 拟流转土地用途 {{outProjectInformationDetail.contractPurpose}} - - 其他农户是否放弃行使优先权 - - {{if outProjectInformationDetail.otherPeasant == 'N'}} - 否 - {{else}} - 是 - {{/if}} - - - - 是否优先本村集体内部成员 - - {{if outProjectInformationDetail.isOwnFirst == 'N'}} - 否 - {{else}} - 是 - {{/if}} - - + + + + + + + + + + + + + + + + + + + + 受让方应当具备的条件 {{outProjectInformationDetail.condition}}