From 63d08b8bb82a0e8f73cd35e45abf46a2c6722a90 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, 14 Mar 2023 14:46:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/js/project/listingItems/items.js     | 13 ++++++++++++-
 static/js/project/listingItems/itemsList.js |  2 +-
 view/listingItems/itemsDetail.html          |  6 ++++--
 view/user/user.html                         |  4 ++--
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/static/js/project/listingItems/items.js b/static/js/project/listingItems/items.js
index 44e4c79..c8e7ace 100644
--- a/static/js/project/listingItems/items.js
+++ b/static/js/project/listingItems/items.js
@@ -363,6 +363,17 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
 
     //出价
     biddingSubmitMethod = function (data) {
+        if (module.data.outProjectInformationDetail.biddingDirect == '递减竞价'){
+            if(module.data.outProjectInformationDetail.price<$('#money').val()){
+                tools.initError('出价不能高于挂牌价');
+                return;
+            }
+        }else{
+            if(module.data.outProjectInformationDetail.price>$('#money').val()){
+                tools.initError('出价不能低于挂牌价');
+                return;
+            }
+        }
         var data = {};
         var projectId = getQueryVariable('id');
         var memberId = tools.getCookie('memberId');
@@ -548,7 +559,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
     }
 
     moneyChange = function(){
-        if (module.data.outProjectInformationDetail.biddingDirect == '反向竞价'){
+        if (module.data.outProjectInformationDetail.biddingDirect == '递减竞价'){
             if(module.data.outProjectInformationDetail.price<$('#money').val()){
                 $('#money').val(module.data.outProjectInformationDetail.price-1);
             }
diff --git a/static/js/project/listingItems/itemsList.js b/static/js/project/listingItems/itemsList.js
index 5847c8a..be55583 100644
--- a/static/js/project/listingItems/itemsList.js
+++ b/static/js/project/listingItems/itemsList.js
@@ -327,7 +327,7 @@ define(['jquery', "template", "Tools", "itemsApi", "paging", 'dateTime', 'swiper
             projectNumber = "";
         }
         module.data.projectNumber = projectNumber;//标的物类型ID
-        //console.log(id+'----------------'+projectNumber)
+        console.log(id+'----------------'+projectNumber)
         document.getElementById('standardTypeAll').className = 'auction_hall_table_tab';
         if (id == '') {
             id = 'All';
diff --git a/view/listingItems/itemsDetail.html b/view/listingItems/itemsDetail.html
index da3a2fc..546ef5f 100644
--- a/view/listingItems/itemsDetail.html
+++ b/view/listingItems/itemsDetail.html
@@ -131,7 +131,7 @@
     <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="../demand/demand.html">个人供求</a></li>
@@ -222,7 +222,7 @@
                             <td>保证金</td>
                             <td><span>{{outProjectInformationDetail.deposit}}</span> 元</td>
                         </tr>
-                        {{if outProjectInformationDetail.biddingType == '拍卖'}}
+                        {{if outProjectInformationDetail.biddingType == '拍卖' && biddinglistInformationDetail.length>0}}
                         <tr>
                             <td>当前价格</td>
                             <td><span>{{biddinglistInformationDetail[0].money}}</span> 元</td>
@@ -232,6 +232,7 @@
 
                     <div style="display: none;" id="swiperType" class="swiperInput">
                         <table>
+                            {{if signup == 1}}
                             <tr>
                                 <td>
                                     <p class="fl inputTit">出价</p>
@@ -246,6 +247,7 @@
                                     </div>
                                 </td>
                             </tr>
+                            {{/if}}
                             <tr>
                                 <td></td>
                                 <td>
diff --git a/view/user/user.html b/view/user/user.html
index af2c9ed..320f3ad 100644
--- a/view/user/user.html
+++ b/view/user/user.html
@@ -128,7 +128,7 @@
     <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="../demand/demand.html">个人供求</a></li>
@@ -527,7 +527,7 @@
                     <tr>
                         <td>{{i+1}}</td>
                         <td>{{value.projectName}}</td>
-                        <td>{{value.biddingStopTime.substr(0,10)}}</td>
+                        <td>{{value.biddingStopTime}}</td>
                         <td>{{value.memberMoney}}</td>
                         <td>{{value.money}}</td>
                         <td>{{value.projectShowStatus}}</td>