diff --git a/index.html b/index.html
index 8256548..9fe34e8 100644
--- a/index.html
+++ b/index.html
@@ -201,6 +201,7 @@
diff --git a/static/css/index.css b/static/css/index.css
index 6f96ea9..3835f32 100644
--- a/static/css/index.css
+++ b/static/css/index.css
@@ -32,7 +32,7 @@
.logo{
width: 593px;
height: 72px;
- background: url("../images/index_head_logo.png") 0px no-repeat;
+ background: url("../images/logo.png") 0px no-repeat;
}
/*顶部标题*/
.topTit {
@@ -175,13 +175,14 @@
.top ul {
/*padding-bottom: 5px;*/
cursor: pointer;
+ display: flex;
}
.top ul li {
/*border-radius: 20px;*/
- display: inline-block;
+ /*display: inline-block;*/
padding: 15px 0;
- margin-right: 15px;
+ flex-shrink: 0;
}
.top ul li a {
@@ -447,7 +448,7 @@
padding: 3px 8px;
margin: 0 5px 0 20px;
display: inline-block;
- border-radius: 10px;
+ /*border-radius: 10px;*/
}
.centerLeft .centerLeft-center .tableList table tr{
@@ -568,7 +569,7 @@
.centerLeft-center-bottom p:first-child {
background: url('../images/address_icon.png') 0px no-repeat;
padding-left: 16px;
- width: 66%;
+ width: 100%;
white-space:nowrap;
text-overflow:ellipsis;
overflow:hidden;
diff --git a/static/css/listingItems/items.css b/static/css/listingItems/items.css
index 569b048..5e428ed 100644
--- a/static/css/listingItems/items.css
+++ b/static/css/listingItems/items.css
@@ -1,9 +1,8 @@
.auction_hall_condition {
width: 1200px;
/* height: 300px; */
- margin: auto;
+ margin: 25px auto;
background: #f8f8f8;
- margin-top: 25px;
padding: 25px;
}
@@ -114,7 +113,6 @@
width: 63px;
height: 28px;
background: var(--color);
- border-radius: 35px;
font-size: 14px;
color: #FFFFFF;
line-height: 28px;
@@ -122,6 +120,20 @@
cursor: pointer;
}
+.input_data_btn_clear {
+ float: left;
+ width: 63px;
+ height: 28px;
+ background: #ebebeb;
+ font-size: 14px;
+ color: #6e6e6e;
+ line-height: 28px;
+ margin-left: 25px;
+ cursor: pointer;
+}
+input[type=text]{
+ background: #fff;
+}
.auction_all_left {
float: left;
width: 60px;
@@ -764,10 +776,29 @@ input::-webkit-inner-spin-button {
width: 100%;
padding: 10px 0;
border-bottom: 1px solid #d5d5d5;
- margin-top: 15px;
}
.center_tap img{
display: block;
margin-left: 10px;
cursor: pointer;
}
+
+.tableHead{
+ margin-top: 0;
+}
+.tableHead tr td:first-child{
+ padding-left: 15px;
+}
+.tableList table tr td:first-child{
+ padding-left: 15px;
+}
+.tableList table tr td:last-child{
+ width: 4%;
+}
+
+.tableList table tr td:last-child span{
+ margin: 0!important;
+}
+.tableHead tr td:last-child{
+ width: 4%;
+}
diff --git a/static/css/page_common.css b/static/css/page_common.css
index 04798fe..38ed240 100644
--- a/static/css/page_common.css
+++ b/static/css/page_common.css
@@ -3,19 +3,19 @@
}
.icon-you:before {
- content: ">";
+ content: ">"!important;
}
.icon-zuo:before {
- content: "<";
+ content: "<"!important;
}
.icon-most-left:before {
- content: "<<";
+ content: "<<"!important;
}
.icon-most-right:before {
- content: ">>";
+ content: ">>"!important;
}
.page_common_btn_style{
@@ -49,4 +49,4 @@ a.page_common_btn_style:active{
.page_common_btn_active{
background:var(--color);
color:#eee;
-}
\ No newline at end of file
+}
diff --git a/static/images/gh.png b/static/images/gh.png
new file mode 100644
index 0000000..02313f7
Binary files /dev/null and b/static/images/gh.png differ
diff --git a/static/images/index_center_right_icon.png b/static/images/index_center_right_icon.png
index 6e2a159..a5a6e91 100644
Binary files a/static/images/index_center_right_icon.png and b/static/images/index_center_right_icon.png differ
diff --git a/static/images/logo.png b/static/images/logo.png
index c2af46d..3b77a3e 100644
Binary files a/static/images/logo.png and b/static/images/logo.png differ
diff --git a/static/js/common/tools.js b/static/js/common/tools.js
index 205a2b8..17f4705 100644
--- a/static/js/common/tools.js
+++ b/static/js/common/tools.js
@@ -532,7 +532,7 @@ define(['jquery', 'dialog','jsencrypt'], function ($, dialog,JSEncrypt) {
// logo = '../images/logo.png';
// }
$("#webConfigName").html(content[0].configValue);
- $("#webConfigRecord").html(content[1].configValue + '' + content[2].configValue);
+ $("#webConfigRecord").html('
'+content[1].configValue + '' + content[2].configValue);
$("#webConfigAddress").html(content[0].configValue + '' + content[3].configValue);
serverApi = content[11].configValue;
diff --git a/static/js/project/bidding/biddingList.js b/static/js/project/bidding/biddingList.js
index 2b9d197..fd48780 100644
--- a/static/js/project/bidding/biddingList.js
+++ b/static/js/project/bidding/biddingList.js
@@ -322,6 +322,17 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT
}
}
+ goSearchClear = function(){
+ selectedStatus('all');
+ tabCheck('');
+ typeCheck('');
+ $('#signStartTimeStr').val('')
+ $('#signEndTimeStr').val('')
+ $('#auctionStartTimeStr').val('')
+ $('#endTimeStr').val('')
+ goSearch();
+ }
+
goSearch = function(){
module.data.itemsInformationList = '';
module.data.biddingInformationList = [];
diff --git a/static/js/project/index.js b/static/js/project/index.js
index 3c7788d..5d8dff7 100644
--- a/static/js/project/index.js
+++ b/static/js/project/index.js
@@ -435,23 +435,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
//console.log(data)
module.data.serverApi = serverApi;
var content = data.rows;
- for (let i = 0 ; i < 4 ; i++){
- if (content[i]==undefined){
- module.data.landListList.push({
- projectShowStatus:'',
- projectName :'',
- price :'',
- unit :'',
- outName :'',
- signupStopTime :'',
- biddingStopTime :'',
- locationName:'',
- });
- }else{
- module.data.landListList.push(content[i]);
- }
- }
- // module.data.landListList = content;
+ module.data.landListList = content;
var landListData = template('landListData', module.data);
$("#landListContent").html(landListData);
}
@@ -462,27 +446,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
//console.log(data)
module.data.serverApi = serverApi;
var content = data.rows;
-
- for (let i = 0 ; i < 4 ; i++){
-
- //console.log(content[i])
- if (content[i]==undefined){
- //console.log('aaaaaaaaaa')
- module.data.collectiveAssetsList.push({
- id :'',
- projectName :'',
- price :'',
- needname :'',
- needStartTime :'',
- needStopTime :'',
- phone:'',
- });
- }else{
- module.data.collectiveAssetsList.push(content[i]);
- }
-
- }
-
+ module.data.collectiveAssetsList = content;
// module.data.collectiveAssetsList = content;
var collectiveAssetsData = template('collectiveAssetsData', module.data);
$("#collectiveAssetsContent").html(collectiveAssetsData);
diff --git a/static/js/project/listingItems/itemsList.js b/static/js/project/listingItems/itemsList.js
index 915ad5f..4ae48aa 100644
--- a/static/js/project/listingItems/itemsList.js
+++ b/static/js/project/listingItems/itemsList.js
@@ -368,6 +368,17 @@ define(['jquery', "template", "Tools", "itemsApi", "paging", 'dateTime', 'swiper
document.getElementById('status' + id).className = 'auction_hall_table_tab auction_hall_table_tab_select'
}
+ goSearchClear = function(){
+ selectedStatus('all');
+ tabCheck('');
+ typeCheck('');
+ $('#signStartTimeStr').val('')
+ $('#signEndTimeStr').val('')
+ $('#auctionStartTimeStr').val('')
+ $('#endTimeStr').val('')
+ goSearch();
+ }
+
goSearch = function () {
module.data.itemsInformationList = '';
module.data.itemsInformationList1 = '';
@@ -413,7 +424,7 @@ define(['jquery', "template", "Tools", "itemsApi", "paging", 'dateTime', 'swiper
if (module.data.searchType == 'gyxm'){
tools.doGet(itemsList, module.data.form, module.itemList, true);
}else{
- tools.doGet(needProjectList, {projectNumber:module.data.projectNumber,pageSize:module.data.pageSize,pageNum:'1'}, module.itemLists, true);
+ tools.doGet(needProjectList, {deptId:module.data.deptId,projectNumber:module.data.projectNumber,pageSize:module.data.pageSize,pageNum:'1'}, module.itemLists, true);
}
}
@@ -440,6 +451,7 @@ define(['jquery', "template", "Tools", "itemsApi", "paging", 'dateTime', 'swiper
document.getElementById('bmsjShow').style.display = 'table-row';
document.getElementById('xmztShow').style.display = 'table-row';
document.getElementById('xqxmSearch').style.display = 'none';
+ document.getElementById('xqxmSearch2').style.display = 'none';
tools.doGet(itemsList, { deptId: 100, pageNum: module.data.pageNum, pageSize: module.data.pageSize }, module.itemList, true);
}else{
module.data.searchType = 'xqxm'
@@ -447,6 +459,7 @@ define(['jquery', "template", "Tools", "itemsApi", "paging", 'dateTime', 'swiper
document.getElementById('bmsjShow').style.display = 'none';
document.getElementById('xmztShow').style.display = 'none';
document.getElementById('xqxmSearch').style.display = 'block';
+ document.getElementById('xqxmSearch2').style.display = 'block';
tools.doGet(needProjectList, {projectNumber:'',pageSize:module.data.pageSize,pageNum:'1'}, module.itemLists, true);
}
diff --git a/view/announcement/announcement.html b/view/announcement/announcement.html
index 9c8e700..46aaf9c 100644
--- a/view/announcement/announcement.html
+++ b/view/announcement/announcement.html
@@ -4,7 +4,7 @@
- 产权交易-项目公告
+ 产权交易-交易公告
@@ -193,7 +193,7 @@
-
友情链接
+
友情链接
+
查询
+
重置