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

src/api/common.js

@@ -72,6 +72,7 @@ export const commonUploadVoiceFile = (file, url, data = {}, fileKey='voice') =>
 		};  
     if (token) 
         header['summary'] = token
+		console.log(`${base_url}${url}`)
 	return new Promise((resolve, reject) => {  
 		uni.uploadFile({  
 			url: `${base_url}${url}`,  

src/api/socket.js

@@ -35,6 +35,7 @@ export default class WebSocketUtil {
    */
   init(flag = false) {
 		if(flag) this.reconnectCount = 0
+		this.isClose = false; // 手动关闭
     // 创建WebSocket连接
     this.socketTask = uni.connectSocket({
       url: this.url,