diff --git a/static/css/demand/demand.css b/static/css/demand/demand.css
index 6d40e34..13ba973 100644
--- a/static/css/demand/demand.css
+++ b/static/css/demand/demand.css
@@ -46,4 +46,56 @@
position: absolute;
top: 10px;
right: 0;
+}
+
+.releaseSupply {
+ width: 1000px;
+ padding-left: 15px;
+}
+
+.releaseSupplyBtn{
+ background: #007b76;
+ padding: 5px 15px;
+ color: #ffffff;
+ border: none;
+ border-radius: 20px;
+ float: right;
+ margin-bottom: 10px;
+}
+
+.releaseSupplyTit{
+ font-size: 18px;
+ color: #007b76;
+ line-height: 28px;
+ padding-left: 32px;
+}
+
+.releaseSupply table{
+ padding: 15px 30px;
+}
+
+.releaseSupply table tr td{
+ padding: 12px 0px;
+}
+
+.releaseSupply table tr td:first-child{
+ width: 8%;
+ text-align: right;
+}
+
+.releaseSupply table tr td p{
+ width: 100%;
+ margin-left: 10px;
+ padding-left: 10px;
+ line-height: 36px;
+}
+
+.releaseSupply table tr td select{
+ height: 36px;
+ border: 1px solid #e3e3e3;
+ margin-left: 10px;
+}
+
+.releaseSupply table tr td span{
+ color: red;
}
\ No newline at end of file
diff --git a/static/css/index.css b/static/css/index.css
index 35e60be..b381241 100644
--- a/static/css/index.css
+++ b/static/css/index.css
@@ -1001,6 +1001,10 @@ label input[type="radio"]:checked+span {
width: 12%;
}
+.tableHead tr td:first-child {
+ width: 16%;
+}
+
.tableHead tr td:last-child {
width: 16%;
}
@@ -1017,6 +1021,13 @@ label input[type="radio"]:checked+span {
padding: 10px 0px;
}
+.tableList table tr td:first-child {
+ width: 16%;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
+
.tableList table tr td:last-child {
width: 16%;
}
@@ -1074,6 +1085,7 @@ label input[type="radio"]:checked+span {
height: 45px;
line-height: 45px;
text-align: center;
+ cursor: pointer;
}
.interactionTableLeft tr td {
diff --git a/static/js/api/announcementList.js b/static/js/api/announcementList.js
index 852efcb..1dd56b9 100644
--- a/static/js/api/announcementList.js
+++ b/static/js/api/announcementList.js
@@ -44,3 +44,11 @@ var Dictionaries = '/transaction/website/data/type'//成交公告字典
deptId：行政区划部门ID
*/
var jzsSearch = '/transaction/website/jzsSearch'//鉴证公告搜索
+
+/*
+@purl /transaction/website/jzsSearch
+@param
+ projectName: 输入框输入的搜索内容(证书关联的项目名称)
+ deptId：行政区划部门ID
+*/
+var jyqzSearch = '/transaction/website/jyqzSearch'//鉴证公告搜索
diff --git a/static/js/api/demand.js b/static/js/api/demand.js
index d1e6c8a..7c78505 100644
--- a/static/js/api/demand.js
+++ b/static/js/api/demand.js
@@ -9,3 +9,13 @@
supplyDemandType：供求类型 1:供应 2:求购 （不传值获取两种类型混合数据）
*/
var demandList = '/transaction/website/supplyDemandList'
+
+/*
+@purl /transaction/website/supplyDemandList
+@param
+ deptId：行政区划部门ID
+ supplyDemandType：供求类型 1:供应 2:求购 （不传值获取两种类型混合数据）
+*/
+var demandImageList = '/transaction/website/supplyDemand/showImg/id'
+
+
diff --git a/static/js/api/index.js b/static/js/api/index.js
index 920c52a..b6334fc 100644
--- a/static/js/api/index.js
+++ b/static/js/api/index.js
@@ -116,4 +116,12 @@ var communicateList = '/transaction/website/communicateList'//互动交流列表
deptId：行政区划部门ID
limit：需要获取的数据条数
*/
-var statistics = '/transaction/website/outproject/statistics'//土地挂牌价格走势统计图
\ No newline at end of file
+var statistics = '/transaction/website/outproject/statistics'//土地挂牌价格走势统计图
+
+/*
+@purl /supplyDemandRecommend/{deptId}/{limit}
+@param
+ deptId：行政区划部门ID
+ limit：需要获取的数据条数
+*/
+var supplyDemandRecommend = '/transaction/website/supplyDemandRecommend'//土地挂牌价格走势统计图
\ No newline at end of file
diff --git a/static/js/api/user.js b/static/js/api/user.js
index b41c511..f3ce355 100644
--- a/static/js/api/user.js
+++ b/static/js/api/user.js
@@ -60,7 +60,7 @@ var userCommunicate = '/transaction/communicate' //添加咨询类接口
@purl /transaction/demand
@param
*/
-var userDemandUpdate = '/transaction/demand' //通过ID查询个人供求
+var userDemandUpdate = '/transaction/website/supplyDemand/id' //通过ID查询个人供求
/*
@purl /transaction/website/data/type
@@ -84,4 +84,10 @@ var showUserImg = 'transaction/member/showImg/memberId' //用户图片展示
@purl /common/base64Attach
@param
*/
-var deleteUserImg = 'transaction/member/deleteImg/attachId' //用户图片展示
\ No newline at end of file
+var deleteUserImg = 'transaction/member/deleteImg/attachId' //用户图片展示
+
+/*
+@purl supplyDemand/showImg/id/{id}
+@param
+*/
+var supplyDemandImg = '/transaction/website/supplyDemand/showImg/id' //用户图片展示
\ No newline at end of file
diff --git a/static/js/common/tools.js b/static/js/common/tools.js
index 8ba8bb2..a489dc1 100644
--- a/static/js/common/tools.js
+++ b/static/js/common/tools.js
@@ -435,7 +435,6 @@ define(['jquery', 'dialog'], function ($, dialog) {
* @param
*/
webConfigInformation: function (data) {
-
if (data.code == 200) {
var content = data.data;
$("#webConfigName").html(content[0].configValue);
diff --git a/static/js/project/announcementList/announcementList.js b/static/js/project/announcementList/announcementList.js
index 4a17151..6866710 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"], function ($, temp
if(type != undefined && type != ''){
console.log('搜索进入')
tabList(type);
- tools.doGet(jzsSearch, {deptId:100,projectName:keyWord,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.attestationInformation,true);
+ tools.doGet(jzsSearch, {deptId:100, jzsNum:keyWord,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.attestationInformation,true);
}else{
console.log('正常进入')
//鉴证公告
diff --git a/static/js/project/announcementList/warrantDetail.js b/static/js/project/announcementList/warrantDetail.js
new file mode 100644
index 0000000..07423c2
--- /dev/null
+++ b/static/js/project/announcementList/warrantDetail.js
@@ -0,0 +1,99 @@
+/**
+ * Created by Administrator on 2021/4/5.
+ */
+define(['jquery', "template", "Tools", "announApi", "paging"], function ($, template, Tools ) {
+ //数据存储
+ var module = {
+ data: {
+ announcementInformationDetail:'',
+ },
+ };
+ var tools = new Tools();
+
+ module.init = function (page) {
+ //成交公告
+ tools.doGet(jyqzSearch, {jyqzNum:getQueryVariable('searchKeyWord'),deptId:100}, module.announDetail,true);
+ //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号）
+ tools.getWebConfig();
+ };
+
+ //获取地址栏参数
+ function getQueryVariable(variable){
+ var query = window.location.search.substring(1);
+ var vars = query.split("&");
+ for (var i=0;i
0){
+ console.log('进行中')
+ content[i].timeType = '进行中'
+ }
+ if(leftTime<0){
+ console.log('已结束')
+ content[i].timeType = '已结束'
+ }
+ if(rightTime>0){
+ console.log('未开始')
+ content[i].timeType = '未开始'
+ }
+ }
var biddingInformationData = template('biddingInformationData', module.data);
$("#biddingInformationContent").html(biddingInformationData);
}
@@ -239,5 +266,8 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT
tools.doGet(biddingList, module.data.form, module.biddingList, true);
}
+ goDetail = function (id) {
+ tools.skip('../listingItems/itemsDetail.html?id='+id);
+ }
return module;
});
\ No newline at end of file
diff --git a/static/js/project/demand/demandDetail.js b/static/js/project/demand/demandDetail.js
new file mode 100644
index 0000000..7079778
--- /dev/null
+++ b/static/js/project/demand/demandDetail.js
@@ -0,0 +1,70 @@
+/**
+ * Created by Administrator on 2021/4/5.
+ */
+define(['jquery', "template", "Tools", "demandApi", "paging","user"], function ($, template, Tools ) {
+ //数据存储
+ var module = {
+ data: {
+ //公告列表
+ demandInformationList:'',
+ //鉴证列表
+ supplyInformationList:'',
+ //页码
+ pageNum: 1,
+ //页码集合
+ pageList: [],
+ //每页数量
+ pageSize: 50,
+ //总页数
+ pageCount:0,
+ //选中卡ID
+ clickType:'supply',
+ //供求类型 1:供应 2:求购 （不传值获取两种类型混合数据）
+ demandType:1
+ },
+ };
+ var tools = new Tools();
+
+ module.init = function (page) {
+ //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号）
+ tools.getWebConfig();
+
+ tools.doGet(userDemandUpdate+'/'+getQueryVariable('id'), {}, module.demandDetail,true);
+ };
+
+ //获取地址栏参数
+ function getQueryVariable(variable){
+ var query = window.location.search.substring(1);
+ var vars = query.split("&");
+ for (var i=0;i0){
+ console.log('进行中')
+ content[i].timeType = '进行中'
+ }
+ if(leftTime<0){
+ console.log('已结束')
+ content[i].timeType = '已结束'
+ }
+ if(rightTime>0){
+ console.log('未开始')
+ content[i].timeType = '未开始'
+ }
+ }
+ console.log(content)
var biddingHallListData = template('biddingHallListData', module.data);
$("#biddingHallListContent").html(biddingHallListData);
}
@@ -439,11 +464,30 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
module.data.supplyDemand2List = content;
var supplyDemand2Data = template('supplyDemand2Data', module.data);
$("#demand").html(supplyDemand2Data);
+ tools.doGet(supplyDemandRecommend + '/100/5', {}, module.supplyDemandRecommend, true);
}
}
+ module.supplyDemandRecommend = function(data){
+ var focusListNext = module.data.focusListNext;
+ for (var i = 0; i < data.data.length; i++) {
+ var imgStrs = data.data[i].fileUrl
+ if (imgStrs != null && imgStrs != '') {
+ focusListNext.push({img:serverApi+imgStrs,title:data.data[i].projectName})
+ }
+ }
+ console.log(focusListNext)
+ module.data.focusListNext = focusListNext;
+ var bannerFocusBottomData = template('bannerFocusBottomData', module.data);
+ $("#bannerFocusNextContent").html(bannerFocusBottomData);
+ new Swiper('#bannerFocusNextWrap', {
+ paginationClickable: true
+ })
+ }
+
module.supplyImages = function(){
var focusListNext = module.data.focusListNext;
+ console.log(module.data.supplyDemandList)
for (var i = 0; i < module.data.supplyDemandList.length; i++) {
var imgStrs = module.data.supplyDemandList[i].projectContent.match(//g)
var title = module.data.supplyDemandList[i].projectName
@@ -483,9 +527,11 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
goSearchKeyWord = function(){
var type = $('input[name="transaction"]:checked').val();
var searchKeyWord = $('#searchKeyWord').val();
-
- tools.skip('view/announcement/announcement.html?type='+type+'&searchKeyWord='+searchKeyWord)
-
+ if(type == 'warrant'){
+ tools.skip('view/announcement/warrantDetail.html?type='+type+'&searchKeyWord='+searchKeyWord)
+ }else{
+ tools.skip('view/announcement/announcement.html?type='+type+'&searchKeyWord='+searchKeyWord)
+ }
}
//项目查询
@@ -525,7 +571,9 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
goDetail = function (id) {
tools.skip('view/listingItems/itemsDetail.html?id='+id);
}
-
+ goUserInteract = function () {
+ tools.skip('view/user/user.html?type=goInteract')
+ }
goListing = function () {
tools.skip('view/listingItems/itemsList.html');
}
@@ -553,5 +601,8 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
goInteraction = function(){
tools.skip('view/interact/interactList.html');
}
+ goInteractSearch = function(){
+ tools.skip('view/interact/interactList.html?keyWord='+$('#interactInput').val());
+ }
return module;
});
\ No newline at end of file
diff --git a/static/js/project/interact/interact.js b/static/js/project/interact/interact.js
index f49f907..8a5c3cb 100644
--- a/static/js/project/interact/interact.js
+++ b/static/js/project/interact/interact.js
@@ -23,13 +23,27 @@ define(['jquery', "template", "Tools", "interactApi", "paging"], function ($, te
module.init = function (page) {
+ if(getQueryVariable('keyWord')){
+ $('#searchTitle').val(getQueryVariable('keyWord'));
+ goSearch()
+ }
+
//互动交流
tools.doGet(interactList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize,reply:'notnull'}, module.interactInformation,true);
//网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号）
tools.getWebConfig();
};
-
+ //获取地址栏参数
+ function getQueryVariable(variable){
+ var query = window.location.search.substring(1);
+ var vars = query.split("&");
+ for (var i=0;i?'
+ module.data.timeConfig = content[8].configValue;
+ module.data.titleConfig = content[9].configValue;
+ module.data.importantTitle = content[7].configName+':'+ content[7].configValue.substr(3).substr(0,(content[7].configValue.substr(3).length-4));
+ module.data.know = content[6].configValue;
+ }
+ }
module.dataCompare = function(signupStartTime,signupStopTime,biddingStartTime,biddingStopTime){
var signupStartTime = signupStartTime;
var signupStopTime = signupStopTime;
@@ -75,11 +86,13 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
if(Date.parse(biddingStartTime)距竞价结束还有：'+d+'天'+h+' 时'+m+' 分'+s+' 秒')
}else if (nowTime>Date.parse(biddingStopTime)){
console.log("竞价结束");
$('#countDown').html('竞价结束')
@@ -93,6 +106,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
if(Date.parse(signupStartTime)
+
+
+
+ 农燊高科-项目公告
+
+
+
+
+
Hi,欢迎来到农村产权交易中心
+
返回主站
+
+
+
+
+
+
+
+
+
+ 文登区
+
+
+
+ 文登区
+
+
+
+ 文登区
+
+
+
+ 文登区
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 鲁公网安备12011502000077号 京ICP备 17061038号-1
+
+
+ 左云县农村产权交易网联系地址：北京紫竹书院技术基地 联系电话：400-060-123
+
+
+
+
+
关注公众号 了解详情
+
+
+
+
+
- 
+
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+