From 37fc3066d0d46c6949bd93b594eca7a81ef21c5c Mon Sep 17 00:00:00 2001
From: xuechunyuan <17853500702@163.com>
Date: Fri, 24 Feb 2023 14:18:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=88=97=E8=A1=A8=E6=97=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=A4=E6=96=AD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js          | 2 +-
 src/views/myExam.vue | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main.js b/src/main.js
index 086efb1..c405ef3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,7 +9,7 @@ import GlobalConfig from "./utils/aisdapp";
 import { Base64 } from "js-base64";
 
 import VConsole from "vconsole";
-let vConsole = new VConsole();
+// let vConsole = new VConsole();
 
 Vue.use(vant);
 
diff --git a/src/views/myExam.vue b/src/views/myExam.vue
index 22462f9..cf12551 100644
--- a/src/views/myExam.vue
+++ b/src/views/myExam.vue
@@ -5,7 +5,7 @@
       <div class="no_title">查询无结果</div>
       <div class="no_txt">暂无您的预约项目，请选择医院后进行预约</div>
     </div>
-    <van-list v-model="loading" :finished="isFinished" finished-text="没有更多了" @load="onLoad">
+    <van-list v-else v-model="loading" :finished="isFinished" 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">
@@ -38,7 +38,8 @@
               <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 ? '已完成' : '取消预约'
+  item1.apmStatus == 1 ? '已取消' : item1.apmStatus == 2 &&
+    item1.lastExamTime === 0 ? '已过期' : item1.apmStatus == 2 ? '取消预约' : item1.apmStatus == 3 ? '已完成' : '取消预约'
                 }}</div>
             </div>
           </div>