From 7d48d0ca04d969781365c52b200e625b0c542d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Thu, 28 Sep 2023 15:31:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/notice/index.vue           | 46 ++++++++++-----
 src/views/project/index.vue          | 83 ++++++++++++++++++----------
 src/views/user/application/index.vue | 13 +++--
 3 files changed, 96 insertions(+), 46 deletions(-)

diff --git a/src/views/notice/index.vue b/src/views/notice/index.vue
index 94b439e7..e6ebbf47 100644
--- a/src/views/notice/index.vue
+++ b/src/views/notice/index.vue
@@ -140,53 +140,73 @@ export default {
     getList(){
       this.loading = true;
       noticeList(this.queryParams).then(response => {
-        this.noticeList = response.rows;
+        response.rows.forEach(res=>{
+          this.noticeList.push(res);
+        })
+
         if(this.noticeList.length >= response.total){
           this.finished = true;
           return;
+        }else{
+          this.loading = false;
+          this.queryParams.pageNum += 1 ;
         }
-        this.queryParams.pageNum += 1 ;
-        this.loading = false;
+
+        // if(this.noticeList.length >= response.total){
+        //   this.finished = true;
+        //   this.loading = false;
+        //   return;
+        // }
+        // this.queryParams.pageNum += 1 ;
+        // this.loading = false;
       });
     },
     //鉴证公告集合
     getAttestationList(){
       this.attestationLoading = true;
       Attestation(this.attestationQueryParams).then(response => {
-        this.attestationList = response.rows;
-        console.log(response.rows)
+        response.rows.forEach(res=>{
+          this.attestationList.push(res);
+        })
         if(this.attestationList.length >= response.total){
           this.attestationFinished = true;
           return;
+        }else{
+          this.attestationLoading = false;
+          this.attestationQueryParams.pageNum += 1 ;
         }
-        this.queryParams.pageNum += 1 ;
-        this.attestationLoading = false;
       });
     },
     //招标公告集合
     getinviteTendersList(){
       this.inviteTendersLoading = true;
       tenderList(this.inviteTendersQueryParams).then(response => {
-        this.inviteTendersList = response.rows;
+        response.rows.forEach(res=>{
+          this.inviteTendersList.push(res);
+        })
         if(this.inviteTendersList.length >= response.total){
           this.inviteTendersFinished = true;
           return;
+        }else{
+          this.inviteTendersLoading = false;
+          this.inviteTendersQueryParams.pageNum += 1 ;
         }
-        this.inviteTendersQueryParams.pageNum += 1 ;
-        this.inviteTendersLoading = false;
       });
     },
     //招标公告集合
     getwinTheBiddingList(){
       this.winTheBiddingLoading = true;
       winList(this.winTheBiddingQueryParams).then(response => {
-        this.winTheBiddingList = response.rows;
+        response.rows.forEach(res=>{
+          this.winTheBiddingList.push(res);
+        })
         if(this.winTheBiddingList.length >= response.total){
           this.winTheBiddingFinished = true;
           return;
+        }else{
+          this.winTheBiddingLoading = false;
+          this.winTheBiddingQueryParams.pageNum += 1 ;
         }
-        this.winTheBiddingQueryParams.pageNum += 1 ;
-        this.winTheBiddingLoading = false;
       });
     },
   },
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index baad5662..564589d9 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -18,7 +18,7 @@
           </van-dropdown-item>
           <van-dropdown-item v-model="value3" :options="option3" @change="getList"/>
         </van-dropdown-menu>
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了">
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="getList">
           <router-link :to="{path:'project/projectDetail',query:{id:item.id}}" v-for="(item,index) in infoList" :key="index">
             <van-card :thumb="item.fileUrl?'/api'+item.fileUrl:'../../static/images/zwtpxw.jpg'" >
               <template #tags>
@@ -87,11 +87,11 @@ export default {
       //是否显示加载
       loading: false,
       //是否滚动到底部
-      finished: true,
+      finished: false,
       //是否显示加载
       loading1: false,
       //是否滚动到底部
-      finished1: true,
+      finished1: false,
       option1: [
       ],
       option2: [
@@ -112,6 +112,19 @@ export default {
       input: '',
       infoList:[],
       infoList1:[],
+      queryDatas : {
+        deptId: this.activeId,
+        projectNumber:this.value1,
+        projectShowStatus:this.value3,
+        pageNum:1,
+        pageSize:10
+      },
+      queryNeedDatas : {
+        deptId: this.activeId,
+        projectNumber:this.value1,
+        pageNum:1,
+        pageSize:10
+      }
     };
   },
   created() {
@@ -166,36 +179,48 @@ export default {
     },
     getList(){
       console.log(this.value1)
-      let queryDatas = {
-        deptId: this.activeId,
-        projectNumber:this.value1,
-        projectShowStatus:this.value3
-      }
-      console.log(queryDatas)
-      getOutProjectList(queryDatas).then(response =>{
-        console.log(response)
-        this.infoList = response.rows
-        if(this.infoList.length>0){
-          let newList = []
-          for(let j = 0 ;j<this.infoList.length;j++){
-            if(this.infoList[j].projectName.indexOf(this.value)>-1){
-              newList.push(this.infoList[j]);
-            }
-          }
-          this.infoList = newList
-          console.log(this.infoList)
+      this.loading = true;
+      getOutProjectList(this.queryDatas).then(response =>{
+        // console.log(response)
+        // this.infoList = response.rows
+        // if(this.infoList.length>0){
+        //   let newList = []
+        //   for(let j = 0 ;j<this.infoList.length;j++){
+        //     if(this.infoList[j].projectName.indexOf(this.value)>-1){
+        //       newList.push(this.infoList[j]);
+        //     }
+        //   }
+        //   this.infoList = newList
+        //   console.log(this.infoList)
+        // }
+
+        response.rows.forEach(res=>{
+          this.infoList.push(res);
+        })
+
+        if(this.infoList.length >= response.total){
+          this.finished = true;
+          return;
+        }else{
+          this.loading = false;
+          this.queryDatas.pageNum += 1 ;
         }
       });
     },
     getNeedProjectList(){
-      let queryDatas = {
-        deptId: this.activeId,
-        projectNumber:this.value1,
-      }
-      console.log(queryDatas)
-      needProjectList(queryDatas).then(response =>{
-        console.log(response)
-        this.infoList1 = response.rows
+      this.loading1 = true;
+      needProjectList(this.queryNeedDatas).then(response =>{
+        response.rows.forEach(res=>{
+          this.infoList1.push(res);
+        })
+
+        if(this.infoList1.length >= response.total){
+          this.finished1 = true;
+          return;
+        }else{
+          this.loading1 = false;
+          this.queryNeedDatas.pageNum += 1 ;
+        }
       });
     },
     clickNav(index){
diff --git a/src/views/user/application/index.vue b/src/views/user/application/index.vue
index 4a809c92..b37f3cac 100644
--- a/src/views/user/application/index.vue
+++ b/src/views/user/application/index.vue
@@ -2,12 +2,10 @@
   <div class="app-container">
     <van-nav-bar
       title="我的报名"
-      right-text="发布"
       left-arrow
       fixed
       placeholder
       @click-left="goClickLeft"
-      @click-right="goAdd"
     />
       <van-list
         v-model="loading"
@@ -17,9 +15,10 @@
       >
         <van-cell icon="play" v-for="(item , index) in supplyList" :key="index" :to="{path:'project/projectDetail',query:{id:item.projectId}}">
           <template #title>
-            <span :style="{color:item.depositStatus == '1' ? '#007E72':'#c21F3a'}">{{item.depositStatus == '1' ? '报名成功':'报名失败'}}</span> {{item.projectName}}
+             {{item.projectName}}
           </template>
           <template #label>
+            <p>报名状态：<span :style="{color:item.depositStatus == '1' ? '#007E72':'#c21F3a'}">{{item.depositStatus}}</span></p>
             <p>开始时间：{{item.biddingStartTime}}</p>
             <p>结束时间：{{item.biddingStopTime}}</p>
             <p>距<span style="margin: 0 0.5em">结</span>束：
@@ -50,10 +49,15 @@ export default {
       //查询参数
       queryParams:{
         memberId:'',
-      }
+      },
+      depositStatusOptions:[]
     };
   },
   created() {
+    this.getDicts("deposit_status").then(rr => {
+      this.depositStatusOptions = rr.data;
+      // this.accountType = this.selectDictLabel(this.depositStatusOptions,res.data.accountType);
+    });
     this.getInfo();
   },
   methods: {
@@ -82,6 +86,7 @@ export default {
         console.log(response)
         for (var i = 0; i < response.rows.length; i++) {
           response.rows[i].endTime = new Date(response.rows[i].biddingStopTime) - new Date();
+          response.rows[i].depositStatus = this.selectDictLabel(this.depositStatusOptions,response.rows[i].depositStatus);
           this.supplyList.push(response.rows[i]);
         }
         this.finished = true;