Merge branch 'master' of http://git.shengws.com/zhangbj/scrm-vue

src/scrm_pages/kefu/index.vue

@@ -947,6 +947,7 @@ var kgetPrePageC2CHistroyMsgInfoMap = {};
   bottom: 0;
   overflow-x: visible;
   overflow-y: auto;
+  /* border:solid 1px red; */
 }
 .channelswitch-wrap {
   position: absolute;