Merge remote-tracking branch 'origin/master'

src/components/common/nav_footer.vue

@@ -6,7 +6,7 @@
     </router-link>
     <router-link to="/project" class="tab" active-class="active">
       <span class="icon"><van-icon name="notes-o" size="25" /></span>
-      <p class="text">供应项目</p>
+      <p class="text">交易项目</p>
     </router-link>
     <router-link to="/user" class="tab" active-class="active">
       <span class="icon"><van-icon name="contact" size="25" /></span>

src/views/project/projectDetail.vue

@@ -44,7 +44,7 @@
           <van-row >
             <van-col span="2"><van-image src="../../static/images/icon/phone.png" style="vertical-align: text-top;" /></van-col>
             <template v-if="biddinglistInformation!=undefined&&biddinglistInformation.length>0">
-              <van-col span="5">{{biddinglistInformation[0].userName}}</van-col>
+              <van-col span="5">{{biddinglistInformation[0].memberId}}</van-col>
               <van-col span="4">{{biddinglistInformation[0].money}}元</van-col>
               <van-col span="4">领先</van-col>
               <van-col span="9">{{biddinglistInformation[0].createTime}}</van-col>
@@ -71,7 +71,7 @@
             <van-col span="24"><span>竞价方向：</span>{{ detail.biddingDirect }}</van-col>
           </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-col span="24"><span>延时周期：</span>{{timeConfig}}分钟</van-col>
@@ -94,8 +94,8 @@
             <van-col span="24"><span>住址（地址）</span>{{ detail.address }}</van-col>
           </van-row>
           <van-row>
-            <van-col span="14"><span>经济类型</span>{{ detail.economicType }}</van-col>
-            <van-col span="10"><span>机构代码证号</span>{{ detail.areaNum }}</van-col>
+            <van-col span="12"><span>经济类型</span>{{ detail.economicType }}</van-col>
+            <van-col span="12"><span>机构代码证号</span>{{ detail.areaNum }}</van-col>
           </van-row>
           <van-row>
             <van-col span="12"><span>法人/负责人</span>{{ detail.legalPerson }}</van-col>
@@ -106,8 +106,8 @@
             <van-col span="24"><span>身份证号</span>***************</van-col>
           </van-row>
           <van-row>
-            <van-col span="14"><span>项目类型</span>{{ detail.projectNumber }}</van-col>
-            <van-col span="10"><span>农地性质</span>{{ detail.projectType }}</van-col>
+            <van-col span="12"><span>项目类型</span>{{ detail.projectNumber }}</van-col>
+            <van-col span="12"><span>农地性质</span>{{ detail.projectType }}</van-col>
           </van-row>
           <van-row>
             <van-col span="24"><span>转出项目名称</span>{{ detail.projectName }}</van-col>
@@ -120,8 +120,8 @@
 <!--            <van-col span="10"><span>前次转出方式</span>{{ detail.oneout}}</van-col>-->
 <!--          </van-row>-->
           <van-row>
-            <van-col span="14"><span>拟转出方式</span>{{ detail.rollout }}</van-col>
-            <van-col span="10"><span>拟转出面积/数量</span> {{detail.allCount}}{{detail.allCountUnit}} </van-col>
+            <van-col span="12"><span>拟转出方式</span>{{ detail.rollout }}</van-col>
+            <van-col span="12"><span>拟转出面积/数量</span> {{detail.allCount}}{{detail.allCountUnit}} </van-col>
           </van-row>
           <van-row>
             <van-col span="24"><span>拟转出期限</span>{{detail.outStartTime}} 至 {{detail.outStopTime}}&nbsp&nbsp&nbsp&nbsp&nbsp共{{detail.outYearNum}}年</van-col>
@@ -216,10 +216,17 @@
           <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 v-if="detail.ladderPrice">{{price}}元</p>
-          </van-button>
+
+          <div style="display: flex;">
+            <van-button round color="#C21F3A" block @click="offer">
+              <p>出价</p>
+              <p v-if="detail.ladderPrice">{{price}}元</p>
+            </van-button>
+
+            <van-button v-if="isFirst == 'Y'" round color="#C21F3A" block @click="offerFirst" style="margin-left: 10px;">
+              <p>优先跟价</p>
+            </van-button>
+          </div>
         </van-col>
         <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>
@@ -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()
   }
 };
 </script>

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){

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: '请输入关键词',

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: '请输入关键词',

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;

src/views/user/signature/signatureList.vue

@@ -44,7 +44,7 @@
                 <p>预览</p>
               </div>
               <div class="opera_btn" v-if="item.signingMode == '线上' && item.isArchive == '是' ">
-                <a :href="'/api/profile/download'+item.contractPdf" download style="color: #333333">
+                <a :href="'/api/profile/download/'+item.contractPdf" download style="color: #333333">
                   <img src="../../../assets/images/sunVillage_info/signature_icon_04.png" alt="" width="35">
                   <p>电子合同</p>
                 </a>