From 5e3a05e3f66c5c43ca0a2c2f50b3a2f0274d1ed3 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, 20 Jun 2023 11:31:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/js/project/user/registerFrom.js | 1 - 1 file changed, 1 deletion(-) diff --git a/static/js/project/user/registerFrom.js b/static/js/project/user/registerFrom.js index 31a46ec..1bd4efc 100644 --- a/static/js/project/user/registerFrom.js +++ b/static/js/project/user/registerFrom.js @@ -312,7 +312,6 @@ define(['jquery', "template", "Tools", "user", "echarts", 'register', 'swiper'," } if (data.code == 200){ tools.initError("注册成功"); - return; setTimeout(function(){ tools.skip('login.html') },2000) From d932573af432c26cd1f7d378f773f8d77591d346 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, 20 Jun 2023 12:01:04 +0800 Subject: [PATCH 2/3] =?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/project/listingItems/items.js | 31 +++++++++---------------- view/listingItems/itemsDetail.html | 2 +- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/static/js/project/listingItems/items.js b/static/js/project/listingItems/items.js index f2c9685..0584916 100644 --- a/static/js/project/listingItems/items.js +++ b/static/js/project/listingItems/items.js @@ -10,7 +10,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function showImgInformationDetail:'', loginNow:'', timer:null, - biddinglistInformationDetailLength:0, + biddinglistInformationDetailLength:1, biddingTimeType:0, biddinglistInformationDetail:[] }, @@ -197,9 +197,9 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function $('#countType').html('未开始') $('#countDown').html('距报名开始还有：'+d+'天'+h+'时'+m+'分'+s+'秒') } - if(module.data.outProjectInformationDetail.biddingType != '公开竞价' && module.data.biddingTimeType != 2){ - document.getElementById('biddingTable').style.display = 'none'; - document.getElementById('biddingTitle').style.display = 'block'; + if(module.data.outProjectInformationDetail.biddingType != '自由竞价' && module.data.biddingTimeType != 2){ + document.getElementById('biddingTable').style.display = 'table-block'; + document.getElementById('biddingTitle').style.display = 'none'; } } @@ -365,27 +365,14 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function if (data.code == 200) { console.log(data) var content = data.rows; - // for (var i = 0; i < content.length-1; i++) { - // for (var j = 0; j < content.length - 1 - i; j++) { - // // 相邻元素两两对比，元素交换，大的元素交换到后面 - // if (content[j].money < content[j + 1].money) { - // var temp = content[j]; - // content[j] = content[j+1]; - // content[j+1] = temp; - // } - // } - // } - console.log(content) + if(module.data.biddinglistInformationDetailLength == content.length){ + return; + } module.data.biddinglistInformationDetail = content; module.data.biddinglistInformationDetailLength = content.length; var biddinglistInformationData = template('biddinglistInformationData', module.data); $("#tabDetail4").html(biddinglistInformationData); $("#nowMoney").html(content[0].money); - - - - console.log(module.data.biddingTimeType) - } } @@ -482,6 +469,10 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function //出价 biddingSubmitMethod = function (data) { + if ($('#money').val()<=0){ + tools.initError('请正常出价！'); + return; + } if (module.data.outProjectInformationDetail.biddingDirect == '反向竞价'){ //判断用户出价不能高于挂牌价 if(module.data.outProjectInformationDetail.price<$('#money').val()){ diff --git a/view/listingItems/itemsDetail.html b/view/listingItems/itemsDetail.html index 0e7d670..a3dbbf4 100644 --- a/view/listingItems/itemsDetail.html +++ b/view/listingItems/itemsDetail.html @@ -624,7 +624,7 @@ - +
From 5b0138c9fba8f71077b001226119270f113e2acf 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, 20 Jun 2023 15:52:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/js/api/register.js | 2 +- static/js/project/user/registerFrom.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/static/js/api/register.js b/static/js/api/register.js index 568f5e7..e34d10c 100644 --- a/static/js/api/register.js +++ b/static/js/api/register.js @@ -18,7 +18,7 @@ var Dictionaries = '/transaction/website/transfer'//成交公告字典 @purl /common/base64Attach @param */ -var base64Upload = '/transaction/website/common/base64Upload' //数据字典 +var base64Upload2 = '/transaction/website/common/base64Upload' //数据字典 var depositListPub = '/open/villageAffairs/public/realtimeBackList' //查询开户行 diff --git a/static/js/project/user/registerFrom.js b/static/js/project/user/registerFrom.js index 1bd4efc..0203cf1 100644 --- a/static/js/project/user/registerFrom.js +++ b/static/js/project/user/registerFrom.js @@ -207,13 +207,13 @@ define(['jquery', "template", "Tools", "user", "echarts", 'register', 'swiper'," $('#cupload-3').find('input').each(function() { if($(this).val()!=''&&$(this).val().indexOf('http') == -1){ module.data.upType1 = true; - tools.doPostImg(base64Upload, {file:$(this).val()}, module.upLoadOverInfo1); + tools.doPostImg(base64Upload2, {file:$(this).val()}, module.upLoadOverInfo1); } }) $('#cupload-4').find('input').each(function() { if($(this).val()!=''&&$(this).val().indexOf('http') == -1){ module.data.upType2 = true; - tools.doPostImg(base64Upload, {file:$(this).val()}, module.upLoadOverInfo2); + tools.doPostImg(base64Upload2, {file:$(this).val()}, module.upLoadOverInfo2); } }) setTimeout(module.register,1000); @@ -222,7 +222,7 @@ define(['jquery', "template", "Tools", "user", "echarts", 'register', 'swiper'," $('#cupload-5').find('input').each(function() { if($(this).val()!=''&&$(this).val().indexOf('http') == -1){ module.data.upType5 = true; - tools.doPostImg(base64Upload, {file:$(this).val()}, module.upLoadOverInfo5); + tools.doPostImg(base64Upload2, {file:$(this).val()}, module.upLoadOverInfo5); } }) setTimeout(module.register,1000);