From fa5cbcd4770e015a3e5e2a7a2ad9a86746fbc638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Wed, 5 Jul 2023 17:30:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/biddingHall/index.vue               |  2 +-
 .../userInformation/companyInformation.vue    | 30 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

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}}
                 </span>
 
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 @@
 
       <!--<van-field v-model="userForm.companySetupTime" label="成立时间" placeholder="请输入成立时间" required :rules="[{ required:true }]" />-->
       <van-field v-model="userForm.companyCapital" label="注册资金" placeholder="请输入注册资金" required :rules="[{ required:true }]" />
-      <van-field v-model="userForm.companyLicense" label="营业执照号" placeholder="请输入公司的营业执照号" required :rules="[{ required:true }]"/>
       <van-field v-model="userForm.address" label="联系地址" placeholder="请输入联系地址" required :rules="[{ required:true }]" />
-      <van-field v-model="form.realname" label="法人姓名" placeholder="请输入法人姓名" required :rules="[{ required:true }]"/>
-      <van-field v-model="form.idCardNum" label="法人身份证号" placeholder="请输入法人身份证号" required :rules="[{ required:true }]"/>
+      <van-field v-model="userForm.realname" label="法人姓名" placeholder="请输入法人姓名" required :rules="[{ required:true }]"/>
+      <van-field v-model="userForm.idCardNum" label="法人身份证号" placeholder="请输入法人身份证号" required :rules="[{ required:true }]"/>
 
       <van-field name="uploader" label="法人证件照" required>
         <template #input>
@@ -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 = [{