zhangzl
/
nsgk_web
1
0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Julkaisut 0 Wiki Toiminta
Selaa lähdekoodia

产权交易问题修改

RongCheng
庞东旭 1 vuosi sitten
vanhempi
caed9b6e0f
commit
5aea79970d
4 muutettua tiedostoa jossa 146 lisäystä ja 83 poistoa
Jaettu näkymä
Diff Options
Show Stats Download Patch File Download Diff File
  1. +87
    -15
      static/js/project/listingItems/items2.js
  2. +18
    -14
      static/js/project/user/index.js
  3. +39
    -52
      view/listingItems/itemsDetail.html
  4. +2
    -2
      view/user/user.html

+ 87
- 15
static/js/project/listingItems/items2.js Näytä tiedosto

@@ -157,7 +157,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
document.getElementById('biddingTitle').style.display = 'block';
document.getElementById('biddingTitle').innerHTML = '竞价进行中...';
}
document.getElementById('swiperType').style.display = 'block';
// document.getElementById('swiperType').style.display = 'block';
d = Math.floor(leftTime/1000/60/60/24);
h = Math.floor(leftTime/1000/60/60%24);
m = Math.floor(leftTime/1000/60%60);
@@ -169,8 +169,8 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
//竞价结束
$('#countType').html('')
$('#countDown').html('竞价结束')
document.getElementById('swiperType').style.display = 'none';
document.getElementById('biddingTable').style.display = 'table-block';
// document.getElementById('swiperType').style.display = 'none';
document.getElementById('biddingTable').style.display = 'table';
document.getElementById('biddingTitle').style.display = 'none';
module.data.biddingTimeType = 2;
}else if (nowTime<Date.parse(biddingStartTime)){
@@ -189,7 +189,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
if(Date.parse(signupStartTime)<nowTime&&nowTime<Date.parse(signupStopTime)){
//正在报名
module.data.signupTimeType = 1;
document.getElementById('swiperType').style.display = 'block';
// document.getElementById('swiperType').style.display = 'block';
d = Math.floor(signDownLeftTime/1000/60/60/24);
h = Math.floor(signDownLeftTime/1000/60/60%24);
m = Math.floor(signDownLeftTime/1000/60%60);
@@ -209,8 +209,80 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
$('#countType').html('未开始')
$('#countDown').html('<span>距报名开始还有：'+d+'</span>天<span>'+h+'</span>时<span>'+m+'</span>分<span>'+s+'</span>秒')
}

//moneyText：出价输入框
//moneyBtn：出价按钮
//signYes：已报名显示文字
//signNo：未报名显示文字
//signBtn：已登录但未报名跳转报名按钮
//signBtn2：未登录跳转登录按钮
//noAction：未开始显示文字

if(module.data.loginNow){ //判断是否登录（已登录）
if(module.data.signup == 1){ //判断是否报名（已报名）
if( module.data.biddingTimeType == 1 ){ //判断当前竞价状态（竞价中）
document.getElementById('signYes').style.display = 'none';
document.getElementById('signNo').style.display = 'none';
document.getElementById('signBtn').style.display = 'none';
document.getElementById('signBtn2').style.display = 'none';
document.getElementById('noAction').style.display = 'none';

document.getElementById('moneyText').style.display = 'table-row';
document.getElementById('moneyBtn').style.display = 'flex';
}else if( module.data.biddingTimeType == 3 ){ //判断当前竞价状态（竞价未开始）
document.getElementById('moneyText').style.display = 'none';
document.getElementById('moneyBtn').style.display = 'none';
document.getElementById('signNo').style.display = 'none';
document.getElementById('signBtn').style.display = 'none';
document.getElementById('signBtn2').style.display = 'none';
document.getElementById('noAction').style.display = 'none';

document.getElementById('signYes').style.display = 'block';
}else{ //判断当前竞价状态（竞价结束）
$('.swiperInput').css('display','none');
$('#timeDown').css('display','none');
clearInterval(module.data.timeDown)
}
}else{ //判断是否报名（未报名）
if( module.data.signupTimeType == 1 ){ //判断当前报名状态（正在报名）
document.getElementById('moneyText').style.display = 'none';
document.getElementById('moneyBtn').style.display = 'none';
document.getElementById('signNo').style.display = 'none';
document.getElementById('signBtn2').style.display = 'none';
document.getElementById('noAction').style.display = 'none';
document.getElementById('signYes').style.display = 'none';

document.getElementById('signBtn').style.display = 'block';
}else if( module.data.signupTimeType == 3 ){ //判断当前报名状态（报名未开始）
document.getElementById('moneyText').style.display = 'none';
document.getElementById('moneyBtn').style.display = 'none';
document.getElementById('signBtn2').style.display = 'none';
document.getElementById('signYes').style.display = 'none';
document.getElementById('signBtn').style.display = 'none';
document.getElementById('signNo').style.display = 'none';

document.getElementById('noAction').style.display = 'block';
}else{ //判断当前报名状态（报名结束）
document.getElementById('moneyText').style.display = 'none';
document.getElementById('moneyBtn').style.display = 'none';
document.getElementById('signBtn2').style.display = 'none';
document.getElementById('noAction').style.display = 'none';
document.getElementById('signYes').style.display = 'none';
document.getElementById('signBtn').style.display = 'none';

document.getElementById('signNo').style.display = 'block';
}
}
}else{ //判断是否登录（未登录）
if( module.data.biddingTimeType == 2 ){//判断当前竞价状态（竞价结束）
$('.swiperInput').css('display','none')
}else{
document.getElementById('signBtn2').style.display = 'block';
}
}

if(module.data.outProjectInformationDetail.biddingType != '自由竞价' && module.data.biddingTimeType != 2){
document.getElementById('biddingTable').style.display = 'table-block';
document.getElementById('biddingTable').style.display = 'table';
document.getElementById('biddingTitle').style.display = 'none';
}
}
@@ -281,11 +353,11 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function

module.data.timeDown = setInterval(function(){
// console.log($('#countType').html())
if ($('#countType').html()!='竞价中'){
clearInterval(module.data.timeDown)
document.getElementById('timeDown').style.display = 'none';
return;
}
// if ($('#countType').html()!='竞价中'){
// clearInterval(module.data.timeDown)
// document.getElementById('timeDown').style.display = 'none';
// return;
// }
timName.innerHTML = t+'<b style="color: #666666">秒后自动刷新</b>';
t--;
document.getElementById('timeDown').style.display = 'inline-block';
@@ -370,7 +442,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
document.getElementById('biddingTitle').style.display = 'block';
document.getElementById('biddingTitle').innerHTML = '竞价进行中...';
}
document.getElementById('swiperType').style.display = 'block';
// document.getElementById('swiperType').style.display = 'block';
module.data.biddingTimeType = 1;
m = Math.floor(difference/1000/60%60);
s = Math.floor(difference/1000%60);
@@ -391,8 +463,8 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
}else{
$('#countType').html('')
$('#countDown').html('竞价结束')
document.getElementById('swiperType').style.display = 'none';
document.getElementById('biddingTable').style.display = 'table-block';
// document.getElementById('swiperType').style.display = 'none';
document.getElementById('biddingTable').style.display = 'table';
document.getElementById('biddingTitle').style.display = 'none';
module.data.biddingTimeType = 2;
return;
@@ -679,8 +751,8 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
}else{
$('#countType').html('')
$('#countDown').html('竞价结束')
document.getElementById('swiperType').style.display = 'none';
document.getElementById('biddingTable').style.display = 'table-block';
// document.getElementById('swiperType').style.display = 'none';
document.getElementById('biddingTable').style.display = 'table';
document.getElementById('biddingTitle').style.display = 'none';
module.data.biddingTimeType = 2;
return;


+ 18
- 14
static/js/project/user/index.js Näytä tiedosto

@@ -12,6 +12,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
userSupplyInformationList:'',
consultingInformationList:'',
biddingInformationList:'',
applicationInformationList:'',
//页码
pageNum: 1,
//页码集合
@@ -655,7 +656,8 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
if (pageCount < 1){
pageCount = 1;
}
if(module.data.biddingInformationList == '') {
if(module.data.applicationInformationList == '') {
console.log('aaaaaa')
// 初始化 分页器
var page_s1=createPage('.page_s4');
// 设置分页
@@ -667,19 +669,18 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
})
$('#page_s4').html('共' + pageCount + '页')
}

content.forEach((res,index)=>{
res.depositStatus = module.data.depositStatusOption.filter(function (e) { return e.dictValue == res.depositStatus; })[0].dictLabel;

setInterval(()=>{
res.endTime = new Date(res.biddingStopTime) - new Date();
if (res.endTime <= 0){
document.getElementById('endTime'+index).innerHTML = '已结束'
return;
}
document.getElementById('endTime'+index).innerHTML = TimeInterval(res.endTime)
},1000)
})
// content.forEach((res,index)=>{
// res.depositStatus = module.data.depositStatusOption.filter(function (e) { return e.dictValue == res.depositStatus; })[0].dictLabel;
//
// setInterval(()=>{
// res.endTime = new Date(res.biddingStopTime) - new Date();
// if (res.endTime <= 0){
// document.getElementById('endTime'+res.id).innerHTML = '已结束'
// return;
// }
// document.getElementById('endTime'+res.id).innerHTML = TimeInterval(res.endTime)
// },1000)
// })

module.data.applicationInformationList = content;
var applicationInformationData = template('applicationInformationData', module.data);
@@ -828,6 +829,9 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
if(module.data.clickType == 'bidding'){
tools.doGet(userBidding, {memberId:module.data.memberId,pageNum:pageNum,pageSize:module.data.pageSize}, module.bidding);
}
if(module.data.clickType == 'application'){
tools.doGet(getSignupByMemberId, {memberId:module.data.memberId,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.application);
}
}

//个人用户资料修改


+ 39
- 52
view/listingItems/itemsDetail.html Näytä tiedosto

@@ -238,66 +238,53 @@
</tr>
{{/if}}
</table>
<div style="display: none;" id="swiperType" class="swiperInput">
<div class="swiperInput">
<table>
{{if signup == 1}}
{{if biddingTimeType == 1}}
<tr>
<td>
<p class="fl inputTit">出价</p>
</td>
<td>
<input type="number" id="money" oninput="moneyChange()" value="{{outProjectInformationDetail.money}}" {{outProjectInformationDetail.biddingType == '阶梯竞价'? 'readonly':''}} class="fl"/>
<div class="fl">
{{if outProjectInformationDetail.biddingType == '阶梯竞价'}}
<input type="button" value="+" onclick="{{loginNow == '' ? '':'upMoney()'}}"/>
<input type="button" value="-" onclick="{{loginNow == '' ? '':'downMoney()'}}"/>
{{/if}}
</div>
</td>
</tr>
{{/if}}
{{/if}}
<tr style="display: none;" id="moneyText">
<td>
<p class="fl inputTit">出价</p>
</td>
<td>
<input type="number" id="money" oninput="moneyChange()" value="{{outProjectInformationDetail.money}}" {{outProjectInformationDetail.biddingType == '阶梯竞价'? 'readonly':''}} class="fl"/>
<div class="fl">
{{if outProjectInformationDetail.biddingType == '阶梯竞价'}}
<input type="button" value="+" onclick="{{loginNow == '' ? '':'upMoney()'}}"/>
<input type="button" value="-" onclick="{{loginNow == '' ? '':'downMoney()'}}"/>
{{/if}}
</div>
</td>
</tr>
<tr>
<td></td>
<td>
{{if loginNow != ''}}
{{if signup == 1}}
{{if biddingTimeType == 1}}
<div style="display: flex;width: 254px;">
<div class="sign" id="signBtnYes" onclick="changeProMoney()">
<p>立即出价</p>
</div>
<div id="moneyBtn" style="display: none;width: 254px;">
<div class="sign" id="signBtnYes" onclick="changeProMoney()">
<p>立即出价</p>
</div>

{{if isFirst == 'Y'}}
<div class="sign" id="signBtnFirst" onclick="changeProMoneyFirst()">
<p>优先跟价</p>
</div>
{{/if}}
</div>
{{/if}}
{{if biddingTimeType == 3}}
<p class="signUpYes">已报名</p>
{{/if}}
{{else}}
<div id="signBtn">
<div class="fl sign" onclick="goBond()">
<p>立即报名</p>
<p>保证金￥{{outProjectInformationDetail.deposit}}</p>
</div>
<p class="signTit fl" title="{{titleConfig}}"><i class="ts">!</i>如何交钱报名</p>
{{if isFirst == 'Y'}}
<div class="sign" id="signBtnFirst" onclick="changeProMoneyFirst()">
<p>优先跟价</p>
</div>
{{/if}}
{{/if}}
{{if loginNow == ''}}
<div id="signBtn2">
<div class="fl sign" onclick="goLogin()">
<p>立即报名</p>
<p>保证金￥{{outProjectInformationDetail.deposit}}</p>
</div>
<p class="signTit fl" title="{{titleConfig}}"><i class="ts">!</i>如何交钱报名</p>
</div>
<p class="signUpYes" style="display: none;" id="signYes">已报名</p>
<p class="signUpYes" style="display: none;" id="signNo">未报名</p>
<p class="signUpYes" style="display: none;" id="noAction">未开始</p>
<div id="signBtn" style="display: none;">
<div class="fl sign" onclick="goBond()">
<p>立即报名</p>
<p>保证金￥{{outProjectInformationDetail.deposit}}</p>
</div>
<p class="signTit fl" title="{{titleConfig}}"><i class="ts">!</i>如何交钱报名</p>
</div>
<div id="signBtn2" style="display: none;">
<div class="fl sign" onclick="goLogin()">
<p>立即报名</p>
<p>保证金￥{{outProjectInformationDetail.deposit}}</p>
</div>
{{/if}}
<p class="signTit fl" title="{{titleConfig}}"><i class="ts">!</i>如何交钱报名</p>
</div>
</td>
</tr>
<tr id="signImg" style="display: none;">


+ 2
- 2
view/user/user.html Näytä tiedosto

@@ -709,7 +709,7 @@
<td>报名是否成功</td>
<td>竞价开始时间</td>
<td>竞价结束时间</td>
<td>结束倒计时</td>
<!-- <td>结束倒计时</td>-->
<td>操作</td>
</tr>
{{each applicationInformationList as value i}}
@@ -725,7 +725,7 @@
<td>{{value.depositStatus}}</td>
<td>{{value.biddingStartTime}}</td>
<td>{{value.biddingStopTime}}</td>
<td><p id="endTime{{i}}"></p></td>
<!-- <td><p id="endTime{{value.id}}"></p></td>-->
<td>
<input type="button" value="查看" onclick="goProject({{value.projectId}})" class="iWanna"/>
</td>


Kirjoita Esikatselu
Ladataan…
Peruuta
Tallenna