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

src/components/parts/chat.vue

@@ -68,7 +68,7 @@ export default {
         return;
       }
       if (this.text != '') {
-        let object = { sender_name: this.user.name, content: this.text };
+        let object = { sender_name: this.user.name ? this.user.name : this.user.adminuser, content: this.text };
         if (this.user.uid) {
           object.sender_id = this.user.uid;
           object.role = this.user.role;