产权交易问题修改

static/css/user/user.css

@@ -253,4 +253,45 @@
 
 textarea {
     display: block;
+}
+
+.dialog{
+    width: 100%;
+    height: 100vh;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999999999;
+    display: none;
+}
+
+.bg-mengban{
+    width: 100%;
+    height: 100vh;
+}
+
+.dialog_content{
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%,-50%);
+    background: #ffffff;
+    width: 20%;
+    border-radius: 10px;
+    overflow: hidden;
+}
+
+.close_dialog{
+    text-align: center;
+    margin: 2vh 0;
+    cursor: pointer;
+}
+
+.close_dialog p{
+    display: inline-block;
+    padding: 5px 35px;
+    background: var(--color);
+    color: #ffffff;
+    margin: 0 auto;
+    border-radius: 50px;
 }

static/js/api/user.js

@@ -38,6 +38,12 @@ var userConsulting = '/transaction/communicate/communicateList/member'  //我的
 */
 var userBidding = '/transaction/outproject/biddinglist/member'  //我的竞价类接口
 
+/*
+@purl /transaction/outproject/biddinglist/member
+@param
+*/
+var userBiddingList = '/transaction/website/biddinglist/projectId'  //我的竞价类接口
+
 /*
 @purl /transaction/demand
 @param

static/js/project/listingItems/items.js

@@ -1,7 +1,7 @@
 /**
  * Created by Administrator on 2021/4/5.
  */
-define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function ($, template, Tools, swiper) {
+define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function ($, template, Tools ,Swiper) {
     //数据存储
     var module = {
         data: {
@@ -39,7 +39,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
         //焦点图
         setTimeout(function () {
             module.swiperBanner();
-        },2000)
+        },5000)
 
         setTimeout(function(){//项目基本信息
             tools.doGet(showImg + '/'+getQueryVariable('id'), {}, module.showImgInformation,true);
@@ -146,8 +146,11 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
         if(Date.parse(biddingStartTime)<nowTime&&nowTime<Date.parse(biddingStopTime)){
             //正在竞价
             module.data.biddingTimeType = 1;
-
-            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);
@@ -451,6 +454,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
         })
 
         $('.view .arrow-left,.preview .arrow-left').on('click', function(e) {
+            console.log('abc')
             e.preventDefault()
             if (viewSwiper.activeIndex == 0) {
                 viewSwiper.swipeTo(viewSwiper.slides.length - 1, 1000);
@@ -458,7 +462,9 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
             }
             viewSwiper.swipePrev()
         })
+
         $('.view .arrow-right,.preview .arrow-right').on('click', function(e) {
+            console.log('abc')
             e.preventDefault()
             if (viewSwiper.activeIndex == viewSwiper.slides.length - 1) {
                 viewSwiper.swipeTo(0, 1000);
@@ -554,7 +560,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
                     //判断当前是否有人出价
                     if (data.data){
                         //判断用户出价不能低于当前出价最高价格
-                        if(newMoney > $('#money').val()){
+                        if(newMoney >= $('#money').val()){
                             tools.initError('出价不能低于当前出价最高价格');
                             return;
                         }
@@ -730,7 +736,6 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
         tools.doGet(projectNewBidMoney+getQueryVariable('id'), {}, module.biddingSubmitMethodFirst);
     }
 
-    //系统是否
     module.biddingSubmitMethodFirst = function (data) {
         if (data.code == 200) {
             let newMoney;
@@ -747,7 +752,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
             var userId = tools.getCookie('userId');
             var userAccount = tools.getCookie('phone');
             var userName = tools.getCookie('userName');
-            var money = parseInt(newMoney).toFixed(2);
+            var money = parseFloat(newMoney);
             // var loginTime = tools.getNowFormatDate();
             data['projectId'] = projectId;
             data['memberId'] = memberId;

static/js/project/user/index.js

@@ -1204,5 +1204,21 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
         tools.skip('../listingItems/itemsDetail.html?id='+id)
     }
 
+    openBiddingList = function(id){
+        tools.doGet(userBiddingList, {projectId:id,memberId:module.data.memberId}, module.openBidding);
+    }
+
+    module.openBidding = function(data){
+        $('#dialog-01').css('display','block')
+
+        if (data.code == 200) {
+            var content = data.rows;
+            module.data.moneyList = content;
+            var biddingMoneyData = template('biddingMoneyData', module.data);
+            $("#biddingMoneyContent").html(biddingMoneyData);
+        }
+
+    }
+
     return module;
 });

view/announcement/announcement.html

@@ -44,7 +44,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>

view/announcement/announcementDetail.html

@@ -41,7 +41,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>

view/announcement/attestation.html

@@ -41,7 +41,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>

view/announcement/inviteTendersDetail.html

@@ -41,7 +41,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>

view/announcement/warrantDetail.html

@@ -41,7 +41,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>

view/announcement/winTheBiddingDetail.html

@@ -41,7 +41,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>

view/bidding/biddingList.html

@@ -44,7 +44,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>

view/demand/demand.html

@@ -42,7 +42,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>

view/demand/demandDetail.html

@@ -42,7 +42,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>

view/interact/interactList.html

@@ -42,7 +42,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>

view/listingItems/bond.html

@@ -43,7 +43,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>

view/listingItems/itemsDetail.html

@@ -47,7 +47,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>
@@ -153,7 +153,7 @@
                     <div class="view">
                         <div class="swiper-container">
                             <a class="arrow-left" href="#"></a>
-                            <a class="arrow-right" href="#"></a>
+                            <a class="arrow-right" id="abc" href="#"></a>
 
                             <div class="swiper-wrapper">
                                 {{if outProjectInformationDetail.fileUrlList == ''}}
@@ -259,7 +259,7 @@
                                     {{if loginNow != ''}}
                                         {{if signup == 1}}
                                             {{if biddingTimeType == 1}}
-                                                <div style="display: flex;">
+                                                <div style="display: flex;width: 254px;">
                                                     <div class="sign" id="signBtnYes" onclick="changeProMoney()">
                                                         <p>立即出价</p>
                                                     </div>

view/listingItems/itemsList.html

@@ -46,7 +46,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>

view/listingItems/itemsNeedsDetail.html

@@ -41,7 +41,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>

view/new/newDetail.html

@@ -41,7 +41,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>

view/new/newList.html

@@ -42,7 +42,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>

view/policy/policy.html

@@ -44,7 +44,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>

view/policy/policyDetail.html

@@ -41,7 +41,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>

view/user/user.html

@@ -44,7 +44,7 @@
                 <div class="clear"></div>
             </div>
             <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
-            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
+<!--            <a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>-->
             <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>
@@ -620,11 +620,18 @@
                         <td>{{i+1}}</td>
                         <td>{{value.projectName}}</td>
                         <td>{{value.biddingStopTime}}</td>
+                        <td>
+                            {{if value.biddingType == '1' && value.projectShowStatus == '竞价中'}}
+                                *
+                            {{else}}
+                                {{value.money}}
+                            {{/if}}
+                        </td>
                         <td>{{value.memberMoney}}</td>
-                        <td>{{value.money}}</td>
                         <td>{{value.projectShowStatus}}</td>
                         <td>
                             <input type="button" value="我要竞价" onclick="goProject({{value.id}})" class="iWanna"/>
+                            <input type="button" value="竞价记录" onclick="openBiddingList({{value.id}})" class="iWanna"/>
                         </td>
                     </tr>
                 {{/each}}
@@ -638,6 +645,32 @@
         </div>
 
         <div class="clear"></div>
+
+        <div class="dialog" id="dialog-01">
+            <div class="bg-mengban"></div>
+
+            <div class="dialog_content supplyTable" style="padding-left: 0;">
+                <div style="height: 400px;overflow-y: scroll;">
+                    <table width="100%" cellspacing="0" cellpadding="0" id="biddingMoneyContent">
+                        <script id="biddingMoneyData" type="text/html">
+                            <tr>
+                                <td>出价金额</td>
+                                <td>出价时间</td>
+                            </tr>
+                            {{each moneyList as value i}}
+                            <tr>
+                                <td>{{value.money}}</td>
+                                <td>{{value.loginTime}}</td>
+                            </tr>
+                            {{/each}}
+                        </script>
+                    </table>
+                </div>
+                <div class="close_dialog" onclick="$('#dialog-01').css('display','none')"><p>关闭</p></div>
+            </div>
+
+        </div>
+
     </div>
 
     <!--底部链接  -->