Merge branch 'develop-rel' into develop

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/',

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; */
             }