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

src/components/parts/chat.vue

@@ -15,10 +15,16 @@
             </p>
           </li>
         </ul>
-        <div class="input">
-          <input v-model="text" />
-          <button type="button" @click="send" class="anniu">发送</button>
-        </div>
+        <!-- <div class="input" > -->
+        <el-row type="flex" :gutter="10" style="padding-top:20px;height:40px;line-height:40px">
+          <el-col :span="20">
+            <el-input v-model="text" size="mini"></el-input>
+          </el-col>
+          <el-col :span="4">
+            <el-button @click="send" size="mini" round style="background: #ff8500;color: #fff;">发送</el-button>
+          </el-col>
+        </el-row>
+        <!-- </div> -->
       </div>
     </el-row>
   </div>