荣成产交问题修改

static/js/project/listingItems/items2.js

@@ -154,11 +154,11 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
             //正在竞价
             // console.log('正在竞价')
             module.data.biddingTimeType = 1;
-            if(module.data.outProjectInformationDetail.biddingType == '自由竞价'){
-                document.getElementById('biddingTable').style.display = 'none';
-                document.getElementById('biddingTitle').style.display = 'block';
-                document.getElementById('biddingTitle').innerHTML = '竞价进行中...';
-            }
+            // if(module.data.outProjectInformationDetail.biddingType == '自由竞价'){
+            //     document.getElementById('biddingTable').style.display = 'none';
+            //     document.getElementById('biddingTitle').style.display = 'block';
+            //     document.getElementById('biddingTitle').innerHTML = '竞价进行中...';
+            // }
             // document.getElementById('swiperType').style.display = 'block';
             d = Math.floor(leftTime/1000/60/60/24);
             h = Math.floor(leftTime/1000/60/60%24);
@@ -186,8 +186,8 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
             $('#countType').html('')
             $('#countDown').html('竞价结束')
             // document.getElementById('swiperType').style.display = 'none';
-            document.getElementById('biddingTable').style.display = 'table';
-            document.getElementById('biddingTitle').style.display = 'none';
+            // document.getElementById('biddingTable').style.display = 'table';
+            // document.getElementById('biddingTitle').style.display = 'none';
             module.data.biddingTimeType = 2;
         }else if (nowTime<Date.parse(biddingStartTime)){
             leftTime = Date.parse(biddingStartTime)-nowTime;
@@ -298,8 +298,8 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
         }
 
         if(module.data.outProjectInformationDetail.biddingType != '自由竞价' && module.data.biddingTimeType != 2){
-            document.getElementById('biddingTable').style.display = 'table';
-            document.getElementById('biddingTitle').style.display = 'none';
+            // document.getElementById('biddingTable').style.display = 'table';
+            // document.getElementById('biddingTitle').style.display = 'none';
         }
     }
 
@@ -460,11 +460,11 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
                 if ( differenceSetime <= 0 && difference >= 0 && difference <= centerTime){
                     console.log("竞价最后两分钟")
                     //正在竞价
-                    if(module.data.outProjectInformationDetail.biddingType == '自由竞价'){
-                        document.getElementById('biddingTable').style.display = 'none';
-                        document.getElementById('biddingTitle').style.display = 'block';
-                        document.getElementById('biddingTitle').innerHTML = '竞价进行中...';
-                    }
+                    // if(module.data.outProjectInformationDetail.biddingType == '自由竞价'){
+                    //     document.getElementById('biddingTable').style.display = 'none';
+                    //     document.getElementById('biddingTitle').style.display = 'block';
+                    //     document.getElementById('biddingTitle').innerHTML = '竞价进行中...';
+                    // }
                     // document.getElementById('swiperType').style.display = 'block';
                     module.data.biddingTimeType = 1;
                     $('#countType').html('竞价中')
@@ -564,8 +564,8 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
                                     $('#timeDown').css('display','none');
                                     $('.swiperInput').css('display','none');
                                     // document.getElementById('swiperType').style.display = 'none';
-                                    document.getElementById('biddingTable').style.display = 'table';
-                                    document.getElementById('biddingTitle').style.display = 'none';
+                                    // document.getElementById('biddingTable').style.display = 'table';
+                                    // document.getElementById('biddingTitle').style.display = 'none';
                                     module.data.biddingTimeType = 2;
                                     return;
                                 }
@@ -582,10 +582,10 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
                     if (!biddingStopTime){console.log('缺失竞价结束时间');return;}
                     module.dataCompare(signupStartTime,signupStopTime,biddingStartTime,biddingStopSetime);
                 }
-                if(module.data.outProjectInformationDetail.biddingType == '自由竞价' && module.data.biddingTimeType != 2){
-                    document.getElementById('biddingTable').style.display = 'none';
-                    document.getElementById('biddingTitle').style.display = 'block';
-                }
+                // if(module.data.outProjectInformationDetail.biddingType == '自由竞价' && module.data.biddingTimeType != 2){
+                //     document.getElementById('biddingTable').style.display = 'none';
+                //     document.getElementById('biddingTitle').style.display = 'block';
+                // }
             },1000)
 
 
@@ -866,8 +866,8 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
                     $('#countType').html('')
                     $('#countDown').html('竞价结束')
                     // document.getElementById('swiperType').style.display = 'none';
-                    document.getElementById('biddingTable').style.display = 'table';
-                    document.getElementById('biddingTitle').style.display = 'none';
+                    // document.getElementById('biddingTable').style.display = 'table';
+                    // document.getElementById('biddingTitle').style.display = 'none';
                     module.data.biddingTimeType = 2;
                     return;
                 }

view/bidding/biddingBigDataDetail.html

@@ -79,20 +79,22 @@
                     <div class="tableList" id="tableList" style="height: calc(100vh - 130px - 27vh)!important">
                         <table width="100%;" id="biddingInformationContent" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
                             <script id="biddingInformationData" type="text/html">
-                            {{each biddinglistInformationDetail as value i}}
-                            <tr>
-                                <td>{{value.memberId}}</td>
-                                <td>{{value.userAccount}}</td>
-                                <td>
-                                    {{if (outProjectInformationDetail.biddingType=='自由竞价' || outProjectInformationDetail.biddingType=='1')&&outProjectInformationDetail.projectShowStatus!='已经成交'}}
-                                    *
-                                    {{else}}
-                                    {{value.money}}
-                                    {{/if}}
-                                </td>
-                                <td>{{value.loginTime}}</td>
-                            </tr>
-                            {{/each}}
+                                {{if ((outProjectInformationDetail.biddingType=='自由竞价' && outProjectInformationDetail.biddingType=='1')&&outProjectInformationDetail.projectShowStatus=='已经成交') || (outProjectInformationDetail.biddingType!='自由竞价' && outProjectInformationDetail.biddingType!='1')}}
+                                    {{each biddinglistInformationDetail as value i}}
+                                    <tr>
+                                        <td>{{value.memberId}}</td>
+                                        <td>{{value.userAccount}}</td>
+                                        <td>
+                                            {{if (outProjectInformationDetail.biddingType=='自由竞价' || outProjectInformationDetail.biddingType=='1')&&outProjectInformationDetail.projectShowStatus!='已经成交'}}
+                                                *
+                                            {{else}}
+                                                {{value.money}}
+                                            {{/if}}
+                                        </td>
+                                        <td>{{value.loginTime}}</td>
+                                    </tr>
+                                    {{/each}}
+                                {{/if}}
                             </script>
                         </table>
                     </div>

view/listingItems/itemsDetail.html

@@ -536,6 +536,7 @@
 
         <script id="biddinglistInformationData" type="text/html">
             <h1>·竞价记录</h1>
+            {{if ((outProjectInformationDetail.biddingType=='自由竞价' && outProjectInformationDetail.biddingType=='1')&&outProjectInformationDetail.projectShowStatus=='已经成交') || (outProjectInformationDetail.biddingType!='自由竞价' && outProjectInformationDetail.biddingType!='1')}}
             <table cellspacing="0" cellpadding="0" width="100%" id="biddingTable">
                 <tr>
                     <td>出价人代号</td>
@@ -556,7 +557,9 @@
                     </tr>
                 {{/each}}
             </table>
-            <p id="biddingTitle" style="display: none;text-align: center;font-size: 24px;color: #999;">竞价进行中...</p>
+            {{else}}
+                <p id="biddingTitle">项目成交前无法查看竞价记录！</p>
+            {{/if}}
         </script>
         <div style="display: none;height: 500px;overflow-y: scroll;" id="tabDetail4"></div>
     </div>