产权交易

static/js/api/items.js

@@ -90,3 +90,10 @@ var base64Upload = '/common/base64Attach'//上传凭证
     id: 主键ID
 */
 var needProject = '/transaction/website/needProject/'//需求详情
+
+/*
+@purl /transaction/outproject/updateLimitDelay
+@param
+    id: 主键ID
+*/
+var updateLimitDelay = '/transaction/outproject/updateLimitDelay'//延时周期

static/js/common/main.js

@@ -83,15 +83,16 @@ requirejs.config({
 //所有页面都需要的js，先行加载
 require(['jquery', 'addressApi']);
 
-require(["jquery", "nprogress"], function ($, nprogress) {
+// require(["jquery", "nprogress"], function ($, nprogress) {
+require(["jquery"], function ($) {
     //ajax加载页面跳转
-    $(document).ajaxStart(function () {
-        // $('.loading').show();
-        nprogress.start();
-    }).ajaxStop(function () {
-        // $('.loading').hide();
-        nprogress.done();
-    });
+    // $(document).ajaxStart(function () {
+    //     // $('.loading').show();
+    //     // nprogress.start();
+    // }).ajaxStop(function () {
+    //     // $('.loading').hide();
+    //     // nprogress.done();
+    // });
     //根据条件加载不同js文件
     var currentPage = $("#require-page").attr("current-page");
     var targetModule = $("#require-page").attr("target-module");

static/js/project/listingItems/bond.js

@@ -35,8 +35,9 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi',"cupload"], function
     module.bankType = function (data) {
         if (data.code == 200) {
             var content = data.data;
-            if(tools.getCookie('bankType') != undefined){
-                var bankType = content.filter(function (e) { return e.dictValue == tools.getCookie('bankType'); })[0].dictLabel;
+            var bankType = ''
+            if(tools.getCookie('bankType') != undefined && tools.getCookie('bankType') != 'null' && tools.getCookie('bankType') != ''){
+                bankType = content.filter(function (e) { return e.dictValue == tools.getCookie('bankType'); })[0].dictLabel;
                 document.getElementById('bankType').value = bankType;
             }
         }
@@ -147,6 +148,9 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi',"cupload"], function
             var content = data.data;
             $("#projectTitle").html('项目名称：'+content.projectName);
             $("#projectNum").html('需缴纳保证新：'+content.deposit+'元');
+            $("#payAccount").html('保证金缴纳账号：'+content.payAccount);
+            $("#accountName").html('账户名称：'+content.accountName);
+            $("#bankName").html('开户银行：'+content.bankName);
             var cupload2 = new Cupload ({
                 ele: '#cupload-3',
                 num: 5,

static/js/project/listingItems/items.js

@@ -8,7 +8,9 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
             //焦点图数据
             focusListTop: [],
             showImgInformationDetail:'',
-            loginNow:''
+            loginNow:'',
+            timer:null,
+            biddinglistInformationDetailLength:0,
         },
     };
     var tools = new Tools();
@@ -130,7 +132,6 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
         biddingStartTime=biddingBeginTimes[1]+'/'+biddingBeginTimes[2]+'/'+biddingBeginTimes[0]+' '+biddingStartTime.substring(10,19);
         biddingStopTime=biddingEndTimes[1]+'/'+biddingEndTimes[2]+'/'+biddingEndTimes[0]+' '+biddingStopTime.substring(10,19);
 
-
         //时间差
         var leftTime = Date.parse(biddingStopTime)-nowTime;
         //报名开始时间差
@@ -153,6 +154,9 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
         }else if (nowTime>Date.parse(biddingStopTime)){
             //竞价结束
             $('#countDown').html('竞价结束')
+            document.getElementById('swiperType').style.display = 'none';
+            document.getElementById('biddingTable').style.display = 'table-block';
+            document.getElementById('biddingTitle').style.display = 'none';
             module.data.biddingTimeType = 2;
         }else if (nowTime<Date.parse(biddingStartTime)){
             //竞价暂未开始
@@ -215,9 +219,41 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
     module.outProjectInformation = function (data) {
         if (data.code == 200) {
             var content = data.data;
+            module.data.biddingStopTime = content.biddingStopTime;
             //倒计时
-            var timer = setInterval(function(){
-                module.dataCompare(content.signupStartTime,content.signupStopTime,content.biddingStartTime,content.biddingStopTime);
+            module.data.timer = setInterval(function(){
+
+                let signupStartTime = content.signupStartTime;
+                let signupStopTime = content.signupStopTime;
+                let biddingStartTime = content.biddingStartTime;
+                let biddingStopTime = module.data.biddingStopTime;
+                // '2023-05-17 14:56:00'
+                var nowTime = Date.parse(new Date());
+                var difference = Date.parse(biddingStopTime)-nowTime;
+                var centerTime = 2 * 60 * 1000
+
+                if ( 0 < difference&&difference <= centerTime){
+                    console.log("竞价最后两分钟")
+                    //正在竞价
+                    var m,s;
+                    document.getElementById('biddingTitle').innerHTML = '竞价进行中...';
+                    document.getElementById('swiperType').style.display = 'block';
+                    m = Math.floor(difference/1000/60%60);
+                    s = Math.floor(difference/1000%60);
+                    $('#countType').html('竞价中')
+                    $('#countDown').html('<span>距竞价结束还有：0</span>天<span>0</span>时<span>'+m+'</span>分<span>'+s+'</span>秒')
+                    //挂牌项目竞价记录
+                    tools.doGet(biddinglist, {projectId:getQueryVariable('id')}, module.biddinglistInformationNew,true);
+
+                    if(module.data.outProjectInformationDetail.biddingType != '拍卖' && module.data.biddingTimeType != 2){
+                        document.getElementById('biddingTable').style.display = 'none';
+                        document.getElementById('biddingTitle').style.display = 'block';
+                    }
+                }else{
+                    module.dataCompare(signupStartTime,signupStopTime,biddingStartTime,biddingStopTime);
+                }
+
+
             },1000)
             for(var i = 0 ; i < content.fileUrlList.length ; i++){
                 content.fileUrlList[i].fileUrl = serverApi+content.fileUrlList[i].fileUrl;
@@ -308,6 +344,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
             }
             console.log(content)
             module.data.biddinglistInformationDetail = content;
+            module.data.biddinglistInformationDetailLength = content.length;
             var biddinglistInformationData = template('biddinglistInformationData', module.data);
             $("#tabDetail4").html(biddinglistInformationData);
             console.log(module.data.biddingTimeType)
@@ -315,6 +352,26 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
         }
     }
 
+    //竞价记录
+    module.biddinglistInformationNew = function (data) {
+        if (data.code == 200) {
+            var content = data.rows;
+            console.log(module.data.biddinglistInformationDetail.length+'----------------------'+content.length)
+            if (module.data.biddinglistInformationDetailLength<content.length){
+                let time = new Date(Date.parse(new Date())+(2 * 60 * 1000));
+                const Y = time.getFullYear()
+                const M = time.getMonth() + 1 < 10 ? '0'+(time.getMonth()+1) : time.getMonth()+1
+                const D = time.getDate()
+                const H = time.getHours() // 小时
+                const m = time.getMinutes() // 分钟
+                const S = time.getSeconds() // 秒
+                module.data.biddingStopTime = Y+'-'+M+'-'+D+' '+H+':'+m+':'+S;
+                module.data.biddinglistInformationDetailLength = content.length;
+
+            }
+        }
+    }
+
     //焦点图滚动
     module.swiperBanner = function (type) {
         console.log('aaaa')
@@ -389,24 +446,23 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
     //出价
     biddingSubmitMethod = function (data) {
         if (module.data.outProjectInformationDetail.biddingDirect == '递减竞价'){
-            if (module.data.biddinglistInformationDetail.length<1){
+            // if (module.data.biddinglistInformationDetail.length<1){
                 if(module.data.outProjectInformationDetail.price<$('#money').val()){
                     tools.initError('出价不能高于挂牌价');
                     return;
                 }
-            }else{
-                if(module.data.biddinglistInformationDetail[0].money<$('#money').val()){
-                    tools.initError('出价不能高于当前出价最低价格');
-                    return;
-                }
-            }
+            // }else{
+            //     if(module.data.biddinglistInformationDetail[0].money<$('#money').val()){
+            //         tools.initError('出价不能高于当前出价最低价格');
+            //         return;
+            //     }
+            // }
         }else{
-            if (module.data.biddinglistInformationDetail.length<1){
-                if(module.data.outProjectInformationDetail.price>$('#money').val()){
-                    tools.initError('出价不能低于挂牌价');
-                    return;
-                }
-            }else{
+            if(module.data.outProjectInformationDetail.price>$('#money').val()){
+                tools.initError('出价不能低于挂牌价');
+                return;
+            }
+            if (module.data.outProjectInformationDetail.biddingType=='拍卖'||module.data.outProjectInformationDetail.biddingType=='阶梯竞价'){
                 if(module.data.biddinglistInformationDetail[0].money>$('#money').val()){
                     tools.initError('出价不能低于当前出价最低价格');
                     return;

static/js/project/user/index.js

@@ -131,7 +131,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
         }
     }
 
-    //底部友情链接
+    //账户类型
     module.accountType = function (data) {
         if (data.code == 200) {
             var content = data.data;
@@ -709,7 +709,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
             tools.setCookie('bankAddress',bankAddress,24 * 60 * 60)
             tools.setCookie('bankType',bankType,24 * 60 * 60)
             tools.setCookie('accountType',accountType,24 * 60 * 60)
-            tools.setCookie('payeePaymentLines',accountType,24 * 60 * 60)
+            tools.setCookie('payeePaymentLines',payeePaymentLines,24 * 60 * 60)
         }
         //data['password'] = password;
         data['id'] = module.data.memberId;

static/js/project/user/registerFrom.js

@@ -113,6 +113,7 @@ define(['jquery', "template", "Tools", "echarts", 'register', 'swiper'], functio
                 data['idCardNum'] = idCardNum;
                 data['address'] = address;
                 data['economicType'] = 1;
+                data['accountType'] = 2;
             }
             if (module.data.type == 2){
                 var phone = $('#phone').val();
@@ -137,6 +138,7 @@ define(['jquery', "template", "Tools", "echarts", 'register', 'swiper'], functio
                 data['companyLicense'] = companyLicense;
                 data['companyCode'] = companyCode;
                 data['economicType'] = economicType;
+                data['accountType'] = 1;
             }
             data['memberType'] = module.data.type;
             tools.doPost(userRegister, data, module.registerData, true)

view/announcement/announcementDetail.html

@@ -4,7 +4,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>农燊高科-项目公告</title>
+    <title>农燊高科-公示公告</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="keywords" content="" />
@@ -125,7 +125,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 class="active"><a href="../announcement/announcement.html">公示公告</a></li>
             <li><a href="../demand/demand.html">个人供求</a></li>

view/bidding/biddingList.html

@@ -4,7 +4,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>农燊高科-新闻列表</title>
+    <title>农燊高科-竞价大厅</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="keywords" content="" />

view/listingItems/bond.html

@@ -4,7 +4,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>农燊高科-新闻详情</title>
+    <title>农燊高科-保证金</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="keywords" content="" />
@@ -125,9 +125,9 @@
     <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="../announcement/announcement.html">公示公告</a></li>
             <li><a href="../demand/demand.html">个人供求</a></li>
             <li><a href="../new/newList.html">新闻资讯</a></li>
             <li><a href="../policy/policy.html">政策法规</a></li>
@@ -137,7 +137,10 @@
     <div class="w-1200">
         <div class="projectInformation m-t-25">
             <p class="m-b-10" id="projectTitle"></p>
-            <p id="projectNum"></p>
+            <p class="m-b-10" id="projectNum"></p>
+            <p class="m-b-10" id="payAccount"></p>
+            <p class="m-b-10" id="accountName"></p>
+            <p id="bankName"></p>
         </div>
         <div class="rule m-t-25 p-l-15">
             <h3>1.竞买人请确认以下事项并勾选</h3>
@@ -146,7 +149,7 @@
             <p>· 已阅读并知晓：如您报名成功，您的姓名、证件号码、手机号、联系地址等信息将披露给资产处置单位及相关服务提供方，用于核实竞买人的真是身份、竞买资格及相关服务提供</p>
             <p>· 已阅读并知晓：竞买人如果没有进行实地看样，视为接受标的所有瑕疵等细则</p>
             <p>· 已阅读并知晓：已阅读并同意《竞拍服务协议》</p>
-            <p><input type="checkbox" id="checkAgree" style="position:relative;top: 2px;"/>本人已知晓并同意以上所有事项</p>
+            <p style="color: #c12e2a;"><input type="checkbox" id="checkAgree" style="position:relative;top: 2px;"/>本人已知晓并同意以上所有事项</p>
         </div>
         <div class="rule m-t-25 p-l-15">
             <h3>竞买人身份确认说明：</h3>

view/listingItems/itemsDetail.html

@@ -4,7 +4,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>农燊高科-新闻列表</title>
+    <title>农燊高科-项目详情</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="keywords" content=""/>
@@ -395,7 +395,7 @@
                         <td colspan="6">{{outProjectInformationDetail.email}}</td>
                     </tr>
                     <tr>
-                        <td rowspan="{{26+outProjectInformationDetail.subjectList.length}}">转出项目<br/>基本情况</td>
+                        <td rowspan="{{29+outProjectInformationDetail.subjectList.length}}">转出项目<br/>基本情况</td>
                         <td colspan="10">项目类型<span class="red">*</span></td>
                         <td colspan="17">{{outProjectInformationDetail.projectNumber}}</td>
                     </tr>
@@ -524,6 +524,18 @@
                         <td colspan="10">缴纳形式</td>
                         <td colspan="17">{{outProjectInformationDetail.depositPaymentType}}</td>
                     </tr>
+                    <tr>
+                        <td colspan="10">保证金缴纳账号</td>
+                        <td colspan="17">{{outProjectInformationDetail.payAccount}}</td>
+                    </tr>
+                    <tr>
+                        <td colspan="10">账户名称</td>
+                        <td colspan="17">{{outProjectInformationDetail.accountName}}</td>
+                    </tr>
+                    <tr>
+                        <td colspan="10">开户银行</td>
+                        <td colspan="17">{{outProjectInformationDetail.bankName}}</td>
+                    </tr>
                     <tr>
                         <td colspan="10">保证金金额<span class="red">*</span></td>
                         <td colspan="17">{{outProjectInformationDetail.deposit}}元</td>

view/listingItems/itemsList.html

@@ -4,7 +4,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>农燊高科-挂牌项目</title>
+    <title>农燊高科-交易项目</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="keywords" content="" />