diff --git a/src/views/biddingHall/index.vue b/src/views/biddingHall/index.vue
index 7cde830e..511d51bc 100644
--- a/src/views/biddingHall/index.vue
+++ b/src/views/biddingHall/index.vue
@@ -115,7 +115,7 @@
         finished-text="没有更多了"
         @load="onL"
       >
-        <van-row v-for="(item,index) in infoList" :key="index" :title="item">
+        <van-row v-for="(item,index) in infoList" :key="index" :title="item" @click="goDetail(item.id)">
           <van-col span="13" class="biddingProcessListLeftCol">
             <span >{{item.content}}</span>
           </van-col>
@@ -156,14 +156,13 @@ export default {
       infoList:[],
       value1: '',
       value2: '标的物位置',
-      activeId: 1,
+      activeId: null,
       activeIndex: 0,
       value3: '',
       value:"",
       info:[],
       //标的物所在地
-      deptListOption: [
-      ],
+      deptListOption: [],
       option3: [
         { text: '竞价状态', value: '' },
         { text: '全部', value: '全部' },
@@ -178,7 +177,7 @@ export default {
   created(){
     this.getDicts("project_type").then(response => {
       response.data.map(item => {
-        this.projectTypeOption.push({ value:item.dictCode, text: item.dictLabel});
+        this.projectTypeOption.push({ value:item.dictValue, text: item.dictLabel});
       });
     });
     getDeptList().then(response => {
@@ -199,10 +198,14 @@ export default {
     });
   },
   methods:{
+    goDetail(id){
+      console.log(id)
+      this.$router.push({path:'project/projectDetail',query:{id:id}})
+    },
     getList(){
       let queryDatas = {
-        deptId: this.value1,
-        projectNumber:this.activeId,
+        deptId: this.activeId,
+        projectNumber:this.value1,
         projectShowStatus:this.value3
       }
       getBiddingList(queryDatas).then(response =>{
@@ -214,9 +217,9 @@ export default {
             if(endDate>nowDate){
               time = endDate-nowDate>0?endDate-nowDate:0
             }
-            return{content:item.projectName,deadline:time,currentPrice:item.price,priceUnit:item.unit}
+            return{content:item.projectName,deadline:time,currentPrice:item.price,priceUnit:item.unit,id:item.id}
           }else {
-            return{content:item.projectName,deadline:0,currentPrice:item.price,priceUnit:item.unit}
+            return{content:item.projectName,deadline:0,currentPrice:item.price,priceUnit:item.unit,id:item.id}
           }
 
         })
@@ -226,6 +229,7 @@ export default {
 
     },
     clickItem(data){
+      console.log(data)
       if(data.text==this.value2){
         this.activeId=1
         this.value2='标的物位置'
diff --git a/src/views/index.vue b/src/views/index.vue
index 1e882557..ee96a49f 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -6,7 +6,7 @@
       </van-col>
       <van-col span="22" style="line-height: 29px;font-size: 20px;">农村产权交易平台</van-col>
     </van-row>
-    <van-swipe class="my-swipe" :autoplay="3000" height="180" indicator-color="white">
+    <van-swipe class="my-swipe" :autoplay="3000" height="180" indicator-color="white" :show-indicators="false">
       <van-swipe-item v-for="(item,index) in bannerList" :key="index">
         <van-image :src="item.img" height="180" @click="goDetail(item.id)" />
         <p class="bannerTit">{{item.title}}</p>
diff --git a/src/views/login.vue b/src/views/login.vue
index 5b4d4ec2..6e8d715f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -71,7 +71,8 @@
                 <van-button
                   size="small"
                   type="primary"
-                  @click.native.prevent="getSmsCode"
+                  native-type="button"
+                  @click="getSmsCode"
                   >{{
                     computeTime > 0 ? `(${computeTime}s)已发送` : "获取验证码"
                   }}</van-button
@@ -171,6 +172,7 @@ export default {
       };
     },
     getSmsCode() {
+      console.log('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
       if (!this.computeTime) {
         let myreg = /^[1][3,4,5,7,8,9][0-9]{9}$/;
         if (!myreg.test(this.formData.mobile)) {
@@ -197,7 +199,8 @@ export default {
       }
     },
     handleLogin(values) {
-      if (this.isSmsLogin) {
+      console.log(this.isSmsLogin)
+      if (this.isSmsLogin==true) {
         //短信登录
         let myreg = /^[1][3,4,5,7,8,9][0-9]{9}$/;
         if (!myreg.test(this.formData.mobile)) {
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index 3858e1e5..cff51c9b 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -175,7 +175,7 @@
               <td>状态</td>
               <td>出价时间</td>
             </tr>
-            <tr v-for="(item,index) in this.biddinglistInformation" :key="index">
+            <tr v-for="(item,index) in biddinglistInformation" :key="index">
               <td>{{ item.userAccount }}</td>
               <td>{{ item.userName }}</td>
               <td>{{ item.money}}</td>
@@ -205,18 +205,18 @@
           </van-button>
         </van-col>
       </van-row>
-      <van-field v-if="showBtn" 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-col span="4" 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-col>
         <van-col span="16">
           <van-button round color="#C21F3A" block @click="offer">
             <p>出价</p>
-<!--            <p>{{price}}元</p>-->
+            <p v-if="detail.ladderPrice">{{price}}元</p>
           </van-button>
         </van-col>
-        <van-col span="4" 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="plus" size="small" @click="add"></van-button>
         </van-col>
       </van-row>
@@ -468,11 +468,15 @@ export default {
       });
       getBiddingList(this.id).then(response =>{
         this.biddinglistInformation = response.rows
+        if (response.rows.length>0&&this.detail.ladderPrice){
+          this.price = response.rows[0].money+this.detail.ladderPrice
+        }
+
       });
     },
     offer(){
 
-      if (this.price==''||this.price<1||this.price == null){
+      if (this.price==''||this.price==0||this.price<0||this.price == null){
         this.$toast({
           icon: 'fail', // 找到自己需要的图标
           message: '请输入出价金额',
@@ -483,26 +487,52 @@ export default {
         return;
       }
       if (this.detail.biddingDirect == '递减竞价'){
-        if(this.detail.price<this.price||this.price == null){
-          this.$toast({
-            icon: 'fail', // 找到自己需要的图标
-            message: '出价不能高于挂牌价',
-            duration:"1000",
-            onClose:function(){
-            }
-          })
-          return;
+        if (this.biddinglistInformation.length<1){
+          if(this.detail.price<this.price){
+            this.$toast({
+              icon: 'fail', // 找到自己需要的图标
+              message: '出价不能高于挂牌价格',
+              duration:"1000",
+              onClose:function(){
+              }
+            })
+            return;
+          }
+        }else{
+          if(this.biddinglistInformation[0].money<this.price){
+            this.$toast({
+              icon: 'fail', // 找到自己需要的图标
+              message: '出价不能高于当前出价最低价格',
+              duration:"1000",
+              onClose:function(){
+              }
+            })
+            return;
+          }
         }
       }else{
-        if(this.detail.price>this.price){
-          this.$toast({
-            icon: 'fail', // 找到自己需要的图标
-            message: '出价不能低于挂牌价',
-            duration:"1000",
-            onClose:function(){
-            }
-          })
-          return;
+        if (this.biddinglistInformation.length<1){
+          if(this.detail.price>this.price){
+            this.$toast({
+              icon: 'fail', // 找到自己需要的图标
+              message: '出价不能低于挂牌价格',
+              duration:"1000",
+              onClose:function(){
+              }
+            })
+            return;
+          }
+        }else{
+          if(this.biddinglistInformation[0].money>this.price){
+            this.$toast({
+              icon: 'fail', // 找到自己需要的图标
+              message: '出价不能低于当前出价最高价格',
+              duration:"1000",
+              onClose:function(){
+              }
+            })
+            return;
+          }
         }
       }
       let data= {
@@ -531,12 +561,56 @@ export default {
       })
     },
     add(){
-      if (this.detail.biddingDirect == '反向竞价'){
-        if(this.detail.price<this.price){
-          return;
+      if (this.detail.biddingDirect == '递减竞价'){
+        if (this.biddinglistInformation.length<1){
+          if(this.detail.price<this.price){
+            this.$toast({
+              icon: 'fail', // 找到自己需要的图标
+              message: '出价不能高于挂牌价格',
+              duration:"1000",
+              onClose:function(){
+              }
+            })
+            return;
+          }
+        }else{
+          if(this.biddinglistInformation[0].money<this.price){
+            this.$toast({
+              icon: 'fail', // 找到自己需要的图标
+              message: '出价不能高于当前出价最低价格',
+              duration:"1000",
+              onClose:function(){
+              }
+            })
+            return;
+          }
+        }
+      }else{
+        if (this.biddinglistInformation.length<1){
+          if(this.detail.price>this.price){
+            this.$toast({
+              icon: 'fail', // 找到自己需要的图标
+              message: '出价不能低于挂牌价格',
+              duration:"1000",
+              onClose:function(){
+              }
+            })
+            return;
+          }
+        }else{
+          if(this.biddinglistInformation[0].money>this.price){
+            this.$toast({
+              icon: 'fail', // 找到自己需要的图标
+              message: '出价不能低于当前出价最高价格',
+              duration:"1000",
+              onClose:function(){
+              }
+            })
+            return;
+          }
         }
       }
-      this.detail.ladderPrice?this.price=this.price+this.detail.ladderPrice:this.price+=1
+      this.detail.ladderPrice?this.price=parseInt(this.price)+parseInt(this.detail.ladderPrice):this.price += 1
     },
     sub(){
       if(this.detail.ladderPrice){
diff --git a/src/views/project/signUp.vue b/src/views/project/signUp.vue
index 622ee185..811b5b48 100644
--- a/src/views/project/signUp.vue
+++ b/src/views/project/signUp.vue
@@ -120,6 +120,7 @@ export default {
       projectName:this.$route.query.projectName,
       bankAddress:"",
       bankCardNum:"",
+      bankCardName:"",
       idCardNum:"",
       phone:"",
       memberId:"",
diff --git a/src/views/register/companyRegister.vue b/src/views/register/companyRegister.vue
index 51e79819..f208c699 100644
--- a/src/views/register/companyRegister.vue
+++ b/src/views/register/companyRegister.vue
@@ -50,7 +50,7 @@
       <van-field v-model="form.companyLicense" label="营业执照号" placeholder="请输入公司的营业执照号" required :rules="[{ required:true }]"/>
       <van-field v-model="form.address" label="联系地址" placeholder="请输入联系地址" />
       <div class="submit">
-        <p>我已阅读并同意<span>《农村产权交易信息服务平台会员注册协议》</span></p>
+<!--        <p>我已阅读并同意<span>《农村产权交易信息服务平台会员注册协议》</span></p>-->
         <van-button round block type="info" color="#007E72" native-type="submit">立即注册</van-button>
       </div>
     </van-form>
@@ -110,8 +110,25 @@ export default {
     },
     getSubmit(){
       console.log(this.form)
+      if (this.form.password!= this.confirmPassWord){
+        this.$toast({
+          icon: 'error', // 找到自己需要的图标
+          message: '两次密码输入不一致',
+          duration:"2000",
+          onClose:function(){
+          }
+        })
+        return;
+      }
       userRegister(this.form).then((res) => {
-        console.log(res)
+        this.$toast({
+          icon: 'success', // 找到自己需要的图标
+          message: '注册成功',
+          duration:"2000",
+          onClose:function(){
+            this.$router.push({path: '/login'})
+          }
+        })
       });
     }
   },
diff --git a/src/views/register/index.vue b/src/views/register/index.vue
index 639b7520..ebef93d8 100644
--- a/src/views/register/index.vue
+++ b/src/views/register/index.vue
@@ -13,7 +13,7 @@
       <p class="title_three">农村产权交易平台</p>
     </div>
     <div class="text_box">
-      <h2>/注册须知/</h2>
+      <h2>/ 注册须知 /</h2>
       <van-divider />
       为营造公开、公平、公正的网络交易环境，维护农村产权交易平台（以下简称平台）会员秩序，确保网络交易的顺利进行，特将有关事项告知如下：
       <div class="text_box-content">
diff --git a/src/views/register/userRegister.vue b/src/views/register/userRegister.vue
index 16aaeaa1..21a86d23 100644
--- a/src/views/register/userRegister.vue
+++ b/src/views/register/userRegister.vue
@@ -40,7 +40,7 @@
       <van-field v-model="form.idCardNum" label="身份证号" placeholder="请输入身份证号" required :rules="[{ required:true }]"/>
       <van-field v-model="form.address" label="联系地址" placeholder="请输入联系地址" />
       <div class="submit">
-        <p>我已阅读并同意<span>《农村产权交易信息服务平台会员注册协议》</span></p>
+<!--        <p>我已阅读并同意<span>《农村产权交易信息服务平台会员注册协议》</span></p>-->
         <van-button round block type="info" color="#007E72" native-type="submit">立即注册</van-button>
       </div>
     </van-form>
@@ -84,6 +84,16 @@ export default {
     },
     getSubmit(){
       console.log(this.form)
+      if (this.form.password!= this.confirmPassWord){
+        this.$toast({
+          icon: 'error', // 找到自己需要的图标
+          message: '两次密码输入不一致',
+          duration:"2000",
+          onClose:function(){
+          }
+        })
+        return;
+      }
       userRegister(this.form).then((res) => {
         this.$toast({
           icon: 'success', // 找到自己需要的图标
diff --git a/src/views/user/accountSetting/index.vue b/src/views/user/accountSetting/index.vue
index 7ef99bf9..694457fa 100644
--- a/src/views/user/accountSetting/index.vue
+++ b/src/views/user/accountSetting/index.vue
@@ -7,7 +7,8 @@
       placeholder
       @click-left="onClickLeft"
     />
-    <van-cell title="用户资料修改" @click="goInformation" to="userInformation" is-link icon="points" />
+    <van-cell title="用户资料修改" v-if="memberType==1" to="userInformation" is-link icon="points" />
+    <van-cell title="用户资料修改" v-if="memberType==2" to="companyInformation" is-link icon="points" />
     <van-cell title="银行账户信息修改" to="bankInformation" is-link icon="credit-pay" />
     <van-cell title="密码修改" to="passWordInformation" is-link icon="lock" />
   </div>
@@ -20,6 +21,7 @@ export default {
   name: "Setting",
   data() {
     return {
+      memberType:1
     };
   },
   created() {
@@ -31,13 +33,6 @@ export default {
     });
   },
   methods: {
-    goInformation(){
-      if(this.memberType == 1){
-        window.location = 'userInformation';
-      }else{
-        window.location = 'companyInformation';
-      }
-    }
   },
 };
 </script>
diff --git a/src/views/user/accountSetting/userInformation/companyInformation.vue b/src/views/user/accountSetting/userInformation/companyInformation.vue
index b80ec2d5..2775cdbc 100644
--- a/src/views/user/accountSetting/userInformation/companyInformation.vue
+++ b/src/views/user/accountSetting/userInformation/companyInformation.vue
@@ -61,7 +61,8 @@
           @confirm="onConfirm"
         />
       </van-popup>
-<!--      <van-field v-model="userForm.companySetupTime" label="成立时间" placeholder="请输入成立时间" required :rules="[{ required:true }]" />-->
+
+      <!--      <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 }]" />
@@ -206,23 +207,28 @@ export default {
     submitForm(){
       this.form.files = [];
       userUpdate(this.userForm).then(response => {
-        var imgList = [];
-        console.log(this.fileList)
-        for (var i = 0 ; i < this.fileList.length ; i++){
-          if(this.fileList[i].url.indexOf('http') == -1&&this.fileList!=''){
-            this.form.files.push(this.fileList[i].url);
+        if(response.code == 200) {
+          var imgList = [];
+          console.log(this.fileList)
+          for (var i = 0; i < this.fileList.length; i++) {
+            if (this.fileList[i].url.indexOf('http') == -1 && this.fileList != '') {
+              this.form.files.push(this.fileList[i].url);
+            }
           }
+          console.log(this.form.files)
+          base64Attach(this.form).then(responseSecond => {
+            if (responseSecond.code == 200) {
+              Dialog.confirm({
+                title: '系统提示',
+                message: '修改成功',
+                confirmButtonText: '确定',
+              })
+                .then(() => {
+                  this.onClickLeft()
+                })
+            }
+          });
         }
-        console.log(this.form.files)
-        base64Attach(this.form).then(responseSecond => {
-          if(response.code == 200 && responseSecond.code == 200){
-            Dialog.confirm({
-              title: '系统提示',
-              message: '修改成功',
-              confirmButtonText: '确定',
-            })
-          }
-        });
       });
     }
   },
diff --git a/src/views/user/signature/signatureDetail.vue b/src/views/user/signature/signatureDetail.vue
index 10449af6..0822550a 100644
--- a/src/views/user/signature/signatureDetail.vue
+++ b/src/views/user/signature/signatureDetail.vue
@@ -18,10 +18,10 @@
       <van-field v-model="form.contractDate" label="登记日期" placeholder="登记日期" input-align="right" :border="false" />
       <van-field v-model="form.startTime" label="开始日期" placeholder="开始日期" input-align="right" :border="false" />
       <van-field v-model="form.endTime" label="结束日期" placeholder="结束日期" input-align="right" :border="false" />
-      <van-field v-model="form.contractRemark" label="合同备注" placeholder="合同备注" input-align="right" :border="false" />
       <van-field v-model="form.status" label="是否有效" placeholder="是否有效" input-align="right" :border="false" />
       <van-field v-model="form.signingMode" label="签订方式" placeholder="签订方式" input-align="right" :border="false" />
       <van-field v-model="form.signingStatus" label="签订状态" placeholder="签订状态" input-align="right" :border="false" />
+      <van-field v-model="form.contractRemark" label="合同备注" placeholder="合同备注" input-align="right" :border="false" />
 
       <van-divider>甲方信息</van-divider>
       <van-field v-model="form.firstIsSign" label="甲方已签" placeholder="甲方已签" input-align="right" :border="false" />
diff --git a/src/views/user/signature/signatureList.vue b/src/views/user/signature/signatureList.vue
index 4c60c14d..c9a6719e 100644
--- a/src/views/user/signature/signatureList.vue
+++ b/src/views/user/signature/signatureList.vue
@@ -16,7 +16,7 @@
         @load="getList"
       >
         <!----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="info">
               <div class="title">
@@ -35,11 +35,11 @@
           <template #right>
             <div class="operation">
               <!-- delete 删除 edit编辑 view查看 list榜单 -->
-              <div class="opera_btn" style="margin-right: 10px;" v-if="item.signingMode == '线上' && item.secondIsSign =='否' " @click="openPopup(item.id)">
+              <div class="opera_btn" v-if="item.signingMode == '线上' && item.secondIsSign =='否' " @click="openPopup(item.id)">
                 <img src="../../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>签名</p>
               </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">
                 <p>预览</p>
               </div>