From 7945cd748b741f746508947c1d57ca0fa8b342ad 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, 5 Jul 2023 15:50:40 +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 | 24 +++++++++++++----------
 view/listingItems/itemsDetail.html      | 26 ++++++++++++-------------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/static/js/project/listingItems/items.js b/static/js/project/listingItems/items.js
index 1f7c33e..11540b3 100644
--- a/static/js/project/listingItems/items.js
+++ b/static/js/project/listingItems/items.js
@@ -402,19 +402,23 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
             }
             console.log(module.data.outProjectInformationDetail.biddingDirect)
             setTimeout(function(){
-                if (module.data.outProjectInformationDetail.biddingDirect == '反向竞价'||module.data.outProjectInformationDetail.biddingDirect == '2'){
-                    if (content.length>0){
-                        document.getElementById('money').value = parseFloat(content[0].money) - parseFloat(module.data.outProjectInformationDetail.ladderPrice);
-                    }else{
-                        document.getElementById('money').value = parseFloat(parseFloat(module.data.outProjectInformationDetail.price) - parseFloat(module.data.outProjectInformationDetail.ladderPrice));
-                    }
-                }else{
-                    if (content.length>0){
-                        document.getElementById('money').value = parseFloat(content[0].money) + parseFloat(module.data.outProjectInformationDetail.ladderPrice);
+
+                if(module.data.outProjectInformationDetail.biddingType != '自由竞价'){
+                    if (module.data.outProjectInformationDetail.biddingDirect == '反向竞价'||module.data.outProjectInformationDetail.biddingDirect == '2'){
+                        if (content.length>0){
+                            document.getElementById('money').value = parseFloat(parseFloat(content[0].money) - parseFloat(module.data.outProjectInformationDetail.ladderPrice)).toFixed(2);
+                        }else{
+                            document.getElementById('money').value = parseFloat(parseFloat(module.data.outProjectInformationDetail.price) - parseFloat(module.data.outProjectInformationDetail.ladderPrice)).toFixed(2);
+                        }
                     }else{
-                        document.getElementById('money').value = parseFloat(parseFloat(module.data.outProjectInformationDetail.price) + parseFloat(module.data.outProjectInformationDetail.ladderPrice));
+                        if (content.length>0){
+                            document.getElementById('money').value = parseFloat(parseFloat(content[0].money) + parseFloat(module.data.outProjectInformationDetail.ladderPrice)).toFixed(2);
+                        }else{
+                            document.getElementById('money').value = parseFloat(parseFloat(module.data.outProjectInformationDetail.price) + parseFloat(module.data.outProjectInformationDetail.ladderPrice)).toFixed(2);
+                        }
                     }
                 }
+
             },2000)
 
             module.data.biddinglistInformationDetail = content;
diff --git a/view/listingItems/itemsDetail.html b/view/listingItems/itemsDetail.html
index be77d87..7c1e598 100644
--- a/view/listingItems/itemsDetail.html
+++ b/view/listingItems/itemsDetail.html
@@ -380,7 +380,7 @@
                     </tr>
                     <tr>
                         <td rowspan="4">转出方<br/>基本情况</td>
-                        <td colspan="12">转出方名称<span class="red">*</span></td>
+                        <td colspan="12">转出方名称</td>
                         <td colspan="15">{{outProjectInformationDetail.outName}}</td>
                     </tr>
                     <tr>
@@ -394,22 +394,22 @@
                         <td colspan="6">{{outProjectInformationDetail.areaNum}}</td>
                     </tr>
                     <tr>
-                        <td colspan="7">法人/负责人<span class="red">*</span></td>
+                        <td colspan="7">法人/负责人</td>
                         <td colspan="8">{{outProjectInformationDetail.legalPerson}}</td>
-                        <td colspan="6">联系电话<span class="red">*</span></td>
+                        <td colspan="6">联系电话</td>
                         <td colspan="6">{{outProjectInformationDetail.phone}}</td>
                     </tr>
                     <tr>
                         <td rowspan="{{25+outProjectInformationDetail.subjectList.length}}">转出项目<br/>基本情况</td>
-                        <td colspan="10">项目类型<span class="red">*</span></td>
+                        <td colspan="10">项目类型</td>
                         <td colspan="17">{{outProjectInformationDetail.projectNumber}}</td>
                     </tr>
                     <tr>
-                        <td colspan="10">农地性质<span class="red">*</span></td>
+                        <td colspan="10">农地性质</td>
                         <td colspan="17">{{outProjectInformationDetail.projectType}}</td>
                     </tr>
                     <tr>
-                        <td colspan="10">转出项目名称<span class="red">*</span></td>
+                        <td colspan="10">转出项目名称</td>
                         <td colspan="17">{{outProjectInformationDetail.projectName}}</td>
                     </tr>
                     <tr>
@@ -417,7 +417,7 @@
                         <td colspan="17">{{outProjectInformationDetail.locationName}}</td>
                     </tr>
 <!--                    <tr>-->
-<!--                        <td colspan="10">是否属再次转出<span class="red">*</span></td>-->
+<!--                        <td colspan="10">是否属再次转出</td>-->
 <!--                        <td colspan="17">-->
 <!--                            {{if outProjectInformationDetail.twoout == 'N'}}-->
 <!--                                否-->
@@ -431,15 +431,15 @@
 <!--                        <td colspan="17">{{outProjectInformationDetail.oneout}}</td>-->
 <!--                    </tr>-->
                     <tr>
-                        <td colspan="10">拟转出方式<span class="red">*</span></td>
+                        <td colspan="10">拟转出方式</td>
                         <td colspan="17">{{outProjectInformationDetail.rollout}}</td>
                     </tr>
                     <tr>
-                        <td colspan="10">拟转出期限<span class="red">*</span></td>
+                        <td colspan="10">拟转出期限</td>
                         <td colspan="17">{{outProjectInformationDetail.outStartTime}}至{{outProjectInformationDetail.outStopTime}}共{{outProjectInformationDetail.outYearNum}}年</td>
                     </tr>
                     <tr>
-                        <td colspan="7">拟转出面积/数量<span class="red">*</span></td>
+                        <td colspan="7">拟转出面积/数量</td>
                         <td colspan="8">{{outProjectInformationDetail.allCount}}{{outProjectInformationDetail.allCountUnit}}</td>
                         <td colspan="6">涉及农户数</td>
                         <td colspan="6">{{outProjectInformationDetail.peasantNum}}户</td>
@@ -462,7 +462,7 @@
                     </tr>
                     {{/each}}
                     <tr>
-                        <td colspan="10">价格是否面议<span class="red">*</span></td>
+                        <td colspan="10">价格是否面议</td>
                         <td colspan="17">
                             {{if outProjectInformationDetail.isDiscuss == 'N'}}
                             否
@@ -472,7 +472,7 @@
                         </td>
                     </tr>
                     <tr>
-                        <td colspan="10">挂牌价格<span class="red">*</span></td>
+                        <td colspan="10">挂牌价格</td>
                         <td colspan="17">{{outProjectInformationDetail.price}}{{outProjectInformationDetail.unit}}</td>
                     </tr>
                     <tr>
@@ -542,7 +542,7 @@
                         <td colspan="17">{{outProjectInformationDetail.bankName}}</td>
                     </tr>
                     <tr>
-                        <td colspan="10">保证金金额<span class="red">*</span></td>
+                        <td colspan="10">保证金金额</td>
                         <td colspan="17">{{outProjectInformationDetail.deposit}}元</td>
                     </tr>
                     <tr>