From 888ba23d4920f09235956721e7be1c6fd7dce27b 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, 10 May 2023 10:58:28 +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 | 59 ++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/src/views/biddingHall/index.vue b/src/views/biddingHall/index.vue
index 10cd3cfd..3142ee1f 100644
--- a/src/views/biddingHall/index.vue
+++ b/src/views/biddingHall/index.vue
@@ -16,7 +16,7 @@
     />
     <van-row>
       <van-dropdown-menu>
-        <van-dropdown-item v-model="value1" :options="projectTypeOption" @change="getList"/>
+        <van-dropdown-item v-model="value1" :options="projectTypeOption" @change="tabChange"/>
         <van-dropdown-item :value="value2" :title="value2">
           <van-tree-select
             :active-id.sync="activeId"
@@ -27,7 +27,7 @@
             @click-nav="clickNav"
           />
         </van-dropdown-item>
-        <van-dropdown-item v-model="value3" :options="option3" @change="getList"/>
+        <van-dropdown-item v-model="value3" :options="option3" @change="tabChange"/>
       </van-dropdown-menu>
     </van-row>
     <van-row type="flex" justify="center" class="biddingProcessTitle">
@@ -108,12 +108,12 @@
       </van-col>
       <van-col span="1"></van-col>
     </van-row>
-    <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
+<!--    <van-pull-refresh v-model="refreshing" @refresh="onRefresh">-->
       <van-list
         v-model="loading"
         :finished="finished"
         finished-text="没有更多了"
-        @load="onL"
+        @load="getList"
       >
         <van-row v-for="(item,index) in infoList" :key="index" :title="item" @click="goDetail(item.id)">
           <van-col span="13" class="biddingProcessListLeftCol">
@@ -129,7 +129,7 @@
           </van-col>
         </van-row>
       </van-list>
-    </van-pull-refresh>
+<!--    </van-pull-refresh>-->
   </div>
 </template>
 
@@ -165,13 +165,19 @@ export default {
       deptListOption: [],
       option3: [
         { text: '竞价状态', value: '' },
-        { text: '全部', value: '全部' },
-        { text: '竞价中', value: '竞价中' },
-        { text: '竞价结束', value: '竞价结束' },
+        { text: '正在报名', value: '正在报名' },
+        { text: '等待竞价', value: '等待竞价' },
+        { text: '正在竞价', value: '正在竞价' },
+        { text: '等待成交', value: '等待成交' },
+        { text: '已经成交', value: '已经成交' },
       ],
       loading: false,
       finished: false,
       refreshing: false,
+      queryParams : {
+        pageNum:1,
+        pageSize:10
+      }
     }
   },
   created(){
@@ -203,26 +209,31 @@ export default {
       this.$router.push({path:'project/projectDetail',query:{id:id}})
     },
     getList(){
-      let queryDatas = {
-        deptId: this.activeId,
-        projectNumber:this.value1,
-        projectShowStatus:this.value3
-      }
-      getBiddingList(queryDatas).then(response =>{
-        this.infoList = response.rows.map(item => {
+      this.queryParams.deptId = this.activeId;
+      this.queryParams.projectNumber = this.value1;
+      this.queryParams.projectShowStatus = this.value3;
+      getBiddingList(this.queryParams).then(response =>{
+        response.rows.map(item => {
           if (item.biddingStopTime!=""){
             let time = 0
-            let endDate =  Date.parse(item.biddingStopTime);
+            let endDate = Date.parse(item.biddingStopTime);
             let nowDate = Date.parse(new Date());
             if(endDate>nowDate){
               time = endDate-nowDate>0?endDate-nowDate:0
             }
-            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,id:item.id}
+            console.log(time)
+            this.infoList.push({content:item.projectName,deadline:time,currentPrice:item.price,priceUnit:item.unit,id:item.id})
+          }else{
+            this.infoList.push({content:item.projectName,deadline:0,currentPrice:item.price,priceUnit:item.unit,id:item.id})
           }
-
         })
+        if(this.infoList.length >= response.total){
+          this.finished = true;
+          return;
+        }else{
+          this.loading = false;
+          this.queryParams.pageNum += 1 ;
+        }
       });
     },
     clickNav(index){
@@ -230,6 +241,8 @@ export default {
     },
     clickItem(data){
       console.log(data)
+      this.infoList = [];
+      this.queryParams.pageNum = 1;
       if(data.text==this.value2){
         this.activeId=1
         this.value2='标的物位置'
@@ -238,6 +251,12 @@ export default {
       }
       this.getList()
     },
+    tabChange(){
+      this.infoList = [];
+      this.queryParams.pageNum = 1;
+      this.finished = false;
+      this.getList()
+    },
     onSearch(val) {
       this.loading = true;
       if(this.infoList.length>0){