From adae463b92565ad51c76626262979ee3e439ba7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Sat, 7 Oct 2023 17:26:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E4=BA=A4=E6=95=B0=E6=8D=AE=E5=A4=A7?=
=?UTF-8?q?=E5=B1=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
static/js/project/bidding/biddingBigData.js | 6 ++-
.../project/bidding/biddingBigDataDetail.js | 22 +++++++--
view/bidding/biddingBigData.html | 2 +-
view/bidding/biddingBigDataDetail.html | 49 ++++++++++---------
4 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/static/js/project/bidding/biddingBigData.js b/static/js/project/bidding/biddingBigData.js
index 1da166a..08e322c 100644
--- a/static/js/project/bidding/biddingBigData.js
+++ b/static/js/project/bidding/biddingBigData.js
@@ -170,8 +170,10 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t
tools.doGet(biddingList, module.data.form, module.biddingHallList, true);
}
- goDetail = function(id){
- tools.skip('biddingBigDataDetail.html?id='+id);
+ goDetail = function(id,type){
+ console.log(type)
+ var biddtype = type == '进行中'?'Y':'N';
+ tools.skip('biddingBigDataDetail.html?id='+id+'&type='+biddtype);
}
return module;
diff --git a/static/js/project/bidding/biddingBigDataDetail.js b/static/js/project/bidding/biddingBigDataDetail.js
index 7147427..a6789b1 100644
--- a/static/js/project/bidding/biddingBigDataDetail.js
+++ b/static/js/project/bidding/biddingBigDataDetail.js
@@ -28,6 +28,13 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t
$("#nowDateSFM").html(new Date().toLocaleTimeString());
$("#nowTime").html('服务器时间：'+new Date().getFullYear()+'.'+(new Date().getMonth()+1)+'.'+new Date().getDate()+' '+new Date().toLocaleTimeString());
},1000)
+ tools.doGet(outProject + '/id/'+getQueryVariable('id'), {}, module.outProjectInformation,true);
+
+ if (getQueryVariable('type') == 'Y'){
+ setInterval(function (){
+ tools.doGet(biddinglist, {projectId:getQueryVariable('id')}, module.biddinglistInformation,true);
+ },5000)
+ }
};
//获取地址栏参数
@@ -85,9 +92,9 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t
}
}
console.log(content)
- module.data.outProjectInformationDetail.biddinglistInformationDetail = content;
- var outProjectInformationData = template('outProjectInformationData', module.data);
- $("#outProjectInformationContent").html(outProjectInformationData);
+ module.data.biddinglistInformationDetail = content;
+ var biddingInformationData = template('biddingInformationData', module.data);
+ $("#biddingInformationContent").html(biddingInformationData);
}
}
@@ -136,6 +143,9 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t
$('#s0').html(((Math.floor(leftTime / 1000 % 60) + '').length < 2 ? '0' + Math.floor(leftTime / 1000 % 60) : Math.floor(leftTime / 1000 % 60) + '')[0]);
$('#s1').html(((Math.floor(leftTime / 1000 % 60) + '').length < 2 ? '0' + Math.floor(leftTime / 1000 % 60) : Math.floor(leftTime / 1000 % 60) + '')[1]);
+
+ //tools.doGet(biddinglist, {projectId:getQueryVariable('id')}, module.biddinglistInformation,true);
+
$('#countType').html('距竞价结束还有')
}else if (nowTime>Date.parse(biddingStopTime)){
//竞价结束
@@ -236,6 +246,8 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t
module.data.outProjectInformationDetail.biddingDirect = biddingDirect;
var outProjectInformationData = template('outProjectInformationData', module.data);
$("#outProjectInformationContent").html(outProjectInformationData);
+ var outProjectInformationData2 = template('outProjectInformationData2', module.data);
+ $("#outProjectInformationContent2").html(outProjectInformationData2);
}
}
@@ -246,6 +258,8 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t
module.data.outProjectInformationDetail.unit = unit;
var outProjectInformationData = template('outProjectInformationData', module.data);
$("#outProjectInformationContent").html(outProjectInformationData);
+ var outProjectInformationData2 = template('outProjectInformationData2', module.data);
+ $("#outProjectInformationContent2").html(outProjectInformationData2);
}
}
@@ -256,6 +270,8 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t
module.data.outProjectInformationDetail.biddingType = biddingType;
var outProjectInformationData = template('outProjectInformationData', module.data);
$("#outProjectInformationContent").html(outProjectInformationData);
+ var outProjectInformationData2 = template('outProjectInformationData2', module.data);
+ $("#outProjectInformationContent2").html(outProjectInformationData2);
}
}
diff --git a/view/bidding/biddingBigData.html b/view/bidding/biddingBigData.html
index 5dec706..581d65e 100644
--- a/view/bidding/biddingBigData.html
+++ b/view/bidding/biddingBigData.html
@@ -112,7 +112,7 @@
{{/if}}
| {{value.timeType}} |
- |
+ |
{{/each}}
diff --git a/view/bidding/biddingBigDataDetail.html b/view/bidding/biddingBigDataDetail.html
index aa189c2..31e424f 100644
--- a/view/bidding/biddingBigDataDetail.html
+++ b/view/bidding/biddingBigDataDetail.html
@@ -43,25 +43,24 @@
-
+
@@ -78,8 +77,9 @@
-
- {{each outProjectInformationDetail.biddinglistInformationDetail as value i}}
+
-
-