Commit f1af298f by 施宇

1111

parent d8c89db0
Showing with 13 additions and 34 deletions
...@@ -69,17 +69,7 @@ ...@@ -69,17 +69,7 @@
</div> </div>
</div> </div>
<div class="chat_item_content"> <div class="chat_item_content">
<!-- <div class="chat_item">
<div class="title clr">
<div class="fr btn btn_border">
<span class="icon iconfont iconjuxing23"></span>
<i>15012479484</i>
</div>
<h3 class="bold boxsiz">深圳市猎芯科技有限公司</h3>
</div>
<div class="notice_list boxsiz"></div>
</div> -->
</div> </div>
</div> </div>
...@@ -97,44 +87,35 @@ ...@@ -97,44 +87,35 @@
<script src="__PUBLIC__/js/chat/uploadShim.js"></script> <script src="__PUBLIC__/js/chat/uploadShim.js"></script>
<script> <script>
// var browser = navigator.appName; var browser = navigator.appName;
// var b_version = navigator.appVersion; var b_version = navigator.appVersion;
// var version = b_version.split(";"); var version = b_version.split(";");
// var trim_Version = version[1].replace(/[ ]/g, ""); var trim_Version = version[1].replace(/[ ]/g, "");
// if (browser == "Microsoft Internet Explorer" && if (browser == "Microsoft Internet Explorer" &&
// (trim_Version == "MSIE6.0" || trim_Version == "MSIE7.0" || trim_Version == "MSIE8.0" || trim_Version == (trim_Version == "MSIE6.0" || trim_Version == "MSIE7.0" || trim_Version == "MSIE8.0" || trim_Version ==
// "MSIE9.0")) { "MSIE9.0")) {
// } $('.pic').hide(); //ie9和ie9以下不能上传图片
}
var CurentTime = function () { var CurentTime = function () {
var now = new Date(); var now = new Date();
var year = now.getFullYear(); //年 var year = now.getFullYear(); //年
var month = now.getMonth() + 1; //月 var month = now.getMonth() + 1; //月
var day = now.getDate(); //日 var day = now.getDate(); //日
var hh = now.getHours(); //时 var hh = now.getHours(); //时
var mm = now.getMinutes(); //分 var mm = now.getMinutes(); //分
var ss = now.getSeconds(); //秒 var ss = now.getSeconds(); //秒
var clock = year + "-"; var clock = year + "-";
if (month < 10) if (month < 10)
clock += "0"; clock += "0";
clock += month + "-"; clock += month + "-";
if (day < 10) if (day < 10)
clock += "0"; clock += "0";
clock += day + " "; clock += day + " ";
if (hh < 10) if (hh < 10)
clock += "0"; clock += "0";
clock += hh + ":"; clock += hh + ":";
if (mm < 10) clock += '0'; if (mm < 10) clock += '0';
clock += mm + ":"; clock += mm + ":";
if (ss < 10) clock += '0'; if (ss < 10) clock += '0';
clock += ss; clock += ss;
return (clock); return (clock);
...@@ -343,9 +324,6 @@ ...@@ -343,9 +324,6 @@
console.log(message) console.log(message)
}, //收到文本消息; }, //收到文本消息;
onEmojiMessage: function (message) { onEmojiMessage: function (message) {
// 当为WebIM添加了Emoji属性后,若发送的消息含WebIM.Emoji里特定的字符串,connection就会自动将
// 这些字符串和其它文字按顺序组合成一个数组,每一个数组元素的结构为{type: 'emoji(或者txt)', data:''}
// 当type='emoji'时,data表示表情图像的路径,当type='txt'时,data表示文本消息;
receiveData(3, message) receiveData(3, message)
}, //收到表情消息; }, //收到表情消息;
...@@ -433,8 +411,6 @@ ...@@ -433,8 +411,6 @@
} catch (e) { } catch (e) {
console.log('GetFile Error:', e); console.log('GetFile Error:', e);
} }
console.log('xixiixixiiiixixix')
var allowType = { var allowType = {
'jpg': true, 'jpg': true,
'gif': true, 'gif': true,
...@@ -511,7 +487,10 @@ ...@@ -511,7 +487,10 @@
$(this).addClass('active').siblings('.notice_classify').removeClass('active'); $(this).addClass('active').siblings('.notice_classify').removeClass('active');
var contentHeight = $('#' + id).find('.notice_item_content').height(); var contentHeight = $('#' + id).find('.notice_item_content').height();
$('#' + id).find('.notice_list').scrollTop(contentHeight); $('#' + id).find('.notice_list').scrollTop(contentHeight);
}) });
$('.notice_right ').on('click', '.edit_img', function () {
})
</script> </script>
</body> </body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment