diff --git a/index.html b/index.html
index a180237..d11e05f 100644
--- a/index.html
+++ b/index.html
@@ -220,7 +220,13 @@
{{value.signupStopTime}} |
{{value.biddingStartTime}} |
{{value.price}} |
- {{value.money}} |
+
+ {{if value.biddingType=='自由竞价'&&value.timeType!='已结束'}}
+ *
+ {{else}}
+ {{value.money}}
+ {{/if}}
+ |
{{value.timeType}} |
diff --git a/static/js/project/bidding/biddingBigData.js b/static/js/project/bidding/biddingBigData.js
index efc3f74..605cb2b 100644
--- a/static/js/project/bidding/biddingBigData.js
+++ b/static/js/project/bidding/biddingBigData.js
@@ -42,7 +42,6 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t
var content = data.rows;
//console.log(content)
- module.data.biddingHallListList = content;
for(var i = 0 ; i < content.length ; i++){
if(content[i].biddingStopTime == null || content[i].biddingStartTime == null){continue;}
var endTimes=content[i].biddingStopTime.substring(0,10).split('-');
@@ -70,6 +69,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t
content[i].timeType = '未开始'
}
}
+ module.data.biddingHallListList = content;
//console.log(content)
var biddingHallListData = template('biddingHallListData', module.data);
$("#biddingHallListContent").html(biddingHallListData);
diff --git a/static/js/project/bidding/biddingList.js b/static/js/project/bidding/biddingList.js
index 9e89e96..5293a3a 100644
--- a/static/js/project/bidding/biddingList.js
+++ b/static/js/project/bidding/biddingList.js
@@ -172,7 +172,6 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT
$('#page_s1').html('共'+pageCount+'页')
}
module.data.pageCount = pageCount;
- module.data.biddingInformationList = content;
for(var i = 0 ; i < content.length ; i++){
if(content[i].biddingStopTime == null || content[i].biddingStartTime == null){continue;}
var endTimes=content[i].biddingStopTime.substring(0,10).split('-');
@@ -200,6 +199,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT
content[i].timeType = '未开始'
}
}
+ module.data.biddingInformationList = content;
var biddingInformationData = template('biddingInformationData', module.data);
$("#biddingInformationContent").html(biddingInformationData);
}
diff --git a/static/js/project/index.js b/static/js/project/index.js
index 2a54bc1..d2738bd 100644
--- a/static/js/project/index.js
+++ b/static/js/project/index.js
@@ -572,8 +572,6 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
if (data.code == 200) {
var content = data.data;
//console.log(content)
-
- module.data.biddingHallListList = content;
for(var i = 0 ; i < content.length ; i++){
if(content[i].biddingStopTime == null || content[i].biddingStartTime == null){continue;}
var endTimes=content[i].biddingStopTime.substring(0,10).split('-');
@@ -601,6 +599,8 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
content[i].timeType = '未开始'
}
}
+
+ module.data.biddingHallListList = content;
//console.log(content)
var biddingHallListData = template('biddingHallListData', module.data);
$("#biddingHallListContent").html(biddingHallListData);
diff --git a/static/js/project/listingItems/items.js b/static/js/project/listingItems/items.js
index 5708ff5..520754c 100644
--- a/static/js/project/listingItems/items.js
+++ b/static/js/project/listingItems/items.js
@@ -154,6 +154,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
$('#countDown').html('距竞价结束还有:'+d+'天'+h+'时'+m+'分'+s+'秒')
}else if (nowTime>Date.parse(biddingStopTime)){
//竞价结束
+ $('#countType').html('')
$('#countDown').html('竞价结束')
document.getElementById('swiperType').style.display = 'none';
document.getElementById('biddingTable').style.display = 'table-block';
diff --git a/view/bidding/biddingBigData.html b/view/bidding/biddingBigData.html
index 9e246b5..407ab69 100644
--- a/view/bidding/biddingBigData.html
+++ b/view/bidding/biddingBigData.html
@@ -18,6 +18,9 @@
+
+
+
@@ -101,7 +104,13 @@
{{value.signupStopTime}} |
{{value.biddingStartTime}} |
{{value.price}} |
- {{value.money}} |
+
+ {{if value.biddingType=='自由竞价'&&value.timeType!='已结束'}}
+ *
+ {{else}}
+ {{value.money}}
+ {{/if}}
+ |
{{value.timeType}} |
|
diff --git a/view/bidding/biddingBigDataDetail.html b/view/bidding/biddingBigDataDetail.html
index 5bbebed..92e7c69 100644
--- a/view/bidding/biddingBigDataDetail.html
+++ b/view/bidding/biddingBigDataDetail.html
@@ -18,6 +18,9 @@
+
+
+
@@ -113,8 +116,7 @@
目前最优出价

- {{outProjectInformationDetail.biddinglistInformationDetail}}
- {{outProjectInformationDetail.biddinglistInformationDetail.length}}
+
{{if outProjectInformationDetail.biddinglistInformationDetail!=undefined && outProjectInformationDetail.biddinglistInformationDetail.length>0 }}
{{outProjectInformationDetail.biddinglistInformationDetail[0].money}}{{outProjectInformationDetail.unit}}
{{else}}
diff --git a/view/listingItems/itemsDetail.html b/view/listingItems/itemsDetail.html
index ff140db..8d58282 100644
--- a/view/listingItems/itemsDetail.html
+++ b/view/listingItems/itemsDetail.html
@@ -133,7 +133,7 @@
首页
交易项目
竞价大厅
- 项目公告
+ 公示公告
个人供求
新闻资讯
政策法规
|