From e7ccc9e3b51a9c57284dc132caafc63ec30091c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 5 Jun 2023 14:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=89=8B=E6=9C=BA=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/phoneView/myCollection.vue | 76 ++++++++++++++----
 jero-web/src/views/phoneView/mySubscribe.vue  | 77 +++++++++++++++----
 2 files changed, 126 insertions(+), 27 deletions(-)

diff --git a/jero-web/src/views/phoneView/myCollection.vue b/jero-web/src/views/phoneView/myCollection.vue
index cb62afad4..2b4bccfe5 100644
--- a/jero-web/src/views/phoneView/myCollection.vue
+++ b/jero-web/src/views/phoneView/myCollection.vue
@@ -8,37 +8,86 @@
     </div>
 
     <div class="content">
-      <div class="content-text" v-for="item in 8">
-        <div class="content-text-left">
-          <div class="content-text-top">
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        :finished-text="$t('noMore')"
+        :loading-text="$t('loading')"
+        @load="onLoad"
+      >
+        <div class="content-text" v-for="(item,index) in collectionList" :key="index">
+          <div class="content-text-left">
+            <div class="content-text-top">
             <span class="content-text-top-left">
-              测试类别
-            </span>
-            <span class="content-text-top-right">
-               测试检验项目
+               {{item.serialNumber}}
             </span>
+              <!--              <span class="content-text-top-right">-->
+              <!--               测试检验项目-->
+              <!--            </span>-->
+            </div>
+            <div class="content-text-button">
+              <span> {{item.title}}</span>
+            </div>
           </div>
-          <div class="content-text-button">
-            <span>ISO 898-1-2013</span>
+          <div class="content-text-right">
+            <van-icon name="arrow"/>
           </div>
         </div>
-        <div class="content-text-right">
-          <van-icon name="arrow"/>
-        </div>
-      </div>
+      </van-list>
     </div>
   </div>
 </template>
 
 <script>
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+
   export default {
     name: 'phoneMyCollection',
+    data() {
+      return {
+        collectionList: [],
+        pageNo: 1,
+        pageSize: 10,
+        loading: false,
+        finished: false
+      }
+    },
     mounted() {
       document.title = 'NIO GRP'
+      this.getCollection()
     },
     methods: {
       iconClick() {
         this.$router.go(-1)
+      },
+      onLoad() {
+        if (this.finished) {
+          this.collectionList = []
+          this.finished = false
+        } else {
+          this.pageNo++
+          this.getCollection()
+        }
+      },
+      getCollection() {
+        let params = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize
+        }
+        postAction(`collection/onlCgformCollection/page`, params).then(res => {
+          if (res.success) {
+            if (res.result.records.length > 0 && this.pageNo > 1) {
+              this.collectionList = this.collectionList.concat(res.result.records)
+            } else if (res.result.records.length > 0 && this.pageNo == 1) {
+              this.collectionList = res.result.records
+            } else if (res.result.records.length == 0) {
+              this.finished = true
+            }
+            this.loading = false
+          } else {
+            this.collectionList = []
+          }
+        })
       }
     }
   }
@@ -108,6 +157,7 @@
     font-weight: 400;
     color: #595E72;
     margin-top: 0.13rem;
+    word-break: break-all;
   }
 
   .content-text-right .van-icon {
diff --git a/jero-web/src/views/phoneView/mySubscribe.vue b/jero-web/src/views/phoneView/mySubscribe.vue
index 8c8fda60e..9d316c3d2 100644
--- a/jero-web/src/views/phoneView/mySubscribe.vue
+++ b/jero-web/src/views/phoneView/mySubscribe.vue
@@ -6,39 +6,87 @@
            {{$t('mySubscription')}}
         </span>
     </div>
-
     <div class="content">
-      <div class="content-text" v-for="item in 8">
-        <div class="content-text-left">
-          <div class="content-text-top">
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        :finished-text="$t('noMore')"
+        :loading-text="$t('loading')"
+        @load="onLoad"
+      >
+        <div class="content-text" v-for="(item,index) in subscribeList" :key="index">
+          <div class="content-text-left">
+            <div class="content-text-top">
             <span class="content-text-top-left">
-              测试类别
-            </span>
-            <span class="content-text-top-right">
-               测试检验项目
+              {{item.serialNumber}}
             </span>
+              <!--            <span class="content-text-top-right">-->
+              <!--               测试检验项目-->
+              <!--            </span>-->
+            </div>
+            <div class="content-text-button">
+              <span>{{item.title}}</span>
+            </div>
           </div>
-          <div class="content-text-button">
-            <span>ISO 898-1-2013</span>
+          <div class="content-text-right">
+            <van-icon name="arrow"/>
           </div>
         </div>
-        <div class="content-text-right">
-          <van-icon name="arrow"/>
-        </div>
-      </div>
+      </van-list>
     </div>
   </div>
 </template>
 
 <script>
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+
   export default {
     name: 'phoneMySubscribe',
+    data() {
+      return {
+        subscribeList: [],
+        pageNo: 1,
+        pageSize: 10,
+        loading: false,
+        finished: false
+      }
+    },
     mounted() {
       document.title = 'NIO GRP'
+      this.getSubscribe()
     },
     methods: {
       iconClick() {
         this.$router.go(-1)
+      },
+      onLoad() {
+        if (this.finished) {
+          this.subscribeList = []
+          this.finished = false
+        } else {
+          this.pageNo++
+          this.getSubscribe()
+        }
+      },
+      getSubscribe() {
+        let params = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize
+        }
+        postAction(`subscribe/onlCgformSubscribe/page`, params).then(res => {
+          if (res.success) {
+            if (res.result.records.length > 0 && this.pageNo > 1) {
+              this.subscribeList = this.subscribeList.concat(res.result.records)
+            } else if (res.result.records.length > 0 && this.pageNo == 1) {
+              this.subscribeList = res.result.records
+            } else if (res.result.records.length == 0) {
+              this.finished = true
+            }
+            this.loading = false
+          } else {
+            this.subscribeList = []
+          }
+        })
       }
     }
   }
@@ -108,6 +156,7 @@
     font-weight: 400;
     color: #595E72;
     margin-top: 0.13rem;
+    word-break: break-all;
   }
 
   .content-text-right .van-icon {