From d8c53ecc0ef0bc471b09ed63b2c0c7a8147b8b5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Tue, 16 Jan 2024 16:33:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=B3=E5=B1=B1=E4=BA=A7=E4=BA=A4=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/js/project/listingItems/items2.js | 48 ++++++++++++------------
 view/listingItems/itemsDetail.html       | 26 +++++++------
 2 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/static/js/project/listingItems/items2.js b/static/js/project/listingItems/items2.js
index 4f6f049..f2149c5 100644
--- a/static/js/project/listingItems/items2.js
+++ b/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;
@@ -297,10 +297,10 @@ 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';
-        }
+        // if(module.data.outProjectInformationDetail.biddingType != '自由竞价' && module.data.biddingTimeType != 2){
+        //     document.getElementById('biddingTable').style.display = 'table';
+        //     document.getElementById('biddingTitle').style.display = 'none';
+        // }
     }
 
     module.projectNum = function(data){
@@ -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;
                 }
diff --git a/view/listingItems/itemsDetail.html b/view/listingItems/itemsDetail.html
index 6c7a986..731eb61 100644
--- a/view/listingItems/itemsDetail.html
+++ b/view/listingItems/itemsDetail.html
@@ -609,6 +609,8 @@
 
         <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>
@@ -617,19 +619,21 @@
                     <td width="300px">出价时间</td>
                 </tr>
                 {{each biddinglistInformationDetail as value i}}
-                    <tr>
-                        <td>{{value.memberId}}</td>
-                        <td>{{value.money}}</td>
-                        <td>
-                            {{if i==0}}
-                                领先
-                            {{/if}}
-                        </td>
-                        <td width="300px">{{value.loginTime}}</td>
-                    </tr>
+                <tr>
+                    <td>{{value.memberId}}</td>
+                    <td>{{value.money}}</td>
+                    <td>
+                        {{if i==0}}
+                        领先
+                        {{/if}}
+                    </td>
+                    <td width="300px">{{value.loginTime}}</td>
+                </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>