Merge branch 'master' of http://git.xt.wenhq.top:8083/wimjiang/squi-HD

src/components/MarkerMap/index.tsx

@@ -219,7 +219,7 @@ export default defineComponent({
                          }
                          let meetObj = JSON.parse(localStorage.getItem('meeting'));
                          let memberList = [];
-                         memberList.push(meetObj.member[0]);
+                         memberList.push(meetObj.member==null||meetObj.member==undefined?"":meetObj.member[0]);
                          memberList.push(memberObj);
                          meetObj.member = memberList
                          console.log(meetObj);

src/constants/constants.ts

@@ -5,9 +5,9 @@ export const BaseReg = /^\+\+\+\+[\.]+|[\d|\w|\s|\u4e00-\u9fa5]+\+\+\+\+$/;
 export const DA_HUA = {
   username: 'huashe2',
   password: 'huashe123',
-  ip: '10.11.208.39',
+  ip: '10.55.134.3',
   host: 'http',
-  port: '31000',
+  port: '6699',
 };
 
 export const DA_HUA_URL_PREFIX =