前端修改

index.html

@@ -117,7 +117,7 @@
                 <li class="active"><a href="javascript:void(0)">首页</a></li>
                 <li><a href="view/listingItems/itemsList.html">挂牌项目</a></li>
                 <li><a href="view/bidding/biddingList.html">竞价大厅</a></li>
-                <li><a href="javascript:void(0)">项目公告</a></li>
+                <li><a href="view/announcement/announcement.html">项目公告</a></li>
                 <li><a href="view/demand/demand.html">个人供求</a></li>
                 <li><a href="view/new/newList.html">新闻资讯</a></li>
                 <li><a href="view/policy/policy.html">政策法规</a></li>
@@ -203,11 +203,11 @@
                                 <span class="m-r-20">土地</span>
                                 <span class="m-r-20">林权</span>
                                 <span class="m-r-20">四荒地</span>
-                                <span>更多></span>
+                                <span onclick="goListing()">更多></span>
                             </p>
                             <script id="landListData" type="text/html">
                                 {{each landListList as value i}}
-                                <div class="centerLeft-center-middle">
+                                <div class="centerLeft-center-middle" onclick="goDetail({{value.id}})">
 <!--                                    项目<br />公示-->
                                     <p class="centerLeft-center-lable">{{# value.projectShowStatus.slice(0,2)+'<br/>'+value.projectShowStatus.slice(2)}}</p>
                                     <img src="{{serverApi}}{{# value.fileUrl}}" alt="" width="100%" height="152px" />
@@ -254,11 +254,11 @@
                         <div>
                             <p class="centerleft-center-tit01">
                                 <span class="m-r-20">集体资产</span>
-                                <span>更多></span>
+                                <span onclick="goListing()">更多></span>
                             </p>
                             <script id="collectiveAssetsData" type="text/html">
                                 {{each collectiveAssetsList as value i}}
-                                <div class="centerLeft-center-middle">
+                                <div class="centerLeft-center-middle" onclick="goDetail({{value.id}})">
                                     <!--                                    项目<br />公示-->
                                     <p class="centerLeft-center-lable">{{# value.projectShowStatus.slice(0,2)+'<br/>'+value.projectShowStatus.slice(2)}}</p>
                                     <img src="{{serverApi}}{{# value.fileUrl}}" alt="" width="100%" height="152px" />
@@ -305,11 +305,11 @@
                         <div>
                             <p class="centerleft-center-tit01">
                                 <span class="m-r-20">农业生产设备</span>
-                                <span>更多></span>
+                                <span onclick="goListing()">更多></span>
                             </p>
                             <script id="productionEquipmentData" type="text/html">
                                 {{each productionEquipmentList as value i}}
-                                <div class="centerLeft-center-middle">
+                                <div class="centerLeft-center-middle" onclick="goDetail({{value.id}})">
                                     <!--                                    项目<br />公示-->
                                     <p class="centerLeft-center-lable">{{# value.projectShowStatus.slice(0,2)+'<br/>'+value.projectShowStatus.slice(2)}}</p>
                                     <img src="{{serverApi}}{{# value.fileUrl}}" alt="" width="100%" height="152px" />
@@ -356,11 +356,11 @@
                         <div>
                             <p class="centerleft-center-tit01">
                                 <span class="m-r-20">小型水利设施</span>
-                                <span>更多></span>
+                                <span onclick="goListing()">更多></span>
                             </p>
                             <script id="waterConservancyFacilitiesData" type="text/html">
                                 {{each waterConservancyFacilitiesList as value i}}
-                                <div class="centerLeft-center-middle">
+                                <div class="centerLeft-center-middle" onclick="goDetail({{value.id}})">
                                     <!--                                    项目<br />公示-->
                                     <p class="centerLeft-center-lable">{{# value.projectShowStatus.slice(0,2)+'<br/>'+value.projectShowStatus.slice(2)}}</p>
                                     <img src="{{serverApi}}{{# value.fileUrl}}" alt="" width="100%" height="152px" />
@@ -460,11 +460,11 @@
                     </div>
 
                     <div class="centerRight-list2">
-                        <p class="centerRight-list2-tit01">成交公告<span>更多></span></p>
+                        <p class="centerRight-list2-tit01">成交公告<span onclick="goAnnouncementList('announcement')">更多></span></p>
                         <script id="announcementListData" type="text/html">
                             {{each announcementListList as value i}}
                             <li>
-                                <p><a href="javascript:void(0)"><i class="sanjiao-right m-r-5"></i>{{# value.projectName}}</a></p>
+                                <p><a href="view/announcement/announcementDetail.html?id={{value.id}}"><i class="sanjiao-right m-r-5"></i>{{# value.projectName}}</a></p>
                                 <p><span>项目编号：<span>{{# value.projectCode}}</span></span><span>{{# value.dealTime.substr(0,10)}}</span></p>
                             </li>
                             {{/each}}
@@ -473,11 +473,11 @@
                     </div>
 
                     <div class="centerRight-list3">
-                        <p class="centerRight-list2-tit01">鉴证公告<span>更多></span></p>
+                        <p class="centerRight-list2-tit01">鉴证公告<span onclick="goAnnouncementList('attestation')">更多></span></p>
                         <script id="attestationData" type="text/html">
                             {{each attestationList as value i}}
                                 <li>
-                                    <p><a href="javascript:void(0)"><i class="sanjiao-right m-r-5"></i>{{value.projectName}}</a></p>
+                                    <p><a href="view/announcement/attestation.html?id={{value.id}}"><i class="sanjiao-right m-r-5"></i>{{value.projectName}}</a></p>
                                     <p>鉴证书编号：<span>{{value.projectCode}}</span></p>
                                 </li>
                             {{/each}}
@@ -502,12 +502,12 @@
                 <div class="container">
                     <div class="bottomNews-list">
                         <p>
-                            新闻资讯<span>更多></span>
+                            新闻资讯<span onclick="goNewList()">更多></span>
                         </p>
                         <script id="NewsInformationData" type="text/html">
                             {{each newsInformationList as value i}}
                                 <li>
-                                    <a href="javascript:void(0)">{{value.title}}</a>
+                                    <a href="view/new/newDetail.html?id={{value.id}}">{{value.title}}</a>
                                 </li>
                             {{/each}}
                         </script>
@@ -516,12 +516,12 @@
                     </div>
                     <div class="bottomNews-list">
                         <p>
-                            政策法规<span>更多></span>
+                            政策法规<span onclick="goPolicy('policy')">更多></span>
                         </p>
                         <script id="policiesRegulationsData" type="text/html">
                             {{each policiesRegulationsList as value i}}
                                 <li>
-                                    <a href="javascript:void(0)">{{value.title}}</a>
+                                    <a href="view/new/newDetail.html?id={{value.id}}">{{value.title}}</a>
                                 </li>
                             {{/each}}
                         </script>
@@ -530,12 +530,12 @@
                     </div>
                     <div class="bottomNews-list">
                         <p>
-                            交易规则<span>更多></span>
+                            交易规则<span onclick="goPolicy('rule')">更多></span>
                         </p>
                         <script id="tradingRulesData" type="text/html">
                             {{each tradingRulesList as value i}}
                                 <li>
-                                    <a href="javascript:void(0)">{{value.title}}</a>
+                                    <a href="view/new/newDetail.html?id={{value.id}}">{{value.title}}</a>
                                 </li>
                             {{/each}}
                         </script>
@@ -677,12 +677,12 @@
                 </div>
                 <div class="bottomNews-list fr">
                     <p>
-                        资料下载<span class="fr">更多></span>
+                        资料下载<span class="fr" onclick="goPolicy('download')">更多></span>
                     </p>
                     <script id="dataDownloadData" type="text/html">
                         {{each dataDownloadList as value i}}
                         <li>
-                            <a href="javascript:void(0)">{{value.title}}</a>
+                            <a href="view/new/newDetail.html?id={{value.id}}">{{value.title}}</a>
                         </li>
                         {{/each}}
                     </script>

static/css/index.css

@@ -267,6 +267,11 @@
 
 .centerLeft-center .centerleft-center-tit01 span:last-child {
   float: right;
+  cursor: pointer;
+}
+
+.centerLeft-center .centerleft-center-tit01 span:last-child:hover {
+  color: #007b76;
 }
 
 .centerLeft-center-middle {

static/js/api/items.js

@@ -69,3 +69,10 @@ var signup = '/transaction/signup/getSignupByMemberIdAndProId'//判断当前登
     id: 主键ID
 */
 var signupSubmit = '/transaction/signup'//项目报名接口
+
+/*
+@purl /transaction/bidding
+@param
+    id: 主键ID
+*/
+var biddingSubmit = '/transaction/bidding'//出价

static/js/common/tools.js

@@ -341,8 +341,8 @@ define(['jquery', 'dialog'], function ($, dialog) {
 			}
 		},
 		/**
-		 * skip 页面跳转
-		 * @param url 跳转页面链接
+		 * skip 获取时间
+		 * @param
 		 */
 		getNowFormatDate:function () {
 			var date = new Date();

static/js/project/index.js

@@ -218,6 +218,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
     module.NewsInformation = function (data) {
         if (data.code == 200) {
             var content = data.data;
+            console.log(content)
             module.data.newsInformationList = content;
             var NewsInformationData = template('NewsInformationData', module.data);
             $("#NewsInformationContent").html(NewsInformationData);
@@ -473,5 +474,25 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
         document.getElementById(type).style.display = 'inline-table';
         document.getElementById(type+'Btn').className = 'active';
     }
+
+    goDetail = function (id) {
+        tools.skip('view/listingItems/itemsDetail.html?id='+id);
+    }
+
+    goListing = function () {
+        tools.skip('view/listingItems/itemsList.html');
+    }
+
+    goAnnouncementList = function (type) {
+        tools.skip('view/announcement/announcement.html?type='+type+'&searchKeyWord=');
+    }
+
+    goNewList = function () {
+        tools.skip('view/new/newList.html');
+    }
+
+    goPolicy = function (type) {
+        tools.skip('view/policy/policy.html?type='+type);
+    }
     return module;
 });

static/js/project/listingItems/items.js

@@ -19,8 +19,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
         //项目基本信息
         tools.doGet(showImg + '/'+getQueryVariable('id'), {}, module.showImgInformation,true);
 
-        //挂牌项目竞价记录
-        tools.doGet(biddinglist, {projectId:getQueryVariable('id')}, module.biddinglistInformation,true);
+
 
     };
 
@@ -55,7 +54,8 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
             var outProjectInformationData = template('outProjectInformationData', module.data);
             $("#outProjectInformationContent").html(outProjectInformationData);
 
-
+            //挂牌项目竞价记录
+            tools.doGet(biddinglist, {projectId:getQueryVariable('id')}, module.biddinglistInformation,true);
             //挂牌价格字典
             tools.doGet(Dictionaries+'/price_unit', {}, module.unitDictionaries,true);
 
@@ -92,6 +92,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
             //判断是否报名
             tools.doGet(signup, {projectId:getQueryVariable('id'),depositStatus:'1',memberId:tools.getCookie('memberId')}, module.signup);
 
+
             //焦点图
             module.swiperBanner();
         }
@@ -126,6 +127,11 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
             module.data.biddinglistInformationDetail = content;
             var biddinglistInformationData = template('biddinglistInformationData', module.data);
             $("#tabDetail4").html(biddinglistInformationData);
+            console.log(module.data.outProjectInformationDetail)
+            if(module.data.outProjectInformationDetail.biddingType != '拍卖'){
+                document.getElementById('biddingTable').style.display = 'none';
+                document.getElementById('biddingTitle').style.display = 'block';
+            }
         }
     }
 
@@ -198,6 +204,30 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
         }
     }
 
+    //出价
+    biddingSubmitMethod = function (data) {
+        var data = {};
+        var projectId = getQueryVariable('id');
+        var memberId = tools.getCookie('memberId');
+        var userId = tools.getCookie('userId');
+        var userAccount = tools.getCookie('phone');
+        var userName = tools.getCookie('userName');
+        var money = $('#money').val();
+        var loginTime = tools.getNowFormatDate();
+        data['projectId'] = projectId;
+        data['memberId'] = memberId;
+        data['userId'] = userId;
+        data['userAccount'] = userAccount;
+        data['userName'] = userName;
+        data['money'] = money;
+        data['loginTime'] = loginTime;
+        tools.doPost(biddingSubmit, data, module.biddingSubmitOpen);
+    }
+
+    module.biddingSubmitOpen = function(){
+        tools.initError('出价成功');
+    }
+
     //经济类型
     module.economicTypeDictionaries = function (data) {
         if (data.code == 200 && module.data.outProjectInformationDetail.economicType!='') {

static/js/project/policy/policy.js

@@ -25,18 +25,43 @@ define(['jquery', "template", "Tools", "policyApi", "paging"], function ($, temp
 
     module.init = function (page) {
 
-        //政策法规
-        tools.doGet(newList, {number:3,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.policyInformation,true);
+        var type = getQueryVariable('type');
+        if(type != undefined && type != ''){
+            console.log('搜索进入')
+            tabList(type);
+            //政策法规
+            tools.doGet(newList, {number:3,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.policyInformation,true);
 
-        //交易规则
-        tools.doGet(newList, {number:4,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.ruleInformation,true);
+            //交易规则
+            tools.doGet(newList, {number:4,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.ruleInformation,true);
 
-        //资料下载
-        tools.doGet(newList, {number:5,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.downloadInformation,true);
+            //资料下载
+            tools.doGet(newList, {number:5,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.downloadInformation,true);
+        }else{
+            console.log('正常进入')
+            //政策法规
+            tools.doGet(newList, {number:3,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.policyInformation,true);
 
+            //交易规则
+            tools.doGet(newList, {number:4,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.ruleInformation,true);
+
+            //资料下载
+            tools.doGet(newList, {number:5,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.downloadInformation,true);
+        }
 
     };
 
+    //获取地址栏参数
+    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.policyInformation = function (data) {
         if (data.code == 200) {

static/js/project/user/login.js

@@ -104,6 +104,7 @@ define(['jquery', "Tools","user"], function ($, Tools) {
         if (data.code == 200) {
             var content = data.user;
             console.log(content)
+            tools.setCookie('userId', content.userId, 24 * 60 * 60);
             tools.doGet(userMember + '/' + content.userId, {}, module.userMember);//memberType 1个人 2单位
         }
     }

view/listingItems/itemsDetail.html

@@ -219,7 +219,7 @@
                                     <p class="fl inputTit">出价</p>
                                 </td>
                                 <td>
-                                    <input type="number" placeholder="{{outProjectInformationDetail.money}}" {{outProjectInformationDetail.biddingType == '阶梯竞价'? 'readonly':''}} class="fl"/>
+                                    <input type="number" id="money" value="{{outProjectInformationDetail.money}}" {{outProjectInformationDetail.biddingType == '阶梯竞价'? 'readonly':''}} class="fl"/>
                                     <div class="fl">
                                         <input type="button" value="+" onclick="upMoney()"/>
                                         <input type="button" value="-" onclick="downMoney()"/>
@@ -230,7 +230,7 @@
                                 <td></td>
                                 <td>
                                     {{if signup == 1}}
-                                    <div class="fl sign" id="signBtnYes">
+                                    <div class="sign" id="signBtnYes" onclick="biddingSubmitMethod()">
                                         <p>立即出价</p>
                                     </div>
                                     {{else}}
@@ -577,7 +577,7 @@
 
         <script id="biddinglistInformationData" type="text/html">
             <h1>·竞价记录</h1>
-            <table cellspacing="0" cellpadding="0">
+            <table cellspacing="0" cellpadding="0" id="biddingTable">
                 <tr>
                     <td>出价人账号</td>
                     <td>出价人姓名</td>
@@ -599,9 +599,10 @@
                     </tr>
                 {{/each}}
             </table>
+            <p id="biddingTitle" style="display: block;text-align: center;font-size: 24px;color: #999;">竞价进行中...</p>
         </script>
         <div style="display: none;" id="tabDetail4">
-            <p>竞价进行中</p>
+
         </div>
     </div>
     <!--底部链接  -->