From 8ad8bcddcf0c1efc708e8247983982546f916773 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Wed, 11 Jan 2023 11:25:39 +0800
Subject: [PATCH] ad

---
 src/page/check/chose.vue | 28 ++++++++++++++++++++--------
 vue.config.js            |  4 ++--
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/page/check/chose.vue b/src/page/check/chose.vue
index 591ea49..a02c8f3 100644
--- a/src/page/check/chose.vue
+++ b/src/page/check/chose.vue
@@ -148,11 +148,16 @@
           </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 || "-") }}
@@ -161,8 +166,15 @@
       </div>
     </div>
 
-    <div style="margin: 0 auto;width: 1100px;display: flex;justify-content: flex-end;">
-        <el-pagination
+    <div
+      style="
+        margin: 0 auto;
+        width: 1100px;
+        display: flex;
+        justify-content: flex-end;
+      "
+    >
+      <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="currentPage"
@@ -371,7 +383,7 @@ export default {
       }
       this.$router.push({ path: "/wel" });
       localStorage.setItem("allClose", true);
-      this.$db.deleteDB('EquipmentStateFiltter')
+      this.$db.deleteDB("EquipmentStateFiltter");
     },
     addLoginCount(houseId) {
       this.$api.api
diff --git a/vue.config.js b/vue.config.js
index 884fc33..2b82699 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,10 +3,10 @@
  * https://cli.vuejs.org/zh/config/
  */
 // const url = 'http://192.168.31.160:9999' //长龙
-const url = 'http://192.168.31.85:9999' // 胜浩
+// const url = 'http://192.168.31.85:9999' // 胜浩
 // const url = 'http://127.0.0.1:9999' // 本地
 
-// const url = 'http://39.97.244.65:9999' // 测试服务器
+const url = 'http://39.97.244.65:9999' // 测试服务器
 
 // const url = 'http://62.234.122.43:9999' //正式服务器1
 // const url = 'https://www.aihxz.com' // 正式域名