diff --git a/.env.development b/.env.development
index 535c20d5e..c0924475f 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ NODE_ENV = 'development'
 # VUE_APP_BASE_API = 'https://joylink.club/jlcloud'
 # VUE_APP_BASE_API = 'http://192.168.3.4:9000'
 VUE_APP_BASE_API = 'http://192.168.3.6:9000'
-VUE_APP_VOICE_API = 'https://test.joylink.club'
+VUE_APP_VOICE_API = 'https://test.joylink.club/jlcloud'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
diff --git a/.env.native b/.env.native
index af5c4a6d3..09eb3fd7c 100644
--- a/.env.native
+++ b/.env.native
@@ -4,4 +4,4 @@ VUE_APP_PRO = 'local'
 
 # base api
 VUE_APP_BASE_API = 'https://joylink.club/jlcloud'
-VUE_APP_VOICE_API = 'https://joylink.club'
+VUE_APP_VOICE_API = 'https://joylink.club/jlcloud'
diff --git a/.env.production b/.env.production
index 684381f92..68c9d7458 100644
--- a/.env.production
+++ b/.env.production
@@ -3,4 +3,4 @@ NODE_ENV = 'production'
 
 # base api
 VUE_APP_BASE_API = 'https://joylink.club/jlcloud'
-VUE_APP_VOICE_API = 'https://joylink.club'
+VUE_APP_VOICE_API = 'https://joylink.club/jlcloud'
diff --git a/.env.staging b/.env.staging
index 41dbe65d7..2e62c739e 100644
--- a/.env.staging
+++ b/.env.staging
@@ -3,4 +3,4 @@ NODE_ENV = 'production'
 
 # base api
 VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud'
-VUE_APP_VOICE_API = 'https://test.joylink.club'
+VUE_APP_VOICE_API = 'https://test.joylink.club/jlcloud'
diff --git a/src/views/demonstration/deomonTopic/index.vue b/src/views/demonstration/deomonTopic/index.vue
index 30a8347e2..a73851405 100644
--- a/src/views/demonstration/deomonTopic/index.vue
+++ b/src/views/demonstration/deomonTopic/index.vue
@@ -72,7 +72,6 @@ export default {
             await this.$store.dispatch('socket/setRoomSubscribe', false);
         },
         async handleJoin() {
-            debugger;
             try {
                 this.loading = true;
                 const rest = await getPublishMapInfo(this.mapId);
diff --git a/src/views/newMap/displayNew/chatView/chatBox.vue b/src/views/newMap/displayNew/chatView/chatBox.vue
index 84e0931a8..3df4ee39a 100644
--- a/src/views/newMap/displayNew/chatView/chatBox.vue
+++ b/src/views/newMap/displayNew/chatView/chatBox.vue
@@ -4,7 +4,7 @@
     <div v-show="!minimize" class="chat-box">
       <chat-member-list ref="chatMemberList" :group="group" :current-coversition="currentCoversition" @addCoversition="addCoversition" />
       <div class="chat-box-main">
-        <chat-coversition-list ref="chatCoversitionList" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" />
+        <chat-coversition-list ref="chatCoversitionList" :user-role="userRole" @hideAddCoversition="hideAddCoversition" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" />
         <div class="chat-window">
           <div class="chat-box-header">
             <div class="chat-box-header-title">{{ headerTitle }}</div>
@@ -30,7 +30,8 @@
           </div>
           <div class="chat-box-footer">
             <div class="chat-box-footer-tool" />
-            <div class="chat-box-footer-send" @click="startRecording()">发送语音</div>
+            <el-button v-if="isButtonShow" size="mini" type="danger" class="chat-box-footer-quit" :loading="quitLoading" @click="quitCoversition()">退出群聊</el-button>
+            <el-button v-if="currentCoversition.all||isButtonShow" class="chat-box-footer-send" size="mini" type="primary" :disabled="recordSending" @click="startRecording()">发送语音</el-button>
             <div v-if="scriptTip" class="scriptTip">{{ scriptTip }}</div>
           </div>
         </div>
@@ -54,7 +55,7 @@ import ChatCreateGroup from './chatCreateGroup';
 import ChatMemberList from './chatMemberList';
 import ChatCoversitionList from './chatCoversitionList';
 import RecordRTC from 'recordrtc';
-import {uploadAudioFileNew} from '@/api/chat';
+import {uploadAudioFileNew, quitCoversition} from '@/api/chat';
 export default {
     name: 'ChatBox',
     components:{
@@ -82,6 +83,8 @@ export default {
             currentCoversition:{},
             seconds:0,
             inter:null,
+            isHasCoversition:false,
+            quitLoading:false,
             recorders: null,
             microphone:null,
             scriptTip:'',
@@ -94,7 +97,10 @@ export default {
     },
     computed:{
         isShow() {
-            return this.userRole != 'ADMIN' && this.userRole != 'AUDIENCE';
+            return this.userRole != 'ADMIN' && this.userRole != 'AUDIENCE' && !this.isHasCoversition;
+        },
+        isButtonShow() {
+            return this.userRole != 'ADMIN' && this.userRole != 'AUDIENCE' && this.isHasCoversition;
         }
     },
     watch: {
@@ -144,21 +150,39 @@ export default {
         setSetting(data) {
             this.form = data;
         },
+        hideAddCoversition() {
+            this.isHasCoversition = true;
+        },
         setCurrentCoversition(coversition) {
-            this.currentCoversition = coversition;
-            if (coversition.all) {
+            if (coversition && coversition.id) {
+                this.currentCoversition = coversition;
                 this.headerTitle = coversition.name;
+            } else {
+                this.headerTitle = '';
             }
             if (this.recordSending) {
                 this.cancleRecording();
             }
             this.$refs.chatContent.scrollTop();
         },
+        quitCoversition() {
+            this.quitLoading = true;
+            quitCoversition(this.group, this.currentCoversition.id).then(res=>{
+                this.quitLoading = false;
+                this.currentCoversition = {all:undefined, id:null};
+                this.$refs.chatCoversitionList.initPage(true);
+                this.isHasCoversition = false;
+            }).catch(error=>{
+                this.$messageBox('退出会话失败: ' + error.message);
+                this.quitLoading = false;
+            });
+        },
         setHeadTitle(headerTitle) {
             this.headerTitle = headerTitle;
         },
         addCoversition({data, headerTitle}) {
             this.$refs.chatCoversitionList.addCoversition(data, headerTitle);
+            this.isHasCoversition = true;
             this.currentCoversition = {id:data.id, all:data.all};
             this.headerTitle = headerTitle;
         },
@@ -281,6 +305,15 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.chat-box-footer-quit{
+    font-size: 12px;
+    padding: 5px 15px;
+    color: #fff;
+    float: left;
+    margin-left: 10px;
+    margin-bottom: 10px;
+    cursor: pointer;
+}
 .chatBox{
   width: 503px;
 //   height: 400px;
@@ -347,17 +380,13 @@ export default {
     height: 30px;
 }
 .chat-box-footer-send{
-    background: #36a2fd;
-    width: 65px;
     font-size: 12px;
-    padding: 5px 0px 4px 0px;
     text-align: center;
-    border-radius: 3px;
-    color: #fff;
     float: right;
     margin-right: 10px;
     margin-bottom: 10px;
     cursor: pointer;
+    padding: 5px 15px;
 }
 .minimality {
     float: right;
@@ -385,6 +414,10 @@ export default {
 .coversition-list{
 
 }
+.chat-box-footer-send.disbled{
+    cursor: no-drop;
+}
+
 .scriptTip{
     position: absolute;
     width: 260px;
diff --git a/src/views/newMap/displayNew/chatView/chatContent.vue b/src/views/newMap/displayNew/chatView/chatContent.vue
index 67ed5ad7e..0411f9bc4 100644
--- a/src/views/newMap/displayNew/chatView/chatContent.vue
+++ b/src/views/newMap/displayNew/chatView/chatContent.vue
@@ -70,20 +70,22 @@ export default {
     },
     methods:{
         inintData() {
-            getSimulationContextListNew(this.$route.query.group, this.coversition.id).then(res=>{
-                const userId = this.$store.state.user.id;
-                const coversitionList = res.data.map(coversition=>{
-                    coversition.self = false;
-                    if (coversition.member.userId == userId) {
-                        coversition.self = true;
-                    }
-                    coversition.src = coversition.isAudio ? `/jlcloud/audio/${coversition.audioPath}` : '';
-                    coversition.targetUser = coversition.targetMember ? coversition.targetMember : 'All';
-                    return coversition;
+            if (this.coversition.id) {
+                getSimulationContextListNew(this.$route.query.group, this.coversition.id).then(res=>{
+                    const userId = this.$store.state.user.id;
+                    const coversitionList = res.data.map(coversition=>{
+                        coversition.self = false;
+                        if (coversition.member.userId == userId) {
+                            coversition.self = true;
+                        }
+                        coversition.src = coversition.isAudio ? `/audio/${coversition.audioPath}` : '';
+                        coversition.targetUser = coversition.targetMember ? coversition.targetMember : 'All';
+                        return coversition;
+                    });
+                    this.chatContentList = coversitionList;
+                    this.scrollTop();
                 });
-                this.chatContentList = coversitionList;
-                this.scrollTop();
-            });
+            }
             // const coversitionListAll = Object.assign({}, this.$store.state.socket.coversitionList);
             // const coversitionList = coversitionListAll[this.coversition.id] || [];
             // // console.log('inintData---coversitionList' + JSON.stringify(this.$store.state.socket.coversitionList[this.coversition.id]));
diff --git a/src/views/newMap/displayNew/chatView/chatCoversitionList.vue b/src/views/newMap/displayNew/chatView/chatCoversitionList.vue
index f1a4a4b03..04f3dfc30 100644
--- a/src/views/newMap/displayNew/chatView/chatCoversitionList.vue
+++ b/src/views/newMap/displayNew/chatView/chatCoversitionList.vue
@@ -7,45 +7,63 @@
         :key="coversition.id"
         :class="coversition.id==currentCoversition.id?'coversition-active each-coversition':'each-coversition'"
         @click="changeCoversition(coversition)"
-      >{{ coversition.coverName }}</div>
+      >{{ coversition.name }}</div>
     </div>
   </div>
 </template>
 <script>
-import ConstConfig from '@/scripts/ConstConfig';
-import Cookies from 'js-cookie';
 import {getSimulationConversationListNew} from '@/api/chat';
 export default {
     name:'ChatCoversitionList',
+    props: {
+        userRole: {
+            type: String,
+            required: true
+        }
+    },
     data() {
         return {
             coversitionList:[],
             currentCoversition:{}
         };
     },
+    watch:{
+        'userRole':function(val) {
+            this.initPage(true);
+        }
+    },
     mounted() {
-        this.initPage(true);
     },
     methods:{
         initPage(status) {
             getSimulationConversationListNew(this.$route.query.group).then(resp=>{
                 if (resp.data) {
                     const data = resp.data;
-                    data.map(coversition=>{
-                        if (coversition.name) {
-                            coversition.coverName = coversition.name;
-                            coversition.isOnline = true;
-                        } else {
-                            const objectCover = this.handleMemberName(coversition);
-                            coversition.coverName = objectCover.coversitionName;
-                            coversition.isOnline = objectCover.isOnline;
+                    if (this.userRole == 'ADMIN' || this.userRole == 'AUDIENCE') {
+                        this.coversitionList = data;
+                    } else {
+                        this.coversitionList = data.filter(coversition=>{ return coversition.all == false; });
+                        if (this.coversitionList.length >= 1) {
+                            this.$emit('hideAddCoversition');
                         }
-                        return coversition;
-                    });
-                    this.coversitionList = data;
+                    }
                     if (resp.data && resp.data.length && resp.data.length > 0 && status) {
-                        this.currentCoversition = data[0];
-                        this.$emit('setCurrentCoversition', resp.data[0]);
+                        if (this.userRole == 'ADMIN' || this.userRole == 'AUDIENCE') {
+                            this.currentCoversition = data[0];
+                            this.$emit('setCurrentCoversition', resp.data[0]);
+                        } else {
+                            if (this.coversitionList.length >= 1) {
+                                this.currentCoversition = data[0];
+                                this.$emit('setCurrentCoversition', resp.data[0]);
+                            } else {
+                                this.currentCoversition = null;
+                                this.$emit('setCurrentCoversition', this.currentCoversition);
+                            }
+                        }
+                    } else if (resp.data && resp.data.length && resp.data.length > 0 && !status) {
+                        const coversition = data.filter(coversition=>{ return coversition.all == false; });
+                        this.currentCoversition = coversition[0];
+                        this.$emit('setCurrentCoversition', coversition[0]);
                     }
                 }
             });
@@ -53,82 +71,22 @@ export default {
         addCoversition(data, headerTitle) {
             const index = this.coversitionList.findIndex(item=>{ return item.id == data.id; });
             if (index < 0) {
-                const objectCover = this.handleMemberName(data);
-                if (data.name) {
-                    data.coverName = data.name;
-                    data.isOnline = true;
-                } else {
-                    data.coverName = objectCover.coversitionName;
-                    data.isOnline = objectCover.isOnline;
-                }
                 this.coversitionList.push(data);
-                if (headerTitle) {
-                    this.currentCoversition = data;
-                }
+                this.currentCoversition = data;
             }
         },
         changeCoversition(coversition) {
-            this.$emit('setHeadTitle', coversition.coverName);
+            this.$emit('setHeadTitle', coversition.name);
             this.currentCoversition = {id:coversition.id, all:coversition.all};
             this.$emit('setCurrentCoversition', coversition);
             // this.$refs.chatContent.reloadData(this.currentCoversition);
         },
         changeCoversitionOther(coversition) {
-            const objectCover = this.handleMemberName(coversition);
-            coversition.coverName = objectCover.coversitionName;
-            coversition.isOnline = objectCover.isOnline;
             const index = this.coversitionList.findIndex(item=>{ return item.id == coversition.id; });
             if (index < 0) {
                 this.coversitionList.push(coversition);
             }
             this.changeCoversition(coversition);
-        },
-        handleMemberName(conversition) {
-            if (conversition.all) {
-                return {coversitionName:conversition.name, isOnline:true};
-            } else {
-                let coversitionName = '';
-                let isOnline = true;
-                if (conversition.memberList) {
-                    conversition.memberList.forEach(member=>{
-                        if (member.userId != this.$store.state.user.id) {
-                            const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
-                            let data = member.role;
-                            roleTypeList.forEach(function(element) {
-                                const rolename = element.value;
-                                if (Cookies.get('user_lang') == 'en') {
-                                    data = data.replace(rolename, element.enLabel);
-                                } else {
-                                    data = data.replace(rolename, element.label);
-                                }
-                            });
-                            const deviceName = member.deviceName ? '-' + member.deviceName : '';
-                            const memberName = member.name ? '-' + member.name : '';
-                            isOnline = member.online;
-                            coversitionName = data + deviceName + memberName;
-                        }
-                    });
-                } else if (conversition.member) {
-                    const member = conversition.member;
-                    let data = member.role;
-                    const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
-                    roleTypeList.forEach(function(element) {
-                        const rolename = element.value;
-                        if (Cookies.get('user_lang') == 'en') {
-                            data = data.replace(rolename, element.enLabel);
-                        } else {
-                            data = data.replace(rolename, element.label);
-                        }
-                    });
-                    const deviceName = member.deviceName ? '-' + member.deviceName : '';
-                    const memberName = member.name ? '-' + member.name : '';
-                    isOnline = member.online;
-                    coversitionName = data + deviceName + memberName;
-                } else {
-                    coversitionName = conversition.name;
-                }
-                return {coversitionName:coversitionName, isOnline:isOnline};
-            }
         }
     }
 };
diff --git a/src/views/newMap/displayNew/chatView/chatMemberList.vue b/src/views/newMap/displayNew/chatView/chatMemberList.vue
index 1fc6bcdb3..9312509d7 100644
--- a/src/views/newMap/displayNew/chatView/chatMemberList.vue
+++ b/src/views/newMap/displayNew/chatView/chatMemberList.vue
@@ -51,26 +51,29 @@ export default {
     },
     methods:{
         getSimulationMembers() {
-            getSimulationChatMemberNew(this.$route.query.group, this.currentCoversition.id).then(resp => {
-                let lastData = JSON.stringify(resp.data);
-                const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
-                roleTypeList.forEach(function(element) {
-                    const rolename = element.value;
-                    if (Cookies.get('user_lang') == 'en') {
-                        lastData = lastData.replace(new RegExp(rolename, 'g'), element.enLabel);
-                    } else {
-                        lastData = lastData.replace(new RegExp(rolename, 'g'), element.label);
-                    }
+            this.memberList = [];
+            if (this.currentCoversition.id) {
+                getSimulationChatMemberNew(this.$route.query.group, this.currentCoversition.id).then(resp => {
+                    let lastData = JSON.stringify(resp.data);
+                    const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
+                    roleTypeList.forEach(function(element) {
+                        const rolename = element.value;
+                        if (Cookies.get('user_lang') == 'en') {
+                            lastData = lastData.replace(new RegExp(rolename, 'g'), element.enLabel);
+                        } else {
+                            lastData = lastData.replace(new RegExp(rolename, 'g'), element.label);
+                        }
+                    });
+                    lastData = JSON.parse(lastData);
+                    lastData.map(member=>{
+                        const deviceName = member.deviceName ? '-' + member.deviceName : '';
+                        const memberName = member.name ? '-' + member.name : '';
+                        member.memberName = member.role + deviceName + memberName;
+                        return member;
+                    });
+                    this.memberList = lastData;
                 });
-                lastData = JSON.parse(lastData);
-                lastData.map(member=>{
-                    const deviceName = member.deviceName ? '-' + member.deviceName : '';
-                    const memberName = member.name ? '-' + member.name : '';
-                    member.memberName = member.role + deviceName + memberName;
-                    return member;
-                });
-                this.memberList = lastData;
-            });
+            }
         },
         getMember(memberId) {
             return this.memberList.filter(member=>{
diff --git a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
index 6f17cb8ff..516e97a5c 100644
--- a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
+++ b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
@@ -4,7 +4,7 @@
     <div v-show="!minimize" class="chat-box">
       <chat-member-list ref="chatMemberList" :group="group" :current-coversition="currentCoversition" />
       <div class="chat-box-main">
-        <chat-coversition-list ref="chatCoversitionList" :group="group" :user-role="userRole" @hideAddCoversition="hideAddCoversition" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" />
+        <chat-coversition-list ref="chatCoversitionList" :user-role="userRole" @hideAddCoversition="hideAddCoversition" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" />
         <div class="chat-window">
           <div class="chat-box-header">
             <div class="chat-box-header-title">{{ headerTitle }}</div>
@@ -30,8 +30,8 @@
           </div>
           <div class="chat-box-footer">
             <div class="chat-box-footer-tool" />
-            <div v-if="isButtonShow" class="chat-box-footer-quit" @click="quitCoversition()">退出群聊</div>
-            <div v-if="currentCoversition.all||isButtonShow" class="chat-box-footer-send" @click="startRecording()">发送语音</div>
+            <el-button v-if="isButtonShow" size="mini" type="danger" class="chat-box-footer-quit" :loading="quitLoading" @click="quitCoversition()">退出群聊</el-button>
+            <el-button v-if="currentCoversition.all||isButtonShow" class="chat-box-footer-send" size="mini" type="primary" :disabled="recordSending" @click="startRecording()">发送语音</el-button>
           </div>
         </div>
       </div>
@@ -87,6 +87,7 @@ export default {
             recorders: null,
             microphone:null,
             isHasCoversition:false,
+            quitLoading:false,
             form:{
                 language:'zh',
                 sex:'1'
@@ -132,7 +133,7 @@ export default {
             this.$refs.chatCoversitionList.initPage(false);
         },
         setCurrentCoversition(coversition) {
-            if (coversition) {
+            if (coversition.id) {
                 this.currentCoversition = coversition;
                 this.headerTitle = coversition.name;
             } else {
@@ -150,12 +151,15 @@ export default {
             this.isHasCoversition = true;
         },
         quitCoversition() {
+            this.quitLoading = true;
             quitCoversition(this.group, this.currentCoversition.id).then(res=>{
                 this.currentCoversition = {all:undefined, id:null};
                 this.$refs.chatCoversitionList.initPage(true);
                 this.isHasCoversition = false;
+                this.quitLoading = false;
             }).catch(error=>{
                 this.$messageBox('退出会话失败: ' + error.message);
+                this.quitLoading = false;
             });
         },
         addCoversition({data, headerTitle}) {
@@ -461,6 +465,9 @@ export default {
     background: #eeeeee;
     cursor: pointer;
 }
+.chat-box-footer-send.disbled{
+    cursor: no-drop;
+}
 
 .minimize-box {
     width: 97.5%;
diff --git a/src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue b/src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue
index 5ca9b55a4..9ac8b5273 100644
--- a/src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue
+++ b/src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue
@@ -19,10 +19,6 @@ import {getSimulationConversationListNew} from '@/api/chat';
 export default {
     name:'ChatCoversitionList',
     props: {
-        group: {
-            type: String,
-            required: true
-        },
         userRole: {
             type: String,
             required: true