- 
+
@@ -133,24 +133,22 @@
-
+
-
-
-
+
项目查询
diff --git a/static/css/index.css b/static/css/index.css index 01310ba..9f8e311 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -399,6 +399,10 @@ color: #d21313; } +.centerRight-list0 .down{ + color: #007b76; +} + .centerRight-list0 p:last-child { text-align: center; color: #adadad; diff --git a/static/css/login/register.css b/static/css/login/register.css index 580a45b..e3909dc 100644 --- a/static/css/login/register.css +++ b/static/css/login/register.css @@ -80,7 +80,7 @@ width: 12%; } -.userTable tr td input[type="text"],.userTable tr td input[type="button"]{ +.userTable tr td input[type="text"],.userTable tr td input[type="button"],.userTable tr td input[type="password"]{ height: 36px; border: 1px solid #e3e3e3; width: 100%; diff --git a/static/css/user/user.css b/static/css/user/user.css index e1f63f7..4a5ecb0 100644 --- a/static/css/user/user.css +++ b/static/css/user/user.css @@ -78,12 +78,15 @@ border-bottom: 1px solid #e3e3e3; } -.userTable table tr:last-child td input[type='button']{ +.userTable table tr:last-child td p{ border-radius: 0; - width: 90%; + width: 30%; margin-left: 10px; background: #007b76; color: #ffffff; + line-height: 35px; + text-align: center; + cursor: pointer; } .supplyTable{ diff --git a/static/js/common/main.js b/static/js/common/main.js index 1e6962c..892435e 100644 --- a/static/js/common/main.js +++ b/static/js/common/main.js @@ -153,4 +153,5 @@ require(["jquery", "Tools","addressApi"], function ($, Tools) { var searchAllTitle = $('#searchAllTitle').val(); tools.skip('view/new/newList.html?title='+searchAllTitle); } + }) \ No newline at end of file diff --git a/static/js/common/tools.js b/static/js/common/tools.js index 7b52d8c..bf6403b 100644 --- a/static/js/common/tools.js +++ b/static/js/common/tools.js @@ -5,7 +5,7 @@ define(['jquery', 'dialog'], function ($, dialog) { this.description = "这是一个工具类"; } var ajaxJsUrl = "/api"; - + var module = {}; $.extend(Tool.prototype, { /** * ajax post @@ -16,6 +16,8 @@ define(['jquery', 'dialog'], function ($, dialog) { */ doPost: function (url, data, cb, Bearer) { var _this = this; + data.deptId = 100 ; + console.log(JSON.stringify(data)) var headAttribute = ''; if (Bearer && Bearer == true || _this.getCookie('Admin-Token') == '') { headAttribute = function (xhr) { @@ -106,7 +108,8 @@ define(['jquery', 'dialog'], function ($, dialog) { */ doGet: function (uri, data, cb, Bearer) { var _this = this; - var url = ajaxJsUrl + uri + '?'; + var url = ajaxJsUrl + uri + '?deptId=100&'; + console.log(url); var headAttribute = '' if (Bearer && Bearer == true || _this.getCookie('Admin-Token') == '') { headAttribute = function (xhr) { @@ -341,7 +344,7 @@ define(['jquery', 'dialog'], function ($, dialog) { } }, /** - * skip 获取时间 + * getNowFormatDate 获取时间 * @param */ getNowFormatDate:function () { @@ -372,7 +375,26 @@ define(['jquery', 'dialog'], function ($, dialog) { console.log(currentdate) return currentdate; }, - + /** + * getWebConfig 网站配置信息 + * @param + */ + getWebConfig: function () { + this.doGet(webConfig, {}, this.webConfigInformation, true) + }, + /** + * webConfigInformation 网站配置信息 + * @param + */ + webConfigInformation : function (data) { + console.log(data) + if (data.code == 200) { + var content = data.data; + $("#webConfigName").html(content[0].configValue); + $("#webConfigRecord").html(content[1].configValue + content[2].configValue); + $("#webConfigAddress").html(content[0].configValue+' '+content[3].configValue); + } + }, }); return Tool; }); diff --git a/static/js/project/announcementList/announcementDetail.js b/static/js/project/announcementList/announcementDetail.js index 298de76..7aa23ab 100644 --- a/static/js/project/announcementList/announcementDetail.js +++ b/static/js/project/announcementList/announcementDetail.js @@ -14,7 +14,8 @@ define(['jquery', "template", "Tools", "announApi", "paging"], function ($, temp //成交公告 tools.doGet(announDetail+'/'+getQueryVariable('id'), {}, module.announInformation,true); - + //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号） + tools.getWebConfig(); }; //获取地址栏参数 diff --git a/static/js/project/announcementList/announcementList.js b/static/js/project/announcementList/announcementList.js index 834e389..4a17151 100644 --- a/static/js/project/announcementList/announcementList.js +++ b/static/js/project/announcementList/announcementList.js @@ -37,8 +37,9 @@ define(['jquery', "template", "Tools", "announApi", "paging"], function ($, temp //鉴证公告 tools.doGet(attestationList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.attestationInformation,true); } + //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号） + tools.getWebConfig(); }; - //获取地址栏参数 function getQueryVariable(variable){ var query = window.location.search.substring(1); diff --git a/static/js/project/announcementList/attestation.js b/static/js/project/announcementList/attestation.js index 5b20dfb..87e8de4 100644 --- a/static/js/project/announcementList/attestation.js +++ b/static/js/project/announcementList/attestation.js @@ -14,7 +14,8 @@ define(['jquery', "template", "Tools", "announApi", "paging"], function ($, temp //鉴证公告 tools.doGet(attestationDetail+'/'+getQueryVariable('id'), {}, module.announInformation,true); - + //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号） + tools.getWebConfig(); }; //获取地址栏参数 diff --git a/static/js/project/bidding/biddingList.js b/static/js/project/bidding/biddingList.js index 2e83c6b..00f0424 100644 --- a/static/js/project/bidding/biddingList.js +++ b/static/js/project/bidding/biddingList.js @@ -61,6 +61,9 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT //标的物所在地 tools.doGet(webDept, {deptId:''}, module.deptLocation, true); + //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号） + tools.getWebConfig(); + $("#signStartTimeStr").datetime({ type:"date", value:[2019,9,31], diff --git a/static/js/project/demand/demand.js b/static/js/project/demand/demand.js index 983cab2..ab8eead 100644 --- a/static/js/project/demand/demand.js +++ b/static/js/project/demand/demand.js @@ -51,6 +51,8 @@ define(['jquery', "template", "Tools", "demandApi", "paging"], function ($, temp module.demandInformation,true ); + //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号） + tools.getWebConfig(); }; //个人供求数据 diff --git a/static/js/project/index.js b/static/js/project/index.js index 2a195c6..ce26079 100644 --- a/static/js/project/index.js +++ b/static/js/project/index.js @@ -121,7 +121,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa tools.doGet(webDeptType+"/project_type", {}, module.deptTypeSelect, true); //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号） - tools.doGet(webConfig, {}, module.webConfigInformation, true); + tools.getWebConfig(); //底部友情链接 tools.doGet(friendsLinks, {}, module.bottomFriendsLinks, true); @@ -192,7 +192,11 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa module.statisticsContent = function(data){ console.log(module.option) - console.log(data.priceAvgList) + console.log(data) + module.data.nowPriceAvg = data.nowPriceAvg; + module.data.priceRate = data.priceRate; + var statisticsData = template('statisticsData', module.data); + $("#statisticsContent").html(statisticsData); for (var i = 0 ; i < data.priceAvgList.length ; i++){ module.option.xAxis.data[i] = data.priceAvgList[i].year module.option.series[0].data[i] = data.priceAvgList[i].price diff --git a/static/js/project/interact/interact.js b/static/js/project/interact/interact.js index cfd05ba..e36e223 100644 --- a/static/js/project/interact/interact.js +++ b/static/js/project/interact/interact.js @@ -24,7 +24,8 @@ define(['jquery', "template", "Tools", "interactApi", "paging"], function ($, te //互动交流 tools.doGet(interactList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.interactInformation,true); - + //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号） + tools.getWebConfig(); }; //新闻资讯数据 diff --git a/static/js/project/listingItems/bond.js b/static/js/project/listingItems/bond.js index fa98146..aaaec1d 100644 --- a/static/js/project/listingItems/bond.js +++ b/static/js/project/listingItems/bond.js @@ -16,6 +16,8 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ document.getElementById('userBank').value = tools.getCookie('bankAddress'); document.getElementById('bankId').value = tools.getCookie('bankCardNum'); document.getElementById('idCard').value = tools.getCookie('idCardNum'); + //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号） + tools.getWebConfig(); }; //获取地址栏参数 diff --git a/static/js/project/listingItems/items.js b/static/js/project/listingItems/items.js index 72c22fb..f6d64dc 100644 --- a/static/js/project/listingItems/items.js +++ b/static/js/project/listingItems/items.js @@ -19,7 +19,8 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ //项目基本信息 tools.doGet(showImg + '/'+getQueryVariable('id'), {}, module.showImgInformation,true); - + //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号） + tools.getWebConfig(); }; diff --git a/static/js/project/listingItems/itemsList.js b/static/js/project/listingItems/itemsList.js index f7c5e05..7139a4e 100644 --- a/static/js/project/listingItems/itemsList.js +++ b/static/js/project/listingItems/itemsList.js @@ -79,6 +79,9 @@ define(['jquery', "template", "Tools", "itemsApi", "paging",'dateTime'], functio //标的物所在地 tools.doGet(webDept, {deptId:''}, module.deptLocation, true); + //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号） + tools.getWebConfig(); + $("#signStartTimeStr").datetime({ type:"date", value:[2019,9,31], diff --git a/static/js/project/new/new.js b/static/js/project/new/new.js index 215ff36..c42eb4a 100644 --- a/static/js/project/new/new.js +++ b/static/js/project/new/new.js @@ -28,6 +28,8 @@ define(['jquery', "template", "Tools", "newApi", "paging"], function ($, templat //新闻资讯 tools.doGet(newList, {number:2,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.NewsInformation,true); } + //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号） + tools.getWebConfig(); }; //获取地址栏参数 diff --git a/static/js/project/new/newDetail.js b/static/js/project/new/newDetail.js index 04a7fe1..27abf5c 100644 --- a/static/js/project/new/newDetail.js +++ b/static/js/project/new/newDetail.js @@ -16,6 +16,8 @@ define(['jquery', "template", "Tools", "newApi"], function ($, template, Tools ) //新闻资讯 tools.doGet(newDetail + '/'+getQueryVariable('id'), {}, module.NewsInformation,true); + //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号） + tools.getWebConfig(); }; //获取地址栏参数 diff --git a/static/js/project/policy/policy.js b/static/js/project/policy/policy.js index 514ac6d..05f2cef 100644 --- a/static/js/project/policy/policy.js +++ b/static/js/project/policy/policy.js @@ -48,6 +48,8 @@ define(['jquery', "template", "Tools", "policyApi", "paging"], function ($, temp //资料下载 tools.doGet(newList, {number:5,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.downloadInformation,true); } + //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号） + tools.getWebConfig(); }; diff --git a/static/js/project/user/index.js b/static/js/project/user/index.js index b88c25b..5e2486c 100644 --- a/static/js/project/user/index.js +++ b/static/js/project/user/index.js @@ -38,6 +38,9 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","ajaxUploadIma //个人中心选项卡鼠标悬浮 module.userListHover(); + //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号） + tools.getWebConfig(); + }; //个人中心用户信息 @@ -89,8 +92,6 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","ajaxUploadIma //我的竞价 tools.doGet(userBidding, {memberId:content.id,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.bidding); //个人资料提交 - $('#userAction').on('click', module.formAction) - $('#bankAction').on('click', module.formAction) $('#supplyAction').on('click', module.supplyAction) $('#releaseAction').on('click', module.releaseAction) //获取附件的值 @@ -232,6 +233,10 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","ajaxUploadIma document.getElementById('supplyInformation').style.display = 'none'; document.getElementById('consultingInformation').style.display = 'none'; document.getElementById('biddingInformation').style.display = 'none'; + + document.getElementById('releaseSupply').style.display = 'none'; + document.getElementById('release').style.display = 'none'; + if(type == 'icon-list1'){ document.getElementById('userInformation').style.display = 'block'; } @@ -285,46 +290,54 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","ajaxUploadIma } //个人用户资料修改 - module.formAction = function (){ + formAction = function (type){ var data = {}; //var password = $('#password').val(); - - //用户信息 - var companyName = $('#companyName').val(); - var idCardNum = $('#idCardNum').val(); - var realname = $('#realname').val(); - var companyCode = $('#companyCode').val(); - var companyNature = $('#companyNature').val(); - var companyScope = $('#companyScope').val(); - var companyTimeLimit = $('#companyTimeLimit').val(); - var companySetupTime = $('#companySetupTime').val(); - var companyCapital = $('#companyCapital').val(); - var companyLicense = $('#companyLicense').val(); - var address = $('#address').val(); - - //银行卡信息 - var bankCardName = $('#bankCardName').val(); - var bankCardNum = $('#bankCardNum').val(); - var bankAddress = $('#bankAddress').val(); - + if(type == 'company'){ + //公司用户信息 + var companyName = $('#companyName').val(); + var idCardNum = $('#idCardNum').val(); + var realname = $('#realname').val(); + var companyCode = $('#companyCode').val(); + var companyNature = $('#companyNature').val(); + var companyScope = $('#companyScope').val(); + var companyTimeLimit = $('#companyTimeLimit').val(); + var companySetupTime = $('#companySetupTime').val(); + var companyCapital = $('#companyCapital').val(); + var companyLicense = $('#companyLicense').val(); + var address = $('#address').val(); + data['companyName'] = companyName; + data['idCardNum'] = idCardNum; + data['realname'] = realname; + data['companyCode'] = companyCode; + data['companyName'] = companyName; + data['companyNature'] = companyNature; + data['companyScope'] = companyScope; + data['companyTimeLimit'] = companyTimeLimit; + data['companySetupTime'] = companySetupTime; + data['companyCapital'] = companyCapital; + data['companyLicense'] = companyLicense; + data['address'] = address; + } + if(type == 'user'){ + //个人用户信息 + var userFormRealName = $('#userFormRealName').val(); + var userFormIdCard = $('#userFormIdCard').val(); + var userFormAddress = $('#userFormAddress').val(); + data['idCardNum'] = userFormIdCard; + data['realname'] = userFormRealName; + data['address'] = userFormAddress; + } + if(type == 'bank'){ + //银行卡信息 + var bankCardName = $('#bankCardName').val(); + var bankCardNum = $('#bankCardNum').val(); + var bankAddress = $('#bankAddress').val(); + data['bankCardName'] = bankCardName; + data['bankCardNum'] = bankCardNum; + data['bankAddress'] = bankAddress; + } //data['password'] = password; - data['companyName'] = companyName; - data['idCardNum'] = idCardNum; - data['realname'] = realname; - data['companyCode'] = companyCode; - data['companyName'] = companyName; - data['companyNature'] = companyNature; - data['companyScope'] = companyScope; - data['companyTimeLimit'] = companyTimeLimit; - data['companySetupTime'] = companySetupTime; - data['companyCapital'] = companyCapital; - data['companyLicense'] = companyLicense; - data['address'] = address; - - data['bankCardName'] = bankCardName; - data['bankCardNum'] = bankCardNum; - data['bankAddress'] = bankAddress; - data['id'] = module.data.memberId; tools.doPut(userUpdate, data, module.Tips) @@ -335,6 +348,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","ajaxUploadIma var data = {}; //供求信息 + var demandType = $('#demandType').val(); var projectName = $('#projectName').val(); var location = $('#location').val(); var projectRealName = $('#projectRealName').val(); @@ -342,12 +356,14 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","ajaxUploadIma var projectContent = $('#projectContent').val(); var logintime = tools.getNowFormatDate(); + console.log(demandType); data['projectName'] = projectName; data['location'] = location; data['realname'] = projectRealName; data['phone'] = projectPhone; data['projectContent'] = projectContent; data['logintime'] = logintime; + data['supplyDemandType'] = demandType; data['memberId'] = module.data.memberId; diff --git a/static/js/project/user/login.js b/static/js/project/user/login.js index 25ad07c..54ec5b3 100644 --- a/static/js/project/user/login.js +++ b/static/js/project/user/login.js @@ -21,6 +21,8 @@ define(['jquery', "Tools","user"], function ($, Tools) { module.verificationCode() //背景高度 module.register() + //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号） + tools.getWebConfig(); }; /*-----------------------------自定义方法-------------------------------------*/ diff --git a/static/js/project/user/register.js b/static/js/project/user/register.js index 23cb3ec..4540824 100644 --- a/static/js/project/user/register.js +++ b/static/js/project/user/register.js @@ -14,6 +14,8 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa //背景高度 module.register(); module.data.type = getQueryVariable("type") + //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号） + tools.getWebConfig(); }; //获取地址栏参数 diff --git a/static/js/project/user/registerFrom.js b/static/js/project/user/registerFrom.js index d706e01..a822dfc 100644 --- a/static/js/project/user/registerFrom.js +++ b/static/js/project/user/registerFrom.js @@ -5,7 +5,7 @@ define(['jquery', "template", "Tools", "echarts", 'register', 'swiper'], functio //数据存储 var module = { data: { - + type: 1 }, }; var tools = new Tools(); @@ -17,7 +17,8 @@ define(['jquery', "template", "Tools", "echarts", 'register', 'swiper'], functio $('#graphicImgBtn').on('click', module.verificationCode) //图形验证码加载 module.verificationCode() - + //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号） + tools.getWebConfig(); module.getType(); }; @@ -82,13 +83,14 @@ define(['jquery', "template", "Tools", "echarts", 'register', 'swiper'], functio var realName = $('#realName').val(); var idCardNum = $('#idCardNum').val(); var address = $('#address').val(); - + var memberType = 1 ; data['phone'] = phone; data['password'] = passwordVal; data['code'] = codeVal; data['realname'] = realName; data['idCardNum'] = idCardNum; data['address'] = address; + data['economicType'] = 1; } if (module.data.type == 2){ var phone = $('#phone').val(); @@ -184,7 +186,6 @@ define(['jquery', "template", "Tools", "echarts", 'register', 'swiper'], functio tools.initTips('请输入图形验证码', 'right', $('#code')[0], 2000) return false; } - console.log($('#iAgree:checked').val()) if ($('#iAgree:checked').val() == undefined){ tools.initTips('请选择我已同意', 'right', $('#iAgree')[0], 2000) diff --git a/view/announcement/announcement.html b/view/announcement/announcement.html index 596dde5..ed78993 100644 --- a/view/announcement/announcement.html +++ b/view/announcement/announcement.html @@ -60,7 +60,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{userInformationDetail.phone}}
修改手机号保存
保存
保存