5 years ago · 938c319010
--- a/xjalt/WebRoot/dist/css/admin.css
+++ b/xjalt/WebRoot/dist/css/admin.css
--- a/xjalt/WebRoot/dist/css/body.css
+++ b/xjalt/WebRoot/dist/css/body.css
@@ -0,0 +1,46 @@
 
				+@-webkit-keyframes animate-cloud {
			
 
				+  from {
			
 
				+    background-position: 600px 100%;
			
 
				+  }
			
 
				+  to {
			
 
				+    background-position: 0 100%;
			
 
				+  }
			
 
				+}
			
 
				+@-moz-keyframes animate-cloud {
			
 
				+  from {
			
 
				+    background-position: 600px 100%;
			
 
				+  }
			
 
				+  to {
			
 
				+    background-position: 0 100%;
			
 
				+  }
			
 
				+}
			
 
				+@-ms-keyframes animate-cloud {
			
 
				+  from {
			
 
				+    background-position: 600px 100%;
			
 
				+  }
			
 
				+  to {
			
 
				+    background-position: 0 100%;
			
 
				+  }
			
 
				+}
			
 
				+@-o-keyframes animate-cloud {
			
 
				+  from {
			
 
				+    background-position: 600px 100%;
			
 
				+  }
			
 
				+  to {
			
 
				+    background-position: 0 100%;
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				+html{
			
 
				+	height: 100%;
			
 
				+}
			
 
				+body{
			
 
				+   background:url(../images/cloud.jpg) 0 bottom repeat-x  #049ec4;
			
 
				+  -webkit-animation: animate-cloud 20s linear infinite;
			
 
				+  -moz-animation: animate-cloud 20s linear infinite;
			
 
				+  -ms-animation: animate-cloud 20s linear infinite;
			
 
				+  -o-animation: animate-cloud 20s linear infinite;
			
 
				+  animation: animate-cloud 20s linear infinite;
			
 
				+  width: 100%;
			
 
				+  height: auto;
			
 
				+}
			
--- a/xjalt/WebRoot/dist/css/login.css
+++ b/xjalt/WebRoot/dist/css/login.css
@@ -0,0 +1,109 @@
 
				+@charset 'UTF-8';
			
 
				+html{ overflow-x:auto; overflow-y:auto;}
			
 
				+*{ padding:0; margin:0;outline:none !important;}
			
 
				+ul, ol,li{ list-style-type:none;}
			
 
				+body, button, input, select, textarea{  font-family: 'Microsoft yahei'; font-size:12px;}
			
 
				+code, kbd, pre, samp { font-family: 'Microsoft yahei';}
			
 
				+a{ text-decoration:none; color:#333; cursor:pointer;
			
 
				+-webkit-transition: all 0.2s ease-out 0s; 
			
 
				+   -moz-transition: all 0.2s ease-out 0s; 
			
 
				+	 -o-transition: all 0.2s ease-out 0s; 
			
 
				+		transition: all 0.2s ease-out 0s;}
			
 
				+img{border:0; max-width:100%;max-height: 100%;vertical-align: middle;}
			
 
				+
			
 
				+li { line-height:normal; }
			
 
				+table { border-collapse: collapse; border-spacing: 0; }
			
 
				+h1,h2,h3,h4,h5,h6{margin:0; font-weight:normal; font-family: 'Microsoft yahei'; }
			
 
				+input,table,tr,td{ margin:0; padding:0; border:none;}
			
 
				+button,table{ border:none; background:none; margin:0; padding:0;}
			
 
				+body{position: relative; float:left; width:100%; overflow:hidden;}
			
 
				+select{ margin:0; padding:0; font-family: 'Microsoft yahei'; border:none;}
			
 
				+textarea{ resize:none;outline:none;}
			
 
				+label{ margin-bottom:0; font-weight:normal;}
			
 
				+input,select,textarea{ margin:0; padding:0; border:0; outline:none;
			
 
				+ -moz-border-radius:0px; 
			
 
				+ -webkit-border-radius:0; 
			
 
				+ -khtml-border-radius:0;
			
 
				+ border-radius:0;
			
 
				+}
			
 
				+.bg{
			
 
				+	width:100%;
			
 
				+	height: 100vh;
			
 
				+	background-image: url(../images/bg.jpg);
			
 
				+	background-size: 100% 100%;
			
 
				+	background-position: center center;
			
 
				+
			
 
				+}
			
 
				+.form{
			
 
				+	position: absolute;
			
 
				+	top: 30%;
			
 
				+	left: 40%;
			
 
				+	width: 290px;
			
 
				+	height: 310px;
			
 
				+	background: #ffffff5f;
			
 
				+	border-radius: 10px;
			
 
				+	padding: 10px;
			
 
				+}
			
 
				+.title{
			
 
				+	width: 100%;
			
 
				+	height:38px;
			
 
				+	line-height: 38px;
			
 
				+	text-align: center;
			
 
				+	margin:30px 0;
			
 
				+}
			
 
				+.title span{
			
 
				+	font-size: 25px;
			
 
				+	color: #000;
			
 
				+	font-weight: bold;
			
 
				+}
			
 
				+.user{
			
 
				+	height:38px;
			
 
				+	line-height: 38px;
			
 
				+	margin:30px 0;
			
 
				+}
			
 
				+.user span{
			
 
				+	display: inline-block;
			
 
				+	float: left;
			
 
				+	width: 38px;
			
 
				+	height: 38px;
			
 
				+	text-align: center;
			
 
				+	line-height: 38px;
			
 
				+	background-color: #373739;
			
 
				+}
			
 
				+.user span img{
			
 
				+	width:25px;
			
 
				+	height: 25px;
			
 
				+}
			
 
				+.user input{
			
 
				+	height:38px;
			
 
				+	float: left;
			
 
				+	line-height:38px;
			
 
				+	width: 247px;
			
 
				+	padding: 0 0 0 5px;
			
 
				+}
			
 
				+.button{
			
 
				+	width: 100%;
			
 
				+	height: 38px;
			
 
				+	background: #1a6c44;
			
 
				+	text-align: center;
			
 
				+	line-height: 38px;
			
 
				+	border-radius: 5px;
			
 
				+}
			
 
				+.button button{
			
 
				+	color: #fff;
			
 
				+	font-size: 18px;
			
 
				+	width: 100%;
			
 
				+	height: 38px;
			
 
				+}
			
 
				+input::-webkit-input-placeholder {  	
			
 
				+   font-size: 16px;
			
 
				+}
			
 
				+input:-moz-placeholder {            
			
 
				+   font-size: 16px;
			
 
				+}
			
 
				+input::-moz-placeholder {           
			
 
				+   font-size: 16px;
			
 
				+}
			
 
				+input:-ms-input-placeholder {       	
			
 
				+   font-size: 16px;
			
 
				+}
			
--- a/xjalt/WebRoot/dist/css/template.css
+++ b/xjalt/WebRoot/dist/css/template.css
--- a/xjalt/WebRoot/dist/images/8bcLQqF.png
+++ b/xjalt/WebRoot/dist/images/8bcLQqF.png
--- a/xjalt/WebRoot/dist/images/bg.jpg
+++ b/xjalt/WebRoot/dist/images/bg.jpg
--- a/xjalt/WebRoot/dist/images/cloud.jpg
+++ b/xjalt/WebRoot/dist/images/cloud.jpg
--- a/xjalt/WebRoot/dist/images/pwd.png
+++ b/xjalt/WebRoot/dist/images/pwd.png
--- a/xjalt/WebRoot/dist/images/speech.png
+++ b/xjalt/WebRoot/dist/images/speech.png
--- a/xjalt/WebRoot/dist/images/user.png
+++ b/xjalt/WebRoot/dist/images/user.png
--- a/xjalt/WebRoot/dist/img/AdminLTELogo.png
+++ b/xjalt/WebRoot/dist/img/AdminLTELogo.png
--- a/xjalt/WebRoot/dist/img/avatar.png
+++ b/xjalt/WebRoot/dist/img/avatar.png
--- a/xjalt/WebRoot/dist/img/avatar04.png
+++ b/xjalt/WebRoot/dist/img/avatar04.png
--- a/xjalt/WebRoot/dist/img/avatar2.png
+++ b/xjalt/WebRoot/dist/img/avatar2.png
--- a/xjalt/WebRoot/dist/img/avatar3.png
+++ b/xjalt/WebRoot/dist/img/avatar3.png
--- a/xjalt/WebRoot/dist/img/avatar5.png
+++ b/xjalt/WebRoot/dist/img/avatar5.png
--- a/xjalt/WebRoot/dist/img/boxed-bg.jpg
+++ b/xjalt/WebRoot/dist/img/boxed-bg.jpg
--- a/xjalt/WebRoot/dist/img/boxed-bg.png
+++ b/xjalt/WebRoot/dist/img/boxed-bg.png
--- a/xjalt/WebRoot/dist/img/credit/american-express.png
+++ b/xjalt/WebRoot/dist/img/credit/american-express.png
--- a/xjalt/WebRoot/dist/img/credit/cirrus.png
+++ b/xjalt/WebRoot/dist/img/credit/cirrus.png
--- a/xjalt/WebRoot/dist/img/credit/mastercard.png
+++ b/xjalt/WebRoot/dist/img/credit/mastercard.png
--- a/xjalt/WebRoot/dist/img/credit/mestro.png
+++ b/xjalt/WebRoot/dist/img/credit/mestro.png
--- a/xjalt/WebRoot/dist/img/credit/paypal.png
+++ b/xjalt/WebRoot/dist/img/credit/paypal.png
--- a/xjalt/WebRoot/dist/img/credit/paypal2.png
+++ b/xjalt/WebRoot/dist/img/credit/paypal2.png
--- a/xjalt/WebRoot/dist/img/credit/visa.png
+++ b/xjalt/WebRoot/dist/img/credit/visa.png
--- a/xjalt/WebRoot/dist/img/default-150x150.png
+++ b/xjalt/WebRoot/dist/img/default-150x150.png
--- a/xjalt/WebRoot/dist/img/icons.png
+++ b/xjalt/WebRoot/dist/img/icons.png
--- a/xjalt/WebRoot/dist/img/photo1.png
+++ b/xjalt/WebRoot/dist/img/photo1.png
--- a/xjalt/WebRoot/dist/img/photo2.png
+++ b/xjalt/WebRoot/dist/img/photo2.png
--- a/xjalt/WebRoot/dist/img/photo3.jpg
+++ b/xjalt/WebRoot/dist/img/photo3.jpg
--- a/xjalt/WebRoot/dist/img/photo4.jpg
+++ b/xjalt/WebRoot/dist/img/photo4.jpg
--- a/xjalt/WebRoot/dist/img/pic-bg.png
+++ b/xjalt/WebRoot/dist/img/pic-bg.png
--- a/xjalt/WebRoot/dist/img/user1-128x128.jpg
+++ b/xjalt/WebRoot/dist/img/user1-128x128.jpg
--- a/xjalt/WebRoot/dist/img/user2-160x160.jpg
+++ b/xjalt/WebRoot/dist/img/user2-160x160.jpg
--- a/xjalt/WebRoot/dist/img/user3-128x128.jpg
+++ b/xjalt/WebRoot/dist/img/user3-128x128.jpg
--- a/xjalt/WebRoot/dist/img/user4-128x128.jpg
+++ b/xjalt/WebRoot/dist/img/user4-128x128.jpg
--- a/xjalt/WebRoot/dist/img/user5-128x128.jpg
+++ b/xjalt/WebRoot/dist/img/user5-128x128.jpg
--- a/xjalt/WebRoot/dist/img/user6-128x128.jpg
+++ b/xjalt/WebRoot/dist/img/user6-128x128.jpg
--- a/xjalt/WebRoot/dist/img/user7-128x128.jpg
+++ b/xjalt/WebRoot/dist/img/user7-128x128.jpg
--- a/xjalt/WebRoot/dist/img/user8-128x128.jpg
+++ b/xjalt/WebRoot/dist/img/user8-128x128.jpg
--- a/xjalt/WebRoot/dist/js/echarts/echarts-gl.js
+++ b/xjalt/WebRoot/dist/js/echarts/echarts-gl.js
--- a/xjalt/WebRoot/dist/js/echarts/echarts.js
+++ b/xjalt/WebRoot/dist/js/echarts/echarts.js
--- a/xjalt/WebRoot/dist/js/jquery-1.11.1.min.js
+++ b/xjalt/WebRoot/dist/js/jquery-1.11.1.min.js
--- a/xjalt/WebRoot/dist/js/layui/css/layui.css
+++ b/xjalt/WebRoot/dist/js/layui/css/layui.css
--- a/xjalt/WebRoot/dist/js/layui/css/layui.mobile.css
+++ b/xjalt/WebRoot/dist/js/layui/css/layui.mobile.css
--- a/xjalt/WebRoot/dist/js/layui/css/modules/code.css
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/code.css
--- a/xjalt/WebRoot/dist/js/layui/css/modules/laydate/default/laydate.css
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/laydate/default/laydate.css
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layer/default/icon-ext.png
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layer/default/icon-ext.png
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layer/default/icon.png
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layer/default/icon.png
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layer/default/layer.css
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layer/default/layer.css
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layer/default/loading-0.gif
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layer/default/loading-0.gif
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layer/default/loading-1.gif
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layer/default/loading-1.gif
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layer/default/loading-2.gif
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layer/default/loading-2.gif
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layim/html/chatlog.html
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layim/html/chatlog.html
@@ -0,0 +1,96 @@
 
				+ 
			
 
				+ 
			
 
				+<!DOCTYPE html>
			
 
				+<html>
			
 
				+<head>
			
 
				+<meta charset="utf-8">
			
 
				+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			
 
				+<title>聊天记录</title>
			
 
				+
			
 
				+<link rel="stylesheet" href="http://local.res.layui.com/layui/src/css/layui.css">
			
 
				+<style>
			
 
				+body .layim-chat-main{height: auto;}
			
 
				+</style>
			
 
				+</head>
			
 
				+<body>
			
 
				+
			
 
				+<div class="layim-chat-main">
			
 
				+  <ul id="LAY_view"></ul>
			
 
				+</div>
			
 
				+
			
 
				+<div id="LAY_page" style="margin: 0 10px;"></div>
			
 
				+
			
 
				+
			
 
				+<textarea title="消息模版" id="LAY_tpl" style="display:none;">
			
 
				+{{# layui.each(d.data, function(index, item){
			
 
				+  if(item.id == parent.layui.layim.cache().mine.id){ }}
			
 
				+    <li class="layim-chat-mine"><div class="layim-chat-user"><img src="{{ item.avatar }}"><cite><i>{{ layui.data.date(item.timestamp) }}</i>{{ item.username }}</cite></div><div class="layim-chat-text">{{ layui.layim.content(item.content) }}</div></li>
			
 
				+  {{# } else { }}
			
 
				+    <li><div class="layim-chat-user"><img src="{{ item.avatar }}"><cite>{{ item.username }}<i>{{ layui.data.date(item.timestamp) }}</i></cite></div><div class="layim-chat-text">{{ layui.layim.content(item.content) }}</div></li>
			
 
				+  {{# }
			
 
				+}); }}
			
 
				+</textarea>
			
 
				+
			
 
				+<!-- 
			
 
				+上述模版采用了 laytpl 语法，不了解的同学可以去看下文档：http://www.layui.com/doc/modules/laytpl.html
			
 
				+
			
 
				+-->
			
 
				+
			
 
				+
			
 
				+<script src="http://local.res.layui.com/layui/src/layui.js"></script>
			
 
				+<script>
			
 
				+layui.use(['layim', 'laypage'], function(){
			
 
				+  var layim = layui.layim
			
 
				+  ,layer = layui.layer
			
 
				+  ,laytpl = layui.laytpl
			
 
				+  ,$ = layui.jquery
			
 
				+  ,laypage = layui.laypage;
			
 
				+  
			
 
				+  //聊天记录的分页此处不做演示，你可以采用laypage，不了解的同学见文档：http://www.layui.com/doc/modules/laypage.html
			
 
				+  
			
 
				+  
			
 
				+  //开始请求聊天记录
			
 
				+  var param =  location.search //获得URL参数。该窗口url会携带会话id和type，他们是你请求聊天记录的重要凭据
			
 
				+  
			
 
				+  //实际使用时，下述的res一般是通过Ajax获得，而此处仅仅只是演示数据格式
			
 
				+  ,res = {
			
 
				+    code: 0
			
 
				+    ,msg: ''
			
 
				+    ,data: [{
			
 
				+      username: '纸飞机'
			
 
				+      ,id: 100000
			
 
				+      ,avatar: 'http://tva3.sinaimg.cn/crop.0.0.512.512.180/8693225ajw8f2rt20ptykj20e80e8weu.jpg'
			
 
				+      ,timestamp: 1480897882000
			
 
				+      ,content: 'face[抱抱] face[心] 你好啊小美女'
			
 
				+    }, {
			
 
				+      username: 'Z_子晴'
			
 
				+      ,id: 108101
			
 
				+      ,avatar: 'http://tva3.sinaimg.cn/crop.0.0.512.512.180/8693225ajw8f2rt20ptykj20e80e8weu.jpg'
			
 
				+      ,timestamp: 1480897892000
			
 
				+      ,content: '你没发错吧？face[微笑]'
			
 
				+    },{
			
 
				+      username: 'Z_子晴'
			
 
				+      ,id: 108101
			
 
				+      ,avatar: 'http://tva3.sinaimg.cn/crop.0.0.512.512.180/8693225ajw8f2rt20ptykj20e80e8weu.jpg'
			
 
				+      ,timestamp: 1480897898000
			
 
				+      ,content: '你是谁呀亲。。我爱的是贤心！我爱的是贤心！我爱的是贤心！重要的事情要说三遍~'
			
 
				+    },{
			
 
				+      username: 'Z_子晴'
			
 
				+      ,id: 108101
			
 
				+      ,avatar: 'http://tva3.sinaimg.cn/crop.0.0.512.512.180/8693225ajw8f2rt20ptykj20e80e8weu.jpg'
			
 
				+      ,timestamp: 1480897908000
			
 
				+      ,content: '注意：这些都是模拟数据，实际使用时，需将其中的模拟接口改为你的项目真实接口。\n该模版文件所在目录（相对于layui.js）：\n/css/modules/layim/html/chatlog.html'
			
 
				+    }]
			
 
				+  }
			
 
				+  
			
 
				+  //console.log(param)
			
 
				+  
			
 
				+  var html = laytpl(LAY_tpl.value).render({
			
 
				+    data: res.data
			
 
				+  });
			
 
				+  $('#LAY_view').html(html);
			
 
				+  
			
 
				+});
			
 
				+</script>
			
 
				+</body>
			
 
				+</html>
			
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layim/html/find.html
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layim/html/find.html
@@ -0,0 +1,38 @@
 
				+ 
			
 
				+ 
			
 
				+<!DOCTYPE html>
			
 
				+<html>
			
 
				+<head>
			
 
				+<meta charset="utf-8">
			
 
				+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			
 
				+<title>发现</title>
			
 
				+
			
 
				+<link rel="stylesheet" href="http://local.res.layui.com/layui/src/css/layui.css">
			
 
				+<style>
			
 
				+
			
 
				+</style>
			
 
				+</head>
			
 
				+<body>
			
 
				+
			
 
				+<div style="margin: 15px;">
			
 
				+  <blockquote class="layui-elem-quote">此为自定义的【查找】页面，因需求不一，所以官方暂不提供该模版结构与样式，实际使用时，可移至该文件到你的项目中，对页面自行把控。
			
 
				+  <br>文件所在目录（相对于layui.js）：/css/modules/layim/html/find.html</blockquote>
			
 
				+</div>
			
 
				+
			
 
				+
			
 
				+
			
 
				+<script src="http://local.res.layui.com/layui/src/layui.js"></script>
			
 
				+<script>
			
 
				+layui.use(['layim', 'laypage'], function(){
			
 
				+  var layim = layui.layim
			
 
				+  ,layer = layui.layer
			
 
				+  ,laytpl = layui.laytpl
			
 
				+  ,$ = layui.jquery
			
 
				+  ,laypage = layui.laypage;
			
 
				+  
			
 
				+  //一些添加好友请求之类的交互参见文档
			
 
				+  
			
 
				+});
			
 
				+</script>
			
 
				+</body>
			
 
				+</html>
			
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layim/html/getmsg.json
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layim/html/getmsg.json
@@ -0,0 +1,87 @@
 
				+{
			
 
				+    "code": 0,
			
 
				+    "pages": 1,
			
 
				+    "data": [
			
 
				+        {
			
 
				+            "id": 76,
			
 
				+            "content": "申请添加你为好友",
			
 
				+            "uid": 168,
			
 
				+            "from": 166488,
			
 
				+            "from_group": 0,
			
 
				+            "type": 1,
			
 
				+            "remark": "有问题要问",
			
 
				+            "href": null,
			
 
				+            "read": 1,
			
 
				+            "time": "刚刚",
			
 
				+            "user": {
			
 
				+                "id": 166488,
			
 
				+                "avatar": "http://q.qlogo.cn/qqapp/101235792/B704597964F9BD0DB648292D1B09F7E8/100",
			
 
				+                "username": "李彦宏",
			
 
				+                "sign": null
			
 
				+            }
			
 
				+        },
			
 
				+        {
			
 
				+            "id": 75,
			
 
				+            "content": "申请添加你为好友",
			
 
				+            "uid": 168,
			
 
				+            "from": 347592,
			
 
				+            "from_group": 0,
			
 
				+            "type": 1,
			
 
				+            "remark": "你好啊！",
			
 
				+            "href": null,
			
 
				+            "read": 1,
			
 
				+            "time": "刚刚",
			
 
				+            "user": {
			
 
				+                "id": 347592,
			
 
				+                "avatar": "http://q.qlogo.cn/qqapp/101235792/B78751375E0531675B1272AD994BA875/100",
			
 
				+                "username": "麻花疼",
			
 
				+                "sign": null
			
 
				+            }
			
 
				+        },
			
 
				+        {
			
 
				+            "id": 62,
			
 
				+            "content": "雷军 拒绝了你的好友申请",
			
 
				+            "uid": 168,
			
 
				+            "from": null,
			
 
				+            "from_group": null,
			
 
				+            "type": 1,
			
 
				+            "remark": null,
			
 
				+            "href": null,
			
 
				+            "read": 1,
			
 
				+            "time": "10天前",
			
 
				+            "user": {
			
 
				+                "id": null
			
 
				+            }
			
 
				+        },
			
 
				+        {
			
 
				+            "id": 60,
			
 
				+            "content": "马小云 已经同意你的好友申请",
			
 
				+            "uid": 168,
			
 
				+            "from": null,
			
 
				+            "from_group": null,
			
 
				+            "type": 1,
			
 
				+            "remark": null,
			
 
				+            "href": null,
			
 
				+            "read": 1,
			
 
				+            "time": "10天前",
			
 
				+            "user": {
			
 
				+                "id": null
			
 
				+            }
			
 
				+        },
			
 
				+        {
			
 
				+            "id": 61,
			
 
				+            "content": "贤心 已经同意你的好友申请",
			
 
				+            "uid": 168,
			
 
				+            "from": null,
			
 
				+            "from_group": null,
			
 
				+            "type": 1,
			
 
				+            "remark": null,
			
 
				+            "href": null,
			
 
				+            "read": 1,
			
 
				+            "time": "10天前",
			
 
				+            "user": {
			
 
				+                "id": null
			
 
				+            }
			
 
				+        }
			
 
				+    ]
			
 
				+}
			
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layim/html/msgbox.html
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layim/html/msgbox.html
@@ -0,0 +1,208 @@
 
				+ 
			
 
				+ 
			
 
				+<!DOCTYPE html>
			
 
				+<html>
			
 
				+<head>
			
 
				+<meta charset="utf-8">
			
 
				+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			
 
				+<title>消息盒子</title>
			
 
				+
			
 
				+<link rel="stylesheet" href="../../../layui.css?v=1">
			
 
				+<style>
			
 
				+.layim-msgbox{margin: 15px;}
			
 
				+.layim-msgbox li{position: relative; margin-bottom: 10px; padding: 0 130px 10px 60px; padding-bottom: 10px; line-height: 22px; border-bottom: 1px dotted #e2e2e2;}
			
 
				+.layim-msgbox .layim-msgbox-tips{margin: 0; padding: 10px 0; border: none; text-align: center; color: #999;}
			
 
				+.layim-msgbox .layim-msgbox-system{padding: 0 10px 10px 10px;}
			
 
				+.layim-msgbox li p span{padding-left: 5px; color: #999;}
			
 
				+.layim-msgbox li p em{font-style: normal; color: #FF5722;}
			
 
				+
			
 
				+.layim-msgbox-avatar{position: absolute; left: 0; top: 0; width: 50px; height: 50px;}
			
 
				+.layim-msgbox-user{padding-top: 5px;}
			
 
				+.layim-msgbox-content{margin-top: 3px;}
			
 
				+.layim-msgbox .layui-btn-small{padding: 0 15px; margin-left: 5px;}
			
 
				+.layim-msgbox-btn{position: absolute; right: 0; top: 12px; color: #999;}
			
 
				+</style>
			
 
				+</head>
			
 
				+<body>
			
 
				+
			
 
				+<ul class="layim-msgbox" id="LAY_view"></ul>
			
 
				+
			
 
				+<div style="margin: 0 15px;">
			
 
				+  <blockquote class="layui-elem-quote">注意：这些都是模拟数据，实际使用时，需将其中的模拟接口改为你的项目真实接口。
			
 
				+  <br>该模版文件所在目录（相对于layui.js）：/css/modules/layim/html/msgbox.html</blockquote>
			
 
				+</div>
			
 
				+
			
 
				+<textarea title="消息模版" id="LAY_tpl" style="display:none;">
			
 
				+{{# layui.each(d.data, function(index, item){
			
 
				+  if(item.from){ }}
			
 
				+    <li data-uid="{{ item.from }}" data-fromGroup="{{ item.from_group }}">
			
 
				+      <a href="/u/{{ item.from }}/" target="_blank">
			
 
				+        <img src="{{ item.user.avatar }}" class="layui-circle layim-msgbox-avatar">
			
 
				+      </a>
			
 
				+      <p class="layim-msgbox-user">
			
 
				+        <a href="/u/{{ item.from }}/" target="_blank">{{ item.user.username||'' }}</a>
			
 
				+        <span>{{ item.time }}</span>
			
 
				+      </p>
			
 
				+      <p class="layim-msgbox-content">
			
 
				+        {{ item.content }} 
			
 
				+        <span>{{ item.remark ? '附言: '+item.remark : '' }}</span>
			
 
				+      </p>
			
 
				+      <p class="layim-msgbox-btn">
			
 
				+        <button class="layui-btn layui-btn-small" data-type="agree">同意</button>
			
 
				+        <button class="layui-btn layui-btn-small layui-btn-primary" data-type="refuse">拒绝</button>
			
 
				+      </p>
			
 
				+    </li>
			
 
				+  {{# } else { }}
			
 
				+    <li class="layim-msgbox-system">
			
 
				+      <p><em>系统：</em>{{ item.content }}<span>{{ item.time }}</span></p>
			
 
				+    </li>
			
 
				+  {{# }
			
 
				+}); }}
			
 
				+</textarea>
			
 
				+
			
 
				+<!-- 
			
 
				+上述模版采用了 laytpl 语法，不了解的同学可以去看下文档：http://www.layui.com/doc/modules/laytpl.html 
			
 
				+-->
			
 
				+
			
 
				+
			
 
				+<script src="../../../../layui.js?v=1"></script>
			
 
				+<script>
			
 
				+layui.use(['layim', 'flow'], function(){
			
 
				+  var layim = layui.layim
			
 
				+  ,layer = layui.layer
			
 
				+  ,laytpl = layui.laytpl
			
 
				+  ,$ = layui.jquery
			
 
				+  ,flow = layui.flow;
			
 
				+
			
 
				+  var cache = {}; //用于临时记录请求到的数据
			
 
				+
			
 
				+  //请求消息
			
 
				+  var renderMsg = function(page, callback){
			
 
				+    
			
 
				+    //实际部署时，请将下述 getmsg.json 改为你的接口地址
			
 
				+    
			
 
				+    $.get('getmsg.json', {
			
 
				+      page: page || 1
			
 
				+    }, function(res){
			
 
				+      if(res.code != 0){
			
 
				+        return layer.msg(res.msg);
			
 
				+      }
			
 
				+
			
 
				+      //记录来源用户信息
			
 
				+      layui.each(res.data, function(index, item){
			
 
				+        cache[item.from] = item.user;
			
 
				+      });
			
 
				+
			
 
				+      callback && callback(res.data, res.pages);
			
 
				+    });
			
 
				+  };
			
 
				+
			
 
				+  //消息信息流
			
 
				+  flow.load({
			
 
				+    elem: '#LAY_view' //流加载容器
			
 
				+    ,isAuto: false
			
 
				+    ,end: '<li class="layim-msgbox-tips">暂无更多新消息</li>'
			
 
				+    ,done: function(page, next){ //加载下一页
			
 
				+      renderMsg(page, function(data, pages){
			
 
				+        var html = laytpl(LAY_tpl.value).render({
			
 
				+          data: data
			
 
				+          ,page: page
			
 
				+        });
			
 
				+        next(html, page < pages);
			
 
				+      });
			
 
				+    }
			
 
				+  });
			
 
				+
			
 
				+  //打开页面即把消息标记为已读
			
 
				+  /*
			
 
				+  $.post('/message/read', {
			
 
				+    type: 1
			
 
				+  });
			
 
				+  */
			
 
				+
			
 
				+  //操作
			
 
				+  var active = {
			
 
				+    //同意
			
 
				+    agree: function(othis){
			
 
				+      var li = othis.parents('li')
			
 
				+      ,uid = li.data('uid')
			
 
				+      ,from_group = li.data('fromGroup')
			
 
				+      ,user = cache[uid];
			
 
				+
			
 
				+      //选择分组
			
 
				+      parent.layui.layim.setFriendGroup({
			
 
				+        type: 'friend'
			
 
				+        ,username: user.username
			
 
				+        ,avatar: user.avatar
			
 
				+        ,group: parent.layui.layim.cache().friend //获取好友分组数据
			
 
				+        ,submit: function(group, index){
			
 
				+          
			
 
				+          //将好友追加到主面板
			
 
				+          parent.layui.layim.addList({
			
 
				+            type: 'friend'
			
 
				+            ,avatar: user.avatar //好友头像
			
 
				+            ,username: user.username //好友昵称
			
 
				+            ,groupid: group //所在的分组id
			
 
				+            ,id: uid //好友ID
			
 
				+            ,sign: user.sign //好友签名
			
 
				+          });
			
 
				+          parent.layer.close(index);
			
 
				+          othis.parent().html('已同意');
			
 
				+        
			
 
				+        
			
 
				+          //实际部署时，请开启下述注释，并改成你的接口地址
			
 
				+          /*
			
 
				+          $.post('/im/agreeFriend', {
			
 
				+            uid: uid //对方用户ID
			
 
				+            ,from_group: from_group //对方设定的好友分组
			
 
				+            ,group: group //我设定的好友分组
			
 
				+          }, function(res){
			
 
				+            if(res.code != 0){
			
 
				+              return layer.msg(res.msg);
			
 
				+            }
			
 
				+
			
 
				+            //将好友追加到主面板
			
 
				+            parent.layui.layim.addList({
			
 
				+              type: 'friend'
			
 
				+              ,avatar: user.avatar //好友头像
			
 
				+              ,username: user.username //好友昵称
			
 
				+              ,groupid: group //所在的分组id
			
 
				+              ,id: uid //好友ID
			
 
				+              ,sign: user.sign //好友签名
			
 
				+            });
			
 
				+            parent.layer.close(index);
			
 
				+            othis.parent().html('已同意');
			
 
				+          });
			
 
				+          */
			
 
				+          
			
 
				+        }
			
 
				+      });
			
 
				+    }
			
 
				+
			
 
				+    //拒绝
			
 
				+    ,refuse: function(othis){
			
 
				+      var li = othis.parents('li')
			
 
				+      ,uid = li.data('uid');
			
 
				+
			
 
				+      layer.confirm('确定拒绝吗？', function(index){
			
 
				+        $.post('/im/refuseFriend', {
			
 
				+          uid: uid //对方用户ID
			
 
				+        }, function(res){
			
 
				+          if(res.code != 0){
			
 
				+            return layer.msg(res.msg);
			
 
				+          }
			
 
				+          layer.close(index);
			
 
				+          othis.parent().html('<em>已拒绝</em>');
			
 
				+        });
			
 
				+      });
			
 
				+    }
			
 
				+  };
			
 
				+
			
 
				+  $('body').on('click', '.layui-btn', function(){
			
 
				+    var othis = $(this), type = othis.data('type');
			
 
				+    active[type] ? active[type].call(this, othis) : '';
			
 
				+  });
			
 
				+});
			
 
				+</script>
			
 
				+</body>
			
 
				+</html>
			
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layim/layim.css
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layim/layim.css
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layim/mobile/layim.css
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layim/mobile/layim.css
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layim/skin/1.jpg
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layim/skin/1.jpg
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layim/skin/2.jpg
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layim/skin/2.jpg
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layim/skin/3.jpg
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layim/skin/3.jpg
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layim/skin/4.jpg
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layim/skin/4.jpg
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layim/skin/5.jpg
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layim/skin/5.jpg
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layim/skin/logo.jpg
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layim/skin/logo.jpg
--- a/xjalt/WebRoot/dist/js/layui/css/modules/layim/voice/default.mp3
+++ b/xjalt/WebRoot/dist/js/layui/css/modules/layim/voice/default.mp3
--- a/xjalt/WebRoot/dist/js/layui/font/iconfont.eot
+++ b/xjalt/WebRoot/dist/js/layui/font/iconfont.eot
--- a/xjalt/WebRoot/dist/js/layui/font/iconfont.svg
+++ b/xjalt/WebRoot/dist/js/layui/font/iconfont.svg
--- a/xjalt/WebRoot/dist/js/layui/font/iconfont.ttf
+++ b/xjalt/WebRoot/dist/js/layui/font/iconfont.ttf
--- a/xjalt/WebRoot/dist/js/layui/font/iconfont.woff
+++ b/xjalt/WebRoot/dist/js/layui/font/iconfont.woff
--- a/xjalt/WebRoot/dist/js/layui/images/face/0.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/0.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/1.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/1.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/10.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/10.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/11.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/11.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/12.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/12.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/13.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/13.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/14.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/14.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/15.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/15.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/16.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/16.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/17.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/17.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/18.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/18.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/19.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/19.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/2.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/2.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/20.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/20.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/21.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/21.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/22.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/22.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/23.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/23.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/24.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/24.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/25.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/25.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/26.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/26.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/27.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/27.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/28.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/28.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/29.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/29.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/3.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/3.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/30.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/30.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/31.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/31.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/32.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/32.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/33.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/33.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/34.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/34.gif
--- a/xjalt/WebRoot/dist/js/layui/images/face/35.gif
+++ b/xjalt/WebRoot/dist/js/layui/images/face/35.gif