From 97c699a9658b697bc795521dfd842f406e3a4754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Thu, 29 Jun 2023 17:44:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93=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 --- static/css/user/user.css | 41 ++++++++++++++++++++++ static/js/api/user.js | 6 ++++ static/js/project/listingItems/items.js | 19 ++++++---- static/js/project/user/index.js | 16 +++++++++ view/announcement/announcement.html | 2 +- view/announcement/announcementDetail.html | 2 +- view/announcement/attestation.html | 2 +- view/announcement/inviteTendersDetail.html | 2 +- view/announcement/warrantDetail.html | 2 +- view/announcement/winTheBiddingDetail.html | 2 +- view/bidding/biddingList.html | 2 +- view/demand/demand.html | 2 +- view/demand/demandDetail.html | 2 +- view/interact/interactList.html | 2 +- view/listingItems/bond.html | 2 +- view/listingItems/itemsDetail.html | 6 ++-- view/listingItems/itemsList.html | 2 +- view/listingItems/itemsNeedsDetail.html | 2 +- view/new/newDetail.html | 2 +- view/new/newList.html | 2 +- view/policy/policy.html | 2 +- view/policy/policyDetail.html | 2 +- view/user/user.html | 37 +++++++++++++++++-- 23 files changed, 130 insertions(+), 29 deletions(-) diff --git a/static/css/user/user.css b/static/css/user/user.css index 373806f..e663f95 100644 --- a/static/css/user/user.css +++ b/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; } \ No newline at end of file diff --git a/static/js/api/user.js b/static/js/api/user.js index b758660..4c45ef4 100644 --- a/static/js/api/user.js +++ b/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 diff --git a/static/js/project/listingItems/items.js b/static/js/project/listingItems/items.js index f62b28c..49a6232 100644 --- a/static/js/project/listingItems/items.js +++ b/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) $('#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; diff --git a/static/js/project/user/index.js b/static/js/project/user/index.js index 50a88db..13bcb7b 100644 --- a/static/js/project/user/index.js +++ b/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; }); \ No newline at end of file diff --git a/view/announcement/announcement.html b/view/announcement/announcement.html index 00e446f..95d1883 100644 --- a/view/announcement/announcement.html +++ b/view/announcement/announcement.html @@ -44,7 +44,7 @@
返回主站 - 竞价大厅 + 返回主站 - 竞价大厅 + 返回主站 - 竞价大厅 + 返回主站 - 竞价大厅 + 返回主站 - 竞价大厅 + 返回主站 - 竞价大厅 + 返回主站 - 竞价大厅 + 返回主站 - 竞价大厅 + 返回主站 - 竞价大厅 + 返回主站 - 竞价大厅 + 返回主站 - 竞价大厅 + 返回主站 - 竞价大厅 +