diff --git a/index.html b/index.html index dd7fc79..156f06b 100644 --- a/index.html +++ b/index.html @@ -366,7 +366,14 @@ {{value.timeType}} - + + {{if value.projectShowStatus == '正在报名'}}{{/if}} + {{if value.projectShowStatus == '正在竞价'}}{{/if}} + {{if value.projectShowStatus == '等待竞价'}}{{/if}} + {{if value.projectShowStatus == '等待成交'}}{{/if}} + {{if value.projectShowStatus == '已经成交'}}{{/if}} + {{if value.projectShowStatus == '项目公示'}}{{/if}} + {{/each}} diff --git a/static/css/announcement/announcement.css b/static/css/announcement/announcement.css index db5e841..8785d94 100644 --- a/static/css/announcement/announcement.css +++ b/static/css/announcement/announcement.css @@ -31,3 +31,127 @@ table{ .titIndex i{ padding: 0px 10px; } + +.newList{ + padding: 0; + margin-top: 0; +} + +.newList ul li{ + display: flex; + align-items: center; + justify-content: space-between; + cursor: pointer; + padding: 15px 0; +} + +.newList #announcementInformationContent li p:nth-child(1){ + width: 25%; + padding-left: 15px; +} + +.newList #announcementInformationContent li p:nth-child(2){ + width: 35%; + text-align: left; +} + +.newList #announcementInformationContent li p:nth-child(3){ + width: 20%; + text-align: right; +} + +.newList #announcementInformationContent li p:nth-child(4){ + width: 20%; + text-align: center; +} + +.newList #attestationInformationContent li p:nth-child(1){ + width: 25%; + padding-left: 15px; +} + +.newList #attestationInformationContent li p:nth-child(2){ + width: 35%; + text-align: left; +} + +.newList #attestationInformationContent li p:nth-child(3){ + width: 20%; + text-align: right; +} + +.newList #attestationInformationContent li p:nth-child(4){ + width: 20%; + text-align: center; +} + +.newHead,.newHead_attestation{ + background: #f1f1f1; + padding: 15px 0; + display: flex; + align-items: center; + justify-content: space-between; +} + +.newHead p,.newHead_attestation p{ + font-size: 16px; + font-weight: bold; +} + +.newHead p:nth-child(1){ + width: 25%; + padding-left: 15px; +} + +.newHead p:nth-child(2){ + width: 35%; + text-align: left; +} + +.newHead p:nth-child(3){ + width: 20%; + text-align: right; +} + +.newHead p:nth-child(4){ + width: 20%; + text-align: center; +} + +.newHead_attestation p:nth-child(1){ + width: 25%; + padding-left: 15px; +} + +.newHead_attestation p:nth-child(2){ + width: 35%; + text-align: left; +} + +.newHead_attestation p:nth-child(3){ + width: 20%; + text-align: right; +} + +.newHead_attestation p:nth-child(4){ + width: 20%; + text-align: center; +} + +.breadcrum { + background: #f8f8f8; + height: auto; + padding: 25px; + margin-bottom: 25px; +} + +.breadcrum p{ + color: #535252; + margin-bottom: 25px; +} + +.search_main{ + display: flex; + justify-content: space-between; + align-items: center; +} diff --git a/static/css/bidding/bidding.css b/static/css/bidding/bidding.css index 9e6be05..0404a9a 100644 --- a/static/css/bidding/bidding.css +++ b/static/css/bidding/bidding.css @@ -3,8 +3,9 @@ } .tableList input[type='button'] { - border: 1px solid #a6a6a6; - border-radius: 20px; + background: #cadbf1; + color: #1269d3; + border: none; padding: 4px 10px; } @@ -12,4 +13,12 @@ color: #FFFFFF !important; border-color: var(--color) !important; background-color: var(--color) !important; -} \ No newline at end of file +} + +.tableList table tr:nth-child(odd){ + background: transparent!important; +} + +.tableList table tr td{ + border-bottom: 1px dashed #d0d0d0; +} diff --git a/static/css/index.css b/static/css/index.css index 32d01cc..204851c 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -132,17 +132,17 @@ } .searchClass { - border: 2px solid var(--color)!important; - border-radius: 20px; - background: transparent; - padding: 6px 10px; + border: 1px solid #e0e0e0!important; + background: #ffffff; + padding: 0px 10px; width: 100%; + height: 40px; } .searchDiv { position: relative; width: 270px; - transform: translate(0, 3px); + /*transform: translate(0, 3px);*/ } .searchButton { @@ -150,10 +150,10 @@ color: #ffffff !important; width: 65px !important; border: 2px solid var(--color); - border-radius: 25px; padding: 4px 0px; position: absolute; right: 0; + height: 40px; } /*导航栏*/ @@ -452,6 +452,10 @@ height: 41px; } +.centerLeft .centerLeft-center .tableList table tr td{ + border-bottom: 1px dashed #e3e3e3; +} + .centerLeft-center .centerleft-center-tit01 { color: #626262; margin: 24px 0px 14px 0px; @@ -998,12 +1002,12 @@ select { cursor: pointer; } -.now-row td { - color: #d21313!important; +.now-row { + color: #ff7b2b!important; } -.notStart-row td { - color: #007b76!important; +.notStart-row { + color: #1269d3!important; } .tableType { @@ -1024,11 +1028,11 @@ select { } .tableType p:nth-child(1) { - color: #007b76; + color: #1269d3; } .tableType p:nth-child(2) { - color: #d21313; + color: #ff7b2b; } .tableType p:nth-child(3) { @@ -1036,11 +1040,11 @@ select { } .tableType p:nth-child(1) i { - background-color: #007b76; + background-color: #1269d3; } .tableType p:nth-child(2) i { - background-color: #d21313; + background-color: #ff7b2b; } .tableType p:nth-child(3) i { @@ -1294,7 +1298,7 @@ label input[type="radio"]:checked+span { } .tableList table tr:nth-child(odd) { - background-color: #f6f5f5; + /*background-color: #f6f5f5;*/ } .tableList_top { height: 260px; diff --git a/static/css/listingItems/items.css b/static/css/listingItems/items.css index 69922e2..569b048 100644 --- a/static/css/listingItems/items.css +++ b/static/css/listingItems/items.css @@ -2,8 +2,14 @@ width: 1200px; /* height: 300px; */ margin: auto; - /* background: red; */ - margin-top: 15px; + background: #f8f8f8; + margin-top: 25px; + padding: 25px; +} + +.auction_hall_condition p{ + color: #535252; + margin-bottom: 25px; } .auction_hall_condition table { @@ -22,8 +28,9 @@ .auction_hall_condition table tr .auction_td { background: #F8F8F8; - color: #999999; - width: 122px; + color: #535252; + width: 80px; + text-align: left; } .auction_hall_table_tab { @@ -668,4 +675,99 @@ input::-webkit-inner-spin-button { #timeDown{ font-size: 14px; margin-left: 15px; -} \ No newline at end of file +} + +.centerLeft_center{ + display: flex; + margin-top: 25px; +} + +.centerLeft_center img{ + display: block; + width: 300px; + height: 174px; + margin-right: 25px; + flex-shrink: 0; +} + +.centerLeft-center-middle-money { + font-size: 14px; + color: #d21313; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + word-break: break-all; + overflow: hidden; +} + +.centerLeft-center-middle-money i{ + font-size: 18px; + color: #d21313; + font-weight: bold; +} + +.centerLeft-center-middle-block{ + display: flex; + justify-content: space-between; + align-items: center; +} + +.centerLeft-center-middle-block .centerLeft-center-middle-tit01{ + font-size: 20px; + font-weight: bold; + color: #333333; + display: flex; + align-items: center; + flex: 1; +} + +.centerLeft-center-middle-block .centerLeft-center-middle-tit01 strong{ + flex: 1; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + word-break: break-all; + overflow: hidden; +} + +.centerLeft-center-middle-block .centerLeft-center-middle-tit01 span{ + font-size: 14px; + border: none; + font-weight: normal; + padding: 2px 6px; + text-align: center; + display: inline-block; +} + +.centerLeft-center-middle-block .centerLeft-center-middle-money i{ + font-size: 28px; +} + +.centerLeft-center-middle-block .centerLeft-center-middle-money{ + line-height: 1; + flex-shrink: 0; +} + +.centerLeft_center .centerLeft-center-middle-ul li p span{ + color: #535252; + font-size: 16px; +} + +.centerLeft_center .centerLeft-center-middle-ul li p{ + color: #535252; + font-size: 16px; +} + +.center_tap{ + display: flex; + justify-content: right; + width: 100%; + padding: 10px 0; + border-bottom: 1px solid #d5d5d5; + margin-top: 15px; +} +.center_tap img{ + display: block; + margin-left: 10px; + cursor: pointer; +} diff --git a/static/images/icon_card_01.png b/static/images/icon_card_01.png new file mode 100644 index 0000000..711f235 Binary files /dev/null and b/static/images/icon_card_01.png differ diff --git a/static/images/icon_card_02.png b/static/images/icon_card_02.png new file mode 100644 index 0000000..a2021c5 Binary files /dev/null and b/static/images/icon_card_02.png differ diff --git a/static/images/icon_list_01.png b/static/images/icon_list_01.png new file mode 100644 index 0000000..404c696 Binary files /dev/null and b/static/images/icon_list_01.png differ diff --git a/static/images/icon_list_02.png b/static/images/icon_list_02.png new file mode 100644 index 0000000..2e164bc Binary files /dev/null and b/static/images/icon_list_02.png differ diff --git a/static/js/common/main.js b/static/js/common/main.js index 8838883..fe5e0ce 100644 --- a/static/js/common/main.js +++ b/static/js/common/main.js @@ -161,9 +161,9 @@ require(["jquery", "Tools","addressApi"], function ($, Tools) { tools.skip('/'); } - searchAllNew = function () { - var searchAllTitle = $('#searchAllTitle').val(); - tools.skip('/view/new/newList.html?title='+searchAllTitle); - } + // searchAllNew = function () { + // var searchAllTitle = $('#searchAllTitle').val(); + // tools.skip('/view/new/newList.html?title='+searchAllTitle); + // } }) diff --git a/static/js/project/announcementList/announcementList.js b/static/js/project/announcementList/announcementList.js index 4909c60..a581aa1 100644 --- a/static/js/project/announcementList/announcementList.js +++ b/static/js/project/announcementList/announcementList.js @@ -31,7 +31,7 @@ define(['jquery', "template", "Tools", "announApi", "paging", 'swiper'], functio module.init = function (page) { //获取焦点图信息 - tools.doGet(websitePicture, {picType:1,status:0,orderByColumn:'picSort',isAsc:'desc'}, module.focusNewsTop , true); + //tools.doGet(websitePicture, {picType:1,status:0,orderByColumn:'picSort',isAsc:'desc'}, module.focusNewsTop , true); //底部友情链接 tools.doGet(friendsLinks, {}, module.bottomFriendsLinks, true); //成交公告 @@ -254,5 +254,31 @@ define(['jquery', "template", "Tools", "announApi", "paging", 'swiper'], functio tools.doGet(announList, {deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.announInformation,true); } } + + searchAllNew = function (type) { + var searchAllTitle = $('#searchAllTitle').val(); + var type = getQueryVariable('type'); + module.data.announcementInformationList = []; + module.data.attestationInformationList = []; + module.data.inviteTendersInformationList = []; + module.data.winTheBiddingInformationList = []; + $('.page_s1').html('') + $('#page_s1').html('') + $('.page_s2').html('') + $('#page_s2').html('') + $('.page_s3').html('') + $('#page_s3').html('') + $('.page_s4').html('') + $('#page_s4').html('') + if(type != undefined && type != ''){ + //成交公告 + tools.doGet(tenderList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.inviteTendersInformation,true); + tools.doGet(winList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.winTheBiddingInformation,true); + }else{ + tools.doGet(announList, {projectName:searchAllTitle,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.announInformation,true); + tools.doGet(attestationList, {projectName:searchAllTitle,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.attestationInformation,true); + } + } + return module; -}); \ No newline at end of file +}); diff --git a/static/js/project/bidding/biddingList.js b/static/js/project/bidding/biddingList.js index 69c3bf4..2b9d197 100644 --- a/static/js/project/bidding/biddingList.js +++ b/static/js/project/bidding/biddingList.js @@ -52,7 +52,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT module.init = function (page) { //获取焦点图信息 - tools.doGet(websitePicture, {picType:1,status:0,orderByColumn:'picSort',isAsc:'desc'}, module.focusNewsTop , true); + //tools.doGet(websitePicture, {picType:1,status:0,orderByColumn:'picSort',isAsc:'desc'}, module.focusNewsTop , true); //底部友情链接 tools.doGet(friendsLinks, {}, module.bottomFriendsLinks, true); //新闻资讯 diff --git a/static/js/project/listingItems/itemsList.js b/static/js/project/listingItems/itemsList.js index d457ba3..e5f3ecc 100644 --- a/static/js/project/listingItems/itemsList.js +++ b/static/js/project/listingItems/itemsList.js @@ -62,7 +62,7 @@ define(['jquery', "template", "Tools", "itemsApi", "paging", 'dateTime', 'swiper module.init = function (page) { //获取焦点图信息 - tools.doGet(websitePicture, {picType:1,status:0,orderByColumn:'picSort',isAsc:'desc'}, module.focusNewsTop , true); + //tools.doGet(websitePicture, {picType:1,status:0,orderByColumn:'picSort',isAsc:'desc'}, module.focusNewsTop , true); //底部友情链接 tools.doGet(friendsLinks, {}, module.bottomFriendsLinks, true); if (getQueryVariable('projectCode') || getQueryVariable('projectName') || getQueryVariable('projectNumber')) { @@ -211,11 +211,9 @@ define(['jquery', "template", "Tools", "itemsApi", "paging", 'dateTime', 'swiper module.data.pageCount = pageCount; module.data.itemsInformationList = content; var ItemsInformationData = template('ItemsInformationData', module.data); - - $("#ItemsInformationContent").html(ItemsInformationData); - - + var ItemsInformationData2 = template('ItemsInformationData2', module.data); + $("#ItemsInformationContent2").html(ItemsInformationData2); } } @@ -429,13 +427,6 @@ define(['jquery', "template", "Tools", "itemsApi", "paging", 'dateTime', 'swiper } tabList = function (id) { - document.getElementById('gyxm').style.display = 'none'; - document.getElementById('xqxm').style.display = 'none'; - document.getElementById(id).style.display = 'block'; - - document.getElementById('gyxmBtn').className = ''; - document.getElementById('xqxmBtn').className = ''; - document.getElementById(id+'Btn').className = 'active'; module.data.itemsInformationList = ''; module.data.itemsInformationList1 = ''; @@ -461,5 +452,11 @@ define(['jquery', "template", "Tools", "itemsApi", "paging", 'dateTime', 'swiper } + centerTap = function (type) { + document.getElementById('ItemsInformationContent2').style.display = 'none'; + document.getElementById('gyxm').style.display = 'none'; + document.getElementById(type).style.display = 'block'; + } + return module; }); diff --git a/view/announcement/announcement.html b/view/announcement/announcement.html index a1e1cfa..257d044 100644 --- a/view/announcement/announcement.html +++ b/view/announcement/announcement.html @@ -12,6 +12,7 @@ + @@ -19,56 +20,9 @@
-
- -
- -
-

Hi,欢迎来到农村产权交易中心

-
- - -
- - - - - - 返回主站 - -