Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

src/views/hall/dock/parts/chat.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="chat">
+  <div id="chats">
     <el-row>
       <el-col :span="24" class="info chat_frame" id="chat">
         <template v-for="(i, index) in talk">
@@ -26,7 +26,7 @@ import wangEditor from '@/components/wang-editor.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: personalChat } = createNamespacedHelpers('personalchat');
 export default {
-  name: 'chat',
+  name: 'chats',
   props: {
     room: { type: Object },
   },