diff --git a/src/components/common/nav_footer.vue b/src/components/common/nav_footer.vue
index 31fa2ac2..4121b1b0 100644
--- a/src/components/common/nav_footer.vue
+++ b/src/components/common/nav_footer.vue
@@ -6,7 +6,7 @@
- 供应项目
+ 交易项目
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index eac1f45e..573dbec0 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -44,7 +44,7 @@
- {{biddinglistInformation[0].userName}}
+ {{biddinglistInformation[0].memberId}}
{{biddinglistInformation[0].money}}元
领先
{{biddinglistInformation[0].createTime}}
@@ -71,7 +71,7 @@
竞价方向:{{ detail.biddingDirect }}
- 阶梯价(增减幅度):{{ detail.ladderPrice }} 元
+ 阶梯价(增减幅度):¥{{ detail.ladderPrice }} 元
延时周期:{{timeConfig}}分钟
@@ -94,8 +94,8 @@
住址(地址){{ detail.address }}
- 经济类型{{ detail.economicType }}
- 机构代码证号{{ detail.areaNum }}
+ 经济类型{{ detail.economicType }}
+ 机构代码证号{{ detail.areaNum }}
法人/负责人{{ detail.legalPerson }}
@@ -106,8 +106,8 @@
身份证号***************
- 项目类型{{ detail.projectNumber }}
- 农地性质{{ detail.projectType }}
+ 项目类型{{ detail.projectNumber }}
+ 农地性质{{ detail.projectType }}
转出项目名称{{ detail.projectName }}
@@ -120,8 +120,8 @@
- 拟转出方式{{ detail.rollout }}
- 拟转出面积/数量 {{detail.allCount}}{{detail.allCountUnit}}
+ 拟转出方式{{ detail.rollout }}
+ 拟转出面积/数量 {{detail.allCount}}{{detail.allCountUnit}}
拟转出期限{{detail.outStartTime}} 至 {{detail.outStopTime}}     共{{detail.outYearNum}}年
@@ -216,10 +216,17 @@
-
- 出价
- {{price}}元
-
+
+
+
+ 出价
+ {{price}}元
+
+
+
+ 优先跟价
+
+
@@ -279,7 +286,9 @@ export default {
userId:"",
timeConfig:'',
biddinglistInformationLength:0,
- biddingTimeType:0
+ biddingTimeType:0,
+ isFirst:'',
+ timer:null
};
},
computed: {
@@ -397,7 +406,12 @@ export default {
}else{
that.price = response.rows[0].money + that.detail.ladderPrice
}
-
+ }else{
+ if (that.detail.biddingDirect == 2 ||that.detail.biddingDirect == '反向竞价') {
+ that.price = that.detail.price - that.detail.ladderPrice
+ }else{
+ that.price = that.detail.price + that.detail.ladderPrice
+ }
}
});
@@ -458,7 +472,7 @@ export default {
};
getSignup(data).then(r =>{
if(r.data=="1"){
- _this.isSignup=true
+ _this.isSignup=true;
this.btnMsg="立即竞价"
// this.price=this.detail.ladderPrice?this.biddinglistInformation[0].money+this.detail.ladderPrice:this.biddinglistInformation[0].money+1
}else{
@@ -492,6 +506,7 @@ export default {
_this.isSignup=true
this.btnMsg="立即竞价"
this.showBtn=true
+ _this.isFirst = r.signup.isFirst;
// this.price=this.detail.ladderPrice?this.biddinglistInformation[0].money+this.detail.ladderPrice:this.biddinglistInformation[0].money+1
}else{
this.btnMsg="未报名"
@@ -501,7 +516,7 @@ export default {
})
})
- setInterval(function () {
+ this.timer = setInterval(function () {
getBiddingList(that.id).then(response =>{
that.biddinglistInformation = response.rows
if((response.rows.length != that.biddinglistInformationLength) && that.detail.ladderPrice){
@@ -537,6 +552,42 @@ export default {
})
});
},
+
+ offerFirst(){
+ let newMoney;
+ projectNewBidMoney(this.id).then(response =>{
+ if (response.data&&response.code==200){
+ newMoney = response.data;
+ }else{
+ newMoney = this.detail.price;
+ }
+
+ let data= {
+ projectId:this.id,
+ memberId:this.memberId,
+ userId:this.userId,
+ userAccount:this.userAccount,
+ userName:this.userName,
+ money:parseFloat(newMoney),
+ };
+ biddingSubmit(data).then(response =>{
+ let _this = this
+ if(response){
+ this.$toast({
+ icon: 'success', // 找到自己需要的图标
+ message: '出价成功',
+ duration:"1000",
+ onClose:function(){
+ _this.reload()
+ }
+ })
+
+ }
+ })
+
+ });
+ },
+
offer(){
let newMoney;
projectNewBidMoney(this.id).then(response =>{
@@ -620,7 +671,7 @@ export default {
userId:this.userId,
userAccount:this.userAccount,
userName:this.userName,
- money:parseInt(this.price).toFixed(2),
+ money:parseFloat(this.price),
};
console.log(data)
biddingSubmit(data).then(response =>{
@@ -642,7 +693,7 @@ export default {
add(){
if (this.detail.biddingDirect == '反向竞价'){
if (this.biddinglistInformation.length<1){
- if(this.detail.price <= this.price){
+ if(this.detail.price < this.price){
this.$toast({
icon: 'fail', // 找到自己需要的图标
message: '出价不能高于挂牌价格',
@@ -654,7 +705,7 @@ export default {
}
}else{
- if(this.biddinglistInformation[0].money <= (parseInt(this.price)+parseInt(this.detail.ladderPrice))){
+ if(this.biddinglistInformation[0].money <= (parseFloat(this.price)+parseFloat(this.detail.ladderPrice))){
this.$toast({
icon: 'fail', // 找到自己需要的图标
message: '出价不能高于当前出价最低价格',
@@ -667,7 +718,7 @@ export default {
}
}else{
if (this.biddinglistInformation.length<1){
- if(this.detail.price>=this.price){
+ if(this.detail.price>this.price){
this.$toast({
icon: 'fail', // 找到自己需要的图标
message: '出价不能低于挂牌价格',
@@ -692,7 +743,7 @@ export default {
}
console.log(this.price == null)
this.price == null?this.price = 0:this.price = this.price;
- this.detail.ladderPrice?this.price=parseInt(this.price)+parseInt(this.detail.ladderPrice):this.price += 1
+ this.detail.ladderPrice?this.price=parseFloat(this.price)+parseFloat(this.detail.ladderPrice):this.price += 1
},
sub(){
if (this.detail.biddingDirect == '反向竞价'){
@@ -732,7 +783,7 @@ export default {
return;
}
}else{
- if(this.biddinglistInformation[0].money>=(parseInt(this.price)-parseInt(this.detail.ladderPrice))){
+ if(this.biddinglistInformation[0].money>=(parseFloat(this.price)-parseFloat(this.detail.ladderPrice))){
this.$toast({
icon: 'fail', // 找到自己需要的图标
message: '出价不能低于当前出价最高价格',
@@ -747,7 +798,7 @@ export default {
this.price == null?this.price = 0:this.price = this.price;
if (this.price == 0)return;
- this.detail.ladderPrice?this.price=parseInt(this.price)-parseInt(this.detail.ladderPrice):this.price -= 1
+ this.detail.ladderPrice?this.price=parseFloat(this.price)-parseFloat(this.detail.ladderPrice):this.price -= 1
// if(this.detail.ladderPrice){
// if((this.price-this.detail.ladderPrice)>this.biddinglistInformation[0].money){
// this.price-=this.detail.ladderPrice
@@ -794,6 +845,19 @@ export default {
}
}
+ },
+ destroyed () {
+ console.log('bbbbbbbbbb')
+ clearInterval(this.timer);
+ },
+ beforeDestory() {
+ clearInterval(this.timer)
+ },
+ //离开页面清除定时器失效问题
+ beforeRouteLeave (to, from, next) {
+ console.log("我离开了")
+ clearInterval(this.timer)
+ next()
}
};
diff --git a/src/views/project/signUp.vue b/src/views/project/signUp.vue
index eada3b30..4b88ac4e 100644
--- a/src/views/project/signUp.vue
+++ b/src/views/project/signUp.vue
@@ -350,6 +350,11 @@ export default {
})
},
onRead (file) {
+ this.$toast.loading({
+ message: "正在提交...",
+ forbidClick: true,
+ duration: 0,
+ });
let data = {};
let f = []
for (let i of file){
diff --git a/src/views/register/companyRegister.vue b/src/views/register/companyRegister.vue
index 3c3cdd82..63f796cf 100644
--- a/src/views/register/companyRegister.vue
+++ b/src/views/register/companyRegister.vue
@@ -346,7 +346,7 @@ export default {
}
depositList(data).then(response => {
if (response.rows.length<1){
- if (this.sheng==''||this.shi==''){
+ if (this.form.sheng==''||this.form.shi==''){
this.$toast({
icon: 'fail', // 找到自己需要的图标
message: '请选择省市',
@@ -354,7 +354,7 @@ export default {
})
return;
}
- if (this.bankDeposit==''){
+ if (this.form.bankDeposit==''){
this.$toast({
icon: 'fail', // 找到自己需要的图标
message: '请输入关键词',
diff --git a/src/views/register/userRegister.vue b/src/views/register/userRegister.vue
index 31b72ba6..18d6193b 100644
--- a/src/views/register/userRegister.vue
+++ b/src/views/register/userRegister.vue
@@ -309,7 +309,7 @@ export default {
}
depositList(data).then(response => {
if (response.rows.length<1){
- if (this.sheng==''||this.shi==''){
+ if (this.form.sheng==''||this.form.shi==''){
this.$toast({
icon: 'fail', // 找到自己需要的图标
message: '请选择省市',
@@ -317,7 +317,7 @@ export default {
})
return;
}
- if (this.bankDeposit==''){
+ if (this.form.bankDeposit==''){
this.$toast({
icon: 'fail', // 找到自己需要的图标
message: '请输入关键词',
diff --git a/src/views/user/accountSetting/bankInformation/index.vue b/src/views/user/accountSetting/bankInformation/index.vue
index 4f3239cb..ac3025e8 100644
--- a/src/views/user/accountSetting/bankInformation/index.vue
+++ b/src/views/user/accountSetting/bankInformation/index.vue
@@ -164,6 +164,22 @@ import {depositList, realtimeBackList} from "@/api/register";
}
depositList(data).then(response => {
if (response.rows.length<1){
+ if (this.form.sheng==''||this.form.shi==''){
+ this.$toast({
+ icon: 'fail', // 找到自己需要的图标
+ message: '请选择省市',
+ duration:"1000",
+ })
+ return;
+ }
+ if (this.form.bankDeposit==''){
+ this.$toast({
+ icon: 'fail', // 找到自己需要的图标
+ message: '请输入关键词',
+ duration:"1000",
+ })
+ return;
+ }
realtimeBackList(data).then(response2 => {
console.log(response2)
this.bankAddressOption = response2.data;
diff --git a/src/views/user/signature/signatureList.vue b/src/views/user/signature/signatureList.vue
index a2016676..3c2c1342 100644
--- a/src/views/user/signature/signatureList.vue
+++ b/src/views/user/signature/signatureList.vue
@@ -44,7 +44,7 @@
预览