From b57ae0d444bb71cb38bce43b88e5e19bd18e1ab0 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Wed, 1 Feb 2023 17:37:50 +0800
Subject: [PATCH] =?UTF-8?q?xiugai=E9=A6=96=E9=A1=B5=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/check/chose.vue | 15 ++++++++++-----
 src/page/wel.vue         |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/page/check/chose.vue b/src/page/check/chose.vue
index 591ea49..0530655 100644
--- a/src/page/check/chose.vue
+++ b/src/page/check/chose.vue
@@ -36,11 +36,16 @@
           <div class="text-1">{{ item.agentName }}</div>
           <div class="text-2">
             服务状态:
-            <span
-              style="font-size: 12px"
-              :style="item.residueTime > 0 ? 'color:green;' : 'color:red;'"
-              >{{ item.residueTime > 0 ? "服务中" : "已过期" }}</span
-            >
+            <template v-if="item.lockFlag == 0">
+              <span
+                style="font-size: 12px"
+                :style="item.residueTime > 0 ? 'color:green;' : 'color:red;'"
+                >{{ item.residueTime > 0 ? "服务中" : "已过期" }}</span
+              >
+            </template>
+            <template v-else>
+              <span style="font-size: 12px" :style="'color:red;'">已禁用</span>
+            </template>
           </div>
           <div class="text-3">
             {{ (item.provinceName || "-") + "-" + (item.cityName || "-") }}
diff --git a/src/page/wel.vue b/src/page/wel.vue
index 7fcd181..38cfae9 100644
--- a/src/page/wel.vue
+++ b/src/page/wel.vue
@@ -2626,7 +2626,7 @@ export default {
         this.cardlist.datalist = res.data.todayStat
         this.cardlist.liftlist = res.data.comparedStat
         this.cardlist.sequential = res.data.yesterdayStat
-      })
+      });
     },
     //获取设备
     findAllZkEquipment() {