From 6b27ae574c9f7e3aeadb3ca99c7865d2a7391804 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Wed, 17 Jan 2024 17:13:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=B3=E5=B1=B1=E4=BA=A7=E6=9D=83=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

---
 index.html                                        | 2 +-
 static/js/project/bidding/biddingBigDataDetail.js | 2 +-
 view/bidding/biddingBigData.html                  | 2 +-
 view/bidding/biddingBigDataDetail.html            | 4 ++--
 view/bidding/biddingList.html                     | 2 +-
 view/listingItems/itemsDetail.html                | 2 +-
 view/user/user.html                               | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/index.html b/index.html
index 9d109de..d48a278 100644
--- a/index.html
+++ b/index.html
@@ -227,7 +227,7 @@
                             <td>{{value.biddingStartTime}}</td>
                             <td>{{value.price}}</td>
                             <td style="width: 5%;">
-                                {{if value.biddingType == '自由竞价' && value.projectShowStatus != '已经成交'}}
+                                {{if value.biddingType == '自由竞价' && value.projectShowStatus == '正在竞价'}}
                                 *
                                 {{else}}
                                 {{value.money}}
diff --git a/static/js/project/bidding/biddingBigDataDetail.js b/static/js/project/bidding/biddingBigDataDetail.js
index 6a44022..fe89a2e 100644
--- a/static/js/project/bidding/biddingBigDataDetail.js
+++ b/static/js/project/bidding/biddingBigDataDetail.js
@@ -185,7 +185,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi"], function ($, t
             var biddingInformationData = template('biddingInformationData', module.data);
             $("#biddingInformationContent").html(biddingInformationData);
             if (content.length > 0){
-                if((module.data.outProjectInformationDetail.biddingType=='自由竞价'||module.data.outProjectInformationDetail.biddingType=='1')&&module.data.outProjectInformationDetail.projectShowStatus!='已经成交'){
+                if((module.data.outProjectInformationDetail.biddingType=='自由竞价'||module.data.outProjectInformationDetail.biddingType=='1')&&module.data.outProjectInformationDetail.projectShowStatus=='正在竞价'){
                     $("#biddingMoney").html('*');
                     $("#biddingPeople").html('*');
                 }else{
diff --git a/view/bidding/biddingBigData.html b/view/bidding/biddingBigData.html
index 6d03b3d..79072ac 100644
--- a/view/bidding/biddingBigData.html
+++ b/view/bidding/biddingBigData.html
@@ -106,7 +106,7 @@
                         <td>{{value.biddingStartTime}}</td>
                         <td>{{value.price}}{{value.unit}}</td>
                         <td>
-                            {{if (value.biddingType=='自由竞价' || value.biddingType=='1')&&value.projectShowStatus!='已经成交'}}
+                            {{if (value.biddingType=='自由竞价' || value.biddingType=='1')&&value.projectShowStatus=='正在竞价'}}
                                 *
                             {{else}}
                                 {{value.money}}{{if value.money}}{{value.unit}}{{/if}}
diff --git a/view/bidding/biddingBigDataDetail.html b/view/bidding/biddingBigDataDetail.html
index bd69e2d..ea66efd 100644
--- a/view/bidding/biddingBigDataDetail.html
+++ b/view/bidding/biddingBigDataDetail.html
@@ -79,13 +79,13 @@
                     <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">
-                                {{if ((outProjectInformationDetail.biddingType=='自由竞价' || outProjectInformationDetail.biddingType=='1')&&outProjectInformationDetail.projectShowStatus=='已经成交') || (outProjectInformationDetail.biddingType!='自由竞价' && outProjectInformationDetail.biddingType!='1')}}
+                                {{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!='已经成交'}}
+                                            {{if (outProjectInformationDetail.biddingType=='自由竞价' || outProjectInformationDetail.biddingType=='1')&&outProjectInformationDetail.projectShowStatus=='正在竞价'}}
                                             *
                                             {{else}}
                                             {{value.money}}
diff --git a/view/bidding/biddingList.html b/view/bidding/biddingList.html
index 7e5d830..c2df351 100644
--- a/view/bidding/biddingList.html
+++ b/view/bidding/biddingList.html
@@ -264,7 +264,7 @@
                         <td>{{value.biddingStopSetime}}</td>
                         <td style="width: 5%;">{{value.price}}</td>
                         <td style="width: 5%;">
-                            {{if value.biddingType=='自由竞价'&&value.projectShowStatus!='已经成交'}}
+                            {{if value.biddingType=='自由竞价'&&value.projectShowStatus=='正在竞价'}}
                                 *
                             {{else}}
                                 {{value.money}}
diff --git a/view/listingItems/itemsDetail.html b/view/listingItems/itemsDetail.html
index c7dc9c2..866b303 100644
--- a/view/listingItems/itemsDetail.html
+++ b/view/listingItems/itemsDetail.html
@@ -610,7 +610,7 @@
         <script id="biddinglistInformationData" type="text/html">
             <h1>·竞价记录</h1>
 
-            {{if ((outProjectInformationDetail.biddingType=='自由竞价' || outProjectInformationDetail.biddingType=='1')&&outProjectInformationDetail.projectShowStatus=='已经成交') || (outProjectInformationDetail.biddingType!='自由竞价' && outProjectInformationDetail.biddingType!='1')}}
+            {{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>
diff --git a/view/user/user.html b/view/user/user.html
index 495bbd2..aca24b1 100644
--- a/view/user/user.html
+++ b/view/user/user.html
@@ -677,7 +677,7 @@
                         <td>{{value.projectName}}</td>
                         <td>{{value.biddingStopTime}}</td>
                         <td>
-                            {{if value.biddingType == '1' && value.projectShowStatus !='已经成交'}}
+                            {{if value.biddingType == '1' && value.projectShowStatus =='正在竞价'}}
                                 *
                             {{else}}
                                 {{value.money}}