diff --git a/index.html b/index.html
index 2a74b48..e517cb7 100644
--- a/index.html
+++ b/index.html
@@ -219,14 +219,14 @@
                 <div class="tableList" id="tableList">
                     <script id="biddingHallListData" type="text/html">
                         {{each biddingHallListList as value i}}
-                        <tr class="{{value.timeType == '未开始' ? 'notStart-row':''}}{{value.timeType == '进行中' ? 'now-row':''}}">
+                        <tr class="{{value.projectShowStatus == '等待竞价' ? 'notStart-row':''}}{{value.projectShowStatus == '正在竞价' ? 'now-row':''}}">
                             <td style="text-align: left;padding-left: 2%;" title="{{value.projectName}}">{{value.projectName}}</td>
                             <td>{{value.biddingType}}</td>
                             <td>{{value.signupStopTime}}</td>
                             <td>{{value.biddingStartTime}}</td>
                             <td>{{value.price}}</td>
                             <td>
-                                {{if value.biddingType=='自由竞价'&&value.timeType=='进行中'}}
+                                {{if value.biddingType == '自由竞价' && value.projectShowStatus != '已经成交'}}
                                 *
                                 {{else}}
                                 {{value.money}}
@@ -234,7 +234,12 @@
                             </td>
                             <td>{{value.projectShowStatus}}</td>
                             <td>
-                                <input type="button" onclick="goDetail({{value.id}})" value="我要竞价" />
+                                {{if value.projectShowStatus == '正在报名'}}<input type="button" onclick="goDetail({{value.id}})" value="我要报名" />{{/if}}
+                                {{if value.projectShowStatus == '正在竞价'}}<input type="button" onclick="goDetail({{value.id}})" value="我要竞价" />{{/if}}
+                                {{if value.projectShowStatus == '等待竞价'}}<input type="button" onclick="goDetail({{value.id}})" value="进入查看" />{{/if}}
+                                {{if value.projectShowStatus == '等待成交'}}<input type="button" onclick="goDetail({{value.id}})" value="进入查看" />{{/if}}
+                                {{if value.projectShowStatus == '已经成交'}}<input type="button" onclick="goDetail({{value.id}})" value="进入查看" />{{/if}}
+                                {{if value.projectShowStatus == '项目公示'}}<input type="button" onclick="goDetail({{value.id}})" value="进入查看" />{{/if}}
                             </td>
                         </tr>
                         {{/each}}
diff --git a/view/bidding/biddingBigData.html b/view/bidding/biddingBigData.html
index 397f1ff..3590eb7 100644
--- a/view/bidding/biddingBigData.html
+++ b/view/bidding/biddingBigData.html
@@ -99,21 +99,21 @@
             <div class="tableList" id="tableList">
                 <script id="biddingHallListData" type="text/html">
                     {{each biddingHallListList as value i}}
-                    <tr class="{{value.timeType == '未开始' ? 'notStart-row':''}}{{value.timeType == '进行中' ? 'now-row':''}}">
+                    <tr class="{{value.projectShowStatus == '等待竞价' ? 'notStart-row':''}}{{value.projectShowStatus == '正在竞价' ? 'now-row':''}}">
                         <td style="text-align: left;padding-left: 2%;" title="{{value.projectName}}">{{value.projectName}}</td>
                         <td>{{value.biddingType}}</td>
                         <td>{{value.signupStopTime}}</td>
                         <td>{{value.biddingStartTime}}</td>
                         <td>{{value.price}}</td>
                         <td>
-                            {{if value.biddingType=='自由竞价'&&value.timeType!='已结束'}}
+                            {{if value.biddingType=='自由竞价'&&value.projectShowStatus!='已经成交'}}
                                 *
                             {{else}}
                                 {{value.money}}
                             {{/if}}
                         </td>
-                        <td>{{value.timeType}}</td>
-                        <td><input type="button" onclick="goDetail({{value.id}},'{{value.timeType}}')" value="详情" style="margin-left: 10px;" /></td>
+                        <td>{{value.projectShowStatus}}</td>
+                        <td><input type="button" onclick="goDetail({{value.id}},'{{value.projectShowStatus}}')" value="详情" style="margin-left: 10px;" /></td>
                     </tr>
                     {{/each}}
                 </script>
diff --git a/view/bidding/biddingList.html b/view/bidding/biddingList.html
index 1922f22..ef839fd 100644
--- a/view/bidding/biddingList.html
+++ b/view/bidding/biddingList.html
@@ -263,14 +263,21 @@
                         <td>{{value.biddingStopSetime}}</td>
                         <td>{{value.price}}</td>
                         <td>
-                            {{if value.biddingType=='自由竞价'&&value.timeType!='已结束'}}
+                            {{if value.biddingType=='自由竞价'&&value.projectShowStatus!='已经成交'}}
                                 *
                             {{else}}
                                 {{value.money}}
                             {{/if}}
                         </td>
                         <td>{{value.projectShowStatus}}</td>
-                        <td><input type="button" onclick="goDetail({{value.id}})" value="我要竞价" /></td>
+                        <td>
+                            {{if value.projectShowStatus == '正在报名'}}<input type="button" onclick="goDetail({{value.id}})" value="我要报名" />{{/if}}
+                            {{if value.projectShowStatus == '正在竞价'}}<input type="button" onclick="goDetail({{value.id}})" value="我要竞价" />{{/if}}
+                            {{if value.projectShowStatus == '等待竞价'}}<input type="button" onclick="goDetail({{value.id}})" value="进入查看" />{{/if}}
+                            {{if value.projectShowStatus == '等待成交'}}<input type="button" onclick="goDetail({{value.id}})" value="进入查看" />{{/if}}
+                            {{if value.projectShowStatus == '已经成交'}}<input type="button" onclick="goDetail({{value.id}})" value="进入查看" />{{/if}}
+                            {{if value.projectShowStatus == '项目公示'}}<input type="button" onclick="goDetail({{value.id}})" value="进入查看" />{{/if}}
+                        </td>
                     </tr>
                 {{/each}}
             </script>