diff --git a/src/views/biddingHall/index.vue b/src/views/biddingHall/index.vue
index 515eb1d7..4a5802bf 100644
--- a/src/views/biddingHall/index.vue
+++ b/src/views/biddingHall/index.vue
@@ -149,7 +149,7 @@
'未开始': '#007E72',
'已结束': '#848484',
'进行中': '#c21F3a',
- }[item.timeType]}" v-if="item.biddingType!='自由竞价'&&item.money">
+ }[item.timeType]}" v-if="(item.biddingType!='自由竞价'&&item.money) || item.deadline<=0">
{{item.money}}{{item.priceUnit}}
diff --git a/src/views/user/accountSetting/userInformation/companyInformation.vue b/src/views/user/accountSetting/userInformation/companyInformation.vue
index 8239ba9a..ca067c6d 100644
--- a/src/views/user/accountSetting/userInformation/companyInformation.vue
+++ b/src/views/user/accountSetting/userInformation/companyInformation.vue
@@ -62,10 +62,9 @@
-
-
-
+
+
@@ -168,18 +167,19 @@ export default {
getMember(response.user.userId).then(response => {
console.log(response)
- this.userForm.companyName = response.data.companyName;
- this.userForm.idCardNum = response.data.idCardNum;
- this.userForm.realname = response.data.realname;
- this.userForm.companyCode = response.data.companyCode;
- this.userForm.companyName = response.data.companyName;
- this.userForm.companyNature = response.data.companyNature;
- this.userForm.companyScope = response.data.companyScope;
- this.userForm.companyTimeLimit = response.data.companyTimeLimit;
- this.userForm.companySetupTime = response.data.companySetupTime;
- this.userForm.companyCapital = response.data.companyCapital;
- // this.userForm.companyLicense = response.data.companyLicense;
- this.userForm.address = response.data.address;
+ // this.userForm.companyName = response.data.companyName;
+ // this.userForm.idCardNum = response.data.idCardNum;
+ // this.userForm.realname = response.data.realname;
+ // this.userForm.companyCode = response.data.companyCode;
+ // this.userForm.companyName = response.data.companyName;
+ // this.userForm.companyNature = response.data.companyNature;
+ // this.userForm.companyScope = response.data.companyScope;
+ // this.userForm.companyTimeLimit = response.data.companyTimeLimit;
+ // this.userForm.companySetupTime = response.data.companySetupTime;
+ // this.userForm.companyCapital = response.data.companyCapital;
+ // // this.userForm.companyLicense = response.data.companyLicense;
+ // this.userForm.address = response.data.address;
+ this.userForm = response.data;
if (response.data.accountOpenCert!=''){
this.fileListKHZM = [{