产权交易

index.html

@@ -220,7 +220,13 @@
                             <td>{{value.signupStopTime}}</td>
                             <td>{{value.biddingStartTime}}</td>
                             <td>{{value.price}}</td>
-                            <td>{{value.money}}</td>
+                            <td>
+                                {{if value.biddingType=='自由竞价'&&value.timeType!='已结束'}}
+                                *
+                                {{else}}
+                                {{value.money}}
+                                {{/if}}
+                            </td>
                             <td>{{value.timeType}}</td>
                             <td>
                                 <input type="button" onclick="goDetail({{value.id}})" value="我要竞价" />

static/js/project/bidding/biddingBigData.js

@@ -42,7 +42,6 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t
             var content = data.rows;
             //console.log(content)
 
-            module.data.biddingHallListList = content;
             for(var i = 0 ; i < content.length ; i++){
                 if(content[i].biddingStopTime == null || content[i].biddingStartTime == null){continue;}
                 var endTimes=content[i].biddingStopTime.substring(0,10).split('-');
@@ -70,6 +69,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t
                     content[i].timeType = '未开始'
                 }
             }
+            module.data.biddingHallListList = content;
             //console.log(content)
             var biddingHallListData = template('biddingHallListData', module.data);
             $("#biddingHallListContent").html(biddingHallListData);

static/js/project/bidding/biddingList.js

@@ -172,7 +172,6 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT
                 $('#page_s1').html('共'+pageCount+'页')
             }
             module.data.pageCount = pageCount;
-            module.data.biddingInformationList = content;
             for(var i = 0 ; i < content.length ; i++){
                 if(content[i].biddingStopTime == null || content[i].biddingStartTime == null){continue;}
                 var endTimes=content[i].biddingStopTime.substring(0,10).split('-');
@@ -200,6 +199,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT
                     content[i].timeType = '未开始'
                 }
             }
+            module.data.biddingInformationList = content;
             var biddingInformationData = template('biddingInformationData', module.data);
             $("#biddingInformationContent").html(biddingInformationData);
         }

static/js/project/index.js

@@ -572,8 +572,6 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
         if (data.code == 200) {
             var content = data.data;
             //console.log(content)
-
-            module.data.biddingHallListList = content;
             for(var i = 0 ; i < content.length ; i++){
                 if(content[i].biddingStopTime == null || content[i].biddingStartTime == null){continue;}
                 var endTimes=content[i].biddingStopTime.substring(0,10).split('-');
@@ -601,6 +599,8 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
                     content[i].timeType = '未开始'
                 }
             }
+
+            module.data.biddingHallListList = content;
             //console.log(content)
             var biddingHallListData = template('biddingHallListData', module.data);
             $("#biddingHallListContent").html(biddingHallListData);

static/js/project/listingItems/items.js

@@ -154,6 +154,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
             $('#countDown').html('<span>距竞价结束还有：'+d+'</span>天<span>'+h+'</span>时<span>'+m+'</span>分<span>'+s+'</span>秒')
         }else if (nowTime>Date.parse(biddingStopTime)){
             //竞价结束
+            $('#countType').html('')
             $('#countDown').html('竞价结束')
             document.getElementById('swiperType').style.display = 'none';
             document.getElementById('biddingTable').style.display = 'table-block';

view/bidding/biddingBigData.html

@@ -18,6 +18,9 @@
     <div class="main" id="page">
         <div id="userLogin" style="display: none;"></div>
         <div id="userInfo" style="display: none;"></div>
+        <div id="userRealName" style="display: none;"></div>
+        <div id="userRealName2" style="display: none;"></div>
+        <div id="headHover" style="display: none;"></div>
 
         <div class="head">
             <div class="head_bg"></div>
@@ -101,7 +104,13 @@
                         <td>{{value.signupStopTime}}</td>
                         <td>{{value.biddingStartTime}}</td>
                         <td>{{value.price}}</td>
-                        <td>{{value.money}}</td>
+                        <td>
+                            {{if value.biddingType=='自由竞价'&&value.timeType!='已结束'}}
+                                *
+                            {{else}}
+                                {{value.money}}
+                            {{/if}}
+                        </td>
                         <td>{{value.timeType}}</td>
                         <td><input type="button" onclick="goDetail({{value.id}})" value="详情" style="margin-left: 10px;" /></td>
                     </tr>

view/bidding/biddingBigDataDetail.html

@@ -18,6 +18,9 @@
     <div class="main" id="page">
         <div id="userLogin" style="display: none;"></div>
         <div id="userInfo" style="display: none;"></div>
+        <div id="userRealName" style="display: none;"></div>
+        <div id="userRealName2" style="display: none;"></div>
+        <div id="headHover" style="display: none;"></div>
 
         <div class="head">
             <div class="head_bg"></div>
@@ -113,8 +116,7 @@
                         <div>
                             <p>目前最优出价</p>
                             <img src="../../static/images/tt_border.png" alt="">
-                            {{outProjectInformationDetail.biddinglistInformationDetail}}
-                            {{outProjectInformationDetail.biddinglistInformationDetail.length}}
+
                             {{if outProjectInformationDetail.biddinglistInformationDetail!=undefined && outProjectInformationDetail.biddinglistInformationDetail.length>0 }}
                             <p style="color: #ff6c92">{{outProjectInformationDetail.biddinglistInformationDetail[0].money}}{{outProjectInformationDetail.unit}}</p>
                             {{else}}

view/listingItems/itemsDetail.html

@@ -133,7 +133,7 @@
             <li><a href="../../index.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="../announcement/announcement.html">公示公告</a></li>
             <li><a href="../demand/demand.html">个人供求</a></li>
             <li><a href="../new/newList.html">新闻资讯</a></li>
             <li><a href="../policy/policy.html">政策法规</a></li>