Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

src/api/common.js

@@ -96,7 +96,6 @@ export function downloadVoiceFile(url) {
 	if (token) 
 			header['summary'] = token
 	let baseUrl = get_base_url();
-	let _params = new FormData()
 	return new Promise((resolve, reject) => {  
 		uni.downloadFile({  
 			url: `${baseUrl}${url}`,  

src/api/request.js

@@ -42,7 +42,6 @@ export const goto_login_fun = () => {
 	})	
 }
 
-
 export default function request({
 	url,
 	method,

src/api/socket.js

@@ -53,7 +53,7 @@ export default class WebSocketUtil {
       console.log('WebSocket连接已打开');
       this.reconnectCount = 0; // 重置重连计数
       clearInterval(this.reconnectTimer); // 清除重连计时器
-      this.startHeartbeat(); // 启动心跳机制
+      // this.startHeartbeat(); // 启动心跳机制
       this.triggerEvent('open'); // 触发连接打开事件
     });
 
@@ -114,6 +114,10 @@ export default class WebSocketUtil {
   triggerEvent(event, data) {
     if (this.callbacks[event]) {
       this.callbacks[event].forEach(callback => callback(data));
+			uni.$emit('socketEvent',{
+				type: event,
+				data
+			})
     }
   }