Merge branch 'newProperty' of http://116.255.223.226:3000/zhangzl/nsgk_web into newProperty

.idea/misc.xml

@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="FindBugsConfigurable">
+    <option name="make" value="true" />
+    <option name="effort" value="default" />
+    <option name="priority" value="Medium" />
+    <option name="excludeFilter" value="" />
+  </component>
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
+  <component name="SuppressionsComponent">
+    <option name="suppComments" value="[]" />
+  </component>
 </project>

view/announcement/announcement.html

@@ -127,9 +127,9 @@
     <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="../listingItems/itemsList.html">交易项目</a></li>
             <li><a href="../bidding/biddingList.html">竞价大厅</a></li>
-            <li class="active"><a href="../announcement/announcement.html">项目公告</a></li>
+            <li class="active"><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>

view/bidding/biddingList.html

@@ -127,9 +127,9 @@
     <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="../listingItems/itemsList.html">交易项目</a></li>
             <li class="active"><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>

view/demand/demand.html

@@ -125,9 +125,9 @@
     <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="../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 class="active"><a href="../demand/demand.html">个人供求</a></li>
             <li><a href="../new/newList.html">新闻资讯</a></li>
             <li><a href="../policy/policy.html">政策法规</a></li>

view/interact/interactList.html

@@ -125,9 +125,9 @@
     <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="../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>

view/listingItems/itemsList.html

@@ -129,9 +129,9 @@
     <div class="top">
         <ul class="container w-1200">
             <li><a href="../../index.html">首页</a></li>
-            <li class="active"><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="../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>
@@ -244,7 +244,7 @@
                 <table width="100%" class="tableHead" style="table-layout: fixed;" >
                     <tr>
                         <td>项目名称</td>
-                        <td>挂牌价格</td>
+                        <td>转出价格</td>
                         <td>转出方</td>
                         <td>报名结束</td>
                         <td>竞价结束</td>

view/new/newList.html

@@ -125,9 +125,9 @@
     <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="../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 class="active"><a href="../new/newList.html">新闻资讯</a></li>
             <li><a href="../policy/policy.html">政策法规</a></li>

view/policy/policy.html

@@ -127,9 +127,9 @@
     <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="../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 class="active"><a href="../policy/policy.html">政策法规</a></li>