From 9d470ac9e8547d890a0492a67642fc83f4004f73 Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Fri, 10 Nov 2023 16:25:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8A=9F=E8=80=97=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=20-=20=E4=BF=AE=E5=A4=8D=20=E7=9B=91=E6=8A=A4?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=AF=BC=E8=87=B4=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/models.js                                 | 2 +-
 src/views/gps-card-frontend/device-setting/index.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/config/models.js b/src/config/models.js
index 7f05ebd..a1e48aa 100644
--- a/src/config/models.js
+++ b/src/config/models.js
@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.96F'; //版本号
+export const VERSION_MODEL = '1.0.97F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',
diff --git a/src/views/gps-card-frontend/device-setting/index.vue b/src/views/gps-card-frontend/device-setting/index.vue
index e442bd2..e6cea45 100644
--- a/src/views/gps-card-frontend/device-setting/index.vue
+++ b/src/views/gps-card-frontend/device-setting/index.vue
@@ -99,7 +99,7 @@ export default {
     // 获取设备场景模式参数
     getWatchConfig() {
         APICore.getWatchConfig({imei: this.imei}).then(res => {
-            let data = res.data;
+            let data = res.data.data;
             if(data) {
                 const modeId = data.modeId;
                 const roleId = data.roleId;
@@ -108,8 +108,8 @@ export default {
                 this.settingItems[0].text = `监护角色(${roleId === 1 ? '学生' : '老人'})`;
                 this.settingItems[1].text = `场景模式(${this.getModeById(modeId)})`;
             } else {
-                this.settingItems[0].text = `监护角色(学生)`;
-                this.settingItems[1].text = `场景模式(无)`;
+                this.settingItems[0].text = `监护角色(无数据)`;
+                this.settingItems[1].text = `场景模式(无数据)`;
                 /* this.modeId = 1;
                 this.roleId = 1; */
             }