张桐

修改聊天模块 内容区域长度随着内容变化 样式调整

@@ -1494,8 +1494,9 @@ height: 1080px; @@ -1494,8 +1494,9 @@ height: 1080px;
1494 border-radius: 8px; 1494 border-radius: 8px;
1495 display: inline-block; 1495 display: inline-block;
1496 min-width: 98px; 1496 min-width: 98px;
1497 - max-width: 280px; 1497 + max-width: 100%;
1498 border: 1px solid #d7d7d7; 1498 border: 1px solid #d7d7d7;
  1499 +
1499 } 1500 }
1500 .chat .msg .teacher-msg p img:nth-of-type(1){ 1501 .chat .msg .teacher-msg p img:nth-of-type(1){
1501 text-align: left; 1502 text-align: left;
@@ -2963,9 +2964,10 @@ canvas { @@ -2963,9 +2964,10 @@ canvas {
2963 border-radius: 8px; 2964 border-radius: 8px;
2964 display: inline-block; 2965 display: inline-block;
2965 min-width: 98px; 2966 min-width: 98px;
2966 - max-width: 280px; 2967 + max-width: 100%;
  2968 +
2967 border: 1px solid #d7d7d7; 2969 border: 1px solid #d7d7d7;
2968 - height: 37px; 2970 + /*height: 37px;*/
2969 2971
2970 } 2972 }
2971 .chat .msg .teacher-msg p.left::after{ 2973 .chat .msg .teacher-msg p.left::after{
@@ -3918,7 +3920,7 @@ canvas { @@ -3918,7 +3920,7 @@ canvas {
3918 margin-top: 10px; 3920 margin-top: 10px;
3919 margin-bottom: 10px; 3921 margin-bottom: 10px;
3920 margin-left: 10px; 3922 margin-left: 10px;
3921 - width: 100%; 3923 + width: 94%;
3922 height: 30px; 3924 height: 30px;
3923 } 3925 }
3924 .chat .msg .teacher-msg .teaImg{ 3926 .chat .msg .teacher-msg .teaImg{
@@ -3926,18 +3928,20 @@ canvas { @@ -3926,18 +3928,20 @@ canvas {
3926 } 3928 }
3927 .chat .msg .teacher-msg p { 3929 .chat .msg .teacher-msg p {
3928 position: relative; 3930 position: relative;
  3931 + top: -24px;
3929 float: left; 3932 float: left;
3930 padding: 8px; 3933 padding: 8px;
3931 font-size: 12px; 3934 font-size: 12px;
3932 color: #333333; 3935 color: #333333;
3933 background: white; 3936 background: white;
3934 - margin-left: 16px; 3937 + margin-left: 40px;
3935 border-radius: 8px; 3938 border-radius: 8px;
3936 display: inline-block; 3939 display: inline-block;
3937 min-width: 98px; 3940 min-width: 98px;
3938 - max-width: 280px; 3941 + max-width: 100%;
3939 border: 1px solid #d7d7d7; 3942 border: 1px solid #d7d7d7;
3940 - height: 37px; 3943 + /*height: 37px;*/
  3944 + word-break: break-all;
3941 3945
3942 } 3946 }
3943 .chat .msg .teacher-msg p.left::after{ 3947 .chat .msg .teacher-msg p.left::after{
@@ -3949,7 +3953,7 @@ canvas { @@ -3949,7 +3953,7 @@ canvas {
3949 position: absolute; 3953 position: absolute;
3950 float: left; 3954 float: left;
3951 left: -8px; 3955 left: -8px;
3952 - bottom: 18px; 3956 + bottom: 33px;
3953 display: block; 3957 display: block;
3954 width: 10px; 3958 width: 10px;
3955 height: 10px; 3959 height: 10px;
@@ -4703,870 +4707,85 @@ canvas { @@ -4703,870 +4707,85 @@ canvas {
4703 top: 97px; 4707 top: 97px;
4704 } 4708 }
4705 4709
4706 -  
4707 -  
4708 -}  
4709 -  
4710 -  
4711 -  
4712 -/*h5课堂*/  
4713 -.h5box{  
4714 - display: none;  
4715 -}  
4716 -  
4717 -img {  
4718 - vertical-align: middle;  
4719 -}  
4720 -  
4721 -ul,  
4722 -ol {  
4723 - list-style: none;  
4724 -}  
4725 -  
4726 -.h1,  
4727 -.h2,  
4728 -.h3,  
4729 -.h4,  
4730 -.h5,  
4731 -.h6,  
4732 -h1,  
4733 -h2,  
4734 -h3,  
4735 -h4,  
4736 -h5,  
4737 -h6 {  
4738 - font-family: inherit;  
4739 - font-weight: 500;  
4740 - line-height: 1.1;  
4741 - color: inherit;  
4742 } 4710 }
4743 4711
4744 -.h1,  
4745 -h1 {  
4746 - font-size: 36px;  
4747 -}  
4748 4712
4749 -.h2,  
4750 -h2 {  
4751 - font-size: 30px;  
4752 -}  
4753 4713
4754 -.h3,  
4755 -h3 {  
4756 - font-size: 24px; 4714 +/*聊天区域*/
  4715 +.message img{
  4716 + width: 16px;
  4717 + height: 16px;
4757 } 4718 }
  4719 +.message_client{
  4720 + overflow: hidden;
4758 4721
4759 -.h4,  
4760 -h4 {  
4761 - font-size: 18px;  
4762 } 4722 }
4763 -  
4764 -.h5,  
4765 -h5 { 4723 +.chat .TeaName{
4766 font-size: 14px; 4724 font-size: 14px;
  4725 + margin-left: 10px;
4767 } 4726 }
4768 -  
4769 -.h6,  
4770 -h6 {  
4771 - font-size: 12px;  
4772 -}  
4773 -  
4774 -.h1,  
4775 -h1,  
4776 -.h2,  
4777 -h2,  
4778 -.h3,  
4779 -h3 {  
4780 - margin-top: 20px;  
4781 - margin-bottom: 20px;  
4782 -}  
4783 -  
4784 -.h4,  
4785 -h4,  
4786 -.h5,  
4787 -h5,  
4788 -.h6,  
4789 -h6 {  
4790 - margin-top: 10px;  
4791 - margin-bottom: 10px;  
4792 -}  
4793 -  
4794 -p {  
4795 - margin: 0 0 10px;  
4796 -}  
4797 -  
4798 -.text-center {  
4799 - text-align: center;  
4800 -}  
4801 -  
4802 -.text-left {  
4803 - text-align: left;  
4804 -}  
4805 -  
4806 -.text-right {  
4807 - text-align: right;  
4808 -}  
4809 -  
4810 -.text-indent {  
4811 - text-indent: 2em;  
4812 -}  
4813 -  
4814 -.dn {  
4815 - display: none;  
4816 -}  
4817 -  
4818 -.db {  
4819 - display: block;  
4820 -}  
4821 -  
4822 -input,  
4823 -button {  
4824 - font-family: Microsoft YaHei, Tahoma, Helvetica, Arial, "\5b8b\4f53", sans-serif; 4727 +.chat .stuName{
  4728 + font-size: 14px;
  4729 + margin-right: 10px;
4825 } 4730 }
4826 -  
4827 -.container {  
4828 - position: absolute;  
4829 - left: 0;  
4830 - top: 0;  
4831 - right: 0;  
4832 - bottom: 0; 4731 +.chat .message_client .message {
  4732 + font-size: 14px;
  4733 + color: #333;
  4734 + margin-top: 5px;
  4735 + line-height: 15px;
4833 } 4736 }
4834 4737
4835 -.video_container { 4738 +.triangle-isosceles {
4836 position: relative; 4739 position: relative;
  4740 + padding: 6px 10px 6px 10px;
  4741 + border-radius: 8px;
  4742 + display: inline-block;
  4743 + /*min-width: 20px;*/
  4744 + max-width:90%;
  4745 + word-break: break-all;
4837 } 4746 }
4838 -  
4839 -.video_container:before {  
4840 - content: "";  
4841 - display: block;  
4842 - padding-top: 240px;  
4843 -}  
4844 -  
4845 -@media screen and (min-height: 568px) {  
4846 - .video_container:before {  
4847 - padding-top: 284px;  
4848 - }  
4849 -}  
4850 -  
4851 -@media screen and (min-height: 667px) {  
4852 - .video_container:before {  
4853 - padding-top: 333px;  
4854 - }  
4855 -}  
4856 -  
4857 -@media screen and (min-height: 768px) {  
4858 - .video_container:before {  
4859 - padding-top: 384px;  
4860 - }  
4861 -}  
4862 -  
4863 -@media screen and (min-height: 1024px) {  
4864 - .video_container:before {  
4865 - padding-top: 512px;  
4866 - }  
4867 -}  
4868 -  
4869 -.video_wrapper {  
4870 - position: absolute;  
4871 - top: 0;  
4872 - left: 0;  
4873 - width: 100%;  
4874 - height: 100%;  
4875 - background: #000;  
4876 -}  
4877 -  
4878 -#video_div {  
4879 - position: absolute;  
4880 - left: 0;  
4881 - top: 0;  
4882 - width: 100%;  
4883 - height: 100%;  
4884 - z-index: 2;  
4885 - text-align: center;  
4886 - background: #333;  
4887 -}  
4888 -  
4889 -#video_div.hide {  
4890 - display: none;  
4891 -}  
4892 -  
4893 -#video {  
4894 - height: 100%;  
4895 - width: auto;  
4896 -}  
4897 -  
4898 -#video_mask {  
4899 - position: absolute;  
4900 - left: 0;  
4901 - top: 0;  
4902 - width: 100%;  
4903 - height: 100%;  
4904 - background: url(../images/beginning.jpg) center center;  
4905 - background-size: cover;  
4906 - z-index: 1;  
4907 -}  
4908 -  
4909 -#online_users {  
4910 - height: 28px;  
4911 - min-width: 60px;  
4912 - border: 1px solid #666;  
4913 - border-radius: 0 14px 14px 0;  
4914 - border-left: 0 none;  
4915 - line-height: 28px;  
4916 - font-size: 12px;  
4917 - color: #999;  
4918 - background: url(../images/icon1x.png) 0 -35px no-repeat rgba(0, 0, 0, 0.2);  
4919 - padding: 0 10px 0 30px;  
4920 - position: absolute;  
4921 - left: 0;  
4922 - top: 15px;  
4923 - z-index: 3;  
4924 - text-align: left;  
4925 -}  
4926 -  
4927 -#btn_video {  
4928 - position: absolute;  
4929 - right: 15px;  
4930 - top: 15px;  
4931 - z-index: 3;  
4932 - background: url(../images/icon1x.png) 0 -190px no-repeat;  
4933 - width: 40px;  
4934 - height: 40px;  
4935 -}  
4936 -  
4937 -#btn_document {  
4938 - position: absolute;  
4939 - right: 15px;  
4940 - top: 15px;  
4941 - z-index: 3;  
4942 - width: 40px;  
4943 - height: 40px;  
4944 - background: url(../images/icon1x.png) 0 -120px no-repeat;  
4945 -}  
4946 -  
4947 -#live_document_container {  
4948 - position: absolute;  
4949 - left: 0;  
4950 - top: 0;  
4951 - z-index: 2;  
4952 - width: 100%;  
4953 - height: 100%;  
4954 - background: #333;  
4955 - color: white;  
4956 - overflow: hidden;  
4957 -}  
4958 -  
4959 -.content_container { 4747 +.stutriangle-isosceles {
  4748 + float:right;
4960 position: relative; 4749 position: relative;
4961 - min-height: 200px;  
4962 -}  
4963 -  
4964 -.content_container .tab_container {  
4965 - position: absolute;  
4966 - left: 0;  
4967 - top: 40px;  
4968 - right: 0;  
4969 - bottom: 0;  
4970 - background: #e1e1e0;  
4971 -}  
4972 -  
4973 -.tab_container .tab_body {  
4974 - width: 100%;  
4975 - height: auto;  
4976 - display: none;  
4977 - position: absolute;  
4978 - left: 0;  
4979 - top: 0;  
4980 - overflow: hidden;  
4981 -}  
4982 -  
4983 -.tab_container .tab_body {  
4984 - position: absolute;  
4985 - left: 0;  
4986 - top: 0;  
4987 - right: 0;  
4988 - bottom: 0;  
4989 - display: none;  
4990 -}  
4991 -  
4992 -.tab_container .tab_message {  
4993 - bottom: 42px;  
4994 -}  
4995 -  
4996 -.tab_container .active {  
4997 - display: block;  
4998 -}  
4999 -  
5000 -.tab_body_container {  
5001 - padding: 2px 4px;  
5002 -}  
5003 -  
5004 -.message_container {  
5005 - padding: 8px; 4750 + padding: 6px 10px 6px 10px;
  4751 + border-radius: 8px;
  4752 + display: inline-block;
  4753 + /*min-width: 20px;*/
  4754 + max-width:90%;
  4755 + word-break: break-all;
5006 } 4756 }
5007 -  
5008 -.input_container {  
5009 - position: absolute;  
5010 - left: 0;  
5011 - bottom: 0;  
5012 - width: 100%;  
5013 - height: 36px;  
5014 - padding-top: 4px;  
5015 - background: #fff;  
5016 - border-top: 1px solid #ddd; 4757 +.triangle-isosceles.leftmsg{
  4758 + margin-left: 8px;
  4759 + background: white;
  4760 + border: 1px solid #d7d7d7;
5017 } 4761 }
5018 -  
5019 -.dark .input_container {  
5020 - border-top: 1px solid #373737; 4762 +.stutriangle-isosceles.rightmsg{
  4763 + margin-left: 8px;
  4764 + background: white;
  4765 + border: 1px solid #d7d7d7;
5021 } 4766 }
5022 4767
5023 -.btn_more {  
5024 - float: left;  
5025 - width: 32px;  
5026 - height: 32px;  
5027 - margin-left: 5px;  
5028 - background: url(../images/more.png) no-repeat #fdfdfd;  
5029 - background-size: 212px;  
5030 - border-radius: 20px; 4768 +.triangle-isosceles.leftmsg:after {
  4769 + top: 6px;
  4770 + left: -7px;
5031 } 4771 }
5032 -  
5033 -.btn_face {  
5034 - float: left;  
5035 - width: 32px;  
5036 - height: 32px;  
5037 - margin-left: 5px;  
5038 - background: url(../images/more.png) no-repeat -60px 0 #fdfdfd;  
5039 - background-size: 212px;  
5040 - border-radius: 20px; 4772 +.stutriangle-isosceles.rightmsg:after {
  4773 + top: 6px;
  4774 + right:-7px;
5041 } 4775 }
5042 -  
5043 -.panel_more { 4776 +.triangle-isosceles:after {
  4777 + content: "";
5044 position: absolute; 4778 position: absolute;
5045 - left: 0;  
5046 - bottom: 0;  
5047 - z-index: 3;  
5048 - width: 100%;  
5049 - height: 100%; 4779 + display: block;
  4780 + width: 10px;
  4781 + height: 10px;
  4782 + background: url(../images/arrow.png) 50% 50%;
5050 } 4783 }
5051 -  
5052 -.panel_inner {  
5053 - position: absolute;  
5054 - bottom: 0;  
5055 - left: 0;  
5056 - z-index: 1;  
5057 - width: 100%;  
5058 - background: #fff;  
5059 -}  
5060 -  
5061 -.list_buttons {  
5062 - vertical-align: middle;  
5063 - margin: 0 10px;  
5064 - margin-top: 40px;  
5065 -}  
5066 -  
5067 -.list_buttons ul {  
5068 - overflow: hidden;  
5069 -}  
5070 -  
5071 -.list_buttons ul li {  
5072 - float: left;  
5073 - width: 50%;  
5074 - text-align: center;  
5075 -}  
5076 -  
5077 -.btn_layout div {  
5078 - padding-top: 50px;  
5079 - width: 60px;  
5080 - display: inline-block;  
5081 - background: url(../images/more.png) -106px 10px no-repeat;  
5082 - background-size: 212px;  
5083 -}  
5084 -  
5085 -.btn_night div {  
5086 - padding-top: 50px;  
5087 - width: 60px;  
5088 - display: inline-block;  
5089 - height: 100%;  
5090 - background: url(../images/more.png) -166px 10px no-repeat;  
5091 - background-size: 212px;  
5092 -}  
5093 -  
5094 -.btn_close {  
5095 - text-align: center;  
5096 - padding-top: 30px;  
5097 - padding-bottom: 10px;  
5098 -}  
5099 -  
5100 -.btn_close span {  
5101 - display: inline-block;  
5102 - width: 25px;  
5103 - height: 20px;  
5104 - background: url(../images/more.png) 0 -60px no-repeat;  
5105 - background-size: 212px;  
5106 - margin-top: 5px;  
5107 -}  
5108 -  
5109 -.list_faces {  
5110 - overflow: hidden;  
5111 - position: absolute;  
5112 - left: 0;  
5113 - bottom: 40px;  
5114 - z-index: 9;  
5115 - background: #fff;  
5116 -}  
5117 -  
5118 -.list_faces ul {  
5119 - display: inline-block;  
5120 - width: 100%;  
5121 - white-space: normal;  
5122 -}  
5123 -  
5124 -.list_faces li {  
5125 - display: inline-block;  
5126 - width: 13%;  
5127 - height: 40px;  
5128 - text-align: center;  
5129 - line-height: 40px;  
5130 -}  
5131 -  
5132 -.list_faces_scroller {  
5133 - -webkit-transition: transform 0.5s ease;  
5134 - white-space: nowrap;  
5135 -}  
5136 -  
5137 -.list_faces_paginator {  
5138 - height: 10px;  
5139 - line-height: 10px;  
5140 - text-align: center;  
5141 - margin: 10px 0;  
5142 -}  
5143 -  
5144 -.list_faces_paginator b {  
5145 - display: inline-block;  
5146 - width: 7px;  
5147 - height: 7px;  
5148 - border: 1px solid #ccc;  
5149 - background: #ccc;  
5150 - border-radius: 7px;  
5151 - margin: 0 3px;  
5152 -}  
5153 -  
5154 -.list_faces_paginator b.selected {  
5155 - border-color: #333;  
5156 - background: #333;  
5157 -}  
5158 -  
5159 -.message_server {}  
5160 -  
5161 -.message_client {  
5162 - overflow: hidden;  
5163 - margin-bottom: 10px;  
5164 -}  
5165 -  
5166 -.message_client .user_avatar {  
5167 - margin-top: 4px;  
5168 - width: 24px;  
5169 - height: 24px;  
5170 -}  
5171 -  
5172 -.message_client p {  
5173 - margin: 0;  
5174 - line-height: 1.5em;  
5175 -}  
5176 -  
5177 -.message_client .username {  
5178 - color: #999;  
5179 - font-size: 12px;  
5180 - margin-left: 8px;  
5181 - margin-bottom: 6px;  
5182 -}  
5183 -  
5184 -.message_client .message {  
5185 - color: #333;  
5186 -}  
5187 -  
5188 -.avatar {  
5189 - width: 24px;  
5190 - height: 24px;  
5191 -}  
5192 -  
5193 -.avatar_teacher {  
5194 - background: url(../images/icon1x.png) no-repeat;  
5195 -}  
5196 -  
5197 -.avatar_student {  
5198 - background: url(../images/icon1x.png) 0 -73px no-repeat;  
5199 -}  
5200 -  
5201 -.flag_teacher {  
5202 - background: #ffcc00;  
5203 - line-height: 20px;  
5204 - display: inline-block;  
5205 - width: 40px;  
5206 - height: 20px;  
5207 - border-radius: 4px;  
5208 - text-align: center;  
5209 - color: #fff;  
5210 -}  
5211 -  
5212 -@media screen and (-webkit-min-device-pixel-ratio: 2) {  
5213 - .avatar_teacher {  
5214 - background: url(../images/icon2x.png) no-repeat;  
5215 - background-size: 37px;  
5216 - }  
5217 - .avatar_student {  
5218 - background: url(../images/icon2x.png) 0 -73px no-repeat;  
5219 - background-size: 37px;  
5220 - }  
5221 - #online_users {  
5222 - background-image: url(../images/icon2x.png);  
5223 - background-size: 37px;  
5224 - }  
5225 - #btn_document {  
5226 - background-image: url(../images/icon2x.png);  
5227 - background-size: 37px;  
5228 - }  
5229 -}  
5230 -  
5231 -.document_pager {  
5232 - position: absolute;  
5233 - bottom: 10px;  
5234 - left: 50%;  
5235 - width: 46px;  
5236 - height: 20px;  
5237 - margin-left: -23px;  
5238 - background: rgba(0, 0, 0, .3);  
5239 - color: #ddd;  
5240 - font-size: 12px;  
5241 - border-radius: 4px;  
5242 - line-height: 20px;  
5243 -}  
5244 -  
5245 -.document_image {  
5246 - margin-top: 30px;  
5247 - padding: 130px 0 0 0;  
5248 - background: url(../images/no-document.png) no-repeat center center;  
5249 - background-size: 100px;  
5250 - font-size: 13px;  
5251 - color: #666;  
5252 -}  
5253 -  
5254 -.detail_wrapper {  
5255 - padding: 20px 15px;  
5256 - color: #666;  
5257 - font-size: 14px;  
5258 -}  
5259 -  
5260 -.detail_title {  
5261 - font-size: 18px;  
5262 - color: #000;  
5263 -}  
5264 -  
5265 -.detail_subtitle {}  
5266 -  
5267 -.col-lg-12 {  
5268 - padding: 0;  
5269 -}  
5270 -  
5271 -.mt10 {  
5272 - margin-top: 10px;  
5273 -}  
5274 -  
5275 -.input_message {  
5276 - width: 100%;  
5277 -}  
5278 -  
5279 -.btn {  
5280 - display: inline-block;  
5281 - padding: 0 12px;  
5282 - font-size: 12px;  
5283 - height: 31px;  
5284 - line-height: 31px;  
5285 - text-align: center;  
5286 - white-space: nowrap;  
5287 - vertical-align: middle;  
5288 - -ms-touch-action: manipulation;  
5289 - touch-action: manipulation;  
5290 - cursor: pointer;  
5291 - -webkit-user-select: none;  
5292 - -moz-user-select: none;  
5293 - -ms-user-select: none;  
5294 - user-select: none;  
5295 - background-image: none;  
5296 - border: 1px solid transparent;  
5297 - border-radius: 6px;  
5298 -}  
5299 -  
5300 -.btn-primary {  
5301 - color: #fff;  
5302 - background-color: #3598db;  
5303 - border-color: #2e6da4;  
5304 -}  
5305 -  
5306 -.form-control {  
5307 - display: block;  
5308 - width: 100%;  
5309 - height: 30px;  
5310 - padding: 0 8px;  
5311 - font-size: 12px;  
5312 - line-height: 30px;  
5313 - color: #626262;  
5314 - background-color: #fff;  
5315 - border: 1px solid #d8d8d8;  
5316 - border-radius: 6px;  
5317 -}  
5318 -  
5319 -.nav-tabs {  
5320 - border-bottom: 1px solid #ddd;  
5321 - list-style: none;  
5322 - display: -webkit-box;  
5323 - display: box;  
5324 - line-height: 38px;  
5325 -}  
5326 -  
5327 -.dark .nav-tabs {  
5328 - border-bottom: 1px solid #373737;  
5329 -}  
5330 -  
5331 -.nav-tabs > li {  
5332 - -webkit-box-flex: 1;  
5333 - box-flex: 1;  
5334 - margin-bottom: -1px;  
5335 -}  
5336 -  
5337 -.nav-tabs > li > a {  
5338 - position: relative;  
5339 - display: block;  
5340 - cursor: pointer;  
5341 - text-align: center;  
5342 -}  
5343 -  
5344 -.nav-tabs > li.active > a {  
5345 - color: #555;  
5346 - cursor: default;  
5347 - border-bottom: 2px solid #2e6da4;  
5348 -}  
5349 -  
5350 -.list_sliders {  
5351 - position: relative;  
5352 -}  
5353 -  
5354 -.list_sliders img {  
5355 - width: 100%;  
5356 -}  
5357 -  
5358 -.docAnno {  
5359 - position: absolute;  
5360 - top: 0px;  
5361 - left: 0px;  
5362 -}  
5363 -  
5364 -.docAnno svg {  
5365 - transform-origin: 0% 0% 0px;  
5366 - -ms-transform-origin: 0% 0% 0px;  
5367 - /* IE 9 */  
5368 - -webkit-transform-origin: 0% 0% 0px;  
5369 - /* Safari 和 Chrome */  
5370 - -moz-transform-origin: 0% 0% 0px;  
5371 - /* Firefox */  
5372 - -o-transform-origin: 0% 0% 0px;  
5373 - /* Opera */  
5374 -}  
5375 -  
5376 -.slideWrapper {  
5377 - width: 100%;  
5378 -}  
5379 -  
5380 -.list_sliders .slide {  
5381 - width: 100%;  
5382 -}  
5383 -  
5384 -.triangle-isosceles.left {  
5385 - margin-left: 8px;  
5386 - background: #fafafa;  
5387 - border: 1px solid #cacaca;  
5388 -}  
5389 -  
5390 -.dark .triangle-isosceles.left {  
5391 - background: #222;  
5392 - border: 0 none;  
5393 -}  
5394 -  
5395 -.triangle-isosceles {  
5396 - position: relative;  
5397 - padding: 10px;  
5398 - margin: 1em 0 3em;  
5399 - border-radius: 8px;  
5400 - display: inline-block;  
5401 - min-width: 120px;  
5402 - max-width: 100%;  
5403 - word-break: break-all;  
5404 -}  
5405 -  
5406 -.triangle-isosceles.left:after {  
5407 - top: 10px;  
5408 - left: -8px;  
5409 -}  
5410 -  
5411 -.dark .triangle-isosceles.left:after {  
5412 - top: 10px;  
5413 - left: -6px;  
5414 -}  
5415 -  
5416 -.triangle-isosceles:after {  
5417 - content: ""; 4784 +.stutriangle-isosceles:after {
  4785 + content: "";
5418 position: absolute; 4786 position: absolute;
5419 display: block; 4787 display: block;
5420 width: 10px; 4788 width: 10px;
5421 height: 10px; 4789 height: 10px;
5422 - background: url(../images/arrow.png) 50% 50%;  
5423 -}  
5424 -  
5425 -.dark .triangle-isosceles:after {  
5426 - background-image: url(../images/arrow-dark.png);  
5427 -}  
5428 -  
5429 -.masker {  
5430 - position: absolute;  
5431 - z-index: 1;  
5432 - left: 0;  
5433 - top: 0;  
5434 - width: 100%;  
5435 - height: 100%;  
5436 - background: rgba(0, 0, 0, .7);  
5437 -}  
5438 -  
5439 -.dlg_login {  
5440 - position: absolute;  
5441 - left: 0;  
5442 - top: 0;  
5443 - width: 100%;  
5444 - height: 100%;  
5445 - z-index: 1;  
5446 -}  
5447 -  
5448 -.dlg_login .dlg_title {  
5449 - height: 64px;  
5450 - background-color: #09c;  
5451 - padding-left: 110px;  
5452 - background: url(../images/cat.png) no-repeat #09c 16px 0;  
5453 - background-size: contain;  
5454 -}  
5455 -  
5456 -.dlg_login .dlg_inner {  
5457 - position: absolute;  
5458 - z-index: 2;  
5459 - left: 50%;  
5460 - top: 50%;  
5461 - margin: -116px 0 0 -128px;  
5462 - width: 256px;  
5463 - /*height: 230px;*/  
5464 - border: 0 solid;  
5465 - border-radius: 8px;  
5466 - background: #fff;  
5467 - overflow: hidden;  
5468 -}  
5469 -  
5470 -.dlg_login .form-control {  
5471 - width: 196px;  
5472 - display: inline-block;  
5473 -}  
5474 -  
5475 -.dlg_login .btn_login {  
5476 - width: 215px;  
5477 - height: 38px;  
5478 - background: #0099cc;  
5479 - border: 0 none;  
5480 - font-size: 15px;  
5481 - border-radius: 4px;  
5482 - color: white;  
5483 -}  
5484 -  
5485 -.dlg_content {  
5486 - text-align: center;  
5487 - margin-top: 15px;  
5488 -}  
5489 -  
5490 -.dlg_content p {  
5491 - margin-bottom: 15px;  
5492 -}  
5493 -  
5494 -.tip_panel {  
5495 - position: absolute;  
5496 - left: 50%;  
5497 - top: 2%;  
5498 - background: #4c4c4c;  
5499 - color: #fff;  
5500 - text-align: center;  
5501 - width: 80%;  
5502 - margin-left: -40%;  
5503 - line-height: 30px;  
5504 - border-radius: 4px;  
5505 - z-index: 10;  
5506 -}  
5507 -  
5508 -.tip_message {  
5509 - position: absolute;  
5510 - left: 50%;  
5511 - top: 50%;  
5512 - background: #4c4c4c;  
5513 - color: #fff;  
5514 - text-align: center;  
5515 - width: 50%;  
5516 - margin-left: -25%;  
5517 - line-height: 30px;  
5518 - border-radius: 4px;  
5519 - z-index: 10;  
5520 - padding: 5px 0;  
5521 -}  
5522 -  
5523 -.dark {  
5524 - background: #000;  
5525 -}  
5526 -  
5527 -.dark .nav-tabs {  
5528 - background: #141414;  
5529 -}  
5530 -  
5531 -.dark .nav-tabs > li > a {  
5532 - color: #666;  
5533 -}  
5534 -  
5535 -.dark .nav-tabs > li.active > a {  
5536 - color: #39c;  
5537 -}  
5538 -  
5539 -.dark .content_container .tab_container {  
5540 - background: #000;  
5541 -}  
5542 -  
5543 -.dark .input_container {  
5544 - background: #141414;  
5545 -}  
5546 -  
5547 -.dark #txt_message {  
5548 - background: #222;  
5549 - border-color: #333;  
5550 -}  
5551 -  
5552 -.dark .btn_face,  
5553 -.dark .btn_more {  
5554 - background-color: #1c1c1c;  
5555 -}  
5556 -  
5557 -.dark .detail_title {  
5558 - color: #999;  
5559 -}  
5560 -  
5561 -.dark .list_faces {  
5562 - background: #ddd;  
5563 -}  
5564 -  
5565 -.dark .panel_inner {  
5566 - background: #141414;  
5567 - color: #999;  
5568 -}  
5569 -  
5570 -.dark .message_client .message {  
5571 - color: #ddd; 4790 + background: url(../images/arrow-r.png) 50% 50%;
5572 } 4791 }
@@ -374,7 +374,8 @@ @@ -374,7 +374,8 @@
374 374
375 </div> 375 </div>
376 <div class="teacherVideo"> 376 <div class="teacherVideo">
377 - <div class="publish" style="position:absolute;top: 0; width:240px;height:180px; -webkit-transform:scale(1.25);"> 377 +
  378 + <div class="publish" style="position:absolute;top: 0; width:400px;height:300px; ">
378 <div id="publish"></div> 379 <div id="publish"></div>
379 </div> 380 </div>
380 <div class="play" style="position:absolute;top: 0; width:240px;height:180px"> 381 <div class="play" style="position:absolute;top: 0; width:240px;height:180px">
@@ -398,12 +399,33 @@ @@ -398,12 +399,33 @@
398 <div class="chat"> 399 <div class="chat">
399 <div class="msg-border"> 400 <div class="msg-border">
400 <div id="panel_message" class="msg clear"> 401 <div id="panel_message" class="msg clear">
  402 + <!--<div class="message_client">-->
  403 + <!--<div style="float: left">-->
  404 + <!--<span class="TeaName">老师:</span>-->
  405 + <!--</div>-->
  406 + <!--<div style="margin-left: 44px">-->
  407 + <!--<div class="message triangle-isosceles leftmsg">打开</div>-->
  408 + <!--</div>-->
  409 + <!--</div>-->
  410 +
  411 + <!--<div class="message_client">-->
  412 + <!--<div style="float: right">-->
  413 + <!--<span class="stuName">学生</span>-->
  414 + <!--</div>-->
  415 + <!--<div style="float:right;margin-right: 14px">-->
  416 + <!--<div class="message stutriangle-isosceles rightmsg">打开</div>-->
  417 + <!--</div>-->
  418 + <!--</div>-->
  419 + </div>
  420 + </div>
  421 +
  422 +
401 <!--<div class="teacher-msg "><img src="images/teacher-photo.png" alt="老师头像">--> 423 <!--<div class="teacher-msg "><img src="images/teacher-photo.png" alt="老师头像">-->
402 <!--<p class="left">哇哦。。。。。。</p></div>--> 424 <!--<p class="left">哇哦。。。。。。</p></div>-->
403 <!--<div class="student-msg"><img src="images/student-photo.png" alt="学生头像">--> 425 <!--<div class="student-msg"><img src="images/student-photo.png" alt="学生头像">-->
404 <!--<p class="right">哇哦。。。。。。</p></div>--> 426 <!--<p class="right">哇哦。。。。。。</p></div>-->
405 - </div>  
406 - </div> 427 +
  428 +
407 <div class="input-send clear"> 429 <div class="input-send clear">
408 <button id="btn_send" class="send" type="submit">发送</button> 430 <button id="btn_send" class="send" type="submit">发送</button>
409 <div class="input-face"> 431 <div class="input-face">
@@ -29,16 +29,35 @@ var canvas ; @@ -29,16 +29,35 @@ var canvas ;
29 var context ; 29 var context ;
30 //蒙版 30 //蒙版
31 var canvas_bak; 31 var canvas_bak;
32 -  
33 // 消息模板-老师 32 // 消息模板-老师
34 -var tpl_message_teacher = `  
35 - <div class="teacher-msg "><img class="teaImg" src="images/teacher-photo.png" alt="老师头像">  
36 - <p>{message}</p></div>`;  
37 - 33 +var tpl_message_teacher = `<div class="message_client">
  34 + <div style="float: left">
  35 + <span class="TeaName"><img class="teaImg" src="images/teacher-photo.png" alt="老师头像"></span>
  36 +</div>
  37 +<div style="margin-left: 37px">
  38 + <div class="message triangle-isosceles leftmsg">{message}</div>
  39 + </div>
  40 + </div>`;
38 // 消息模板-学生 41 // 消息模板-学生
39 -var tpl_message_student = `  
40 - <div class="student-msg"><img class="stuImg" src="images/student-photo.png" alt="学生头像">  
41 - <p>{message}</p></div>`; 42 +var tpl_message_student = `<div class="message_client">
  43 + <div style="float: right">
  44 + <span class="stuName"><img class="teaImg" src="images/student-photo.png" alt="学生头像"></span>
  45 + </div>
  46 + <div style="margin-right: 47px">
  47 + <div class="message stutriangle-isosceles rightmsg">{message}</div>
  48 + </div>
  49 + </div>`;
  50 +
  51 +
  52 +// // 消息模板-老师
  53 +// var tpl_message_teacher = `
  54 +// <div class="teacher-msg "><img class="teaImg" src="images/teacher-photo.png" alt="老师头像">
  55 +// <p>{message}</p></div>`;
  56 +
  57 +// // 消息模板-学生
  58 +// var tpl_message_student = `
  59 +// <div class="student-msg"><img class="stuImg" src="images/student-photo.png" alt="学生头像">
  60 +// <p>{message}</p></div>`;
42 //上传文件列表模板 61 //上传文件列表模板
43 var tpl_doc=`<li><div class="forSwitch"><span class="iconfont">&#xe639;</span><span class="itemName">{name}</span><span class="itemIdx">{itemIdx}</span></div><span class="deleteDoc iconfont">&#xe635;</span> 62 var tpl_doc=`<li><div class="forSwitch"><span class="iconfont">&#xe639;</span><span class="itemName">{name}</span><span class="itemIdx">{itemIdx}</span></div><span class="deleteDoc iconfont">&#xe635;</span>
44 </li>`; 63 </li>`;
@@ -936,7 +955,7 @@ function classJoinSuccess(callbackData){ @@ -936,7 +955,7 @@ function classJoinSuccess(callbackData){
936 classAllInfo=callbackData; 955 classAllInfo=callbackData;
937 console.log("classJoinSuccess====>",callbackData); 956 console.log("classJoinSuccess====>",callbackData);
938 //去掉复制功能 957 //去掉复制功能
939 - document.body.onselectstart=document.body.oncontextmenu=function(){ return false;} 958 + // document.body.onselectstart=document.body.oncontextmenu=function(){ return false;}
940 959
941 //进入成功后 画笔可以使用 960 //进入成功后 画笔可以使用
942 $(".Color1").trigger("click"); 961 $(".Color1").trigger("click");
@@ -1055,13 +1074,17 @@ function layoutView( ) { @@ -1055,13 +1074,17 @@ function layoutView( ) {
1055 $(".showImg").css("display","block"); 1074 $(".showImg").css("display","block");
1056 }); 1075 });
1057 1076
  1077 + $(document).keydown(function (e) {
  1078 + if(event.keyCode==13){
  1079 + $("#btn_send").click();
  1080 + }
1058 1081
  1082 + });
1059 1083
1060 //发送聊天消息 1084 //发送聊天消息
1061 $("#btn_send").click(function (e) { 1085 $("#btn_send").click(function (e) {
1062 console.log("点击了发送消息按钮------->"); 1086 console.log("点击了发送消息按钮------->");
1063 sendChatMsg(); 1087 sendChatMsg();
1064 -  
1065 }); 1088 });
1066 1089
1067 // 文件上传 1090 // 文件上传