Skip to content

施宇 / icsales

Go to a project
Commit 18a5a589 by 施宇
Options

121212

parent 8823e059
Expand all
Inline Side-by-side
Showing with 143 additions and 20 deletions
Application/Home/View/public/header.html
...@@ -9,6 +9,5 @@ ...@@ -9,6 +9,5 @@
<!--[if IE 8]> <!--[if IE 8]>
<link rel="stylesheet" type="text/css" href="__PUBLIC__/css/common/ie.css"> <link rel="stylesheet" type="text/css" href="__PUBLIC__/css/common/ie.css">
<![endif]--> <![endif]-->
<link rel="stylesheet" type="text/css" href="__PUBLIC__/js/layui/css/layui.css">
<link rel="stylesheet" type="text/css" href="__PUBLIC__/js/layui/css/layui.css">
\ No newline at end of file
dist/css/chat.css
...@@ -86,18 +86,74 @@ ...@@ -86,18 +86,74 @@
right: 0; right: 0;
bottom: 0; bottom: 0;
} }
.chat_content .content .content_div .notice_right .edit_img {
cursor: pointer;
}
.chat_content .content .content_div .notice_right .chat_item { .chat_content .content .content_div .notice_right .chat_item {
display: none; display: none;
} }
.chat_content .content .content_div .notice_right .chat_item.active { .chat_content .content .content_div .notice_right .chat_item.active {
display: block; display: block;
} }
.chat_content .content .content_div .notice_right .layui-layedit { .chat_content .content .content_div .notice_right .edit_content {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 0; right: 0;
} }
.chat_content .content .content_div .notice_right .edit_content .face_ul {
width: 350px;
height: 140px;
-webkit-box-shadow: 0 0 4px 0 rgba(173, 185, 193, 0.5);
box-shadow: 0 0 4px 0 rgba(173, 185, 193, 0.5);
display: none;
position: absolute;
left: 0;
top: -140px;
z-index: 99;
background-color: #fff;
}
.chat_content .content .content_div .notice_right .edit_content .face_ul li {
height: 25px;
width: 25px;
padding: 5px;
cursor: pointer;
border-radius: 2px 2px 0 0;
}
.chat_content .content .content_div .notice_right .edit_content .face_ul li:hover {
background-color: #ebfaf4;
}
.chat_content .content .content_div .notice_right .edit_content .face_ul li img {
height: 100%;
width: 100%;
}
.chat_content .content .content_div .notice_right .edit_content .edit_title {
padding: 3px 5px;
border-top: 1px solid #e6e6e6;
border-bottom: 1px solid #e6e6e6;
}
.chat_content .content .content_div .notice_right .edit_content .edit_title img {
margin: 3px 5px;
cursor: pointer;
}
.chat_content .content .content_div .notice_right .edit_content .edit_title img.face {
height: 25px;
width: 25px;
}
.chat_content .content .content_div .notice_right .edit_content .edit_title img.pic {
height: 20px;
width: 20px;
}
.chat_content .content .content_div .notice_right .edit_content .edit_input {
height: 150px;
padding: 10px;
}
.chat_content .content .content_div .notice_right .edit_content .edit_input .chat_textarea {
height: 100%;
width: 100%;
line-height: 20px;
resize: none;
}
.chat_content .content .content_div .notice_right .title { .chat_content .content .content_div .notice_right .title {
border-bottom: 2px solid #E6ECF2; border-bottom: 2px solid #E6ECF2;
} }
...@@ -121,7 +177,7 @@ ...@@ -121,7 +177,7 @@
top: 90px; top: 90px;
left: 0; left: 0;
right: 0; right: 0;
bottom: 244px; bottom: 210px;
overflow: auto; overflow: auto;
padding: 10px 20px; padding: 10px 20px;
} }
...@@ -166,4 +222,3 @@ ...@@ -166,4 +222,3 @@
color: #ADB6BF; color: #ADB6BF;
padding: 10px 15px; padding: 10px 15px;
} }
/*# sourceMappingURL=chat.css.map */
\ No newline at end of file
dist/css/chat.less
...@@ -105,17 +105,87 @@ ...@@ -105,17 +105,87 @@
left: 248px; left: 248px;
right: 0; right: 0;
bottom: 0; bottom: 0;
.chat_item{
.edit_img {
cursor: pointer;
}
.chat_item {
display: none; display: none;
&.active{
&.active {
display: block display: block
} }
} }
.layui-layedit {
.edit_content {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 0; right: 0;
.face_ul {
width: 350px;
height: 140px;
-webkit-box-shadow: 0 0 4px 0 rgba(173, 185, 193, 0.5);
box-shadow: 0 0 4px 0 rgba(173, 185, 193, 0.5);
display: none;
position: absolute;
left:0;
top:-140px;
z-index:99;
background-color: #fff;
li {
height: 25px;
width: 25px;
padding: 5px;
cursor: pointer;
border-radius: 2px 2px 0 0;
&:hover {
background-color: #ebfaf4;
}
img {
height: 100%;
width: 100%;
}
}
}
.edit_title {
padding: 3px 5px;
border-top: 1px solid #e6e6e6;
border-bottom: 1px solid #e6e6e6;
img {
margin: 3px 5px;
cursor: pointer;
&.face {
height: 25px;
width: 25px;
}
&.pic {
height: 20px;
width: 20px;
}
}
}
.edit_input {
height: 150px;
padding: 10px;
.chat_textarea {
height: 100%;
width: 100%;
line-height: 20px;
resize: none;
}
}
} }
.title { .title {
...@@ -145,10 +215,10 @@ ...@@ -145,10 +215,10 @@
top: 90px; top: 90px;
left: 0; left: 0;
right: 0; right: 0;
bottom: 244px; bottom: 210px;
overflow: auto; overflow: auto;
padding: 10px 20px; padding: 10px 20px;
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 2px; width: 2px;
} }
......
dist/js/chat/websdk-1.4.8.js
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
/***/ 223: /***/ function (module, exports, __webpack_require__) { /***/ 223: /***/ function (module, exports, __webpack_require__) {
'use strict'; // 'use strict';
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
return typeof obj; return typeof obj;
...@@ -264,10 +264,9 @@ ...@@ -264,10 +264,9 @@
_isCanUploadFileAsync = _isCanSetRequestHeader && _hasFormData, _isCanUploadFileAsync = _isCanSetRequestHeader && _hasFormData,
_isCanUploadFile = _isCanUploadFileAsync || _hasFlash, _isCanUploadFile = _isCanUploadFileAsync || _hasFlash,
_isCanDownLoadFile = _isCanSetRequestHeader && (_hasBlob || _hasOverrideMimeType); _isCanDownLoadFile = _isCanSetRequestHeader && (_hasBlob || _hasOverrideMimeType);
console.log('hahah')
if (!Object.keys) { if (!Object.keys) {
Object.keys = function () { Object.keys = function () {
'use strict'; // 'use strict';
var hasOwnProperty = Object.prototype.hasOwnProperty, var hasOwnProperty = Object.prototype.hasOwnProperty,
hasDontEnumBug = !{toString: null}.propertyIsEnumerable('toString'), hasDontEnumBug = !{toString: null}.propertyIsEnumerable('toString'),
...@@ -1113,7 +1112,7 @@ ...@@ -1113,7 +1112,7 @@
/***/ 224: /***/ function (module, exports) { /***/ 224: /***/ function (module, exports) {
"use strict"; // "use strict";
; ;
(function () { (function () {
...@@ -1206,7 +1205,7 @@ ...@@ -1206,7 +1205,7 @@
/***/ 230: /***/ function (module, exports, __webpack_require__) { /***/ 230: /***/ function (module, exports, __webpack_require__) {
'use strict'; // 'use strict';
module.exports = __webpack_require__(231); module.exports = __webpack_require__(231);
...@@ -1215,7 +1214,7 @@ ...@@ -1215,7 +1214,7 @@
/***/ 231: /***/ function (module, exports, __webpack_require__) { /***/ 231: /***/ function (module, exports, __webpack_require__) {
'use strict'; // 'use strict';
var _version = '1.4.2'; var _version = '1.4.2';
var _code = __webpack_require__(224).code; var _code = __webpack_require__(224).code;
...@@ -4080,11 +4079,11 @@ ...@@ -4080,11 +4079,11 @@
/***/ 232: /***/ function (module, exports, __webpack_require__) { /***/ 232: /***/ function (module, exports, __webpack_require__) {
'use strict'; // 'use strict';
; ;
(function () { (function () {
'use strict'; // 'use strict';
var _utils = __webpack_require__(223).utils; var _utils = __webpack_require__(223).utils;
var Message = function Message(type, id) { var Message = function Message(type, id) {
...@@ -4404,7 +4403,7 @@ ...@@ -4404,7 +4403,7 @@
/***/ 233: /***/ function (module, exports) { /***/ 233: /***/ function (module, exports) {
"use strict"; // "use strict";
; ;
(function () { (function () {
......
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