From c47e066678f4e9089562accac3bbc8cd6b2caf00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Mon, 23 Aug 2021 13:43:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html                                  |   8 +-
 static/css/user/user.css                    |   2 +-
 static/js/api/user.js                       |  32 +++-
 static/js/project/bidding/biddingList.js    |   4 +
 static/js/project/index.js                  |   4 +-
 static/js/project/interact/interact.js      |  20 ++-
 static/js/project/listingItems/bond.js      |  48 +++++-
 static/js/project/listingItems/items.js     |  15 +-
 static/js/project/listingItems/itemsList.js |  17 ++
 static/js/project/policy/policyDetail.js    |  69 ++++++++
 static/js/project/user/index.js             |  57 ++++++-
 view/bidding/biddingList.html               |   2 +-
 view/listingItems/bond.html                 |   6 +-
 view/login/login.html                       |   2 +-
 view/new/newDetail.html                     |   4 +-
 view/policy/policy.html                     |   6 +-
 view/policy/policyDetail.html               | 170 ++++++++++++++++++++
 view/user/user.html                         |  23 ++-
 18 files changed, 442 insertions(+), 47 deletions(-)
 create mode 100644 static/js/project/policy/policyDetail.js
 create mode 100644 view/policy/policyDetail.html

diff --git a/index.html b/index.html
index 3ef6ec4..3d8dd8d 100644
--- a/index.html
+++ b/index.html
@@ -133,10 +133,10 @@
                         <script id="deptTypeData" type="text/html">
                             {{each deptTypeList as value i}}
                             <li>
-                                <a href="javascript:goListing()">{{value.dictLabel}}</a>
+                                <a href="javascript:goListing('deptType',{{value.dictSort}},{{value.dictCode}})">{{value.dictLabel}}</a>
                             </li>
                             {{/each}}
-                            <li><a href="javascript:goListing()">更多类型></a></li>
+                            <li><a href="javascript:goListing('','','')">更多类型></a></li>
                         </script>
                         <ul id="deptTypeContent"></ul>
                     </div>
@@ -145,10 +145,10 @@
                         <script id="deptLocationData" type="text/html">
                             {{each deptLocationList as value i}}
                             <li>
-                                <a href="javascript:goListing()">{{value.deptName}}</a>
+                                <a href="javascript:goListing('deptLocation',{{value.deptId}},'')">{{value.deptName}}</a>
                             </li>
                             {{/each}}
-                            <li><a href="javascript:goListing()">更多类型></a></li>
+                            <li><a href="javascript:goListing('','','')">更多类型></a></li>
                         </script>
                         <ul id="deptLocationContent">
 
diff --git a/static/css/user/user.css b/static/css/user/user.css
index 7b1b3b9..7a3c44a 100644
--- a/static/css/user/user.css
+++ b/static/css/user/user.css
@@ -66,7 +66,7 @@
     text-align: right;
 }
 
-.userTable input[type='text']{
+.userTable input[type='text'],input[type='password']{
     border: 1px solid #e3e3e3;
     width: 90%;
     height: 36px;
diff --git a/static/js/api/user.js b/static/js/api/user.js
index f3ce355..34c98fa 100644
--- a/static/js/api/user.js
+++ b/static/js/api/user.js
@@ -6,7 +6,7 @@
 @purl /transaction/website/member/{id}
 @param
 */
-var userUpdate = '/transaction/member'  //修改用户信息类接口
+var userUpdate = '/transaction/member/edit'  //修改用户信息类接口
 
 /*
 @purl /getInfo
@@ -42,19 +42,31 @@ var userBidding = '/transaction/outproject/biddinglist/member'  //我的竞价
 @purl /transaction/demand
 @param
 */
-var userDemand = '/transaction/demand'  //新增供求类接口
+var userDemand = '/transaction/demand/add'  //新增供求类接口
+
+/*
+@purl /transaction/demand
+@param
+*/
+var userEdit = '/transaction/demand/edit'  //修改供求类接口
 
 /*
 @purl /transaction/demand/{ids}
 @param
 */
-var deleteSupply = '/transaction/demand'  //删除供求类接口
+var deleteSupply = '/transaction/demand/remove'  //删除供求类接口
+
+/*
+@purl /transaction/demand/{ids}
+@param
+*/
+var selectSupply = '/transaction/demand'  //查询供求类接口
 
 /*
 @purl /transaction/communicate
 @param
 */
-var userCommunicate = '/transaction/communicate'  //添加咨询类接口
+var userCommunicate = '/transaction/communicate/add'  //添加咨询类接口
 
 /*
 @purl /transaction/demand
@@ -78,16 +90,22 @@ var base64Attach = '/common/base64Attach'  //数据字典
 @purl /common/base64Attach
 @param
 */
-var showUserImg = 'transaction/member/showImg/memberId'  //用户图片展示
+var showUserImg = '/transaction/member/showImg/memberId'  //用户图片展示
 
 /*
 @purl /common/base64Attach
 @param
 */
-var deleteUserImg = 'transaction/member/deleteImg/attachId'  //用户图片展示
+var deleteUserImg = '/transaction/member/deleteImg/attachId'  //用户图片展示
+
+/*
+@purl supplyDemand/showImg/id/{id}
+@param
+*/
+var supplyDemandImg = '/transaction/website/supplyDemand/showImg/id'  //用户图片展示
 
 /*
 @purl supplyDemand/showImg/id/{id}
 @param
 */
-var supplyDemandImg = '/transaction/website/supplyDemand/showImg/id'  //用户图片展示
\ No newline at end of file
+var updatePwd = '/system/user/profile/updatePwd'  //修改用户密码
\ No newline at end of file
diff --git a/static/js/project/bidding/biddingList.js b/static/js/project/bidding/biddingList.js
index 6fec5db..4d0c964 100644
--- a/static/js/project/bidding/biddingList.js
+++ b/static/js/project/bidding/biddingList.js
@@ -194,6 +194,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT
 
     tabCheck = function (deptId) {
         module.data.deptId = deptId;
+
         $('#locInfoall').attr("class","auction_hall_table_tab auction_loc");
         $("#deptLocationContent div").attr("class","auction_hall_table_tab auction_loc");
         if(deptId == ''){
@@ -234,6 +235,9 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT
         if(id == ''){
             id = 'All';
         }
+        if(projectNumber == undefined){
+            module.data.projectNumber = '';
+        }
         for (var i = 0 ; i < module.data.deptTypeList.length ; i++){
             document.getElementById('standardType'+(i+1)).className = 'auction_hall_table_tab';
         }
diff --git a/static/js/project/index.js b/static/js/project/index.js
index 0922492..e74d710 100644
--- a/static/js/project/index.js
+++ b/static/js/project/index.js
@@ -576,8 +576,8 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
     goUserInteract = function () {
         tools.skip('view/user/user.html?type=goInteract')
     }
-    goListing = function () {
-        tools.skip('view/listingItems/itemsList.html');
+    goListing = function (clickType,dictSort,dictCode) {
+        tools.skip('view/listingItems/itemsList.html?clickType='+clickType+'&dictSort='+dictSort+'&dictCode='+dictCode);
     }
 
     goAnnouncementList = function (type) {
diff --git a/static/js/project/interact/interact.js b/static/js/project/interact/interact.js
index 595fcef..eb04e13 100644
--- a/static/js/project/interact/interact.js
+++ b/static/js/project/interact/interact.js
@@ -92,8 +92,7 @@ define(['jquery', "template", "Tools", "interactApi", "paging"], function ($, te
             if (pageCount < 1){
                 pageCount = 1;
             }
-            console.log(module.data.searchInformationList)
-            if(module.data.searchInformationList == ''){
+            if((module.data.searchInformationList == '' || module.data.searchType == 'YES')&& module.data.turnPage != 'YES'){
                 // 初始化 分页器
                 var page_s1=createPage('.page_s2');
                 // 设置分页
@@ -113,11 +112,16 @@ define(['jquery', "template", "Tools", "interactApi", "paging"], function ($, te
     }
 
     goSearch = function () {
+        $('.page_s2').html('');
         var searchTitle = $('#searchTitle').val();
         var searchContent = $('#searchContent').val();
         module.data.searchTitle = searchTitle ;
         module.data.searchContent = searchContent ;
+        module.data.searchType = 'YES';
+        module.data.turnPage = 'NO';
         module.data.pageNum = 1 ;
+        console.log('aaa')
+
         document.getElementById('interact').style.display = 'none';
         document.getElementById('search').style.display = 'block';
         tools.doGet(interactSearch, {deptId:100,title:searchTitle,content:searchContent,pageNum:1,pageSize:module.data.pageSize}, module.searchInteractInformation,true)
@@ -125,16 +129,22 @@ define(['jquery', "template", "Tools", "interactApi", "paging"], function ($, te
 
     turnThePage = function (pageNum) {
         module.data.pageNum = pageNum ;
-        console.log(pageNum)
         if (module.data.searchType == 'YES'){
-            tools.doGet(interactSearch, {deptId:100,title:module.data.searchTitle,content:module.data.searchContent,pageNum:pageNum,pageSize:module.data.pageSize}, module.interactInformation,true)
+            module.data.turnPage = 'YES';
+            tools.doGet(interactSearch, {deptId:100,title:module.data.searchTitle,content:module.data.searchContent,pageNum:pageNum,pageSize:module.data.pageSize}, module.searchInteractInformation,true)
         }else{
             tools.doGet(interactList, {deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.interactInformation,true);
         }
     }
 
     goUserInteract = function () {
-        tools.skip('../user/user.html?type=goInteract')
+        if(tools.getCookie('Admin-Token')){
+            tools.skip('../user/user.html?type=goInteract')
+        }else{
+            tools.initDialog('登陆提示', '登陆后可参与竞价，是否登录？', function () {
+                tools.skip('../login/login.html')
+            }, '登录', function () { }, "取消")
+        }
     }
     return module;
 });
\ No newline at end of file
diff --git a/static/js/project/listingItems/bond.js b/static/js/project/listingItems/bond.js
index 50d37c1..c53d1df 100644
--- a/static/js/project/listingItems/bond.js
+++ b/static/js/project/listingItems/bond.js
@@ -14,8 +14,8 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi',"cupload"], function
         tools.doGet(friendsLinks, {}, module.bottomFriendsLinks, true);
         document.getElementById('realName').value = tools.getCookie('userName');
         document.getElementById('userNum').value = tools.getCookie('phone');
-        document.getElementById('userBank').value = tools.getCookie('bankAddress');
-        document.getElementById('bankId').value = tools.getCookie('bankCardNum');
+        document.getElementById('userBank').value == null ? '': tools.getCookie('bankAddress');
+        document.getElementById('bankId').value == null ? '':tools.getCookie('bankCardNum');
         document.getElementById('idCard').value = tools.getCookie('idCardNum');
         //项目基本信息
         tools.doGet(outProject + '/id/'+getQueryVariable('id'), {}, module.outProjectInformation,true);
@@ -89,7 +89,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi',"cupload"], function
     }
 
     submit  = function(){
-
+        if(module.onCheck()){
         var data = {};
         var realName = $('#realName').val();
         var userNum = $('#userNum').val();
@@ -109,10 +109,48 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi',"cupload"], function
         data['status'] = 'Y';
 
         tools.doPost(signupSubmit, data, module.upLoadAction);
-
-
+        }
     }
+    //验证表单
+    module.onCheck = function () {
+        var userNum = $('#userNum').val();
+        var realName = $('#realName').val();
+        var userBank = $('#userBank').val();
+        var bankId = $('#bankId').val();
+        var idCard = $('#idCard').val();
+        if ($('#checkAgree:checked').val() == undefined ) {
+            $('#checkAgree')[0].focus()
+            tools.initTips('请选择我已同意    ', 'right', $('#checkAgree')[0], 2000)
+            return false;
+        }
+        if (realName == '') {
+            $('#realName')[0].focus()
+            tools.initTips('请输入姓名', 'right', $('#realName')[0], 2000)
+            return false;
+        }
+        if (userNum == '') {
+            $('#userNum')[0].focus()
+            tools.initTips('请输入会员账号', 'right', $('#userNum')[0], 2000)
+            return false;
+        }
+        if (userBank == '') {
+            $('#userBank')[0].focus()
+            tools.initTips('请输入开户银行', 'right', $('#userBank')[0], 2000)
+            return false;
+        }
+        if (bankId == '') {
+            $('#bankId')[0].focus()
+            tools.initTips('请输入银行卡号', 'right', $('#bankId')[0], 2000)
+            return false;
+        }
+        if (idCard == '') {
+            $('#idCard')[0].focus()
+            tools.initTips('请输入身份证号', 'right', $('#idCard')[0], 2000)
+            return false;
+        }
 
+        return true;
+    }
     module.toTips = function(data){
         console.log(data)
         if(data.msg != '操作成功'){
diff --git a/static/js/project/listingItems/items.js b/static/js/project/listingItems/items.js
index 9c19adf..a0f2dbe 100644
--- a/static/js/project/listingItems/items.js
+++ b/static/js/project/listingItems/items.js
@@ -15,18 +15,23 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
         //底部友情链接
         tools.doGet(friendsLinks, {}, module.bottomFriendsLinks, true);
 
+        //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号）
+        tools.getWebConfig();
+
         module.data.loginNow = tools.getCookie('Admin-Token');
         //浏览次数
         tools.doGet(outProject, {id:getQueryVariable('id')}, module.projectNum,true);
 
-        //项目基本信息
-        tools.doGet(outProject + '/id/'+getQueryVariable('id'), {}, module.outProjectInformation,true);
+        setTimeout(function(){//项目基本信息
+            tools.doGet(outProject + '/id/'+getQueryVariable('id'), {}, module.outProjectInformation,true);
+        },100)
+
+
 
         //项目基本信息
         tools.doGet(showImg + '/'+getQueryVariable('id'), {}, module.showImgInformation,true);
 
-        //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号）
-        tools.getWebConfig();
+
 
         //焦点图
         setTimeout(function () {
@@ -170,12 +175,10 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
         if (data.code == 200) {
             console.log(serverApi)
             var content = data.data;
-
             //倒计时
             var timer = setInterval(function(){
                 module.dataCompare(content.signupStartTime,content.signupStopTime,content.biddingStartTime,content.biddingStopTime);
             },1000)
-
             for(var i = 0 ; i < content.fileUrlList.length ; i++){
                 content.fileUrlList[i].fileUrl = serverApi+content.fileUrlList[i].fileUrl;
             }
diff --git a/static/js/project/listingItems/itemsList.js b/static/js/project/listingItems/itemsList.js
index 250f0e1..69e781d 100644
--- a/static/js/project/listingItems/itemsList.js
+++ b/static/js/project/listingItems/itemsList.js
@@ -70,6 +70,18 @@ define(['jquery', "template", "Tools", "itemsApi", "paging", 'dateTime'], functi
                 projectName: getQueryVariable('projectName'),
                 projectNumber: getQueryVariable('projectNumber')
             }, module.itemList, true);
+        }else if(getQueryVariable('clickType') == 'deptType'){//新闻资讯
+            tools.doGet(itemsList, { deptId: 100, pageNum: module.data.pageNum, pageSize: module.data.pageSize }, module.itemList, true);
+            setTimeout(function(){
+                typeCheck(getQueryVariable('dictSort'),getQueryVariable('dictCode'))
+                goSearch()
+            },500)
+        }else if(getQueryVariable('clickType') == 'deptLocation'){
+            tools.doGet(itemsList, { deptId: 100, pageNum: module.data.pageNum, pageSize: module.data.pageSize }, module.itemList, true);
+            setTimeout(function(){
+                tabCheck(getQueryVariable('dictSort'))
+                goSearch()
+            },500)
         } else {
             //新闻资讯
             tools.doGet(itemsList, { deptId: 100, pageNum: module.data.pageNum, pageSize: module.data.pageSize }, module.itemList, true);
@@ -133,6 +145,7 @@ define(['jquery', "template", "Tools", "itemsApi", "paging", 'dateTime'], functi
     //挂牌项目列表
     module.itemList = function (data) {
         if (data.code == 200) {
+            console.log(data)
             module.data.serverApi = serverApi;
             var content = data.rows;
             var pageCount = (data.total / module.data.pageSize).toFixed(0);
@@ -257,10 +270,14 @@ define(['jquery', "template", "Tools", "itemsApi", "paging", 'dateTime'], functi
 
     typeCheck = function (id, projectNumber) {
         module.data.projectNumber = projectNumber;//标的物类型ID
+        console.log(id+'----------------'+projectNumber)
         document.getElementById('standardTypeAll').className = 'auction_hall_table_tab';
         if (id == '') {
             id = 'All';
         }
+        if(projectNumber == undefined){
+            module.data.projectNumber = '';
+        }
         for (var i = 0; i < module.data.deptTypeList.length; i++) {
             document.getElementById('standardType' + (i + 1)).className = 'auction_hall_table_tab';
         }
diff --git a/static/js/project/policy/policyDetail.js b/static/js/project/policy/policyDetail.js
new file mode 100644
index 0000000..04f5655
--- /dev/null
+++ b/static/js/project/policy/policyDetail.js
@@ -0,0 +1,69 @@
+/**
+ * Created by Administrator on 2021/4/5.
+ */
+define(['jquery', "template", "Tools", "newApi"], function ($, template, Tools ) {
+    //数据存储
+    var module = {
+        data: {
+            newsInformationList:''
+        },
+    };
+    var tools = new Tools();
+
+    module.init = function (page) {
+        //底部友情链接
+        tools.doGet(friendsLinks, {}, module.bottomFriendsLinks, true);
+        console.log(getQueryVariable('id'))
+        var titName = getQueryVariable('type')
+        if(titName == 'zcfg'){
+           document.getElementById('titIndex').innerText = '政策法规'
+        }
+        if(titName == 'jygz'){
+            document.getElementById('titIndex').innerText = '交易规则'
+        }
+        if(titName == 'zlxz'){
+            document.getElementById('titIndex').innerText = '资料下载'
+        }
+
+        //新闻资讯
+        tools.doGet(newDetail + '/'+getQueryVariable('id'), {}, module.NewsInformation,true);
+
+        //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号）
+        tools.getWebConfig();
+    };
+    //底部友情链接
+    module.bottomFriendsLinks = function (data) {
+        if (data.code == 200) {
+            var content = data.data;
+            console.log(content)
+            module.data.friendsLinksList = content;
+            var friendsLinksData = template('friendsLinksData', module.data);
+            $("#friendsLinksContent").html(friendsLinksData);
+        }
+    }
+
+    //获取地址栏参数
+    function getQueryVariable(variable){
+        var query = window.location.search.substring(1);
+        var vars = query.split("&");
+        for (var i=0;i<vars.length;i++) {
+            var pair = vars[i].split("=");
+            if(pair[0] == variable){return pair[1];}
+        }
+        return(false);
+    }
+
+    //新闻资讯数据
+    module.NewsInformation = function (data) {
+        console.log(data)
+        if (data.code == 200) {
+            var content = data.data;
+            $("#newTitle").html(content.title);
+            $("#newTime").html(content.newsTime);
+            $("#newCome").html(content.createBy);
+            $("#newContent").html(content.content);
+        }
+    }
+
+    return module;
+});
\ No newline at end of file
diff --git a/static/js/project/user/index.js b/static/js/project/user/index.js
index e6f84a7..9582443 100644
--- a/static/js/project/user/index.js
+++ b/static/js/project/user/index.js
@@ -199,7 +199,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor"],
 
     deleteList = function(){
          console.log(module.data.fileNum[deleteNum])
-        tools.doDelete(deleteUserImg+'/'+module.data.fileNum[deleteNum], {}, module.Tips);
+        tools.doGet(deleteUserImg+'/'+module.data.fileNum[deleteNum], {}, module.Tips);
     }
 
     module.getData = function(data){
@@ -262,7 +262,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor"],
 
     //删除供求
     deleteUserSupply = function(ids){
-        tools.doDelete(deleteSupply+'/'+ids, {}, module.Tips);
+        tools.doGet(deleteSupply+'/'+ids, {}, module.Tips);
     }
 
     //个人中心我的供求
@@ -351,6 +351,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor"],
     tabCheck = function(type){
         document.getElementById('user').className = '';
         document.getElementById('bank').className = '';
+        document.getElementById('passWord').className = '';
         document.getElementById(type).className = 'active';
 
         console.log(type)
@@ -358,6 +359,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor"],
         document.getElementById('companyInformationContent').style.display = 'none';
         document.getElementById('bankInformationContent').style.display = 'none';
         document.getElementById('phoneInformationContent').style.display = 'none';
+        document.getElementById('passWordInformationContent').style.display = 'none';
         if (module.data.memberType == '2' && type == 'user'){
             document.getElementById('companyInformationContent').style.display = 'block';
         }else if (module.data.memberType == '1' && type == 'user'){
@@ -531,6 +533,43 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor"],
         tools.doPost(userUpdate, data, module.Tips)
     }
 
+    editPassword = function(){
+        var data = {};
+        if(module.passWordCompare()){
+            var oldPassWord = $('#originalPassWord').val();
+            var newPassWord = $('#newPassWord').val();
+            data['oldPassword'] = oldPassWord;
+            data['newPassword'] = newPassWord;
+            tools.doPost(updatePwd, data, module.Tips)
+        }
+    }
+
+    //手动验证密码是否一致
+    module.passWordCompare = function(){
+        var newPassword = $('#newPassWord').val();
+        var determinePassWord = $('#determinePassWord').val();
+        var originalPassWord = $('#originalPassWord').val();
+        /*原密码*/
+        if (originalPassWord == '') {
+            $('#originalPassWord')[0].focus()
+            tools.initTips('请输入原密码', 'right', $('#originalPassWord')[0], 2000)
+            return false;
+        }
+        /* 新密码 */
+        if (newPassword == '') {
+            $('#newPassWord')[0].focus()
+            tools.initTips('请输入新密码', 'right', $('#newPassWord')[0], 2000)
+            return false;
+        }
+        /* 确认密码 */
+        if (determinePassWord == '') {
+            $('#determinePassWord')[0].focus()
+            tools.initTips('请确认密码', 'right', $('#determinePassWord')[0], 2000)
+            return false;
+        }
+        return true;
+    }
+
     //发布供求
     module.supplyAction = function (){
         var data = {};
@@ -556,7 +595,12 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor"],
 
             data['memberId'] = module.data.memberId;
 
-            tools.doPost(userDemand, data, module.getData)
+            if(module.data.supplyType == 'edit'){
+                tools.doPost(userEdit, data, module.getData)
+            }else{
+                tools.doPost(userDemand, data, module.getData)
+            }
+
         }
     }
 
@@ -734,10 +778,12 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor"],
     }
 
     selectUserSupply = function(ids) {
-        tools.doGet(deleteSupply + '/' + ids, {}, module.selectSupplyDetail);//memberType 1个人 2单位
+        module.data.supplyType = 'edit'
+        console.log('点击修改')
+        tools.doGet(selectSupply + '/' + ids, {}, module.selectSupplyDetail);//memberType 1个人 2单位
     }
     module.selectSupplyDetail = function(data){
-
+        console.log('进入修改供求')
         document.getElementById('supplyInformation').style.display = "none";
         document.getElementById('releaseSupply').style.display = "block";
 
@@ -751,7 +797,6 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor"],
         $('#projectContent').val(content.projectContent);
 
         tools.doGet(supplyDemandImg+'/'+content.id, {}, module.showSupplyImage);
-        console.log(data)
     }
 
     goProject = function(id){
diff --git a/view/bidding/biddingList.html b/view/bidding/biddingList.html
index 75d96df..56f5ee9 100644
--- a/view/bidding/biddingList.html
+++ b/view/bidding/biddingList.html
@@ -136,7 +136,7 @@
                     <td>
                         <div class="auction_all_right2" id="auction_all_right_standard_type">
                             <script id="deptTypeData" type="text/html">
-                                <div class="auction_hall_table_tab auction_hall_table_tab_select" id="standardTypeAll">全部</div>
+                                <div class="auction_hall_table_tab auction_hall_table_tab_select" onclick="typeCheck('')" id="standardTypeAll">全部</div>
                                 {{each deptTypeList as value i}}
                                 <div class="auction_hall_table_tab" id="standardType{{value.dictSort}}" onclick="typeCheck({{value.dictSort}},{{value.dictCode}})">{{value.dictLabel}}</div>
                                 {{/each}}
diff --git a/view/listingItems/bond.html b/view/listingItems/bond.html
index c691ac0..823b3e7 100644
--- a/view/listingItems/bond.html
+++ b/view/listingItems/bond.html
@@ -116,11 +116,11 @@
     <div class="top">
         <ul class="container w-1200">
             <li><a href="../../index.html">首页</a></li>
-            <li><a href="../listingItems/itemsList.html">挂牌项目</a></li>
+            <li class="active"><a href="../listingItems/itemsList.html">挂牌项目</a></li>
             <li><a href="../bidding/biddingList.html">竞价大厅</a></li>
             <li><a href="../announcement/announcement.html">项目公告</a></li>
             <li><a href="../demand/demand.html">个人供求</a></li>
-            <li class="active"><a href="../new/newList.html">新闻资讯</a></li>
+            <li><a href="../new/newList.html">新闻资讯</a></li>
             <li><a href="../policy/policy.html">政策法规</a></li>
             <li><a href="../interact/interactList.html">互动交流</a></li>
         </ul>
@@ -137,7 +137,7 @@
             <p>· 已阅读并知晓：如您报名成功，您的姓名、证件号码、手机号、联系地址等信息将披露给资产处置单位及相关服务提供方，用于核实竞买人的真是身份、竞买资格及相关服务提供</p>
             <p>· 已阅读并知晓：竞买人如果没有进行实地看样，视为接受标的所有瑕疵等细则</p>
             <p>· 已阅读并知晓：已阅读并同意《竞拍服务协议》</p>
-            <p><input type="checkbox" style="position:relative;top: 2px;"/>本人已知晓并同意以上所有事项</p>
+            <p><input type="checkbox" id="checkAgree" style="position:relative;top: 2px;"/>本人已知晓并同意以上所有事项</p>
         </div>
         <div class="m-t-25 p-l-15">
             <h3 style="text-align: left;">2.竞买人身份确认</h3>
diff --git a/view/login/login.html b/view/login/login.html
index bc2cdf4..a543bda 100644
--- a/view/login/login.html
+++ b/view/login/login.html
@@ -151,7 +151,7 @@
                     <input type="checkbox"/>记住密码
                 </div>
                 <input type="button" value="登录" id="login-submit" class="loginBtn"/>
-                <input type="button" value="注册" onclick="window.location='../login/register.html'" class="registerBtn"/>
+                <input type="button" value="注册" onclick="window.location='register.html'" class="registerBtn"/>
             </div>
         </div>
     </div>
diff --git a/view/new/newDetail.html b/view/new/newDetail.html
index cb961b7..c389cef 100644
--- a/view/new/newDetail.html
+++ b/view/new/newDetail.html
@@ -128,13 +128,13 @@
     <div class="w-1200">
         <p class="font16 m-t-15 titIndex">新闻资讯<i>></i><span>详情</span></p>
         <div class="title">
-            <h1 class="font56" id="newTitle"></h1>
+            <h1 class="font38" id="newTitle"></h1>
             <div class="m-b-30">
                 <p id="newTime"></p>
                 <p id="newCome"></p>
             </div>
         </div>
-        <div class="font24" id="newContent"></div>
+        <div class="font16" id="newContent"></div>
 <!--        <div class="share">-->
 <!--            <p class="fl">分享到:</p>-->
 <!--            <img src="../../static/images/icon5.png" alt=""/>-->
diff --git a/view/policy/policy.html b/view/policy/policy.html
index d5035ee..d49fd2c 100644
--- a/view/policy/policy.html
+++ b/view/policy/policy.html
@@ -141,7 +141,7 @@
             <script id="policyInformationData" type="text/html">
                 {{each policyInformationList as value i}}
                 <li>
-                    <a href="../new/newDetail.html?id={{value.id}}" class="fl"><i class="sanjiao-right"></i>{{value.title}}</a>
+                    <a href="policyDetail.html?id={{value.id}}&type=zcfg" class="fl"><i class="sanjiao-right"></i>{{value.title}}</a>
                     <p class="fr">{{value.newsTime}}</p>
                     <div class="clear"></div>
                 </li>
@@ -153,7 +153,7 @@
             <script id="ruleInformationData" type="text/html">
                 {{each ruleInformationList as value i}}
                 <li>
-                    <a href="../new/newDetail.html?id={{value.id}}" class="fl"><i class="sanjiao-right"></i>{{value.title}}</a>
+                    <a href="policyDetail.html?id={{value.id}}&type=jygz" class="fl"><i class="sanjiao-right"></i>{{value.title}}</a>
                     <p class="fr">{{value.newsTime}}</p>
                     <div class="clear"></div>
                 </li>
@@ -165,7 +165,7 @@
             <script id="downloadInformationData" type="text/html">
                 {{each downloadInformationList as value i}}
                 <li>
-                    <a href="../new/newDetail.html?id={{value.id}}" class="fl"><i class="sanjiao-right"></i>{{value.title}}</a>
+                    <a href="policyDetail.html?id={{value.id}}&type=zlxz" class="fl"><i class="sanjiao-right"></i>{{value.title}}</a>
                     <p class="fr">{{value.newsTime}}</p>
                     <div class="clear"></div>
                 </li>
diff --git a/view/policy/policyDetail.html b/view/policy/policyDetail.html
new file mode 100644
index 0000000..6dc2c5f
--- /dev/null
+++ b/view/policy/policyDetail.html
@@ -0,0 +1,170 @@
+<!DOCTYPE html
+        PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="zh-CN" xml:lang="zh-CN">
+
+<head>
+    <meta charset="utf-8">
+    <title>农燊高科-新闻详情</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="keywords" content="" />
+    <meta name="description" cxontent="" />
+    <link href="../../static/css/main.css" rel="stylesheet" type="text/css" />
+    <link href="../../static/css/index.css" rel="stylesheet" type="text/css" />
+    <link href="../../static/css/new/new.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+<div class="main" id="page">
+    <!--顶部Title  -->
+    <div class="bg-f7 txc">
+        <div class="w-1200 topDress">
+            <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+            <a href="../../index.html" class="topTit02 fr">返回主站</a>
+<!--            <div class="topTit02 fr" id="dress">-->
+<!--                <img src="../../static/images/icon3.png" alt="" class="fl"/>-->
+<!--                <p class="fl">威海市</p>-->
+<!--                <div class="clear"></div>-->
+<!--            </div>-->
+            <div class="clear"></div>
+            <div class="dressPc" id="dressList" style="display: none;">
+                <ul>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <!--LOGO search -->
+    <div class="logoSearch w-1200">
+        <div class="wid50 logoSearch-div fl">
+            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+            <h1 class="fl" id="webConfigName" onclick="goIndex()"></h1>
+            <div class="clear"></div>
+        </div>
+        <div class="wid50 logoSearch-div fr">
+            <div class="searchDiv fl">
+                <input type="text" placeholder="请输入关键词搜索" class="searchClass" />
+                <input type="button" value="搜索" class="searchButton" />
+            </div>
+            <div class="fr" id="userInfo" style="display: none;">
+                <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
+                <div class="clear"></div>
+            </div>
+            <div class="headHover" id="headHover" style="display: none;">
+                <ul>
+                    <li>
+                        <p id="userRealName2">Sherry</p>
+                    </li>
+                    <li class="m-t-5">
+                        <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的资料</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=demand" class="fl">我的供求</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=interact" class="fl">我的咨询</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li class="m-b-5">
+                        <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=bidding" class="fl">我的竞价</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li onclick="outLogin()">
+                        <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
+                        <a class="fl">退出登录</a>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+            <div class="fr" id="userLogin" style="display: none;">
+                <a href="../login/login.html">请登录</a>
+                <a href="../login/register.html">免费注册</a>
+            </div>
+            <div class="clear"></div>
+        </div>
+        <div class="clear"></div>
+    </div>
+
+    <!--顶部导航栏  -->
+    <div class="top">
+        <ul class="container w-1200">
+            <li><a href="../../index.html">首页</a></li>
+            <li><a href="../listingItems/itemsList.html">挂牌项目</a></li>
+            <li><a href="../bidding/biddingList.html">竞价大厅</a></li>
+            <li><a href="../announcement/announcement.html">项目公告</a></li>
+            <li><a href="../demand/demand.html">个人供求</a></li>
+            <li><a href="../new/newList.html">新闻资讯</a></li>
+            <li class="active"><a href="../policy/policy.html">政策法规</a></li>
+            <li><a href="../interact/interactList.html">互动交流</a></li>
+        </ul>
+    </div>
+    <div class="w-1200">
+        <p class="font16 m-t-15 titIndex">政策法规<i>></i><b id="titIndex"></b><i>></i><span>详情</span></p>
+        <div class="title">
+            <h1 class="font38" id="newTitle"></h1>
+            <div class="m-b-30">
+                <p id="newTime"></p>
+                <p id="newCome"></p>
+            </div>
+        </div>
+        <div class="font16" id="newContent"></div>
+<!--        <div class="share">-->
+<!--            <p class="fl">分享到:</p>-->
+<!--            <img src="../../static/images/icon5.png" alt=""/>-->
+<!--            <img src="../../static/images/icon6.png" alt=""/>-->
+<!--            <img src="../../static/images/icon7.png" alt=""/>-->
+<!--        </div>-->
+    </div>
+    <!--底部链接  -->
+    <div class="bottomLink">
+            <div class="w-1200">
+                <div class="w-1000 fl">
+                    <p class="bottomLink-tit"><i class="el-icon-link"></i>友情链接</p>
+                    <script id="friendsLinksData" type="text/html">
+                        {{each friendsLinksList as value i}}
+                            <a href="{{value.url}}" target="_blank">{{value.name}}</a>
+                        {{/each}}
+                    </script>
+                    <div class="bottomLink-linkList" id="friendsLinksContent"></div>
+                    <p class="ba" id="webConfigRecord"></p>
+                    <p class="ba" id="webConfigAddress"></p>
+                </div>
+                <div class="ewm fr">
+                    <img src="../../static/images/ewm.jpg" width="110" height="110" alt="" />
+                    <p class="ewmtit">关注公众号 了解详情</p>
+                </div>
+                <div class="clear"></div>
+            </div>
+        </div>
+</div>
+</body>
+<script src="../../static/js/common/require.js" data-main="../../static/js/common/main.js?t=101" id="require-page"
+        target-module="../../static/js/project/policy/policyDetail.js" defer type="text/javascript"></script>
+</html>
\ No newline at end of file
diff --git a/view/user/user.html b/view/user/user.html
index 0766137..d862d0a 100644
--- a/view/user/user.html
+++ b/view/user/user.html
@@ -158,6 +158,7 @@
         <div class="fl userTable" id="userInformation">
             <input type="button" id="user" onclick="tabCheck('user')" class="active" value="用户资料"/>
             <input type="button" id="bank" onclick="tabCheck('bank')" value="银行账户信息"/>
+            <input type="button" id="passWord" onclick="tabCheck('passWord')" value="修改密码"/>
 
             <script id="userInformationData" type="text/html">
                 <tr>
@@ -276,6 +277,26 @@
                 </tr>
             </table>
 
+            <!--  我的资料 — 修改密码      -->
+            <table width="100%" id="passWordInformationContent" style="display: none;">
+                <tr>
+                    <td style="border: none;"><span>*</span>原密码:</td>
+                    <td style="border: none;"><input type="password" id="originalPassWord" class="p-l-10" style="width: 30%"/></td>
+                </tr>
+                <tr>
+                    <td><span>*</span>新密码:</td>
+                    <td><input type="password" id="newPassWord" class="p-l-10" style="width: 30%"/></td>
+                </tr>
+                <tr>
+                    <td><span>*</span>确认密码:</td>
+                    <td><input type="password" id="determinePassWord" class="p-l-10" style="width: 30%"/></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td><p onclick="editPassword('passWord')">保存</p></td>
+                </tr>
+            </table>
+
 
             <!--  我的资料 — 更换手机号      -->
             <table width="100%" id="phoneInformationContent" style="display: none;">
@@ -300,7 +321,7 @@
 
         <!--  我的供求     -->
         <div class="fl supplyTable" id="supplyInformation" style="display: none;">
-            <input type="button" onclick="goSupply()" id="goSupply" value="发布供求"/>
+            <input type="button" onclick="goSupply()" id="goSupply" class="fr" value="发布供求"/>
             <div class="clear"></div>
             <script id="userSupplyInformationData" type="text/html">
                 <tr>