From 1475ce4e60f49308e335fbbfa3f2ad05c0f2c387 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Tue, 21 Feb 2023 15:18:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=BE=E5=8F=B7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/myExam.vue | 103 +++++++++++++++++++++++++++----------------
 1 file changed, 66 insertions(+), 37 deletions(-)

diff --git a/src/views/myExam.vue b/src/views/myExam.vue
index e5544b0..ea3ac79 100644
--- a/src/views/myExam.vue
+++ b/src/views/myExam.vue
@@ -5,42 +5,48 @@
       <div class="no_title">查询无结果</div>
       <div class="no_txt">暂无您的预约项目，请选择医院后进行预约</div>
     </div>
-    <div class="exam_box" v-for="item in examArr" :key="item.id">
-      <div class="time_box">{{ item.createDeptName }}</div>
-      <div class="pro_box" v-for="item1 in item.details" :key="item1.project">
-        <div class="pro_top">
-          <div class="img_box">
-            <img v-if="item.apmStatus !== 1" src="~@/assets/image/time.png" alt="" />
-            <img v-else src="~@/assets/image/time_gray.png" alt="" />
-          </div>
-          <div class="time_box">
-            <div class="time_text">{{ doDateFormatter(item.apmDay) }}</div>
-            <div class="date_txt">{{ item1.period + ' ' + item1.timeFrame }}</div>
-          </div>
-        </div>
-        <div class="pro_bottom">
-          <div class="pro_left">
+    <van-list
+      :finished="finished"
+      finished-text="没有更多了"
+      @load="onLoad"
+    >
+      <van-cell class="exam_box" v-for="item in examArr" :key="item.id">
+        <div class="time_box">{{ item.createDeptName }}</div>
+        <div class="pro_box" v-for="item1 in item.details" :key="item1.id">
+          <div class="pro_top">
             <div class="img_box">
-              <img v-if="item.apmStatus !== 1" src="~@/assets/image/pro.png" alt="" />
-              <img v-else src="~@/assets/image/pro_gray.png" alt="" />
+              <img v-if="item.apmStatus !== 1" src="~@/assets/image/time.png" alt="" />
+              <img v-else src="~@/assets/image/time_gray.png" alt="" />
+            </div>
+            <div class="time_box">
+              <div class="time_text">{{ doDateFormatter(item.apmDay) }}</div>
+              <div class="date_txt">{{ item1.period + ' ' + item1.timeFrame }}</div>
             </div>
-            <div class="pro_name">{{ item1.project }} </div>
-            <div class="pro_pos" :class="[item1.apmStatus === 2 ? 'tips' : item1.apmStatus == 1 ? 'cancel_tip' : '',]">
-              {{
-                item1.apmStatus == 1 ? '您的体检项目已取消' : item1.apmStatus == 3 ? '体检项目已完成' : (item1.apmStatus == 2 &&
-                  item1.lastExamTime == 0) ? '您的体检已过期' : item1.limitTime
-              }}</div>
           </div>
-          <div class="pro_right">
-            <div class="cancel" @click="cancelRegisiter(item1)"
-              :class="[item1.apmStatus == 3 ? 'finish' : item1.apmStatus == 1 || item1.limitCancelTime < 30 * 60 * 1000 ? 'cancel_item' : '',]">
-              {{
-  item1.apmStatus == 1 ? '已取消' : item1.apmStatus == 2 ? '取消预约' : item1.apmStatus == 3 ? '已完成' : '取消预约'
-              }}</div>
+          <div class="pro_bottom">
+            <div class="pro_left">
+              <div class="img_box">
+                <img v-if="item.apmStatus !== 1" src="~@/assets/image/pro.png" alt="" />
+                <img v-else src="~@/assets/image/pro_gray.png" alt="" />
+              </div>
+              <div class="pro_name">{{ item1.project }} </div>
+              <div class="pro_pos" :class="[item1.apmStatus === 2 ? 'tips' : item1.apmStatus == 1 ? 'cancel_tip' : '',]">
+                {{
+                  item1.apmStatus == 1 ? '您的体检项目已取消' : item1.apmStatus == 3 ? '体检项目已完成' : (item1.apmStatus == 2 &&
+                    item1.lastExamTime == 0) ? '您的体检已过期' : item1.limitTime
+                }}</div>
+            </div>
+            <div class="pro_right">
+              <div class="cancel" @click="cancelRegisiter(item1)"
+                :class="[item1.apmStatus == 3 ? 'finish' : item1.apmStatus == 1 || item1.limitCancelTime < 30 * 60 * 1000 ? 'cancel_item' : '',]">
+                {{
+    item1.apmStatus == 1 ? '已取消' : item1.apmStatus == 2 ? '取消预约' : item1.apmStatus == 3 ? '已完成' : '取消预约'
+                }}</div>
+            </div>
           </div>
         </div>
-      </div>
-    </div>
+      </van-cell>
+    </van-list>
   </div>
 </template>
 
@@ -52,6 +58,7 @@ export default {
     return {
       current: 1,
       size: 10,
+      finished:false,
       examArr: [],
       userInfo: null,
       systemTime: dateFormat(new Date(), 'yyyy-MM-dd hh:mm:ss'),
@@ -82,6 +89,10 @@ export default {
     }
   },
   methods: {
+    onLoad(){
+      this.current += 1;
+      this.queryMyRecord();
+    },
     //系统时间
     querySystemTime() {
       if (this.GlobalConfig.appMode) {
@@ -111,10 +122,20 @@ export default {
           vaildInterfacefn("cgstjyyjzpzp", "qdsgajjtjczdckwdyy", JSON.stringify({ createDept: "", cupCardNo: this.userInfo.papersnumber, current: this.current, size: this.size }), "2", "https://" + this.GlobalConfig.urlCreatesign, "https://" + this.GlobalConfig.urlGateway).then((value) => {
             this.$toast.clear();
             let retData = JSON.parse(value);
-            // console.log(retData,'record')
             if (retData.code == 200) {
-              this.examArr = retData.data.records;
-              console.log(this.examArr)
+              let list = retData.data.records;
+
+              if(res.data.pages > 1){
+                this.examArr = [...this.examArr,...list]
+              }else{
+                 this.examArr = retData.data.records;
+              }
+              if(res.data.current == res.data.pages){
+                this.finished = true
+              }else{
+                this.current++
+              }
+             
               this.examArr.map(item1 => {
                 item1.details.map(item => {
                   console.log(item)
@@ -144,11 +165,19 @@ export default {
         else {
           myRecord("", this.userInfo.papersnumber, this.current, this.size).then(res => {
             this.$toast.clear();
-            this.examArr = res.data.records;
-            console.log(this.examArr)
+            let list = res.data.records;
+            if(res.data.pages > 1){
+              this.examArr = [...this.examArr,...list]
+            }else{
+              this.examArr = res.data.records;
+            }
+            if(res.data.current == res.data.pages){
+              this.finished = true
+            }else{
+              this.current++
+            }
             this.examArr.map(item1 => {
               item1.details.map(item => {
-                console.log(item)
                 let systemTime = Date.parse(new Date(this.systemTime));
                 item.starTime = systemTime
                 let latime = item1.apmDay.substr(0, 10) + ' ' + item.timeFrame.split('-')[1] + ':00';