From 2ddbff649aa95bfc8dfb689f8b39098d417d56f9 Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Tue, 28 Nov 2023 12:17:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js           |  3 ++-
 src/pages/device/index.vue | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 537507d..4bed7a5 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -37,11 +37,12 @@ http.interceptors.response.use((response) => { /* 请求之后拦截器*/
   const { code } = response.data
   if (code != 200) {
     if (code == 4024) {
+      
       toast(response.data.msg)
     } else if (code == 401) {
       toast('请关闭，重新进入')
     } else {
-
+      toast(response.data.msg ?? response.data.message)
     }
     return Promise.reject(response)
   }
diff --git a/src/pages/device/index.vue b/src/pages/device/index.vue
index 418c9a4..00888ea 100644
--- a/src/pages/device/index.vue
+++ b/src/pages/device/index.vue
@@ -108,7 +108,7 @@
 									</view>
 								</view>
 							</u-form-item>
-							<u-form-item label="项目" label-width="140">
+							<u-form-item label="项目" label-width="140" :required='true'>
 								<view class="input_box">
 									<view class="u-select-list" @click="selectFn4()">
 										<view class="value u-line-2" 
@@ -127,32 +127,32 @@
 							</u-form-item>
 							<!-- 监控设备字段 -->
 							<template v-if="setInfo.type==1">
-							<u-form-item label="设备IP" label-width="140" :required='true'>
+							<u-form-item label="设备IP" label-width="140" :required='false'>
 								<view class="input_box">
 									<u-input v-model="extendConf.ip" type="text"/>
 								</view>
 							</u-form-item>
-							<u-form-item label="设备端口" label-width="140" :required='true'>
+							<u-form-item label="设备端口" label-width="140" :required='false'>
 								<view class="input_box">
 									<u-input v-model="extendConf.port" type="text"/>
 								</view>
 							</u-form-item>
-							<u-form-item label="RTSP地址" label-width="140" :required='true'>
+							<u-form-item label="RTSP地址" label-width="140" :required='false'>
 								<view class="input_box">
 									<u-input v-model="extendConf.rtsp_url" type="text"/>
 								</view>
 							</u-form-item>
-							<u-form-item label="设备登录名" label-width="160" :required='true'>
+							<u-form-item label="设备登录名" label-width="160" :required='false'>
 								<view class="input_box">
 									<u-input v-model="extendConf.username" type="text"/>
 								</view>
 							</u-form-item>
-							<u-form-item label="设备登录密码" label-width="180" :required='true'>
+							<u-form-item label="设备登录密码" label-width="180" :required='false'>
 								<view class="input_box">
 									<u-input v-model="extendConf.password" type="password"/>
 								</view>
 							</u-form-item>
-							<u-form-item label="设备播放通道" label-width="180" :required='true'>
+							<u-form-item label="设备播放通道" label-width="180" :required='false'>
 								<view class="input_box">
 									<u-input v-model="extendConf.passage" type="text"/>
 								</view>