@@ -81,7 +81,7 @@ export function updateCommunicate(query){ | |||||
//咨询详情 | //咨询详情 | ||||
export function selectCommunicate(id){ | export function selectCommunicate(id){ | ||||
return request({ | return request({ | ||||
url: '/transaction/communicate/'+id, | |||||
url: '/transaction/communicate/get/'+id, | |||||
method: 'get' | method: 'get' | ||||
}) | }) | ||||
} | } | ||||
@@ -103,11 +103,11 @@ export default { | |||||
for (var i = 0; i < response.rows.length; i++) { | for (var i = 0; i < response.rows.length; i++) { | ||||
this.newList.push(response.rows[i]); | this.newList.push(response.rows[i]); | ||||
var imgStrs = response.rows[i].content.match(/<IMG src=\"([^\"]*?)\">/gi) | var imgStrs = response.rows[i].content.match(/<IMG src=\"([^\"]*?)\">/gi) | ||||
console.log(imgStrs) | |||||
if (imgStrs != null && imgStrs != '') { | if (imgStrs != null && imgStrs != '') { | ||||
this.newList[i].img = imgStrs[0].substr(10,(imgStrs[0].length-12)); | this.newList[i].img = imgStrs[0].substr(10,(imgStrs[0].length-12)); | ||||
} | } | ||||
} | } | ||||
console.log(this.newList) | |||||
if(this.newList.length >= response.total){ | if(this.newList.length >= response.total){ | ||||
this.finished = true; | this.finished = true; | ||||
return; | return; | ||||
@@ -125,7 +125,7 @@ export default { | |||||
for (var i = 0; i < response.rows.length; i++) { | for (var i = 0; i < response.rows.length; i++) { | ||||
var imgStrs = response.rows[i].content.match(/<IMG src=\"([^\"]*?)\">/gi) | var imgStrs = response.rows[i].content.match(/<IMG src=\"([^\"]*?)\">/gi) | ||||
if (imgStrs != null && imgStrs != '') { | if (imgStrs != null && imgStrs != '') { | ||||
this.bannerList[i].img = imgStrs[0].substr(10,(imgStrs[0].length-12)); | |||||
this.bannerList[i].img = '/api'+imgStrs[0].substr(10,(imgStrs[0].length-12)); | |||||
} | } | ||||
} | } | ||||
this.loading = false; | this.loading = false; | ||||
@@ -70,7 +70,7 @@ | |||||
<van-row> | <van-row> | ||||
<van-col span="24"><span>竞价方向:</span>{{ detail.biddingDirect }}</van-col> | <van-col span="24"><span>竞价方向:</span>{{ detail.biddingDirect }}</van-col> | ||||
</van-row> | </van-row> | ||||
<van-row> | |||||
<van-row v-if="detail.ladderPrice"> | |||||
<van-col span="24"><span>阶梯价(加价幅度):</span>{{ detail.ladderPrice }}</van-col> | <van-col span="24"><span>阶梯价(加价幅度):</span>{{ detail.ladderPrice }}</van-col> | ||||
</van-row> | </van-row> | ||||
<van-row> | <van-row> | ||||
@@ -206,7 +206,7 @@ | |||||
</van-col> | </van-col> | ||||
</van-row> | </van-row> | ||||
<van-field v-if="showBtn&&!detail.ladderPrice" v-model="price" type="number" input-align="center" placeholder="请输入出价金额" /> | <van-field v-if="showBtn&&!detail.ladderPrice" v-model="price" type="number" input-align="center" placeholder="请输入出价金额" /> | ||||
<van-row v-if="showBtn"> | |||||
<van-row v-if="showBtn" type="flex" justify="space-around"> | |||||
<van-col span="4" v-if="detail.ladderPrice" style="text-align: center;line-height: 1rem"> | <van-col span="4" v-if="detail.ladderPrice" style="text-align: center;line-height: 1rem"> | ||||
<van-button color="#e2e2e2" icon="minus" size="small" @click="sub"></van-button> | <van-button color="#e2e2e2" icon="minus" size="small" @click="sub"></van-button> | ||||
</van-col> | </van-col> | ||||
@@ -488,7 +488,7 @@ export default { | |||||
} | } | ||||
if (this.detail.biddingDirect == '递减竞价'){ | if (this.detail.biddingDirect == '递减竞价'){ | ||||
if (this.biddinglistInformation.length<1){ | if (this.biddinglistInformation.length<1){ | ||||
if(this.detail.price<this.price){ | |||||
if(this.detail.price<=this.price){ | |||||
this.$toast({ | this.$toast({ | ||||
icon: 'fail', // 找到自己需要的图标 | icon: 'fail', // 找到自己需要的图标 | ||||
message: '出价不能高于挂牌价格', | message: '出价不能高于挂牌价格', | ||||
@@ -499,7 +499,7 @@ export default { | |||||
return; | return; | ||||
} | } | ||||
}else{ | }else{ | ||||
if(this.biddinglistInformation[0].money<this.price){ | |||||
if(this.biddinglistInformation[0].money<=this.price){ | |||||
this.$toast({ | this.$toast({ | ||||
icon: 'fail', // 找到自己需要的图标 | icon: 'fail', // 找到自己需要的图标 | ||||
message: '出价不能高于当前出价最低价格', | message: '出价不能高于当前出价最低价格', | ||||
@@ -512,7 +512,7 @@ export default { | |||||
} | } | ||||
}else{ | }else{ | ||||
if (this.biddinglistInformation.length<1){ | if (this.biddinglistInformation.length<1){ | ||||
if(this.detail.price>this.price){ | |||||
if(this.detail.price>=this.price){ | |||||
this.$toast({ | this.$toast({ | ||||
icon: 'fail', // 找到自己需要的图标 | icon: 'fail', // 找到自己需要的图标 | ||||
message: '出价不能低于挂牌价格', | message: '出价不能低于挂牌价格', | ||||
@@ -523,7 +523,7 @@ export default { | |||||
return; | return; | ||||
} | } | ||||
}else{ | }else{ | ||||
if(this.biddinglistInformation[0].money>this.price){ | |||||
if(this.biddinglistInformation[0].money>=this.price){ | |||||
this.$toast({ | this.$toast({ | ||||
icon: 'fail', // 找到自己需要的图标 | icon: 'fail', // 找到自己需要的图标 | ||||
message: '出价不能低于当前出价最高价格', | message: '出价不能低于当前出价最高价格', | ||||
@@ -562,7 +562,7 @@ export default { | |||||
}, | }, | ||||
add(){ | add(){ | ||||
if (this.detail.biddingDirect == '递减竞价'){ | if (this.detail.biddingDirect == '递减竞价'){ | ||||
if (this.biddinglistInformation.length<1){ | |||||
if (this.biddinglistInformation.length<=1){ | |||||
if(this.detail.price<this.price){ | if(this.detail.price<this.price){ | ||||
this.$toast({ | this.$toast({ | ||||
icon: 'fail', // 找到自己需要的图标 | icon: 'fail', // 找到自己需要的图标 | ||||
@@ -574,7 +574,7 @@ export default { | |||||
return; | return; | ||||
} | } | ||||
}else{ | }else{ | ||||
if(this.biddinglistInformation[0].money<this.price){ | |||||
if(this.biddinglistInformation[0].money<=this.price){ | |||||
this.$toast({ | this.$toast({ | ||||
icon: 'fail', // 找到自己需要的图标 | icon: 'fail', // 找到自己需要的图标 | ||||
message: '出价不能高于当前出价最低价格', | message: '出价不能高于当前出价最低价格', | ||||
@@ -587,7 +587,7 @@ export default { | |||||
} | } | ||||
}else{ | }else{ | ||||
if (this.biddinglistInformation.length<1){ | if (this.biddinglistInformation.length<1){ | ||||
if(this.detail.price>this.price){ | |||||
if(this.detail.price>=this.price){ | |||||
this.$toast({ | this.$toast({ | ||||
icon: 'fail', // 找到自己需要的图标 | icon: 'fail', // 找到自己需要的图标 | ||||
message: '出价不能低于挂牌价格', | message: '出价不能低于挂牌价格', | ||||
@@ -598,7 +598,7 @@ export default { | |||||
return; | return; | ||||
} | } | ||||
}else{ | }else{ | ||||
if(this.biddinglistInformation[0].money>this.price){ | |||||
if(this.biddinglistInformation[0].money>=this.price){ | |||||
this.$toast({ | this.$toast({ | ||||
icon: 'fail', // 找到自己需要的图标 | icon: 'fail', // 找到自己需要的图标 | ||||
message: '出价不能低于当前出价最高价格', | message: '出价不能低于当前出价最高价格', | ||||
@@ -179,6 +179,14 @@ export default { | |||||
icon: 'warning', // 找到自己需要的图标 | icon: 'warning', // 找到自己需要的图标 | ||||
message: '保存之前,请先勾选<<竞拍服务协议>>!' | message: '保存之前,请先勾选<<竞拍服务协议>>!' | ||||
}) | }) | ||||
return; | |||||
} | |||||
if(this.fileList.length<1){ | |||||
this.$toast({ | |||||
icon: 'warning', // 找到自己需要的图标 | |||||
message: '请上传相关凭证' | |||||
}) | |||||
return; | |||||
} | } | ||||
submmitSignup(values).then(response =>{ | submmitSignup(values).then(response =>{ | ||||
if(response.code==200){ | if(response.code==200){ | ||||
@@ -17,7 +17,7 @@ | |||||
@load="getList" | @load="getList" | ||||
> | > | ||||
<!----1--> | <!----1--> | ||||
<van-swipe-cell v-for="(item,index) in applicationList" :key="index" > | |||||
<van-swipe-cell v-for="(item,index) in applicationList" :key="index" :disabled="item.secondIsSign =='是'&&item.attachement == null&&item.isArchive == '否'"> | |||||
<div class="item" @click="goDetail(item.id)"> | <div class="item" @click="goDetail(item.id)"> | ||||
<div class="info"> | <div class="info"> | ||||
<div class="title"> | <div class="title"> | ||||
@@ -37,11 +37,11 @@ | |||||
<div class="operation"> | <div class="operation"> | ||||
<!-- delete 删除 edit编辑 view查看 list榜单 --> | <!-- delete 删除 edit编辑 view查看 list榜单 --> | ||||
<div class="opera_btn" style="margin-right: 10px;" v-if="item.signingMode == '线上' && item.firstIsSign =='否' " @click="openPopup(item.id)"> | |||||
<div class="opera_btn" v-if="item.signingMode == '线上' && item.firstIsSign =='否' " @click="openPopup(item.id)"> | |||||
<img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35"> | <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35"> | ||||
<p>签名</p> | <p>签名</p> | ||||
</div> | </div> | ||||
<div class="opera_btn" style="margin-right: 10px;" v-if="item.signingMode == '线上' && item.attachement != null "> | |||||
<div class="opera_btn" style="margin: 0 10px;" v-if="item.signingMode == '线上' && item.attachement != null "> | |||||
<img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35"> | <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35"> | ||||
<p>预览</p> | <p>预览</p> | ||||
</div> | </div> | ||||
@@ -12,6 +12,7 @@ | |||||
<van-list | <van-list | ||||
v-model="loading" | v-model="loading" | ||||
:finished="finished" | :finished="finished" | ||||
:immediate-check="false" | |||||
finished-text="没有更多了" | finished-text="没有更多了" | ||||
style="margin-top: 10px;" | style="margin-top: 10px;" | ||||
@load="getList()" | @load="getList()" | ||||
@@ -21,18 +22,18 @@ | |||||
<van-row> | <van-row> | ||||
<van-col span="20"><van-icon name="../../static/images/icon/questions.png" size="18" style="top: 5px;margin-right: 5px;"/> | <van-col span="20"><van-icon name="../../static/images/icon/questions.png" size="18" style="top: 5px;margin-right: 5px;"/> | ||||
{{item.content}}</van-col> | {{item.content}}</van-col> | ||||
<van-col span="4" style="text-align: right;font-size: 0.2rem;color: #007E72;" v-if="item.reply != null">已回复</van-col> | |||||
<van-col span="4" style="text-align: right;font-size: 0.2rem;color: #c21F3a;" v-if="item.reply == null">未回复</van-col> | |||||
<van-col span="4" style="text-align: right;font-size: 0.2rem;color: #007E72;" v-if="item.reply">已回复</van-col> | |||||
<van-col span="4" style="text-align: right;font-size: 0.2rem;color: #c21F3a;" v-if="!item.reply">未回复</van-col> | |||||
</van-row> | </van-row> | ||||
</template> | </template> | ||||
<template #label> | <template #label> | ||||
<van-icon name="../../static/images/icon/answer.png" size="18" style="top: 5px;margin-right: 5px;"/>{{item.reply}} | <van-icon name="../../static/images/icon/answer.png" size="18" style="top: 5px;margin-right: 5px;"/>{{item.reply}} | ||||
<van-row> | <van-row> | ||||
<van-col span="18">发布时间:{{item.logintime}}</van-col> | <van-col span="18">发布时间:{{item.logintime}}</van-col> | ||||
<van-col span="3" style="color: #007E72;text-align: right;" @click="goAdd('update',item.id)" v-if="item.reply == null"> | |||||
<van-col span="3" style="color: #007E72;text-align: right;" @click="goAdd('update',item.id)" v-if="!item.reply"> | |||||
<van-icon name="edit" size="15" style="top:3px"/>修改 | <van-icon name="edit" size="15" style="top:3px"/>修改 | ||||
</van-col> | </van-col> | ||||
<van-col span="3" style="color: #007E72;text-align: right;" @click="deleteInteraction(item.id)" v-if="item.reply == null"> | |||||
<van-col span="3" style="color: #007E72;text-align: right;" @click="deleteInteraction(item.id)" v-if="!item.reply"> | |||||
<van-icon name="delete-o" size="15" style="top:3px"/>删除 | <van-icon name="delete-o" size="15" style="top:3px"/>删除 | ||||
</van-col> | </van-col> | ||||
</van-row> | </van-row> | ||||
@@ -66,7 +67,12 @@ export default { | |||||
}; | }; | ||||
}, | }, | ||||
created() { | created() { | ||||
this.getInfo(); | |||||
getInfo().then(response => { | |||||
getMember(response.user.userId).then(response => { | |||||
this.queryParams.memberId = response.data.id; | |||||
this.getList() | |||||
}); | |||||
}); | |||||
}, | }, | ||||
methods: { | methods: { | ||||
goAdd(type,id){ | goAdd(type,id){ | ||||
@@ -80,13 +86,6 @@ export default { | |||||
goClickLeft(){ | goClickLeft(){ | ||||
window.location='user'; | window.location='user'; | ||||
}, | }, | ||||
getInfo(){ | |||||
getInfo().then(response => { | |||||
getMember(response.user.userId).then(response => { | |||||
this.queryParams.memberId = response.data.id; | |||||
}); | |||||
}); | |||||
}, | |||||
getList(){ | getList(){ | ||||
this.loading = true; | this.loading = true; | ||||
userConsulting(this.queryParams).then(response => { | userConsulting(this.queryParams).then(response => { | ||||