产权交易问题修改

static/css/bidding/biddingBigData.css

@@ -165,7 +165,7 @@
 
 .tableList{
     width: 100%!important;
-    height: calc(100vh - 130px - 3vh - 10vh)!important;
+    height: calc(100vh - 130px - 10vh)!important;
 }
 
 .tableList table tr:nth-child(odd){
@@ -184,6 +184,7 @@
 
 .tableType{
     background: #133194!important;
+    text-align: center!important;
 }
 
 .bidding input[type='button']{
@@ -213,11 +214,12 @@ select{
 
 .bidding{
     width: 98%;
-    margin: 0 auto;
+    margin: 30px auto 0;
 }
 
 .tableType p{
     color: #ffffff!important;
+    margin-left: 0px!important;
 }
 
 .topTit_content{
@@ -533,4 +535,4 @@ select{
     100% {
         opacity: 1;
     }
-}
+}

static/js/project/bidding/biddingBigData.js

@@ -18,15 +18,15 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t
     module.init = function (page) {
         //查询交易项目浏览总次数
         // tools.doGet(biddingHallList + '/0/10', {}, module.biddingHallList, true);
-        tools.doGet(biddingList, {deptId:100}, module.biddingHallList,true);
+        tools.doGet(biddingList, {deptId:100,projectShowStatus:'正在竞价'}, module.biddingHallList,true);
         //竞价大厅-滚动
         // module.hallRolling();
 
         //标的物类型
-        tools.doGet(webDeptType+"/project_type", {}, module.deptType,true);
+        //tools.doGet(webDeptType+"/project_type", {}, module.deptType,true);
 
         //标的物所在地
-        tools.doGet(webDept, {deptId:''}, module.deptLocation, true);
+        //tools.doGet(webDept, {deptId:''}, module.deptLocation, true);
 
         $("#nowDateNYR").html(new Date().getFullYear()+'.'+(new Date().getMonth()+1)+'.'+new Date().getDate())
 

static/js/project/bidding/biddingList.js

@@ -18,7 +18,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT
             //页码集合
             pageList: [],
             //每页数量
-            pageSize: 50,
+            pageSize: 20,
             //总页数
             pageCount:0,
             //标的物选中项id
@@ -45,8 +45,6 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT
                 // signupStopTime:'',
                 // biddingStartTime:'',
                 // biddingStopTime:'',
-                pageNum:1,
-                pageSize:1,
             }
         },
     };
@@ -58,7 +56,12 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT
         //底部友情链接
         tools.doGet(friendsLinks, {}, module.bottomFriendsLinks, true);
         //新闻资讯
-        tools.doGet(biddingList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.biddingList,true);
+        tools.doGet(biddingList, {
+            deptId:100,
+            pageNum:module.data.pageNum,
+            pageSize:module.data.pageSize,
+            projectShowStatus:'正在竞价'
+        }, module.biddingList,true);
 
         //标的物类型
         tools.doGet(webDeptType+"/project_type", {}, module.deptType,true);
@@ -279,7 +282,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT
 
     turnThePage = function (pageNum) {
         module.data.pageNum = pageNum ;
-        tools.doGet(biddingList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.itemList,true);
+        tools.doGet(biddingList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.biddingList,true);
     }
 
     typeCheck = function(id,projectNumber){
@@ -322,6 +325,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT
 
     goSearch = function(){
         module.data.itemsInformationList = '';
+        module.data.biddingInformationList = [];
         $('.page_s1').html('')
         $('#page_s1').html('')
         module.data.form.deptId = module.data.deptId;

view/announcement/inviteTendersDetail.html

@@ -213,6 +213,12 @@
                     <td>招标书领取结束日期</td>
                     <td>{{announcementInformationDetail.stopTime}}</td>
                 </tr>
+                <tr>
+                    <td>招标评审时间</td>
+                    <td>{{announcementInformationDetail.revieveAt}}</td>
+                    <td>招标评审地点</td>
+                    <td>{{announcementInformationDetail.revieveAddress}}</td>
+                </tr>
 
             </script>
         </table>

view/bidding/biddingBigData.html

@@ -38,49 +38,50 @@
             <img src="../../static/images/bigData_logo.png" alt="" class="logoData">
 
             <div class="time">
+                <div style="display: none;" class="rech" onclick="rechSelect()"><img src="../../static/images/rech.png" alt="" /></div>
                 <div id="nowDateNYR"></div>
                 <div id="nowDateSFM"></div>
                 <a href="/"><img src="../../static/images/home.png" alt=""></a>
             </div>
         </div>
 
-        <div class="tab_select">
-            <div class="tab_main">
-                <div class="tab1 active" id="statusall" onclick="selectedStatus('all','')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>
-                <div class="tab2" id="status1" onclick="selectedStatus('1','正在报名')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>
-                <div class="tab3" id="status2" onclick="selectedStatus('2','等待竞价')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>
-                <div class="tab4" id="status3" onclick="selectedStatus('3','正在竞价')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>
-                <div class="tab5" id="status4" onclick="selectedStatus('4','等待成交')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>
-                <div class="tab6" id="status5" onclick="selectedStatus('5','已经成交')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>
-            </div>
+<!--        <div class="tab_select">-->
+<!--            <div class="tab_main">-->
+<!--                <div class="tab1 active" id="statusall" onclick="selectedStatus('all','')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>-->
+<!--                <div class="tab2" id="status1" onclick="selectedStatus('1','正在报名')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>-->
+<!--                <div class="tab3" id="status2" onclick="selectedStatus('2','等待竞价')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>-->
+<!--                <div class="tab4" id="status3" onclick="selectedStatus('3','正在竞价')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>-->
+<!--                <div class="tab5" id="status4" onclick="selectedStatus('4','等待成交')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>-->
+<!--                <div class="tab6" id="status5" onclick="selectedStatus('5','已经成交')"><img src="../../static/images/icon_jj_bg.png" alt="" style="width: 6vw;height: 3vh;display: none;"></div>-->
+<!--            </div>-->
 
-            <div class="select_main">
-                <select name="" id="deptLocationContent" onchange="goSearch('dept')">
-                    <script id="deptLocationData" type="text/html">
-                        <option value="100">请选择所在镇</option>
-                        {{each deptLocationList as value i}}
-                        <option value="{{value.deptId}}">{{value.deptName}}</option>
-                        {{/each}}
-                    </script>
-                </select>
-                <select name="" id="secondDept" onchange="goSearch('secondDept')" style="display: none;">
-                    <script id="deptSecondLocationData" type="text/html">
-                        <option value="">请选择所在村</option>
-                        {{each deptSecondLocationList as value i}}
-                        <option value="{{value.deptId}}">{{value.deptName}}</option>
-                        {{/each}}
-                    </script>
-                </select>
-                <select name="" id="deptTypeContent" onchange="goSearch()">
-                    <script id="deptTypeData" type="text/html">
-                        <option value="">请选择类型</option>
-                        {{each deptTypeList as value i}}
-                        <option value="{{value.dictValue}}">{{value.dictLabel}}</option>
-                        {{/each}}
-                    </script>
-                </select>
-            </div>
-        </div>
+<!--            <div class="select_main">-->
+<!--                <select name="" id="deptLocationContent" onchange="goSearch('dept')">-->
+<!--                    <script id="deptLocationData" type="text/html">-->
+<!--                        <option value="100">请选择所在镇</option>-->
+<!--                        {{each deptLocationList as value i}}-->
+<!--                        <option value="{{value.deptId}}">{{value.deptName}}</option>-->
+<!--                        {{/each}}-->
+<!--                    </script>-->
+<!--                </select>-->
+<!--                <select name="" id="secondDept" onchange="goSearch('secondDept')" style="display: none;">-->
+<!--                    <script id="deptSecondLocationData" type="text/html">-->
+<!--                        <option value="">请选择所在村</option>-->
+<!--                        {{each deptSecondLocationList as value i}}-->
+<!--                        <option value="{{value.deptId}}">{{value.deptName}}</option>-->
+<!--                        {{/each}}-->
+<!--                    </script>-->
+<!--                </select>-->
+<!--                <select name="" id="deptTypeContent" onchange="goSearch()">-->
+<!--                    <script id="deptTypeData" type="text/html">-->
+<!--                        <option value="">请选择类型</option>-->
+<!--                        {{each deptTypeList as value i}}-->
+<!--                        <option value="{{value.dictValue}}">{{value.dictLabel}}</option>-->
+<!--                        {{/each}}-->
+<!--                    </script>-->
+<!--                </select>-->
+<!--            </div>-->
+<!--        </div>-->
 
         <div class="bidding">
             <table width="100%" class="tableHead" style="table-layout: fixed;" >
@@ -119,9 +120,10 @@
                 <table width="100%;" cellpadding="0" cellspacing="0" style="table-layout: fixed;" id="biddingHallListContent"></table>
             </div>
             <div class="tableType">
-                <p><i></i>未开始</p>
-                <p><i></i>进行中</p>
-                <p><i></i>已结束</p>
+<!--                <p><i></i>未开始</p>-->
+<!--                <p><i></i>进行中</p>-->
+<!--                <p><i></i>已结束</p>-->
+                <p>技术支持：北京农燊高科信息技术有限公司</p>
             </div>
         </div>
 

view/bidding/biddingBigDataDetail.html

@@ -70,7 +70,7 @@
                     </div>
                     <table width="100%" class="tableHead" style="table-layout: fixed;" >
                         <tr>
-                            <td>出价人</td>
+                            <td>出价人代号</td>
                             <td>联系电话</td>
                             <td>出价（元）</td>
                             <td>出价时间</td>
@@ -81,7 +81,7 @@
                             <script id="biddingInformationData" type="text/html">
                             {{each biddinglistInformationDetail as value i}}
                             <tr>
-                                <td>{{value.userName}}</td>
+                                <td>{{value.memberId}}</td>
                                 <td>{{value.userAccount}}</td>
                                 <td>{{value.money}}</td>
                                 <td>{{value.loginTime}}</td>
@@ -117,7 +117,7 @@
                             <p>{{outProjectInformationDetail.price}}</span>{{outProjectInformationDetail.unit}}</p>
                         </div>
                         <div>
-                            <p>目前最优出价</p>
+                            <p>最{{outProjectInformationDetail.biddingDirect=='反向竞价'?'低':'高'}}出价</p>
                             <img src="../../static/images/tt_border.png" alt="">
 
                             {{if biddinglistInformationDetail!=undefined && biddinglistInformationDetail.length>0 }}
@@ -129,10 +129,10 @@
                     </div>
 
                     <div class="content_box_right_num">
-                        <p>当前最优出价人（相同出价时以最终成交为准！）</p>
+                        <p>最新出价人代号（相同出价时以最终成交为准！）</p>
                         <img src="../../static/images/tt_border.png" alt="">
                         {{if biddinglistInformationDetail!=undefined && biddinglistInformationDetail.length>0 }}
-                        <p>{{biddinglistInformationDetail[0].userName}}</p>
+                        <p>{{biddinglistInformationDetail[0].memberId}}</p>
                         {{else}}
                         <p>无</p>
                         {{/if}}

view/bidding/biddingList.html

@@ -189,7 +189,7 @@
                 <tr class="auction_tr">
                     <td class="auction_td">项目状态</td>
                     <td>
-                        <div class="auction_hall_table_tab auction_hall_table_tab_select" id="statusall"
+                        <div class="auction_hall_table_tab" id="statusall"
                              onclick="selectedStatus('all')">全部
                         </div>
 
@@ -197,7 +197,7 @@
 
                         <div class="auction_hall_table_tab" id="status2" onclick="selectedStatus('2','等待竞价')">等待竞价</div>
 
-                        <div class="auction_hall_table_tab" id="status3" onclick="selectedStatus('3','正在竞价')">正在竞价</div>
+                        <div class="auction_hall_table_tab auction_hall_table_tab_select" id="status3" onclick="selectedStatus('3','正在竞价')">正在竞价</div>
 
                         <div class="auction_hall_table_tab" id="status4" onclick="selectedStatus('4','等待成交')">等待成交</div>