From 5914b427efa9c224c250d564a0480c65e1249472 Mon Sep 17 00:00:00 2001
From: shenzi <shenzi@theyeasy.com>
Date: Tue, 26 Dec 2017 14:01:07 +0800
Subject: [PATCH] 前端页面初步整理：删除不必要的文件及图片

---
 WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp         |  243 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebContent/WEB-INF/jsp/pc/activity/activityList.jsp         |  235 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebContent/WEB-INF/jsp/pc/article/articleEdit.jsp           |  301 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/article/articleIndex.jsp          |  183 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/autoresponse/autoresponseEdit.jsp |  213 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/game1.jsp                         |  169 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/game2.jsp                         |  156 ------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/game3.jsp                         |  156 ------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp               |  301 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp               |  183 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebContent/WEB-INF/jsp/pc/index.jsp                         |  151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/poster/coordinate.jsp             |  168 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/poster/poster.jsp                 |  386 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/poster/posterlist.jsp             |  209 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/prize/prizeEdit.jsp               |  243 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp               |  235 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebContent/WEB-INF/jsp/pc/project/projectEdit.jsp           |  243 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/project/projectlist.jsp           |  235 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/report/callreport.jsp             |  132 ------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/report/chatrecord.jsp             |  330 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/report/chatrecord_copy.jsp        | 1020 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/report/goods.jsp                  |  150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebContent/WEB-INF/jsp/pc/report/posterrecord.jsp           |  156 ------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/report/prize.jsp                  |  150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebContent/WEB-INF/jsp/pc/report/remarksreport.jsp          |  228 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/report/salereport.jsp             |  134 --------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/report/winningrecord.jsp          |  167 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/sale/sale.jsp                     |  575 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/testue.jsp                        |   86 --------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/vanker/vanker.jsp                 |  296 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/pc/wx/wxmanage.jsp                   |   92 --------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/weixin/binding.jsp                   |  181 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/weixin/chat.1.jsp                    | 1225 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/weixin/chat.jsp                      | 1410 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/jsp/weixin/error.jsp                     |   12 ------------
 WebContent/WEB-INF/jsp/weixin/redpackage.jsp                |  181 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 WebContent/WEB-INF/res/images/Group2Copy.png                | Bin 257 -> 0 bytes
 WebContent/WEB-INF/res/images/acedit1.png                   | Bin 897 -> 0 bytes
 WebContent/WEB-INF/res/images/acedit2.png                   | Bin 649 -> 0 bytes
 WebContent/WEB-INF/res/images/acedit3.png                   | Bin 830 -> 0 bytes
 WebContent/WEB-INF/res/images/browser.png                   | Bin 4479 -> 0 bytes
 WebContent/WEB-INF/res/images/chat_add_sale.png             | Bin 2857 -> 0 bytes
 WebContent/WEB-INF/res/images/chat_bg.png                   | Bin 143712 -> 0 bytes
 WebContent/WEB-INF/res/images/code.png                      | Bin 1428 -> 0 bytes
 WebContent/WEB-INF/res/images/confirm.jpg                   | Bin 32482 -> 0 bytes
 WebContent/WEB-INF/res/images/dafaultlogo.png               | Bin 4495 -> 0 bytes
 WebContent/WEB-INF/res/images/default_user.png              | Bin 9119 -> 0 bytes
 WebContent/WEB-INF/res/images/fail1.png                     | Bin 5122 -> 0 bytes
 WebContent/WEB-INF/res/images/hongbao.png                   | Bin 9020 -> 0 bytes
 WebContent/WEB-INF/res/images/icon01_active.png             | Bin 537 -> 0 bytes
 WebContent/WEB-INF/res/images/iphone.png                    | Bin 97140 -> 0 bytes
 WebContent/WEB-INF/res/images/loginimg.png                  | Bin 2391151 -> 0 bytes
 WebContent/WEB-INF/res/images/logo.jpg                      | Bin 12167 -> 0 bytes
 WebContent/WEB-INF/res/images/moren.jpg                     | Bin 150581 -> 0 bytes
 WebContent/WEB-INF/res/images/pg_bottom.jpg                 | Bin 20107 -> 0 bytes
 WebContent/WEB-INF/res/images/pg_top.jpg                    | Bin 20729 -> 0 bytes
 WebContent/WEB-INF/res/images/phicon.png                    | Bin 149 -> 0 bytes
 WebContent/WEB-INF/res/images/photo.png                     | Bin 157435 -> 0 bytes
 WebContent/WEB-INF/res/images/redpackage.png                | Bin 23854 -> 0 bytes
 WebContent/WEB-INF/res/images/robot_logo.png                | Bin 7613 -> 0 bytes
 WebContent/WEB-INF/res/images/status1.png                   | Bin 794 -> 0 bytes
 WebContent/WEB-INF/res/images/status2.png                   | Bin 880 -> 0 bytes
 WebContent/WEB-INF/res/images/status3.png                   | Bin 760 -> 0 bytes
 WebContent/WEB-INF/res/images/succ1.png                     | Bin 4909 -> 0 bytes
 WebContent/WEB-INF/res/images/vanke_logo.png                | Bin 13463 -> 0 bytes
 WebContent/WEB-INF/res/images/weixin.png                    | Bin 1190 -> 0 bytes
 WebContent/WEB-INF/res/images/xiazai.png                    | Bin 1156 -> 0 bytes
 WebContent/WEB-INF/res/images/xzicon.png                    | Bin 441 -> 0 bytes
 WebContent/WEB-INF/res/plugins/datas/nav.js                 |   54 ++++++++++++------------------------------------------
 WebContent/index.jsp                                        |  172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------
 70 files changed, 1909 insertions(+), 8852 deletions(-)
 create mode 100644 WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp
 create mode 100644 WebContent/WEB-INF/jsp/pc/activity/activityList.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/article/articleEdit.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/article/articleIndex.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/autoresponse/autoresponseEdit.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/game1.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/game2.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/game3.jsp
 create mode 100644 WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp
 create mode 100644 WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/poster/coordinate.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/poster/poster.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/poster/posterlist.jsp
 create mode 100644 WebContent/WEB-INF/jsp/pc/prize/prizeEdit.jsp
 create mode 100644 WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/project/projectEdit.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/project/projectlist.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/report/callreport.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/report/chatrecord.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/report/chatrecord_copy.jsp
 create mode 100644 WebContent/WEB-INF/jsp/pc/report/goods.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/report/posterrecord.jsp
 create mode 100644 WebContent/WEB-INF/jsp/pc/report/prize.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/report/remarksreport.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/report/salereport.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/report/winningrecord.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/sale/sale.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/testue.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/vanker/vanker.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/pc/wx/wxmanage.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/weixin/binding.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/weixin/chat.1.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/weixin/chat.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/weixin/error.jsp
 delete mode 100644 WebContent/WEB-INF/jsp/weixin/redpackage.jsp
 delete mode 100644 WebContent/WEB-INF/res/images/Group2Copy.png
 delete mode 100644 WebContent/WEB-INF/res/images/acedit1.png
 delete mode 100644 WebContent/WEB-INF/res/images/acedit2.png
 delete mode 100644 WebContent/WEB-INF/res/images/acedit3.png
 delete mode 100644 WebContent/WEB-INF/res/images/browser.png
 delete mode 100644 WebContent/WEB-INF/res/images/chat_add_sale.png
 delete mode 100644 WebContent/WEB-INF/res/images/chat_bg.png
 delete mode 100644 WebContent/WEB-INF/res/images/code.png
 delete mode 100644 WebContent/WEB-INF/res/images/confirm.jpg
 delete mode 100644 WebContent/WEB-INF/res/images/dafaultlogo.png
 delete mode 100644 WebContent/WEB-INF/res/images/default_user.png
 delete mode 100644 WebContent/WEB-INF/res/images/fail1.png
 delete mode 100644 WebContent/WEB-INF/res/images/hongbao.png
 delete mode 100644 WebContent/WEB-INF/res/images/icon01_active.png
 delete mode 100644 WebContent/WEB-INF/res/images/iphone.png
 delete mode 100644 WebContent/WEB-INF/res/images/loginimg.png
 delete mode 100644 WebContent/WEB-INF/res/images/logo.jpg
 delete mode 100644 WebContent/WEB-INF/res/images/moren.jpg
 delete mode 100644 WebContent/WEB-INF/res/images/pg_bottom.jpg
 delete mode 100644 WebContent/WEB-INF/res/images/pg_top.jpg
 delete mode 100644 WebContent/WEB-INF/res/images/phicon.png
 delete mode 100644 WebContent/WEB-INF/res/images/photo.png
 delete mode 100644 WebContent/WEB-INF/res/images/redpackage.png
 delete mode 100644 WebContent/WEB-INF/res/images/robot_logo.png
 delete mode 100644 WebContent/WEB-INF/res/images/status1.png
 delete mode 100644 WebContent/WEB-INF/res/images/status2.png
 delete mode 100644 WebContent/WEB-INF/res/images/status3.png
 delete mode 100644 WebContent/WEB-INF/res/images/succ1.png
 delete mode 100644 WebContent/WEB-INF/res/images/vanke_logo.png
 delete mode 100644 WebContent/WEB-INF/res/images/weixin.png
 delete mode 100644 WebContent/WEB-INF/res/images/xiazai.png
 delete mode 100644 WebContent/WEB-INF/res/images/xzicon.png

diff --git a/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp b/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp
new file mode 100644
index 0000000..2f2bdea
--- /dev/null
+++ b/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp
@@ -0,0 +1,243 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<meta http-equiv="X-UA-Compatible" content="ie=edge">
+		<title>项目列表</title>
+		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
+		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
+	</head>
+	<style>
+		.layui-form-select dl{
+			max-height:190px;
+		}
+		#allmap {top:10px;width:100%;height: 400px;overflow: hidden;margin:0;font-family:"微软雅黑";}
+	</style>
+	
+	<body class="wrap">
+		<div class="layui-form Detailbtn" style="display:block;">
+			  <div class="layui-form-item">
+			    <label class="layui-form-label"><i style="color:red;margin-right:5px;">*</i>项目名称</label>
+			    <div class="layui-input-inline" style="width:390px;">
+			      <input type="text" name="name"   lay-verify="name" placeholder="项目名称"  class="layui-input">
+			    </div>
+			    <div class="layui-form-mid layui-word-aux">不超过20个汉字</div>
+			  </div>
+			  <div class="layui-form-item">
+			    <label class="layui-form-label"><i style="color:red;margin-right:5px;">*</i>海报模板</label>
+			    <div class="layui-input-inline">
+			      <select name="postertempletid" lay-search="">
+			        <option value="">全部</option>
+			      </select>
+			    </div>
+			  </div>
+			  <div class="layui-form-item">
+			    <label class="layui-form-label">位置</label>
+			   <!--  <div class="layui-input-inline">
+			      <input type="text" name="lng"  readonly lay-verify="required" placeholder="经度"  class="layui-input" style="background-color:#f5f5f5;color:#666;">
+			    </div>
+			    <div class="layui-input-inline">
+			      <input type="text" name="lat" readonly lay-verify="required" placeholder="纬度"  class="layui-input" style="background-color:#f5f5f5;color:#666;">
+			    </div> -->
+			    <div class="layui-input-inline">
+			      <input type="number" name="lng"   lay-verify="required" placeholder="经度"  class="layui-input" >
+			    </div>
+			    <div class="layui-input-inline">
+			      <input type="number" name="lat"  lay-verify="required" placeholder="纬度"  class="layui-input" >
+			    </div>
+			  </div>
+			  <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=V45f8fZO8HiU1gLflQdrpv81D4gXKGRH"></script>
+			   <div class="layui-form-mid layui-word-aux" style="padding-bottom:0;">提示：可以在地图上点击位置获取坐标（鼠标滚动放大缩小地图）</div>
+			    <div id="allmap"></div>
+			   <div class="layui-form-item" style="margin-top: 30px;">
+			   <button class="layui-btn" lay-submit lay-filter="submit">提交</button>
+				<button class="layui-btn layui-btn-primary resetBtn">重置</button>
+				</div>
+  </div>
+		
+		
+		
+		
+	</body>
+
+	<script src='/zzhnc/res/js/jquery.min.js'></script>
+	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
+	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
+	<script>
+	// 百度地图API功能
+	 var map = new BMap.Map("allmap");            
+	var map = new BMap.Map("allmap",{minZoom:4,maxZoom:18}); // 创建Map实例,设置地图允许的最小/大级别
+	map.enableScrollWheelZoom(true);
+	
+	//单击获取点击的经纬度
+	map.addEventListener("click",function(e){
+		$("input[name=lng]").val(e.point.lng);
+		$("input[name=lat]").val(e.point.lat);
+		var allOverlay = map.getOverlays();
+		if(allOverlay.length>0){
+			function deletePoint(){
+				for (var i = 0; i < allOverlay.length ; i++){
+					map.removeOverlay(allOverlay[i]);
+				}
+			}
+			deletePoint()
+			var point = new BMap.Point(e.point.lng,e.point.lat);
+			var marker = new BMap.Marker(point);  // 创建标注
+			map.addOverlay(marker);              // 将标注添加到地图中
+			marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
+		}
+	}); 
+		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
+			var form = layui.form(),
+				element = layui.element(),
+				laydate = layui.laydate,
+				layer = layui.layer,
+				laypage = layui.laypage;
+			
+			$("input[name=lng],input[name=lat]").blur(function(){
+				var plng=$("input[name=lng]").val();
+				var plat=$("input[name=lat]").val();
+				var allOverlay = map.getOverlays();
+				if(allOverlay.length>0){
+					function deletePoint(){
+						for (var i = 0; i < allOverlay.length ; i++){
+							map.removeOverlay(allOverlay[i]);
+						}
+					}
+					deletePoint()
+					var point = new BMap.Point(plng,plat);
+					var marker = new BMap.Marker(point);  // 创建标注
+					map.addOverlay(marker);              // 将标注添加到地图中
+					marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
+					
+				}
+			});
+			
+			//下拉海报
+			$.post("/zzhnc/poster/getAllPostertemplet",function(data){
+				console.log(data);
+				var str="";
+				for(var i=0;i<data.data.length;i++){
+					str+='<option value='+ data.data[i].id +'>'+ data.data[i].name +'</option>';
+				}
+				$("select[name=postertempletid]").append(str);
+				form.render();
+			})
+			$(".resetBtn").on("click",function(){
+				$("input[name=name]").val("");
+				$("select[name=postertempletid]").val("0");
+				var allOverlay = map.getOverlays();
+				if(allOverlay.length>0){
+					function deletePoint(){
+						for (var i = 0; i < allOverlay.length ; i++){
+							map.removeOverlay(allOverlay[i]);
+						}
+					}
+					deletePoint()
+				}
+				$("input[name=lng]").val(113.754653);
+				$("input[name=lat]").val(23.025333);
+				map.centerAndZoom(new BMap.Point(113.754653,23.025333),13); 
+				var point = new BMap.Point(113.754653,23.025333);
+				var marker = new BMap.Marker(point);  // 创建标注
+				map.addOverlay(marker);              // 将标注添加到地图中
+				marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
+				form.render();
+			})
+			var id=getUrl_G("id");
+			if(id>0){
+				$.post("/zzhnc/project/getProject",{
+					id:id
+				},function(data){
+					console.log(data);
+					 if(data.code==0){
+						$("input[name=name]").val(data.data.name);
+						$("select[name=postertempletid]").val(data.data.postertempletid);
+						$("input[name=lng]").val(data.data.lng);
+						$("input[name=lat]").val(data.data.lat);
+						map.centerAndZoom(new BMap.Point(data.data.lng,data.data.lat),13); 
+						var point = new BMap.Point(data.data.lng,data.data.lat);
+						var marker = new BMap.Marker(point);  // 创建标注
+						map.addOverlay(marker);              // 将标注添加到地图中
+						marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
+						form.render();
+					} 
+				})
+				 
+			}else{
+				$("input[name=lng]").val(113.754653);
+				$("input[name=lat]").val(23.025333);
+				map.centerAndZoom(new BMap.Point(113.754653,23.025333),13); 
+				var point = new BMap.Point(113.754653,23.025333);
+				var marker = new BMap.Marker(point);  // 创建标注
+				map.addOverlay(marker);              // 将标注添加到地图中
+				marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
+				
+				
+			}
+			
+		
+			form.on('submit(submit)', function(data){
+				    var name=$("input[name=name]").val();
+					var templetid=$("select[name=postertempletid]").val();
+					var lng=$("input[name=lng]").val();
+					var lat=$("input[name=lat]").val();
+				 	if(name==""){
+						top.layer.msg("请填写项目名称");
+						return false;
+					}else{
+						if(strlen(name) > 40) {
+				    		top.layer.msg("项目名称不超过20个汉字");
+				    		return false;
+						}
+					}
+					if(templetid==""||templetid=="0"){
+						top.layer.msg("请选择海报");
+						return false;
+					}
+					
+					if(id>0){
+						//修改项目
+						$.post("/zzhnc/project/updateProject",{
+							id:id,
+							name:name,
+							templetid:templetid,
+							lng:lng,
+							lat:lat
+						},function(data){
+							console.log(data);
+							 if(data.code==0){
+								top.layer.msg("修改成功");
+								
+							} else{
+								top.layer.msg(data.msg);
+							}
+						})  
+					}else{
+						//添加项目
+						$.post("/zzhnc/project/addProject",{
+							name:name,
+							templetid:templetid,
+							lng:lng,
+							lat:lat
+						},function(data){
+							console.log(data);
+							if(data.code==0){
+								top.layer.msg("添加成功");
+								form.render();
+							}else{
+								top.layer.msg(data.msg);
+							}
+						}) 
+					}
+					return false;
+					
+			  });
+			
+
+		})
+	</script>
+
+</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp b/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp
new file mode 100644
index 0000000..958838f
--- /dev/null
+++ b/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp
@@ -0,0 +1,235 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<meta http-equiv="X-UA-Compatible" content="ie=edge">
+		<title>项目列表</title>
+		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
+		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
+	</head>
+	<style>
+		.layui-form-select dl{
+			max-height:190px;
+		}
+		#allmap {top:10px;width:100%;height: 200px;overflow: hidden;margin:0;font-family:"微软雅黑";}
+	</style>
+	<body class="wrap">
+		<div class="layui-form">
+			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
+				
+				<!-- <div class="layui-input-inline producttype" style="width: 140px;">
+					<select name="producttype" >
+						<option value="">项目名称</option>
+					</select>
+				</div>
+				<div class="layui-input-inline productid" style="width: 140px;">
+					<select name="productid">
+						<option value="">海报模板id</option>
+					</select>
+				</div>
+				<div class="layui-input-inline" style="width: 150px;">
+					<input name="date1" class="layui-input" placeholder="更新时间" onclick="layui.laydate({elem: this,format: 'YYYY-MM-DD hh:mm:ss',istime: true})" />
+				</div> -->
+				<div class="layui-input-inline" style="width: 140px;">
+					<input type="text" class="layui-input" name="keyword" placeholder="关键字" />
+				</div>
+				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
+				<button class="layui-btn layui-btn-primary resetBtn">重置</button>
+				<a class="layui-btn layui-btn-warm createBtn" href="#"><i class="layui-icon">&#xe61f;</i> 添加项目</a>
+			</div>
+		</div>
+		
+		<table class="layui-table">
+			<thead>
+				<tr>
+					<th style="width: 30px;">No</th>
+					<th style="min-width:120px;">项目名称</th>
+					<th style="min-width: 80px;">经度</th>
+					<th style="min-width: 80px;">纬度</th>
+					<th style="min-width: 80px;">海报模板id</th>
+					<th style="min-width: 80px;">更新时间</th>
+					<th style="min-width: 80px;">操作</th>
+				</tr>
+			</thead>
+				
+			<tbody id="tablelist">
+			<!-- 	<tr>
+					<td>1</td>
+					<td>项目名称</td>
+					<td>经度</td>
+					<td>纬度</td>
+					<td>海报模板id</td>
+					<td>更新时间</td>
+					<td>
+						<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>
+						<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>
+					</td>
+				</tr> -->
+			</tbody>
+		</table>
+		<div class="nulldata">暂无数据</div>
+		<div id="page"></div>
+		
+	</body>
+<form class="layui-form Detailbtn" >
+  <div class="layui-form-item">
+    <label class="layui-form-label">项目名称</label>
+    <div class="layui-input-inline" style="width:390px;">
+      <input type="text" name="name"   lay-verify="required" placeholder="项目名称"  class="layui-input">
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">海报模板id</label>
+    <div class="layui-input-inline">
+      <select name="postertempletid" lay-verify="required">
+        <option value=""></option>
+        <option value="0">1</option>
+        <option value="1">2</option>
+        <option value="2">3</option>
+        <option value="3">4</option>
+        <option value="4">5</option>
+      </select>
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">位置</label>
+    <div class="layui-input-inline">
+      <input type="text" name="lng"  lay-verify="required" placeholder="经度"  class="layui-input">
+    </div>
+    <div class="layui-input-inline">
+      <input type="text" name="lat"  lay-verify="required" placeholder="纬度"  class="layui-input">
+    </div>
+    <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=V45f8fZO8HiU1gLflQdrpv81D4gXKGRH"></script>
+    <div id="allmap"></div>
+  </div>
+  </form>
+	<script src='/zzhnc/res/js/jquery.min.js'></script>
+	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
+	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
+	<script>
+	// 百度地图API功能
+	var map = new BMap.Map("allmap");            
+	map.centerAndZoom("重庆",12);           
+	//单击获取点击的经纬度
+	map.addEventListener("click",function(e){
+		alert(e.point.lng + "," + e.point.lat);
+	});
+		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
+			var form = layui.form(),
+				element = layui.element(),
+				laydate = layui.laydate,
+				layer = layui.layer,
+				laypage = layui.laypage;
+				var page=1;
+				var keyword="";
+				//查询
+				 form.on('submit(querybtn)', function(data){
+					  var keyword=$("input[name=keyword]").val();
+				      Initdata(page,keyword)
+				  });
+				$(".resetBtn").on("click",function(){
+					$("input[name=keyword]").val("");
+					 Initdata(page,keyword)
+				})
+			//初始化数据
+			Initdata(page,keyword);
+			function Initdata(page,keyword){
+				
+				$.post("/zzhnc/project/getProjectList",{page:page,keyword:keyword},function(data){
+					data=data.data;
+					console.log(data)
+					laypage({
+						cont: 'page',
+						pages: data.totalPages, //总页数
+						curr: page,
+						skip: true,
+						jump: function(obj, first) {
+							if(!first) {
+								page = obj.curr
+								Initdata(page,keyword);
+							}
+
+						}
+					});
+					var str="";
+					if(data.rows.length<1){
+						$(".nulldata").show();
+					}else{
+						$(".nulldata").hide();
+						for(var i=0;i<data.rows.length;i++){
+							str+='<tr data-id='+ data.rows[i].id +'>'
+								+'<td>'+ ((data.page - 1) * data.pageSize + i + 1) +'</td>'
+								+'<td style="text-align:left;">'+ data.rows[i].name+'</td>'
+								+'<td>'+ data.rows[i].lng+'</td>'
+								+'<td>'+ data.rows[i].lat+'</td>'
+								+'<td>'+ data.rows[i].postertempletid+'</td>'
+								+'<td>'+ toTime_G(data.rows[i].updatedtime) +'</td>'
+								+'<td>'
+								+'<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>'
+								+'<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>'
+								+'</td>'
+								+'</tr>';
+						}
+					}
+					
+					
+					$("#tablelist").html(str);
+					toNull_G();
+				})
+			}
+			
+			//添加项目
+			$(document).on("click",".createBtn",function(){
+				if(parent.tab.exists("添加项目")>0){
+					var tabid=parent.tab.getTabId("添加项目");
+					parent.tab.deleteTab(tabid);
+				}
+				parent.tab.tabAdd({
+					href: "/zzhnc/project/projectEdit?id=0",
+					icon: "fa-cubes",
+					title: "添加项目" 
+				});
+			})
+			//修改项目
+			$(document).on("click",".updataBtn",function(){
+				var id=$(this).parents("tr").attr("data-id");    
+				  if(parent.tab.exists("修改项目")>0){
+					var tabid=parent.tab.getTabId("修改项目");
+					parent.tab.deleteTab(tabid);
+				}
+				parent.tab.tabAdd({
+					href: "/zzhnc/project/projectEdit?id="+ id ,
+					icon: "fa-cubes",
+					title: "修改项目" 
+				});  
+			})
+			//删除项目
+			$(document).on("click", ".deleteBtn", function() {
+				var id=$(this).parents("tr").attr("data-id");
+				layer.confirm('您确定要删除该项目吗？', {
+					btn: ['确定', '取消'] //按钮
+				}, function(index, layero) {
+					$.post( "/zzhnc/project/deleteProject",{id:id}, function(data) {
+						console.log(data)
+						if(data.code == 0) {
+							top.layer.msg("删除成功");
+							Initdata(1,keyword)
+							layer.close(index);
+						}else{
+							top.layer.msg(data.msg);
+						}
+					})
+				
+			}, function(index, layero) {
+				layer.close(index);
+			});
+			});
+			
+
+		})
+	</script>
+
+</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/article/articleEdit.jsp b/WebContent/WEB-INF/jsp/pc/article/articleEdit.jsp
deleted file mode 100644
index 4b9d754..0000000
--- a/WebContent/WEB-INF/jsp/pc/article/articleEdit.jsp
+++ /dev/null
@@ -1,301 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta http-equiv="X-UA-Compatible" content="ie=edge">
-<title>项目列表</title>
-<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
-
-    
-    <style type="text/css">
-        
-        .activity-rule-box {
-        	padding-left:20px;
-        }
-        #myEditor img{
-        	width:80%;
-        }
-        #myEditor{
-        	margin:0 !important;
-        }
-        
-.layui-form-select dl {
-	max-height: 190px;
-}
-
-#allmap {
-	top: 10px;
-	width: 100%;
-	height: 400px;
-	overflow: hidden;
-	margin: 0;
-	font-family: "微软雅黑";
-}
-.layui-upload-list{
-	width:200px;
-	max-height:200px;
-	overflow:hidden;
-	clear:both;
-	border-radius:4px;
-}
-.layui-upload-list img{
-width:100%;
-margin-top:15px;
-}
-
-#connect-container {
-	float: left;
-	width: 400px
-}
-
-#connect-container div {
-	padding: 5px;
-}
-
-#console-container {
-	float: left;
-	margin-left: 15px;
-	width: 400px;
-}
-
-#console {
-	border: 1px solid #CCCCCC;
-	border-right-color: #999999;
-	border-bottom-color: #999999;
-	height: 170px;
-	overflow-y: scroll;
-	padding: 5px;
-	width: 100%;
-}
-
-#console p {
-	padding: 0;
-	margin: 0;
-}
-
-#container *{-webkit-box-sizing: content-box;-moz-box-sizing: content-box;box-sizing: content-box;}  
-#container *:before,.edui-container *:after {-webkit-box-sizing: content-box;-moz-box-sizing: content-box;box-sizing: content-box;}  
-#container img{
-max-width:80%;
-}
-</style>
-<script src="http://cdn.sockjs.org/sockjs-0.3.min.js"></script>
-<body class="wrap">
-
-	<div class="layui-form Detailbtn" style="display: block;">
-	 <form action="server.php" method="post">
-		<div class="layui-form-item">
-			<label class="layui-form-label"><i
-				style="color: red; margin-right: 5px;">*</i>文章标题</label>
-			<div class="layui-input-inline" style="width: 390px;">
-				<input type="text" name="title" lay-verify="title" placeholder="文章标题"
-					class="layui-input">
-			</div>
-			<div class="layui-form-mid layui-word-aux">不超过20个汉字</div>
-		</div>
-		<div class="layui-form-item">
-			<label class="layui-form-label"><i
-				style="color: red; margin-right: 5px;">*</i>上传主图</label>
-				
-			<div class="layui-input-inline" style="width: 390px;">
-				<div class="layui-upload">
-				  <button type="button" class="layui-btn" id="upload" style="margin:0 20px 0 0;float:left;">上传主图</button>
-				  <span class="layui-form-mid layui-word-aux">建议尺寸：200*200</span>
-				  <div class="layui-upload-list">
-				    <img class="layui-upload-img mainpictrue" src="" >
-				    <input type="text" style="display:none;" name="imgurl" >
-				    <p id="demoText"></p>
-				  </div>
-				</div> 
-			</div>
-			<div class="layui-form-mid layui-word-aux"></div>
-		</div>
-		
-		<div class="layui-form-item">
-			<label class="layui-form-label"><i
-				style="color: red; margin-right: 5px;">*</i>内容</label>
-			<div class="layui-input-block">
-					 <!-- 加载编辑器的容器 -->
-		    <script id="container" name="content" type="text/plain">
-                                       这里写你的初始化内容
-    		</script>
-				
-			</div>
-		</div>
-
-
-		<div class="layui-form-item" style="margin-top: 30px;">
-			<button class="layui-btn" lay-submit lay-filter="submit">提交</button>
-			<button class="layui-btn layui-btn-primary resetBtn">重置</button>
-		</div>
-		</form>
-	</div>
-
-
-
-
-</body>
-
-<script src='/zzhnc/res/js/jquery.min.js'></script>
-<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-<script>
-
-window.onload = function(){  
-	  UE.Editor.prototype._bkGetActionUrl = UE.Editor.prototype.getActionUrl;
-	    UE.Editor.prototype.getActionUrl = function(action) {
-	        if (action == 'uploadimage' || action == 'uploadscrawl' || action == 'uploadimage') {
-	            return '/zzhnc/upload/NewUploadImg';
-	        } else {
-	            return this._bkGetActionUrl.call(this, action);
-	        }
-	    }
-    window.UEDITOR_CONFIG.initialFrameWidth = 900;  
-    window.UEDITOR_CONFIG.initialFrameHeight = 600;  
-    //UE.getEditor("container");  
-    var ue = UE.getEditor('container', {
-        autoHeight: false
-    });
-  
-  
-}   
-   
-
-		layui.use(['form', 'element', 'laydate', 'layer', 'laypage','layedit','upload'], function() {
-			var form = layui.form(),
-				element = layui.element(),
-				laydate = layui.laydate,
-				layer = layui.layer,
-				laypage = layui.laypage;
-			 var $ = layui.jquery
-			  ,upload = layui.upload;
-			  
-			  //普通图片上传
-			  //普通图片上传
-		    var uploadInst = upload.render({
-		      elem: '#upload'
-		      ,url: '/zzhnc/upload/UploadImg'
-		      ,done: function(data){
-		    	  console.log(data)
-		    	  if(data.code==0){
-		    		  imgurl=data.data;
-				   	$("input[name=imgurl]").val(imgurl);
-				   	$(".mainpictrue").attr("src",imgurl);
-				    	 
-		    	  }
-		    	
-		        //如果上传失败
-		        if(data.code > 0){
-		          return layer.msg('上传失败');
-		        }
-		        //上传成功
-		      }
-		     
-		    });
-			
-		
-			$(".resetBtn").on("click",function(){
-				$("input[name=title]").val("");
-				$("textarea[name=content]").val("");
-				$("input[name=imgurl]").val("");
-				$(".mainpictrue").attr("src","");
-				form.render();
-			})
-			var id=getUrl_G("id");
-			if(id>0){
-				$.post("/zzhnc/article/getArticle",{
-					id:id
-				},function(data){
-					console.log(data);
-					 if(data.code==0){
-						$("input[name=title]").val(data.data.title);
-						//$("textarea[name=content]").val(data.data.content);	
-						//重新渲染
-						UE.getEditor("container").ready(function () {
-							UE.getEditor("container").setContent(unescape(data.data.content));
-	                    }) 
-						$("input[name=imgurl]").attr("src",data.data.imgurl);
-						$(".mainpictrue").attr("src",data.data.imgurl);
-						form.render();
-					} 
-				})
-				 
-			}
-			
-		
-			form.on('submit(submit)', function(data){
-				    var title=$("input[name=title]").val();
-				    var content = UE.getEditor('container').getContent();
-					var imgurl=$("input[name=imgurl]").val();
-				 	if(title==""){
-						top.layer.msg("请填写文章标题");
-						return false;
-					}else{
-						if(strlen(title) > 40) {
-				    		top.layer.msg("文章标题不超过20个汉字");
-				    		return false;
-						}
-					}
-				 	if(imgurl==""){
-						top.layer.msg("请上传主图");
-						return false;
-					}
-				 	if(content==""){
-						top.layer.msg("请输入内容");
-						return false;
-					}
-				 	console.log()
-					if(id>0){
-						//修改项目
-						$.post("/zzhnc/article/updateArticle",{
-							id:id,
-							title:title,
-							content:content,
-							imgurl:imgurl
-						},function(data){
-							console.log(data);
-							 if(data.code==0){
-								top.layer.msg("修改成功");
-								 
-							} else{
-								top.layer.msg(data.msg);
-							}
-						})  
-					}else{
-						//添加项目
-						$.post("/zzhnc/article/addArticle",{
-							title:title,
-							content:content,
-							imgurl:imgurl
-						},function(data){
-							console.log(data);
-							if(data.code==0){
-								top.layer.msg("添加成功");
-								form.render();
-							}else{
-								top.layer.msg(data.msg);
-							}
-						}) 
-					}
-					return false;
-					
-			  });
-			
-
-		})
-		
-		
-	</script>
-
-    <!-- 配置文件 -->
-    <script type="text/javascript" src="/zzhnc/res/UE/ueditor.config.js"></script>
-    <!-- 编辑器源码文件 -->
-    <script type="text/javascript" src="/zzhnc/res/UE/ueditor.all.js"></script>
-    <!-- 实例化编辑器 -->
-
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/article/articleIndex.jsp b/WebContent/WEB-INF/jsp/pc/article/articleIndex.jsp
deleted file mode 100644
index 732a3cd..0000000
--- a/WebContent/WEB-INF/jsp/pc/article/articleIndex.jsp
+++ /dev/null
@@ -1,183 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>文章列表</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
-	</head>
-	<style>
-		.layui-form-select dl{
-			max-height:190px;
-		}
-		#allmap {top:10px;width:100%;height: 200px;overflow: hidden;margin:0;font-family:"微软雅黑";}
-	</style>
-	<body class="wrap">
-		<div class="layui-form">
-			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
-				<div class="layui-input-inline" style="width: 140px;">
-					<input type="text" class="layui-input" name="keyword" placeholder="关键字" />
-				</div>
-				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
-				<button class="layui-btn layui-btn-primary resetBtn">重置</button>
-				<a class="layui-btn layui-btn-warm createBtn" href="#"><i class="layui-icon">&#xe61f;</i> 添加文章</a>
-			</div>
-		</div>
-		
-		<table class="layui-table">
-			<thead>
-				<tr>
-					<th style="width: 30px;">No</th>
-					<th style="min-width:120px;">标题</th>
-					<th style="min-width: 120px;">图片链接</th>
-					<th style="min-width: 80px;">更新时间</th>
-					<th style="min-width: 80px;">操作</th>
-				</tr>
-			</thead>
-				
-			<tbody id="tablelist">
-			</tbody>
-		</table>
-		<div class="nulldata">暂无数据</div>
-		<div id="page"></div>
-		
-	</body>
-
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-	<script>
-		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
-			var form = layui.form(),
-				element = layui.element(),
-				laydate = layui.laydate,
-				layer = layui.layer,
-				laypage = layui.laypage;
-			
-			  var queryObj={
-					page : 1,
-					pagesize:10,
-					keyword:''
-				};
-				
-				initdata(queryObj);
-				
-				
-				
-				//查询
-				 form.on('submit(querybtn)', function(data){
-				      	queryObj.keyword=$("[name=keyword]").val();
-						queryObj.page=1;
-						initdata(queryObj)
-				  });
-				$(".resetBtn").on("click",function(){
-					$("[name=keyword]").val("")
-					queryObj={
-							page : 1,
-							pagesize:10,
-							keyword : ""
-					};
-					initdata(queryObj)
-					return false
-				})
-			//初始化数据
-			initdata(queryObj);
-			function initdata(queryObj){
-				
-				$.post("/zzhnc/article/getArticlesList",queryObj,function(data){
-					data=data.data;
-					console.log(data)
-					laypage({
-						cont: 'page',
-						pages: data.totalPages, //总页数
-						curr: queryObj.page,
-						skip: true,
-						jump: function(obj, first) {
-							if(!first) {
-								queryObj.page = obj.curr
-								initdata(queryObj);
-							}
-
-						}
-					});
-					var str="";
-					if(data.rows.length<1){
-						$(".nulldata").show();
-					}else{
-						$(".nulldata").hide();
-						for(var i=0;i<data.rows.length;i++){
-							str+='<tr data-id='+ data.rows[i].id +'>'
-								+'<td>'+ ((data.page - 1) * data.pageSize + i + 1) +'</td>'
-								+'<td style="text-align:left;">'+ data.rows[i].title+'</td>'
-								+'<td>'+ data.rows[i].imgurl+'</td>'
-								+'<td>'+ toTime_G(data.rows[i].createdtime) +'</td>'
-								+'<td>'
-								+'<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>'
-								+'<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>'
-								+'</td>'
-								+'</tr>';
-						}
-					}
-					
-					
-					$("#tablelist").html(str);
-					toNull_G();
-				})
-			}
-			
-			//添加文章
-			$(document).on("click",".createBtn",function(){
-				if(parent.tab.exists("添加文章")>0){
-					var tabid=parent.tab.getTabId("添加文章");
-					parent.tab.deleteTab(tabid);
-				}
-				parent.tab.tabAdd({
-					href: "/zzhnc/article/articleEdit",
-					icon: "fa-cubes",
-					title: "添加文章" 
-				});
-			})
-			//修改文章
-			$(document).on("click",".updataBtn",function(){
-				var id=$(this).parents("tr").attr("data-id");    
-				  if(parent.tab.exists("修改文章")>0){
-					var tabid=parent.tab.getTabId("修改文章");
-					parent.tab.deleteTab(tabid);
-				}
-				parent.tab.tabAdd({
-					href: "/zzhnc/article/articleEdit?id="+ id ,
-					icon: "fa-cubes",
-					title: "修改文章" 
-				});  
-			})
-			//删除文章
-			$(document).on("click", ".deleteBtn", function() {
-				var id=$(this).parents("tr").attr("data-id");
-				layer.confirm('您确定要删除该文章吗？', {
-					btn: ['确定', '取消'] //按钮
-				}, function(index, layero) {
-					$.post( "/zzhnc/article/deleteArticle",{id:id}, function(data) {
-						console.log(data)
-						if(data.code == 0) {
-							top.layer.msg("删除成功");
-							initdata(queryObj);
-							layer.close(index);
-						}else{
-							top.layer.msg(data.msg);
-						}
-					})
-				
-			}, function(index, layero) {
-				layer.close(index);
-			});
-			});
-			
-
-		})
-	</script>
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/autoresponse/autoresponseEdit.jsp b/WebContent/WEB-INF/jsp/pc/autoresponse/autoresponseEdit.jsp
deleted file mode 100644
index 22d52a7..0000000
--- a/WebContent/WEB-INF/jsp/pc/autoresponse/autoresponseEdit.jsp
+++ /dev/null
@@ -1,213 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<title>自动回复</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/Layuiglobal.css">
-		<link rel="stylesheet" href="/zzhnc/res/plugins/font-awesome/css/font-awesome.min.css">
-		<link rel="stylesheet" href="http://at.alicdn.com/t/font_191348_aee57zbh6jyk3xr.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">	
-	</head>
-
-	<body class="wrap">
-		<div id="keywords-form">
-		<div class="popupbox">
-			<div class="popupbos">
-				<div class="layui-form">
-					<div class="layui-form-item">
-						<label class="layui-form-label">关键词：</label>
-						<div class="layui-input-inline" style="width:250px;">
-							<input type="text" name="keywords" lay-verify="required" placeholder="关键词" autocomplete="off" id="text1" class="layui-input" value="">
-						</div>
-						<div class="layui-form-mid layui-word-aux">多个关键词请用英文“ , ”分隔</div>
-					</div>
-					<form class="layui-form">
-						<div class="layui-form-item">
-							<label class="layui-form-label">是否转人工客服：</label>
-							<div class="layui-input-inline">
-								<input type="radio" name="isRedirectStaff" lay-filter="isRedirectStaff" value="0" title="否" checked="ture">
-								<input type="radio" name="isRedirectStaff" lay-filter="isRedirectStaff" value="1" title="是" >
-							</div>
-						</div>
-					</form>
-					
-					<div class="layui-form-item layui-form-text Redirectbox">
-						<label for="" class="layui-form-label">回复内容：</label>
-						<div class="layui-input-inline" style="width:65%;">
-							<textarea class="layui-textarea" name="content" lay-verify="required" id="saytext" placeholder="请输入内容" style="height:100px;" ></textarea>
-							<i class="iconfont icon-xiaolian emotion"></i><div class="layui-form-mid layui-word-aux" style="padding-top:10px;line-height:28px;">多条回复内容用“ | ”分隔</div>
-						</div>
-						<div class="layui-form-mid layui-word-aux " style="margin-left:150px;">注: 活动结束或过期后会自动停止推送</div>
-					</div>
-
-					
-					<div class="layui-form-item" style="margin-left:140px;margin-top:30px;">
-						<button class="layui-btn Sumbit">提交</button>
-						<button class="layui-btn layui-btn-primary resetBtn">重置</button>
-					</div>
-					
-				</div>
-				
-
-			</div>
-		</div>
-	</div>
-
-	</body>
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script type="text/javascript" src="/zzhnc/res/js/jquery.qqFace.js"></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-	<script src="/zzhnc/res/js/me.js"></script>
-	
-	<script>
-		layui.use(['element', 'form', 'layedit', 'layer', 'jquery', 'laypage'], function() {
-			var element = layui.element();
-			var form = layui.form(); //初始化弹窗组件
-			var layedit = layui.layedit; //初始化富文本
-			var editIndex = layedit.build("LAY_demo_editor"); //实例化一个富文本
-			var layer = layui.layer;
-			var laypage = layui.laypage;
-			var page_ = 1;
-			var ispush = false ;
-			var ispushAdd = false ;
-			
-			//初始化数据
-			var id = getUrl_G("id");
-			if(id>0){
-				$.post("/zzhnc/autoreply/getAutoReply",{id:id},function(data){
-					console.log(data)
-					$("input[name=keywords]").val(data.data.keywords);
-					if(data.data.isredirectstaff==true){
-						$("input[name=isRedirectStaff]").eq(1).attr("checked",true);
-					}else{
-						$("input[name=isRedirectStaff]").eq(0).attr("checked",true);
-					}
-					form.render();
-					
-				})
-			}
-			 $(".resetBtn").on("click",function(){
-					$("input[name=keywords]").val("");
-					$("input[name=isRedirectStaff]").eq(0).attr("checked",true);
-					$(".Redirectbox").show();
-					$("textarea[name=content]").val("");
-					form.render();
-					
-				}) 
-			$(".Sumbit").on("click",function(){
-					var keywords=$("input[name=keywords]").val();
-					var isRedirectStaff=$("input[name=isRedirectStaff]:checked").val();
-					var content="";
-					if(keywords==""){
-						top.layer.msg("请填写关键词");
-						return false;
-					}
-					if(isRedirectStaff=="0"){
-						isRedirectStaff=false;
-						content=$("textarea[name=content]").val();
-						if(content==""){
-							top.layer.msg("请填写回复内容");
-							return false;
-						}
-					}else if(isRedirectStaff=="1"){
-						isRedirectStaff=true;
-					}
-					
-					 if(id>0){
-						$.post("/zzhnc/autoreply/updateAutoreply",{
-							id:id,
-							keywords:keywords, 
-							isRedirectStaff:isRedirectStaff,
-							content:content
-						},function(data){
-							if(data.code==0){
-								top.layer.msg("修改成功");
-							}
-						});
-					}else{
-						 $.post("/zzhnc/autoreply/addAutoreply",{
-							 id:id,
-							keywords:keywords, 
-							isRedirectStaff:isRedirectStaff,
-							content:content
-						},function(data){
-							if(data.code==0){
-								top.layer.msg("添加成功");
-							}
-						}); 
-					}  
-					 form.render();
-					
-			})
-			
-			
-			form.render() ;
-			//显示自动回复信息
-		function getReplyInfo() {
-				$.post( "http", {
-					data:data
-				}, function(data) {
-					if(data.data!== null) {
-						console.log(data)
-						$('textarea[name=attention]').html(replace_em(data.data.content));
-					}
-				})
-			}
-
-			//获取自动回复类型
-			function getMenuType() {
-				var value = "";
-				var radio = $("input[name=isRedirectStaff]");
-				for(var i = 0; i < radio.length; i++) {
-					if(radio[i].checked == true) {
-						value = radio[i].value;
-						break;
-					}
-				}
-				return value;
-			}
-		
-			
-			/*是否转人工客服切换*/
-			form.on('radio(isRedirectStaff)', function(data) {
-				if(this.value == 1) {
-					$('.Redirectbox').hide();
-				} else {
-					$('.Redirectbox').show();
-				}
-			});
-
-			//切换自动回复类型
-			form.on('radio(keytype)', function(data) {
-				if(this.value == 1) {
-					$('.Redirectbox').hide();
-					$('radio(isRedirectStaff)').attr("checked",true);
-					form.render();
-				} else {
-					$('.Redirectbox').show();
-					$('radio(isRedirectStaff)').attr("checked",false);
-					form.render();
-					
-				}
-			});
-				
-			
-			$(function(){
-				$('.emotion').qqFace({
-					id : 'facebox', 
-					assign:'saytext', 
-					path:'/zzhnc/res/arclist/'	//表情存放的路径
-			
-				});
-			});
-
-		})
-		
-		
-	</script>
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/game1.jsp b/WebContent/WEB-INF/jsp/pc/game1.jsp
deleted file mode 100644
index 2ec4393..0000000
--- a/WebContent/WEB-INF/jsp/pc/game1.jsp
+++ /dev/null
@@ -1,169 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>客户发消息</title>
-<style type="text/css">
-#connect-container {
-	float: left;
-	width: 400px
-}
-
-#connect-container div {
-	padding: 5px;
-}
-
-#console-container {
-	float: left;
-	margin-left: 15px;
-	width: 400px;
-}
-
-#console {
-	border: 1px solid #CCCCCC;
-	border-right-color: #999999;
-	border-bottom-color: #999999;
-	height: 170px;
-	overflow-y: scroll;
-	padding: 5px;
-	width: 100%;
-}
-
-#console p {
-	padding: 0;
-	margin: 0;
-}
-</style>
-
-<script src="http://cdn.sockjs.org/sockjs-0.3.min.js"></script>
-
-<script type="text/javascript">
-	var ws = null;
-	var url = null;
-	var transports = [];
-
-	connect();
-	function connect() {
-
-		if (ws != null && (ws.readyState == 1 || ws.readyState == 2))
-			return;//判断是否已成功连接,已成功连接不在执行
-		if (ws != null)
-			ws.close();
-
-		ws = new WebSocket('ws://mini.weiyisz.com/zzhnc/web/socket/77/1');
-
-		ws.onopen = function() {
-			console.log("连接服务器成功");
-		};
-
-		ws.onmessage = function(event) {
-			log('Received: ' + event.data);
-		};
-
-		ws.onclose = function() {
-		};
-	}
-
-	function disconnect() {
-		if (ws != null) {
-			ws.close();
-			ws = null;
-		}
-	}
-
-	//查询数据条件
-	function getSearchJson() {
-		var id = Math.ceil(Math.random() * 10);
-		var message = document.getElementById('message').value;
-		var askfrom = document.getElementById('askfrom').value;
-		var salesid = document.getElementById('salesid').value;
-		var json = {
-			"fansid" : 77,
-			"ask" : message,
-			"reply" : "",
-			"askfrom" : askfrom,
-			"salesid":salesid,
-			"readed" : false
-		};
-		json = JSON.stringify(json);
-		return json;
-	}
-
-	window.setInterval("connect()", 5000);
-	function echo() {
-		if (ws != null) {
-
-			if (ws.readyState == 1) {
-				var json = getSearchJson();
-				ws.send(json);
-			} else {
-				//connect();
-			}
-
-		} else {
-			alert('connection not established, please connect.');
-		}
-	}
-
-	function updateUrl(urlPath) {
-		if (urlPath.indexOf('sockjs') != -1) {
-			url = urlPath;
-			document.getElementById('sockJsTransportSelect').style.visibility = 'visible';
-		} else {
-			if (window.location.protocol == 'http:') {
-				url = 'ws://' + window.location.host + urlPath;
-			} else {
-				url = 'wss://' + window.location.host + urlPath;
-			}
-			document.getElementById('sockJsTransportSelect').style.visibility = 'hidden';
-		}
-	}
-
-	function updateTransport(transport) {
-		transports = (transport == 'all') ? [] : [ transport ];
-	}
-
-	function log(message) {
-		var console = document.getElementById('console');
-		var p = document.createElement('p');
-		p.style.wordWrap = 'break-word';
-		p.appendChild(document.createTextNode(message));
-		console.appendChild(p);
-		while (console.childNodes.length > 25) {
-			console.removeChild(console.firstChild);
-		}
-		console.scrollTop = console.scrollHeight;
-	}
-</script>
-</head>
-<body>
-
-	<noscript>
-		<h2 style="color: #ff0000">Seems your browser doesn't support
-			Javascript! Websockets rely on Javascript being enabled. Please
-			enable Javascript and reload this page!</h2>
-	</noscript>
-	<div>
-		<div id="connect-container">
-
-			<div>
-				<textarea id="message" style="width: 350px">Here is a message!</textarea>
-			</div>
-			<div>
-				万小二  :<textarea id="askfrom" style="width: 350px; height: 10">1</textarea>
-			</div>
-			<div>
-				销售id:<textarea id="salesid" style="width: 350px; height: 10">1</textarea>
-			</div>
-			<div>
-				<button id="echo" onclick="echo();">Echo message</button>
-			</div>
-		</div>
-		<div id="console-container">
-			<div id="console"></div>
-		</div>
-	</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/game2.jsp b/WebContent/WEB-INF/jsp/pc/game2.jsp
deleted file mode 100644
index 1fc550f..0000000
--- a/WebContent/WEB-INF/jsp/pc/game2.jsp
+++ /dev/null
@@ -1,156 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>销售代表</title>
-<style type="text/css">
-#connect-container {
-	float: left;
-	width: 400px
-}
-
-#connect-container div {
-	padding: 5px;
-}
-
-#console-container {
-	float: left;
-	margin-left: 15px;
-	width: 400px;
-}
-
-#console {
-	border: 1px solid #CCCCCC;
-	border-right-color: #999999;
-	border-bottom-color: #999999;
-	height: 170px;
-	overflow-y: scroll;
-	padding: 5px;
-	width: 100%;
-}
-
-#console p {
-	padding: 0;
-	margin: 0;
-}
-</style>
-
-<script src="http://cdn.sockjs.org/sockjs-0.3.min.js"></script>
-
-<script type="text/javascript">
-	var ws = null;
-	var url = null;
-	var transports = [];
-
-	connect();
-	function connect() {
-
-		if (ws != null && (ws.readyState == 1 || ws.readyState == 2))
-			return;//判断是否已成功连接,已成功连接不在执行
-		if (ws != null)
-			ws.close();
-
-		ws = new WebSocket(
-				'ws://mini.weiyisz.com/zzhnc/web/socket/228/1');
-
-		ws.onopen = function() {
-			console.log("连接服务器成功");
-		};
-
-		ws.onmessage = function(event) {
-			log('Received: ' + event.data);
-		};
-
-		ws.onclose = function() {
-			//connect();
-		};
-	}
-
-	function disconnect() {
-		if (ws != null) {
-			ws.close();
-			ws = null;
-		}
-	}
-
-
-	//查询数据条件
-	function getSearchJson() {
-		var id = Math.ceil(Math.random() * 10);
-		var message = document.getElementById('message').value;
-		var json =  {"fansid":77,"ask":"","reply":message,"askfrom":1,salesid:"1","readed":true};
-		json = JSON.stringify(json);
-		return json;
-	}
-
-	//  window.setInterval("connect()",1000);
-	function echo() {
-		if (ws != null) {
-
-			if (ws.readyState == 1) {
-				var json = getSearchJson();
-				ws.send(json);
-			} else {
-				//connect();
-			}
-
-		} else {
-			alert('connection not established, please connect.');
-		}
-	}
-
-	function updateUrl(urlPath) {
-		if (urlPath.indexOf('sockjs') != -1) {
-			url = urlPath;
-			document.getElementById('sockJsTransportSelect').style.visibility = 'visible';
-		} else {
-			if (window.location.protocol == 'http:') {
-				url = 'ws://' + window.location.host + urlPath;
-			} else {
-				url = 'wss://' + window.location.host + urlPath;
-			}
-			document.getElementById('sockJsTransportSelect').style.visibility = 'hidden';
-		}
-	}
-
-	function updateTransport(transport) {
-		transports = (transport == 'all') ? [] : [ transport ];
-	}
-
-	function log(message) {
-		var console = document.getElementById('console');
-		var p = document.createElement('p');
-		p.style.wordWrap = 'break-word';
-		p.appendChild(document.createTextNode(message));
-		console.appendChild(p);
-		while (console.childNodes.length > 25) {
-			console.removeChild(console.firstChild);
-		}
-		console.scrollTop = console.scrollHeight;
-	}
-</script>
-</head>
-<body>
-	<noscript>
-		<h2 style="color: #ff0000">Seems your browser doesn't support
-			Javascript! Websockets rely on Javascript being enabled. Please
-			enable Javascript and reload this page!</h2>
-	</noscript>
-	<div>
-		<div id="connect-container">
-
-			<div>
-				<textarea id="message" style="width: 350px">Here is a message!</textarea>
-			</div>
-			<div>
-				<button id="echo" onclick="echo();">Echo message</button>
-			</div>
-		</div>
-		<div id="console-container">
-			<div id="console"></div>
-		</div>
-	</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/game3.jsp b/WebContent/WEB-INF/jsp/pc/game3.jsp
deleted file mode 100644
index 73c588e..0000000
--- a/WebContent/WEB-INF/jsp/pc/game3.jsp
+++ /dev/null
@@ -1,156 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>万小二</title>
-<style type="text/css">
-#connect-container {
-	float: left;
-	width: 400px
-}
-
-#connect-container div {
-	padding: 5px;
-}
-
-#console-container {
-	float: left;
-	margin-left: 15px;
-	width: 400px;
-}
-
-#console {
-	border: 1px solid #CCCCCC;
-	border-right-color: #999999;
-	border-bottom-color: #999999;
-	height: 170px;
-	overflow-y: scroll;
-	padding: 5px;
-	width: 100%;
-}
-
-#console p {
-	padding: 0;
-	margin: 0;
-}
-</style>
-
-<script src="http://cdn.sockjs.org/sockjs-0.3.min.js"></script>
-
-<script type="text/javascript">
-	var ws = null;
-	var url = null;
-	var transports = [];
-
-	connect();
-	function connect() {
-
-		if (ws != null && (ws.readyState == 1 || ws.readyState == 2))
-			return;//判断是否已成功连接,已成功连接不在执行
-		if (ws != null)
-			ws.close();
-
-		ws = new WebSocket(
-				'ws://192.168.1.110:8080/zzhnc/web/socket/3/0');
-
-		ws.onopen = function() {
-			console.log("连接服务器成功");
-		};
-
-		ws.onmessage = function(event) {
-			log('Received: ' + event.data);
-		};
-
-		ws.onclose = function() {
-			//connect();
-		};
-	}
-
-	function disconnect() {
-		if (ws != null) {
-			ws.close();
-			ws = null;
-		}
-	}
-
-
-	//查询数据条件
-	function getSearchJson() {
-		var id = Math.ceil(Math.random() * 10);
-		var message = document.getElementById('message').value;
-		var json =  {"fansid":7,"ask":"aaa","reply":message,"askfrom":2,"readed":true,"salesid":1};
-		json = JSON.stringify(json);
-		return json;
-	}
-
-	//  window.setInterval("connect()",1000);
-	function echo() {
-		if (ws != null) {
-
-			if (ws.readyState == 1) {
-				var json = getSearchJson();
-				ws.send(json);
-			} else {
-				//connect();
-			}
-
-		} else {
-			alert('connection not established, please connect.');
-		}
-	}
-
-	function updateUrl(urlPath) {
-		if (urlPath.indexOf('sockjs') != -1) {
-			url = urlPath;
-			document.getElementById('sockJsTransportSelect').style.visibility = 'visible';
-		} else {
-			if (window.location.protocol == 'http:') {
-				url = 'ws://' + window.location.host + urlPath;
-			} else {
-				url = 'wss://' + window.location.host + urlPath;
-			}
-			document.getElementById('sockJsTransportSelect').style.visibility = 'hidden';
-		}
-	}
-
-	function updateTransport(transport) {
-		transports = (transport == 'all') ? [] : [ transport ];
-	}
-
-	function log(message) {
-		var console = document.getElementById('console');
-		var p = document.createElement('p');
-		p.style.wordWrap = 'break-word';
-		p.appendChild(document.createTextNode(message));
-		console.appendChild(p);
-		while (console.childNodes.length > 25) {
-			console.removeChild(console.firstChild);
-		}
-		console.scrollTop = console.scrollHeight;
-	}
-</script>
-</head>
-<body>
-	<noscript>
-		<h2 style="color: #ff0000">Seems your browser doesn't support
-			Javascript! Websockets rely on Javascript being enabled. Please
-			enable Javascript and reload this page!</h2>
-	</noscript>
-	<div>
-		<div id="connect-container">
-
-			<div>
-				<textarea id="message" style="width: 350px">Here is a message!</textarea>
-			</div>
-			<div>
-				<button id="echo" onclick="echo();">Echo message</button>
-			</div>
-		</div>
-		<div id="console-container">
-			<div id="console"></div>
-		</div>
-	</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp b/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp
new file mode 100644
index 0000000..4b9d754
--- /dev/null
+++ b/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp
@@ -0,0 +1,301 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta http-equiv="X-UA-Compatible" content="ie=edge">
+<title>项目列表</title>
+<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
+<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
+
+    
+    <style type="text/css">
+        
+        .activity-rule-box {
+        	padding-left:20px;
+        }
+        #myEditor img{
+        	width:80%;
+        }
+        #myEditor{
+        	margin:0 !important;
+        }
+        
+.layui-form-select dl {
+	max-height: 190px;
+}
+
+#allmap {
+	top: 10px;
+	width: 100%;
+	height: 400px;
+	overflow: hidden;
+	margin: 0;
+	font-family: "微软雅黑";
+}
+.layui-upload-list{
+	width:200px;
+	max-height:200px;
+	overflow:hidden;
+	clear:both;
+	border-radius:4px;
+}
+.layui-upload-list img{
+width:100%;
+margin-top:15px;
+}
+
+#connect-container {
+	float: left;
+	width: 400px
+}
+
+#connect-container div {
+	padding: 5px;
+}
+
+#console-container {
+	float: left;
+	margin-left: 15px;
+	width: 400px;
+}
+
+#console {
+	border: 1px solid #CCCCCC;
+	border-right-color: #999999;
+	border-bottom-color: #999999;
+	height: 170px;
+	overflow-y: scroll;
+	padding: 5px;
+	width: 100%;
+}
+
+#console p {
+	padding: 0;
+	margin: 0;
+}
+
+#container *{-webkit-box-sizing: content-box;-moz-box-sizing: content-box;box-sizing: content-box;}  
+#container *:before,.edui-container *:after {-webkit-box-sizing: content-box;-moz-box-sizing: content-box;box-sizing: content-box;}  
+#container img{
+max-width:80%;
+}
+</style>
+<script src="http://cdn.sockjs.org/sockjs-0.3.min.js"></script>
+<body class="wrap">
+
+	<div class="layui-form Detailbtn" style="display: block;">
+	 <form action="server.php" method="post">
+		<div class="layui-form-item">
+			<label class="layui-form-label"><i
+				style="color: red; margin-right: 5px;">*</i>文章标题</label>
+			<div class="layui-input-inline" style="width: 390px;">
+				<input type="text" name="title" lay-verify="title" placeholder="文章标题"
+					class="layui-input">
+			</div>
+			<div class="layui-form-mid layui-word-aux">不超过20个汉字</div>
+		</div>
+		<div class="layui-form-item">
+			<label class="layui-form-label"><i
+				style="color: red; margin-right: 5px;">*</i>上传主图</label>
+				
+			<div class="layui-input-inline" style="width: 390px;">
+				<div class="layui-upload">
+				  <button type="button" class="layui-btn" id="upload" style="margin:0 20px 0 0;float:left;">上传主图</button>
+				  <span class="layui-form-mid layui-word-aux">建议尺寸：200*200</span>
+				  <div class="layui-upload-list">
+				    <img class="layui-upload-img mainpictrue" src="" >
+				    <input type="text" style="display:none;" name="imgurl" >
+				    <p id="demoText"></p>
+				  </div>
+				</div> 
+			</div>
+			<div class="layui-form-mid layui-word-aux"></div>
+		</div>
+		
+		<div class="layui-form-item">
+			<label class="layui-form-label"><i
+				style="color: red; margin-right: 5px;">*</i>内容</label>
+			<div class="layui-input-block">
+					 <!-- 加载编辑器的容器 -->
+		    <script id="container" name="content" type="text/plain">
+                                       这里写你的初始化内容
+    		</script>
+				
+			</div>
+		</div>
+
+
+		<div class="layui-form-item" style="margin-top: 30px;">
+			<button class="layui-btn" lay-submit lay-filter="submit">提交</button>
+			<button class="layui-btn layui-btn-primary resetBtn">重置</button>
+		</div>
+		</form>
+	</div>
+
+
+
+
+</body>
+
+<script src='/zzhnc/res/js/jquery.min.js'></script>
+<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
+<script>
+
+window.onload = function(){  
+	  UE.Editor.prototype._bkGetActionUrl = UE.Editor.prototype.getActionUrl;
+	    UE.Editor.prototype.getActionUrl = function(action) {
+	        if (action == 'uploadimage' || action == 'uploadscrawl' || action == 'uploadimage') {
+	            return '/zzhnc/upload/NewUploadImg';
+	        } else {
+	            return this._bkGetActionUrl.call(this, action);
+	        }
+	    }
+    window.UEDITOR_CONFIG.initialFrameWidth = 900;  
+    window.UEDITOR_CONFIG.initialFrameHeight = 600;  
+    //UE.getEditor("container");  
+    var ue = UE.getEditor('container', {
+        autoHeight: false
+    });
+  
+  
+}   
+   
+
+		layui.use(['form', 'element', 'laydate', 'layer', 'laypage','layedit','upload'], function() {
+			var form = layui.form(),
+				element = layui.element(),
+				laydate = layui.laydate,
+				layer = layui.layer,
+				laypage = layui.laypage;
+			 var $ = layui.jquery
+			  ,upload = layui.upload;
+			  
+			  //普通图片上传
+			  //普通图片上传
+		    var uploadInst = upload.render({
+		      elem: '#upload'
+		      ,url: '/zzhnc/upload/UploadImg'
+		      ,done: function(data){
+		    	  console.log(data)
+		    	  if(data.code==0){
+		    		  imgurl=data.data;
+				   	$("input[name=imgurl]").val(imgurl);
+				   	$(".mainpictrue").attr("src",imgurl);
+				    	 
+		    	  }
+		    	
+		        //如果上传失败
+		        if(data.code > 0){
+		          return layer.msg('上传失败');
+		        }
+		        //上传成功
+		      }
+		     
+		    });
+			
+		
+			$(".resetBtn").on("click",function(){
+				$("input[name=title]").val("");
+				$("textarea[name=content]").val("");
+				$("input[name=imgurl]").val("");
+				$(".mainpictrue").attr("src","");
+				form.render();
+			})
+			var id=getUrl_G("id");
+			if(id>0){
+				$.post("/zzhnc/article/getArticle",{
+					id:id
+				},function(data){
+					console.log(data);
+					 if(data.code==0){
+						$("input[name=title]").val(data.data.title);
+						//$("textarea[name=content]").val(data.data.content);	
+						//重新渲染
+						UE.getEditor("container").ready(function () {
+							UE.getEditor("container").setContent(unescape(data.data.content));
+	                    }) 
+						$("input[name=imgurl]").attr("src",data.data.imgurl);
+						$(".mainpictrue").attr("src",data.data.imgurl);
+						form.render();
+					} 
+				})
+				 
+			}
+			
+		
+			form.on('submit(submit)', function(data){
+				    var title=$("input[name=title]").val();
+				    var content = UE.getEditor('container').getContent();
+					var imgurl=$("input[name=imgurl]").val();
+				 	if(title==""){
+						top.layer.msg("请填写文章标题");
+						return false;
+					}else{
+						if(strlen(title) > 40) {
+				    		top.layer.msg("文章标题不超过20个汉字");
+				    		return false;
+						}
+					}
+				 	if(imgurl==""){
+						top.layer.msg("请上传主图");
+						return false;
+					}
+				 	if(content==""){
+						top.layer.msg("请输入内容");
+						return false;
+					}
+				 	console.log()
+					if(id>0){
+						//修改项目
+						$.post("/zzhnc/article/updateArticle",{
+							id:id,
+							title:title,
+							content:content,
+							imgurl:imgurl
+						},function(data){
+							console.log(data);
+							 if(data.code==0){
+								top.layer.msg("修改成功");
+								 
+							} else{
+								top.layer.msg(data.msg);
+							}
+						})  
+					}else{
+						//添加项目
+						$.post("/zzhnc/article/addArticle",{
+							title:title,
+							content:content,
+							imgurl:imgurl
+						},function(data){
+							console.log(data);
+							if(data.code==0){
+								top.layer.msg("添加成功");
+								form.render();
+							}else{
+								top.layer.msg(data.msg);
+							}
+						}) 
+					}
+					return false;
+					
+			  });
+			
+
+		})
+		
+		
+	</script>
+
+    <!-- 配置文件 -->
+    <script type="text/javascript" src="/zzhnc/res/UE/ueditor.config.js"></script>
+    <!-- 编辑器源码文件 -->
+    <script type="text/javascript" src="/zzhnc/res/UE/ueditor.all.js"></script>
+    <!-- 实例化编辑器 -->
+
+
+</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp b/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp
new file mode 100644
index 0000000..732a3cd
--- /dev/null
+++ b/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp
@@ -0,0 +1,183 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<meta http-equiv="X-UA-Compatible" content="ie=edge">
+		<title>文章列表</title>
+		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
+		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
+	</head>
+	<style>
+		.layui-form-select dl{
+			max-height:190px;
+		}
+		#allmap {top:10px;width:100%;height: 200px;overflow: hidden;margin:0;font-family:"微软雅黑";}
+	</style>
+	<body class="wrap">
+		<div class="layui-form">
+			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
+				<div class="layui-input-inline" style="width: 140px;">
+					<input type="text" class="layui-input" name="keyword" placeholder="关键字" />
+				</div>
+				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
+				<button class="layui-btn layui-btn-primary resetBtn">重置</button>
+				<a class="layui-btn layui-btn-warm createBtn" href="#"><i class="layui-icon">&#xe61f;</i> 添加文章</a>
+			</div>
+		</div>
+		
+		<table class="layui-table">
+			<thead>
+				<tr>
+					<th style="width: 30px;">No</th>
+					<th style="min-width:120px;">标题</th>
+					<th style="min-width: 120px;">图片链接</th>
+					<th style="min-width: 80px;">更新时间</th>
+					<th style="min-width: 80px;">操作</th>
+				</tr>
+			</thead>
+				
+			<tbody id="tablelist">
+			</tbody>
+		</table>
+		<div class="nulldata">暂无数据</div>
+		<div id="page"></div>
+		
+	</body>
+
+	<script src='/zzhnc/res/js/jquery.min.js'></script>
+	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
+	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
+	<script>
+		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
+			var form = layui.form(),
+				element = layui.element(),
+				laydate = layui.laydate,
+				layer = layui.layer,
+				laypage = layui.laypage;
+			
+			  var queryObj={
+					page : 1,
+					pagesize:10,
+					keyword:''
+				};
+				
+				initdata(queryObj);
+				
+				
+				
+				//查询
+				 form.on('submit(querybtn)', function(data){
+				      	queryObj.keyword=$("[name=keyword]").val();
+						queryObj.page=1;
+						initdata(queryObj)
+				  });
+				$(".resetBtn").on("click",function(){
+					$("[name=keyword]").val("")
+					queryObj={
+							page : 1,
+							pagesize:10,
+							keyword : ""
+					};
+					initdata(queryObj)
+					return false
+				})
+			//初始化数据
+			initdata(queryObj);
+			function initdata(queryObj){
+				
+				$.post("/zzhnc/article/getArticlesList",queryObj,function(data){
+					data=data.data;
+					console.log(data)
+					laypage({
+						cont: 'page',
+						pages: data.totalPages, //总页数
+						curr: queryObj.page,
+						skip: true,
+						jump: function(obj, first) {
+							if(!first) {
+								queryObj.page = obj.curr
+								initdata(queryObj);
+							}
+
+						}
+					});
+					var str="";
+					if(data.rows.length<1){
+						$(".nulldata").show();
+					}else{
+						$(".nulldata").hide();
+						for(var i=0;i<data.rows.length;i++){
+							str+='<tr data-id='+ data.rows[i].id +'>'
+								+'<td>'+ ((data.page - 1) * data.pageSize + i + 1) +'</td>'
+								+'<td style="text-align:left;">'+ data.rows[i].title+'</td>'
+								+'<td>'+ data.rows[i].imgurl+'</td>'
+								+'<td>'+ toTime_G(data.rows[i].createdtime) +'</td>'
+								+'<td>'
+								+'<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>'
+								+'<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>'
+								+'</td>'
+								+'</tr>';
+						}
+					}
+					
+					
+					$("#tablelist").html(str);
+					toNull_G();
+				})
+			}
+			
+			//添加文章
+			$(document).on("click",".createBtn",function(){
+				if(parent.tab.exists("添加文章")>0){
+					var tabid=parent.tab.getTabId("添加文章");
+					parent.tab.deleteTab(tabid);
+				}
+				parent.tab.tabAdd({
+					href: "/zzhnc/article/articleEdit",
+					icon: "fa-cubes",
+					title: "添加文章" 
+				});
+			})
+			//修改文章
+			$(document).on("click",".updataBtn",function(){
+				var id=$(this).parents("tr").attr("data-id");    
+				  if(parent.tab.exists("修改文章")>0){
+					var tabid=parent.tab.getTabId("修改文章");
+					parent.tab.deleteTab(tabid);
+				}
+				parent.tab.tabAdd({
+					href: "/zzhnc/article/articleEdit?id="+ id ,
+					icon: "fa-cubes",
+					title: "修改文章" 
+				});  
+			})
+			//删除文章
+			$(document).on("click", ".deleteBtn", function() {
+				var id=$(this).parents("tr").attr("data-id");
+				layer.confirm('您确定要删除该文章吗？', {
+					btn: ['确定', '取消'] //按钮
+				}, function(index, layero) {
+					$.post( "/zzhnc/article/deleteArticle",{id:id}, function(data) {
+						console.log(data)
+						if(data.code == 0) {
+							top.layer.msg("删除成功");
+							initdata(queryObj);
+							layer.close(index);
+						}else{
+							top.layer.msg(data.msg);
+						}
+					})
+				
+			}, function(index, layero) {
+				layer.close(index);
+			});
+			});
+			
+
+		})
+	</script>
+
+</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/index.jsp b/WebContent/WEB-INF/jsp/pc/index.jsp
index 1da6fc0..5113e5d 100644
--- a/WebContent/WEB-INF/jsp/pc/index.jsp
+++ b/WebContent/WEB-INF/jsp/pc/index.jsp
@@ -7,7 +7,7 @@
 		<meta charset="UTF-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>东万小程序后台</title>
+		<title>华南城小程序后台</title>
 		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
 		<link rel="stylesheet" href="/zzhnc/res/css/Layuiglobal.css">
 		<link rel="stylesheet" href="/zzhnc/res/plugins/font-awesome/css/font-awesome.min.css">
@@ -19,78 +19,84 @@
 				padding: 16px;
 			}
 			
-			
 			.layui-nav-tree .layui-nav-more {
 				right: 30px;
 			}
+			
 			.layui-layout-admin .site-demo-body {
-			    top: 70px;
+				top: 70px;
 			}
-			.layui-layout-admin .header-demo{
+			
+			.layui-layout-admin .header-demo {
 				border: none;
 			}
-			#chromeTip{
-				position:fixed;
-				top:0;
-				bottom:0;
-				left:0;
-				right:0;
-				background-color:#fff;
+			
+			#chromeTip {
+				position: fixed;
+				top: 0;
+				bottom: 0;
+				left: 0;
+				right: 0;
+				background-color: #fff;
 				z-index: 10000;
 				display: none;
-				
 			}
-			.browserhint{
-			    width: 800px;
-			    margin: 0 auto;
-			    border-radius: 4px;
-			    height: 100px;
-			    top: 50%;
-			    margin-top: -50px;
-			    position: relative;
-			    color: #666;
-			    text-align: center;
+			
+			.browserhint {
+				width: 800px;
+				margin: 0 auto;
+				border-radius: 4px;
+				height: 100px;
+				top: 50%;
+				margin-top: -50px;
+				position: relative;
+				color: #666;
+				text-align: center;
 			}
-			.browserhint i{
-				position:absolute;
-				right:40px;
-				top:20px;
-				color:#fff;
-				font-size:16px;
+			
+			.browserhint i {
+				position: absolute;
+				right: 40px;
+				top: 20px;
+				color: #fff;
+				font-size: 16px;
 			}
-			.browserhint p{
-				line-height:35px;
+			
+			.browserhint p {
+				line-height: 35px;
 			}
-			.browseimg{
-				background:url(../res/images/browser.png) no-repeat top -60px left 0px;
-				width:40px;
-				height:40px;
+			
+			.browseimg {
+				background: url(../res/images/browser.png) no-repeat top -60px left 0px;
+				width: 40px;
+				height: 40px;
 				vertical-align: middle;
-				margin:0 5px;
+				margin: 0 5px;
 				display: inline-block;
 			}
-			.fa{
-				margin-top:10px;
+			
+			.fa {
+				margin-top: 10px;
 			}
 		</style>
 		<script>
-		/* $(function(){
-			var tipObj = document.getElementById('chromeTip');
-			if(tipObj){
-				if( navigator.userAgent.indexOf('Chrome') == -1 || navigator.userAgent.indexOf('Edge') != -1){
-					tipObj.style.display = 'block';
-				}
-			}
-		}) */
-			
+			/* $(function(){
+						var tipObj = document.getElementById('chromeTip');
+						if(tipObj){
+							if( navigator.userAgent.indexOf('Chrome') == -1 || navigator.userAgent.indexOf('Edge') != -1){
+								tipObj.style.display = 'block';
+							}
+						}
+					}) */
 		</script>
 	</head>
-	
+
 	<body>
-		<div id="chromeTip"> 
+		<div id="chromeTip">
 			<div class="browserhint">
-				<p>由于您正在使用非谷歌内核的浏览器，微易互动将无法为您提供最佳体验。<br />
-	建议您更换：<a href="http://rj.baidu.com/soft/detail/14744.html?ald" target="_blank" style="color:#ff8400;text-decoration: underline;"><span class="browseimg"></span>谷歌浏览器</a></p>
+				<p>由于您正在使用非谷歌内核的浏览器，微易互动将无法为您提供最佳体验。<br /> 建议您更换：
+					<a href="http://rj.baidu.com/soft/detail/14744.html?ald" target="_blank" style="color:#ff8400;text-decoration: underline;"><span class="browseimg"></span>谷歌浏览器</a>
+				</p>
 			</div>
 		</div>
 		<div class="layui-layout layui-layout-admin">
@@ -113,10 +119,10 @@
 							<a href="javascript:;" class="admin-header-user loginnamebtn">
 								<span class="loginname">admin</span>
 							</a>
-							
+
 						</li>
 					</ul>
-			
+
 					<div class="layui-nav-item" style="position: absolute;top:0;right:10px;">
 						<a class="signOut" style="color:#999;padding:0 12px;line-height:25px;margin-top:20px;border:1px solid #999;border-radius:20px;display:inline-block; cursor: pointer;">退出</a>
 					</div>
@@ -129,13 +135,13 @@
 			<div class="layui-body layui-tab-content site-demo site-demo-body" style="bottom: 0;" id="admin-body">
 				<div class="layui-tab admin-nav-card layui-tab-brief" lay-filter="admin-tab">
 					<ul class="layui-tab-title">
-					 <li lay-id="0" class="layui-this"><i class="iconfont icon-xiangmu"></i><cite>项目管理</cite><i class="layui-icon layui-unselect layui-tab-close" data-id="0">ဆ</i></li>
-					<!-- </li>
+						<li lay-id="0" class="layui-this"><i class="iconfont icon-xiangmu"></i><cite>项目管理</cite><i class="layui-icon layui-unselect layui-tab-close" data-id="0">ဆ</i></li>
+						<!-- </li>
 						<li class="layui-this">
 							<i class="fa fa-dashboard" aria-hidden="true"></i>
 							<cite>项目管理</cite>
 						</li>-->
-					</ul> 
+					</ul>
 					<div class="layui-tab-content" style="min-height: 150px; padding: 0; height: auto;">
 						<div class="layui-tab-item layui-show">
 							<iframe src="/zzhnc/project/projectIndex" target="_self" id="baseIframe" data-id="0"></iframe>
@@ -143,33 +149,33 @@
 					</div>
 				</div>
 			</div>
-			
+
 			<div class="site-tree-mobile layui-hide">
 				<i class="layui-icon">&#xe602;</i>
 			</div>
 			<div class="site-mobile-shade"></div>
 			<script src='/zzhnc/res/js/jquery.min.js'></script>
 			<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-			<script src="/zzhnc/res/js/navbar.js" charset="utf-8"></script> 
+			<script src="/zzhnc/res/js/navbar.js" charset="utf-8"></script>
 			<script type="text/javascript" src="/zzhnc/res/plugins/datas/nav.js"></script>
 			<script src="/zzhnc/res/js/index.js"></script>
 			<script src="/zzhnc/res/js/me.js"></script>
 			<script>
-				layui.use([ 'element','layer'], function() {
-						var element = layui.element(),
+				layui.use(['element', 'layer'], function() {
+					var element = layui.element(),
 						layer = layui.layer;
-						 $(".fa-dashboard").on("click",function(){
-							 if($(this).attr("lay-id")=="0"){
-								var src=$("iframe[data-id='0']")[0].src;
-								window.parent.location.reload(src)
-							} 
-							
-						}) 
-							
-						
+					$(".fa-dashboard").on("click", function() {
+						if($(this).attr("lay-id") == "0") {
+							var src = $("iframe[data-id='0']")[0].src;
+							window.parent.location.reload(src)
+						}
+
+					})
+
 				});
-				
-				var cookie="Th_xc_30b679eb2c90c60ff8679ce4ca562fcc";
+
+				var cookie = "Th_xc_30b679eb2c90c60ff8679ce4ca562fcc";
+
 				function setCookie(name, value) {
 					var Days = 0;
 					var exp = new Date();
@@ -188,9 +194,6 @@
 						nickname: ''
 					};
 
-
-					
-					
 					//退出
 					$(".signOut").click(function() {
 						$.post("/zzhnc/exit", function(data) {
@@ -206,7 +209,7 @@
 
 					}
 					init();
-					
+
 				})
 			</script>
 		</div>
diff --git a/WebContent/WEB-INF/jsp/pc/poster/coordinate.jsp b/WebContent/WEB-INF/jsp/pc/poster/coordinate.jsp
deleted file mode 100644
index f0f6be7..0000000
--- a/WebContent/WEB-INF/jsp/pc/poster/coordinate.jsp
+++ /dev/null
@@ -1,168 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-	<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>设置坐标</title>
-    <link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-    <link rel="stylesheet" href="http://at.alicdn.com/t/font_9lmlt21w1lv26gvi.css">
-    <style>
-        body{
-            margin: 0;
-            padding: 0;
-            -moz-user-select: none; /*火狐*/
-            -webkit-user-select: none;  /*webkit浏览器*/
-            -ms-user-select: none;   /*IE10*/
-            -khtml-user-select: none; /*早期浏览器*/
-            user-select: none;
-        }
-        .haibao-view{
-            display: inline-block;
-            min-width:300px;
-            min-height:600px;
-        }
-        .haibao-view img{
-        	border:1px solid #ddd;
-        	
-        }
-        .box {
-            cursor: move;
-            background-color: #FFF;
-            border: 1px solid #CCCCCC;
-        }
-        
-        #box {
-            width: 160px;
-            height: 160px;
-            position: absolute;
-            top: 0px;
-            left: 100px;
-            background: url(/zzhnc/res/images/code.png);
-            background-size: 100% 100%;
-        }
-        
-       
-        
-        .coor {
-            overflow: hidden;
-            cursor: se-resize;
-            position: absolute;
-            right: 0;
-            bottom: 0;
-        }
-    </style>
-</head>
-
-<body>
-    <div class="haibao-view">
-        <button class="layui-btn" style="position:fixed;top:20px;right:20px;z-index:10">保存</button>
-        <img src="/zzhnc/res/images/1.jpg" alt="">
-        <div id="box" class="box">
-            <div id="coor" class="coor"><span class="iconfont icon-suofang"></span></div>
-        </div>
-       
-    </div>
-   <script src='/zzhnc/res/js/jquery.min.js'></script>
-    <script>
-    
-
-    var qrH = window.parent.qrH || 160
-    var qrW = window.parent.qrW || 160
-    var qrX = window.parent.qrX || 100
-    var qrY = window.parent.qrY || 0
-    $("#box").css({"width":qrW,"height":qrH,"top":qrY,"left":qrX})
-   	$(".haibao-view img").attr("src",  $("input[name=postertemplet]",window.parent.document).val() || "../res/images/1.jpg")
-    
-    $(function () {
-        $(document).mousemove(function (e) {
-
-            if (!!this.move) {
-
-                var posix = !document.move_target ? { 'x': 0, 'y': 0 } : document.move_target.posix
-
-                var callback = document.call_down || function () {
-
-                    if (this.move_target.id == "box") {
-                        qrY = Math.max(e.pageY - posix.y  , 0)
-                        qrY = Math.min(qrY,$(".haibao-view").height()-qrH)
-                        qrX = Math.max(e.pageX - posix.x  , 0)
-                        qrX = Math.min(qrX,$(".haibao-view").width()-qrW)
-                        
-                        $("#box").css({
-                            'top': qrY ,
-                            'left': qrX 
-                        });
-                    }
-
-                };
-
-                callback.call(this, e, posix);
-            }
-        }).mouseup(function (e) {
-
-            if (!!this.move) {
-                var callback = document.call_up || function () { };
-                callback.call(this, e);
-                $.extend(this, {
-                    'move': false,
-                    'move_target': null,
-                    'call_down': false,
-                    'call_up': false
-                });
-            }
-        });
-
-        var $box = $('#box').mousedown(function (e) {
-            var offset = $(this).offset();
-
-            this.posix = { 'x': e.pageX - offset.left, 'y': e.pageY - offset.top };
-
-            $.extend(document, { 'move': true, 'move_target': this });
-
-
-        }).on('mousedown', '#coor', function (e) {
-            var posix = {
-                'w': $box.width(),
-                'h': $box.height(),
-                'x': e.pageX,
-                'y': e.pageY
-            };
-
-            $.extend(document, {
-                'move': true, 'call_down': function (e) {
-                    qrW = Math.max(30, e.pageX - posix.x + posix.w)
-                    qrW = Math.min(qrW,$(".haibao-view").width() - qrX)
-                    qrH = Math.max(30, e.pageY - posix.y + posix.h)
-                    qrH = Math.min(qrH,$(".haibao-view").height() - qrY)
-                    qrH = qrW
-                    qrW = qrH
-                    $box.css({
-                        'width': qrW,
-                        'height': qrH
-                    });
-                    
-                }
-            });
-            return false;
-        });
-
-
-
-        $("button").click(function(){
-        	window.parent.layer.close(window.parent.layers)
-            $("input[name=qrX]",window.parent.document).val(qrX)
-            $("input[name=qrY]",window.parent.document).val(qrY)
-            $("input[name=qrWidth]",window.parent.document).val(qrW)
-            $("input[name=qrHeight]",window.parent.document).val(qrH)
-            window.parent.aa = [qrX,qrY,qrH,qrW]
-        })
-    });
-    </script>
-</body>
-
-
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/poster/poster.jsp b/WebContent/WEB-INF/jsp/pc/poster/poster.jsp
deleted file mode 100644
index 8383c3c..0000000
--- a/WebContent/WEB-INF/jsp/pc/poster/poster.jsp
+++ /dev/null
@@ -1,386 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-	<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-	<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>设置坐标</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="http://at.alicdn.com/t/font_9lmlt21w1lv26gvi.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
-		<style>
-			.layui-form-label {
-				width: 100px !important;
-			}
-
-			.layui-input-block {
-				margin-left: 130px !important;
-			}
-
-			.layui-input-block,
-			.layui-input-inline {
-				width: 140px !important;
-			}
-
-			.layui-input-inline input {
-				padding: 0 5px;
-			}
-
-			body {
-				margin: 0;
-				padding: 0;
-				-moz-user-select: none;
-				/*鐏嫄*/
-				-webkit-user-select: none;
-				/*webkit娴忚鍣�*/
-				-ms-user-select: none;
-				/*IE10*/
-				-khtml-user-select: none;
-				/*鏃╂湡娴忚鍣�*/
-				user-select: none;
-			}
-		</style>
-	</head>
-
-	<body style="min-width:1070px;">
-		<div class="hint">提示：上传海报后，拖拽拉伸左边海报上的二维码设置二维码在海报上的位置和大小，建议二维码宽高不小于120px，以免无法识别。</div>
-		<div style="margin-bottom:20px;overflow:hidden;">
-			<div class="haibaofl">
-				<div class="haibao-box">
-					<!-- <img src="/zzhnc/res/images/pg_top.jpg" class="ph_top"/>  -->
-					<div class="haibao-viewbox">
-						<div class="haibao-view">
-							<img src="/zzhnc/res/images/moren.jpg" alt="">
-							<div id="box" class="box">
-								<div id="coor" class="coor">
-									<span class="iconfont icon-suofang"></span>
-								</div>
-							</div>
-						</div>
-					</div>
-					<!--  <img src="/zzhnc/res/images/pg_bottom.jpg" class="ph_ft"/>  -->
-				</div>
-			</div>
-			<div class="haibaofr" style="margin-top:40px;">
-				<div class="layui-form">
-					<div class="layui-form-item">
-						<label class="layui-form-label">
-							<i style="color:red;margin-right:5px;">*</i>海报名称</label>
-						<div class="layui-input-inline">
-							<input type="text" name="name" lay-verify="name" placeholder="" autocomplete="off" class="layui-input">
-						</div>
-						<div class="layui-form-mid layui-word-aux">不超过20个汉字</div>
-					</div>
-					<div class="layui-form-item">
-						<label class="layui-form-label">
-							<i style="color:red;margin-right:5px;">*</i>海报类别</label>
-
-						<div class="layui-input-inline">
-							<select name="posttype">
-								<option value="0">请选择</option>
-								<option value="1">项目海报</option>
-								<option value="2">销售助手首页</option>
-								<option value="3">万小二首页</option>
-							</select>
-						</div>
-					</div>
-					<div class="layui-form-item">
-						<label class="layui-form-label">
-							<i style="color:red;margin-right:5px;">*</i>上传海报</label>
-						<div class="layui-input-inline">
-							<input type="text" name="imgurl" placeholder="请上传一张海报" class="layui-input" style="display:none;">
-						</div>
-						<div id="upload" style="display:inline-block;">
-							<span class="layui-btn" style="float:left;margin-right:10px;"> 上传海报</span>
-						</div>
-
-						<div class="layui-form-mid layui-word-aux" style="margin-left:130px;">海报宽度应不小于640px,以免海报显示不清晰</div>
-					</div>
-					<div class="layui-form-item">
-						<label class="layui-form-label">
-							<i style="color:red;margin-right:5px;">*</i>二维码宽度</label>
-						<div class="layui-input-inline">
-							<input type="text" readonly name="width" placeholder="宽度" autocomplete="off" class="layui-input" value="120" style="background-color:#f5f5f5;color:#666;">
-						</div>
-
-					</div>
-					<div class="layui-form-item">
-						<label class="layui-form-label">
-							<i style="color:red;margin-right:5px;">*</i>二维码高度</label>
-						<div class="layui-input-inline">
-							<input type="text" readonly name="height" placeholder="高度" autocomplete="off" class="layui-input" value="120" style="background-color:#f5f5f5;color:#666;">
-						</div>
-
-					</div>
-					<div class="layui-form-item" style="margin-bottom:0;">
-						<label class="layui-form-label">
-							<i style="color:red;margin-right:5px;">*</i>二维码位置</label>
-						<div class="layui-input-block">
-							<input type="text" readonly name="x" placeholder="X坐标" autocomplete="off" class="layui-input" style="margin-bottom:15px;background-color:#f5f5f5;color:#666;"
-							 value="0">
-							<input type="text" readonly name="y" placeholder="Y坐标" autocomplete="off" class="layui-input" style="margin-bottom:15px;background-color:#f5f5f5;color:#666;"
-							 value="0">
-						</div>
-					</div>
-
-
-
-
-					<div class="layui-form-item" style="margin-left:130px;">
-						<button class="layui-btn submit">提交</button>
-						<button class="layui-btn layui-btn-primary resetBtn">重置</button>
-					</div>
-				</div>
-			</div>
-		</div>
-
-		<script src='/zzhnc/res/js/jquery.min.js'></script>
-		<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-		<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-
-		<script>
-			var imgurl = "";
-			var height = window.parent.height || 120
-			var width = window.parent.width || 120
-			var x = window.parent.x || 0
-			var y = window.parent.y || 0
-			$("#box").css({ "width": width, "height": height, "top": y, "left": x })
-			$(".haibao-view img").attr("src", $("input[name=postertemplet]", window.parent.document).val() || "/zzhnc/res/images/moren.jpg")
-
-			$(function () {
-				$(document).mousemove(function (e) {
-
-					if (!!this.move) {
-
-						var posix = !document.move_target ? { 'x': 0, 'y': 0 } : document.move_target.posix
-
-						var callback = document.call_down || function () {
-
-							if (this.move_target.id == "box") {
-								e.pageX = e.pageX - 10
-								e.pageY = e.pageY - 50
-								y = Math.max(e.pageY - posix.y, 0)
-								y = Math.min(y, $(".haibao-view").height() - height)
-								x = Math.max(e.pageX - posix.x, 0)
-								x = Math.min(x, $(".haibao-view").width() - width)
-
-								$("#box").css({
-									'top': y,
-									'left': x
-								});
-
-								$("input[name=x]").val(decimal(x, 0));
-								$("input[name=y]").val(decimal(y, 0));
-							}
-
-						};
-
-						callback.call(this, e, posix);
-					}
-				}).mouseup(function (e) {
-
-					if (!!this.move) {
-						var callback = document.call_up || function () { };
-						callback.call(this, e);
-						$.extend(this, {
-							'move': false,
-							'move_target': null,
-							'call_down': false,
-							'call_up': false
-						});
-					}
-
-				});
-
-				var $box = $('#box').mousedown(function (e) {
-					var offset = $(this).offset();
-
-					this.posix = { 'x': e.pageX - offset.left, 'y': e.pageY - offset.top };
-
-					$.extend(document, { 'move': true, 'move_target': this });
-
-				}).on('mousedown', '#coor', function (e) {
-					var posix = {
-						'w': $box.width(),
-						'h': $box.height(),
-						'x': e.pageX,
-						'y': e.pageY
-					};
-
-					$.extend(document, {
-						'move': true, 'call_down': function (e) {
-							width = Math.max(30, e.pageX - posix.x + posix.w)
-							width = Math.min(width, $(".haibao-view").width() - x)
-							height = Math.max(30, e.pageY - posix.y + posix.h)
-							height = Math.min(height, $(".haibao-view").height() - y)
-
-							height = Math.min(width, height)
-							width = Math.min(width, height)
-							$box.css({
-								'width': width,
-								'height': height
-							});
-							$("input[name=width]").val(decimal(width, 0));
-							$("input[name=height]").val(decimal(height, 0));
-						}
-
-					});
-
-					return false;
-				});
-
-
-			});
-			layui.use(['form', 'element', 'laydate', 'layer', 'laypage', 'upload'], function () {
-				var form = layui.form(),
-					element = layui.element(),
-					laydate = layui.laydate,
-					layer = layui.layer,
-					laypage = layui.laypage;
-				var $ = layui.jquery
-					, upload = layui.upload;
-				var id = getUrl_G("id");
-				if (id > 0) {
-					$.post("/zzhnc/poster/getPoster", { id: id }, function (data) {
-						$("input[name=name]").val(data.data.name);
-						$("select[name=posttype]").val(data.data.postertype);
-						height = data.data.height
-						width = data.data.width
-						x = data.data.x
-						y = data.data.y
-						$("input[name=width]").val(width);
-						$("input[name=height]").val(height);
-						$("input[name=x]").val(x);
-						$("input[name=y]").val(y);
-						$("input[name=imgurl]").val(data.data.imgurl);
-						$(".haibao-view img").attr("src", data.data.imgurl);
-						$("#box").css({ "width": data.data.width, "height": data.data.height, "top": data.data.y, "left": data.data.x })
-						form.render();
-					})
-				}
-				//普通图片上传
-				var uploadInst = upload.render({
-					elem: '#upload'
-					, url: '/zzhnc/upload/UploadImg'
-					, done: function (data) {
-						console.log(data)
-						if (data.code == 0) {
-							imgurl = data.data;
-							$("input[name=imgurl]").val(imgurl);
-							$(".haibao-view img").attr("src", imgurl);
-
-						}
-
-						//如果上传失败
-						if (data.code > 0) {
-							return layer.msg('上传失败');
-						}
-						//上传成功
-					}
-
-				});
-
-				$(".resetBtn").on("click", function () {
-					$("input[name=name]").val("");
-					$("select[name=posttype]").val("");
-					form.render();
-				})
-				//提交
-				$(".submit").on("click", function () {
-					var x = $("input[name=x]").val();
-					var y = $("input[name=y]").val();
-					var width = $("input[name=width]").val();
-					var height = $("input[name=height]").val();
-					var name = $("input[name=name]").val();
-					var posttype = $("select[name=posttype]").val();
-					var imgurl = $("input[name=imgurl]").val();
-					if (name == "") {
-						top.layer.msg("请填写海报名称");
-						return false;
-					} else {
-						if (strlen(name) > 40) {
-							top.layer.msg("海报名称不超过20个汉字");
-							return false;
-						}
-					}
-					//表单验证
-
-					if (posttype == "" || posttype == "0") {
-						top.layer.msg("请选择海报类别");
-						return false;
-					}
-					if (imgurl == "") {
-						top.layer.msg("请上传海报");
-						return false;
-					}
-					if (id > 0) {
-						$.post("/zzhnc/poster/updatetemplet", {
-							id: id,
-							name: name,
-							posttype: posttype,
-							imgurl: imgurl,
-							x: x,
-							y: y,
-							width: width,
-							height: height
-						}, function (data) {
-							console.log(data);
-							if (data.code == 0) {
-								top.layer.msg("修改成功");
-								$.post("/zzhnc/wxmini/cleanProgramMedia?code=nmdzpsmhs", function(res){
-									console.log(res);
-								})
-							}
-						})
-					} else {
-						$.post("/zzhnc/poster/addtemplet", {
-							name: name,
-							posttype: posttype,
-							imgurl: imgurl,
-							x: x,
-							y: y,
-							width: width,
-							height: height
-						}, function (data) {
-							console.log(data);
-							if (data.code == 0) {
-								top.layer.msg("添加成功");
-								$.post("/zzhnc/wxmini/cleanProgramMedia?code=nmdzpsmhs", function(res){
-									console.log(res);
-								})
-							}
-						})
-					}
-
-
-				})
-				/*  $(".returnBtn").on("click",function(){
-					 if(parent.tab.exists("海报模板")>0){
-						 var tabid=parent.tab.getTabId("海报模板");
-						 parent.tab.deleteTab(tabid);
-					 }
-					 parent.tab.tabAdd({
-						 href: "/zzhnc/poster/posterlist",
-						 icon: "fa-cubes",
-						 title: "海报模板" 
-					 });
-				 }) */
-
-
-			});
-			//对数字进行四舍五入
-			function decimal(num, v) {
-				var vv = Math.pow(10, v);
-				return Math.round(num * vv) / vv;
-			}
-
-
-
-		</script>
-	</body>
-
-
-
-	</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/poster/posterlist.jsp b/WebContent/WEB-INF/jsp/pc/poster/posterlist.jsp
deleted file mode 100644
index 89875e4..0000000
--- a/WebContent/WEB-INF/jsp/pc/poster/posterlist.jsp
+++ /dev/null
@@ -1,209 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>海报列表</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
-	</head>
-	<style>
-		.layui-form-select dl{
-			max-height:190px;
-		}
-	</style>
-	<body class="wrap">
-		<div class="layui-form">
-			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
-				
-				<!-- <div class="layui-input-inline producttype" style="width: 140px;">
-					<select name="producttype" >
-						<option value="">海报名称</option>
-					</select>
-				</div>
-				<div class="layui-input-inline productid" style="width: 140px;">
-					<select name="productid">
-						<option value="0">海报类别</option>
-						<option value="1">项目海报</option>
-						<option value="2">销售助手首页</option>
-						<option value="3">万小二首页</option>
-					</select>
-				</div>
-				<div class="layui-input-inline" style="width: 140px;">
-					<input type="text" class="layui-input" name="keyword" placeholder="关键字" />
-				</div>
-				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
-				<button class="layui-btn layui-btn-primary resetBtn" >重置</button> -->
-				<a class="layui-btn layui-btn-warm createBtn" href="#"><i class="layui-icon">&#xe61f;</i> 添加海报</a>
-			</div>
-		</div>
-		
-		<table class="layui-table">
-			<thead>
-				<tr>
-					<th style="width:30px;">No</th>
-					<th style="min-width: 120px;">海报名称</th>
-					<th style="min-width:80px;">海报类别</th>
-					<th>海报图片</th>
-					<th style="min-width: 80px;">操作</th>
-				</tr>
-			</thead>
-				
-			<tbody id="tablelist">
-				<!-- <tr>
-					<td>1</td>
-					<td>海报名称</td>
-					<td>海报类别</td>
-					<td>海报图片</td>
-					<td>
-						<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>
-						<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>
-					</td>
-				</tr> -->
-			</tbody>
-		</table>
-		<div class="nulldata">暂无数据</div>
-		<div id="page"></div>
-		
-	</body>
-
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-    <script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-	<script>
-	layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
-		var form = layui.form(),
-			element = layui.element(),
-			laydate = layui.laydate,
-			layer = layui.layer,
-			laypage = layui.laypage;
-		var queryObj = {
-				page: 1,
-			} //查询条件
-		//查询
-		/*  form.on('submit(querybtn)', function(data){
-			 queryObj=data.field;
-			 queryObj.page=1;
-		      initdata(queryObj);
-		      form.render();
-		  });
-		 $(".resetBtn").on("click",function(){
-			$("input[name=keyword]").val("");
-			$("select[name=projectid]").val("");
-			form.render();
-			initdata(queryObjd)
-		})  */
-		//初始化数据
-		initdata(queryObj);
-		function initdata(queryObj){
-			
-			$.post("/zzhnc/poster/templetList",queryObj,function(data){
-				data=data.data;
-				console.log(data)
-				  laypage({
-					cont: 'page',
-					pages: data.totalPages, //总页数
-					curr: queryObj.page,
-					skip: true,
-					jump: function(obj, first) {
-						if(!first) {
-							queryObj.page = obj.curr
-							initdata(queryObj);
-						}
-
-					}
-				});  
-				var str="";
-				if(data.rows.length<1){
-					$(".nulldata").show();
-				}else{
-					$(".nulldata").hide();
-					for(var i=0;i<data.rows.length;i++){
-						str+='<tr data-id='+ data.rows[i].id +'>'
-							+'<td>'+ ((data.page - 1) * data.pageSize + i + 1) +'</td>'
-							+'<td style="text-align:left;">'+ data.rows[i].name+'</td>'
-							+'<td>'+ postertype(data.rows[i].postertype) +'</td>'
-							+'<td><div class="logoimg" style="background:url(http://mini.weiyisz.com'+data.rows[i].imgurl+') no-repeat center;-webkit-backgorund-size:contain;backgorund-size:contain;float:none;margin:0 auto;"></div></td>'
-							+'<td>'
-							+'<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>'
-							+'<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>'
-							+'</td>'
-							+'</tr>';
-					}
-				}
-				
-				$("#tablelist").html(str);
-				toNull_G();
-			})
-		}
-		//添加海报模板
-		$(document).on("click", ".createBtn", function() {
-				if(parent.tab.exists("添加海报")>0){
-					var tabid=parent.tab.getTabId("添加海报");
-					parent.tab.deleteTab(tabid);
-				}
-				parent.tab.tabAdd({
-					href: "/zzhnc/poster/poster",
-					icon: "fa-cubes",
-					title: "添加海报" 
-				});
-			})
-				//修改海报模板
-		$(document).on("click", ".updataBtn", function() {
-			var id=$(this).parents("tr").attr("data-id");
-				if(parent.tab.exists("修改海报")>0){
-					var tabid=parent.tab.getTabId("修改海报");
-					parent.tab.deleteTab(tabid);
-				}
-				parent.tab.tabAdd({
-					href: "/zzhnc/poster/poster?id="+id,
-					icon: "fa-cubes",
-					title: "修改海报" 
-				});
-			})
-		//删除海报模板
-		$(document).on("click", ".deleteBtn", function() {
-			var id=$(this).parents("tr").attr("data-id");
-			layer.confirm('您确定要删除该海报吗？', {
-				btn: ['确定', '取消'] //按钮
-			}, function(index, layero) {
-				$.post( "/zzhnc/poster/deletetemplet",{id:id}, function(data) {
-					console.log(data)
-					if(data.code == 0) {
-						top.layer.msg("删除成功");
-						queryObj.page=1;
-						initdata(queryObj);
-						layer.close(index);
-					}else{
-						top.layer.msg(data.msg);
-					}
-				})
-			}, function(index, layero) {
-				layer.close(index);
-			});
-		});
-
-	})
-		function postertype(v){
-			if(v!==null&&v!==""){
-				switch(v){
-					case 1:
-					 return "项目海报";
-					  break;
-					case 2:
-						 return "销售助手首页";
-					  break;
-					case 3:
-						 return "万小二首页";
-					  break;
-				}
-			}else{
-				return ""
-			}
-		}
-	</script>
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/prize/prizeEdit.jsp b/WebContent/WEB-INF/jsp/pc/prize/prizeEdit.jsp
new file mode 100644
index 0000000..2f2bdea
--- /dev/null
+++ b/WebContent/WEB-INF/jsp/pc/prize/prizeEdit.jsp
@@ -0,0 +1,243 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<meta http-equiv="X-UA-Compatible" content="ie=edge">
+		<title>项目列表</title>
+		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
+		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
+	</head>
+	<style>
+		.layui-form-select dl{
+			max-height:190px;
+		}
+		#allmap {top:10px;width:100%;height: 400px;overflow: hidden;margin:0;font-family:"微软雅黑";}
+	</style>
+	
+	<body class="wrap">
+		<div class="layui-form Detailbtn" style="display:block;">
+			  <div class="layui-form-item">
+			    <label class="layui-form-label"><i style="color:red;margin-right:5px;">*</i>项目名称</label>
+			    <div class="layui-input-inline" style="width:390px;">
+			      <input type="text" name="name"   lay-verify="name" placeholder="项目名称"  class="layui-input">
+			    </div>
+			    <div class="layui-form-mid layui-word-aux">不超过20个汉字</div>
+			  </div>
+			  <div class="layui-form-item">
+			    <label class="layui-form-label"><i style="color:red;margin-right:5px;">*</i>海报模板</label>
+			    <div class="layui-input-inline">
+			      <select name="postertempletid" lay-search="">
+			        <option value="">全部</option>
+			      </select>
+			    </div>
+			  </div>
+			  <div class="layui-form-item">
+			    <label class="layui-form-label">位置</label>
+			   <!--  <div class="layui-input-inline">
+			      <input type="text" name="lng"  readonly lay-verify="required" placeholder="经度"  class="layui-input" style="background-color:#f5f5f5;color:#666;">
+			    </div>
+			    <div class="layui-input-inline">
+			      <input type="text" name="lat" readonly lay-verify="required" placeholder="纬度"  class="layui-input" style="background-color:#f5f5f5;color:#666;">
+			    </div> -->
+			    <div class="layui-input-inline">
+			      <input type="number" name="lng"   lay-verify="required" placeholder="经度"  class="layui-input" >
+			    </div>
+			    <div class="layui-input-inline">
+			      <input type="number" name="lat"  lay-verify="required" placeholder="纬度"  class="layui-input" >
+			    </div>
+			  </div>
+			  <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=V45f8fZO8HiU1gLflQdrpv81D4gXKGRH"></script>
+			   <div class="layui-form-mid layui-word-aux" style="padding-bottom:0;">提示：可以在地图上点击位置获取坐标（鼠标滚动放大缩小地图）</div>
+			    <div id="allmap"></div>
+			   <div class="layui-form-item" style="margin-top: 30px;">
+			   <button class="layui-btn" lay-submit lay-filter="submit">提交</button>
+				<button class="layui-btn layui-btn-primary resetBtn">重置</button>
+				</div>
+  </div>
+		
+		
+		
+		
+	</body>
+
+	<script src='/zzhnc/res/js/jquery.min.js'></script>
+	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
+	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
+	<script>
+	// 百度地图API功能
+	 var map = new BMap.Map("allmap");            
+	var map = new BMap.Map("allmap",{minZoom:4,maxZoom:18}); // 创建Map实例,设置地图允许的最小/大级别
+	map.enableScrollWheelZoom(true);
+	
+	//单击获取点击的经纬度
+	map.addEventListener("click",function(e){
+		$("input[name=lng]").val(e.point.lng);
+		$("input[name=lat]").val(e.point.lat);
+		var allOverlay = map.getOverlays();
+		if(allOverlay.length>0){
+			function deletePoint(){
+				for (var i = 0; i < allOverlay.length ; i++){
+					map.removeOverlay(allOverlay[i]);
+				}
+			}
+			deletePoint()
+			var point = new BMap.Point(e.point.lng,e.point.lat);
+			var marker = new BMap.Marker(point);  // 创建标注
+			map.addOverlay(marker);              // 将标注添加到地图中
+			marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
+		}
+	}); 
+		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
+			var form = layui.form(),
+				element = layui.element(),
+				laydate = layui.laydate,
+				layer = layui.layer,
+				laypage = layui.laypage;
+			
+			$("input[name=lng],input[name=lat]").blur(function(){
+				var plng=$("input[name=lng]").val();
+				var plat=$("input[name=lat]").val();
+				var allOverlay = map.getOverlays();
+				if(allOverlay.length>0){
+					function deletePoint(){
+						for (var i = 0; i < allOverlay.length ; i++){
+							map.removeOverlay(allOverlay[i]);
+						}
+					}
+					deletePoint()
+					var point = new BMap.Point(plng,plat);
+					var marker = new BMap.Marker(point);  // 创建标注
+					map.addOverlay(marker);              // 将标注添加到地图中
+					marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
+					
+				}
+			});
+			
+			//下拉海报
+			$.post("/zzhnc/poster/getAllPostertemplet",function(data){
+				console.log(data);
+				var str="";
+				for(var i=0;i<data.data.length;i++){
+					str+='<option value='+ data.data[i].id +'>'+ data.data[i].name +'</option>';
+				}
+				$("select[name=postertempletid]").append(str);
+				form.render();
+			})
+			$(".resetBtn").on("click",function(){
+				$("input[name=name]").val("");
+				$("select[name=postertempletid]").val("0");
+				var allOverlay = map.getOverlays();
+				if(allOverlay.length>0){
+					function deletePoint(){
+						for (var i = 0; i < allOverlay.length ; i++){
+							map.removeOverlay(allOverlay[i]);
+						}
+					}
+					deletePoint()
+				}
+				$("input[name=lng]").val(113.754653);
+				$("input[name=lat]").val(23.025333);
+				map.centerAndZoom(new BMap.Point(113.754653,23.025333),13); 
+				var point = new BMap.Point(113.754653,23.025333);
+				var marker = new BMap.Marker(point);  // 创建标注
+				map.addOverlay(marker);              // 将标注添加到地图中
+				marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
+				form.render();
+			})
+			var id=getUrl_G("id");
+			if(id>0){
+				$.post("/zzhnc/project/getProject",{
+					id:id
+				},function(data){
+					console.log(data);
+					 if(data.code==0){
+						$("input[name=name]").val(data.data.name);
+						$("select[name=postertempletid]").val(data.data.postertempletid);
+						$("input[name=lng]").val(data.data.lng);
+						$("input[name=lat]").val(data.data.lat);
+						map.centerAndZoom(new BMap.Point(data.data.lng,data.data.lat),13); 
+						var point = new BMap.Point(data.data.lng,data.data.lat);
+						var marker = new BMap.Marker(point);  // 创建标注
+						map.addOverlay(marker);              // 将标注添加到地图中
+						marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
+						form.render();
+					} 
+				})
+				 
+			}else{
+				$("input[name=lng]").val(113.754653);
+				$("input[name=lat]").val(23.025333);
+				map.centerAndZoom(new BMap.Point(113.754653,23.025333),13); 
+				var point = new BMap.Point(113.754653,23.025333);
+				var marker = new BMap.Marker(point);  // 创建标注
+				map.addOverlay(marker);              // 将标注添加到地图中
+				marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
+				
+				
+			}
+			
+		
+			form.on('submit(submit)', function(data){
+				    var name=$("input[name=name]").val();
+					var templetid=$("select[name=postertempletid]").val();
+					var lng=$("input[name=lng]").val();
+					var lat=$("input[name=lat]").val();
+				 	if(name==""){
+						top.layer.msg("请填写项目名称");
+						return false;
+					}else{
+						if(strlen(name) > 40) {
+				    		top.layer.msg("项目名称不超过20个汉字");
+				    		return false;
+						}
+					}
+					if(templetid==""||templetid=="0"){
+						top.layer.msg("请选择海报");
+						return false;
+					}
+					
+					if(id>0){
+						//修改项目
+						$.post("/zzhnc/project/updateProject",{
+							id:id,
+							name:name,
+							templetid:templetid,
+							lng:lng,
+							lat:lat
+						},function(data){
+							console.log(data);
+							 if(data.code==0){
+								top.layer.msg("修改成功");
+								
+							} else{
+								top.layer.msg(data.msg);
+							}
+						})  
+					}else{
+						//添加项目
+						$.post("/zzhnc/project/addProject",{
+							name:name,
+							templetid:templetid,
+							lng:lng,
+							lat:lat
+						},function(data){
+							console.log(data);
+							if(data.code==0){
+								top.layer.msg("添加成功");
+								form.render();
+							}else{
+								top.layer.msg(data.msg);
+							}
+						}) 
+					}
+					return false;
+					
+			  });
+			
+
+		})
+	</script>
+
+</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
new file mode 100644
index 0000000..958838f
--- /dev/null
+++ b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
@@ -0,0 +1,235 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<meta http-equiv="X-UA-Compatible" content="ie=edge">
+		<title>项目列表</title>
+		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
+		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
+	</head>
+	<style>
+		.layui-form-select dl{
+			max-height:190px;
+		}
+		#allmap {top:10px;width:100%;height: 200px;overflow: hidden;margin:0;font-family:"微软雅黑";}
+	</style>
+	<body class="wrap">
+		<div class="layui-form">
+			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
+				
+				<!-- <div class="layui-input-inline producttype" style="width: 140px;">
+					<select name="producttype" >
+						<option value="">项目名称</option>
+					</select>
+				</div>
+				<div class="layui-input-inline productid" style="width: 140px;">
+					<select name="productid">
+						<option value="">海报模板id</option>
+					</select>
+				</div>
+				<div class="layui-input-inline" style="width: 150px;">
+					<input name="date1" class="layui-input" placeholder="更新时间" onclick="layui.laydate({elem: this,format: 'YYYY-MM-DD hh:mm:ss',istime: true})" />
+				</div> -->
+				<div class="layui-input-inline" style="width: 140px;">
+					<input type="text" class="layui-input" name="keyword" placeholder="关键字" />
+				</div>
+				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
+				<button class="layui-btn layui-btn-primary resetBtn">重置</button>
+				<a class="layui-btn layui-btn-warm createBtn" href="#"><i class="layui-icon">&#xe61f;</i> 添加项目</a>
+			</div>
+		</div>
+		
+		<table class="layui-table">
+			<thead>
+				<tr>
+					<th style="width: 30px;">No</th>
+					<th style="min-width:120px;">项目名称</th>
+					<th style="min-width: 80px;">经度</th>
+					<th style="min-width: 80px;">纬度</th>
+					<th style="min-width: 80px;">海报模板id</th>
+					<th style="min-width: 80px;">更新时间</th>
+					<th style="min-width: 80px;">操作</th>
+				</tr>
+			</thead>
+				
+			<tbody id="tablelist">
+			<!-- 	<tr>
+					<td>1</td>
+					<td>项目名称</td>
+					<td>经度</td>
+					<td>纬度</td>
+					<td>海报模板id</td>
+					<td>更新时间</td>
+					<td>
+						<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>
+						<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>
+					</td>
+				</tr> -->
+			</tbody>
+		</table>
+		<div class="nulldata">暂无数据</div>
+		<div id="page"></div>
+		
+	</body>
+<form class="layui-form Detailbtn" >
+  <div class="layui-form-item">
+    <label class="layui-form-label">项目名称</label>
+    <div class="layui-input-inline" style="width:390px;">
+      <input type="text" name="name"   lay-verify="required" placeholder="项目名称"  class="layui-input">
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">海报模板id</label>
+    <div class="layui-input-inline">
+      <select name="postertempletid" lay-verify="required">
+        <option value=""></option>
+        <option value="0">1</option>
+        <option value="1">2</option>
+        <option value="2">3</option>
+        <option value="3">4</option>
+        <option value="4">5</option>
+      </select>
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">位置</label>
+    <div class="layui-input-inline">
+      <input type="text" name="lng"  lay-verify="required" placeholder="经度"  class="layui-input">
+    </div>
+    <div class="layui-input-inline">
+      <input type="text" name="lat"  lay-verify="required" placeholder="纬度"  class="layui-input">
+    </div>
+    <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=V45f8fZO8HiU1gLflQdrpv81D4gXKGRH"></script>
+    <div id="allmap"></div>
+  </div>
+  </form>
+	<script src='/zzhnc/res/js/jquery.min.js'></script>
+	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
+	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
+	<script>
+	// 百度地图API功能
+	var map = new BMap.Map("allmap");            
+	map.centerAndZoom("重庆",12);           
+	//单击获取点击的经纬度
+	map.addEventListener("click",function(e){
+		alert(e.point.lng + "," + e.point.lat);
+	});
+		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
+			var form = layui.form(),
+				element = layui.element(),
+				laydate = layui.laydate,
+				layer = layui.layer,
+				laypage = layui.laypage;
+				var page=1;
+				var keyword="";
+				//查询
+				 form.on('submit(querybtn)', function(data){
+					  var keyword=$("input[name=keyword]").val();
+				      Initdata(page,keyword)
+				  });
+				$(".resetBtn").on("click",function(){
+					$("input[name=keyword]").val("");
+					 Initdata(page,keyword)
+				})
+			//初始化数据
+			Initdata(page,keyword);
+			function Initdata(page,keyword){
+				
+				$.post("/zzhnc/project/getProjectList",{page:page,keyword:keyword},function(data){
+					data=data.data;
+					console.log(data)
+					laypage({
+						cont: 'page',
+						pages: data.totalPages, //总页数
+						curr: page,
+						skip: true,
+						jump: function(obj, first) {
+							if(!first) {
+								page = obj.curr
+								Initdata(page,keyword);
+							}
+
+						}
+					});
+					var str="";
+					if(data.rows.length<1){
+						$(".nulldata").show();
+					}else{
+						$(".nulldata").hide();
+						for(var i=0;i<data.rows.length;i++){
+							str+='<tr data-id='+ data.rows[i].id +'>'
+								+'<td>'+ ((data.page - 1) * data.pageSize + i + 1) +'</td>'
+								+'<td style="text-align:left;">'+ data.rows[i].name+'</td>'
+								+'<td>'+ data.rows[i].lng+'</td>'
+								+'<td>'+ data.rows[i].lat+'</td>'
+								+'<td>'+ data.rows[i].postertempletid+'</td>'
+								+'<td>'+ toTime_G(data.rows[i].updatedtime) +'</td>'
+								+'<td>'
+								+'<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>'
+								+'<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>'
+								+'</td>'
+								+'</tr>';
+						}
+					}
+					
+					
+					$("#tablelist").html(str);
+					toNull_G();
+				})
+			}
+			
+			//添加项目
+			$(document).on("click",".createBtn",function(){
+				if(parent.tab.exists("添加项目")>0){
+					var tabid=parent.tab.getTabId("添加项目");
+					parent.tab.deleteTab(tabid);
+				}
+				parent.tab.tabAdd({
+					href: "/zzhnc/project/projectEdit?id=0",
+					icon: "fa-cubes",
+					title: "添加项目" 
+				});
+			})
+			//修改项目
+			$(document).on("click",".updataBtn",function(){
+				var id=$(this).parents("tr").attr("data-id");    
+				  if(parent.tab.exists("修改项目")>0){
+					var tabid=parent.tab.getTabId("修改项目");
+					parent.tab.deleteTab(tabid);
+				}
+				parent.tab.tabAdd({
+					href: "/zzhnc/project/projectEdit?id="+ id ,
+					icon: "fa-cubes",
+					title: "修改项目" 
+				});  
+			})
+			//删除项目
+			$(document).on("click", ".deleteBtn", function() {
+				var id=$(this).parents("tr").attr("data-id");
+				layer.confirm('您确定要删除该项目吗？', {
+					btn: ['确定', '取消'] //按钮
+				}, function(index, layero) {
+					$.post( "/zzhnc/project/deleteProject",{id:id}, function(data) {
+						console.log(data)
+						if(data.code == 0) {
+							top.layer.msg("删除成功");
+							Initdata(1,keyword)
+							layer.close(index);
+						}else{
+							top.layer.msg(data.msg);
+						}
+					})
+				
+			}, function(index, layero) {
+				layer.close(index);
+			});
+			});
+			
+
+		})
+	</script>
+
+</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/project/projectEdit.jsp b/WebContent/WEB-INF/jsp/pc/project/projectEdit.jsp
deleted file mode 100644
index 2f2bdea..0000000
--- a/WebContent/WEB-INF/jsp/pc/project/projectEdit.jsp
+++ /dev/null
@@ -1,243 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>项目列表</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
-	</head>
-	<style>
-		.layui-form-select dl{
-			max-height:190px;
-		}
-		#allmap {top:10px;width:100%;height: 400px;overflow: hidden;margin:0;font-family:"微软雅黑";}
-	</style>
-	
-	<body class="wrap">
-		<div class="layui-form Detailbtn" style="display:block;">
-			  <div class="layui-form-item">
-			    <label class="layui-form-label"><i style="color:red;margin-right:5px;">*</i>项目名称</label>
-			    <div class="layui-input-inline" style="width:390px;">
-			      <input type="text" name="name"   lay-verify="name" placeholder="项目名称"  class="layui-input">
-			    </div>
-			    <div class="layui-form-mid layui-word-aux">不超过20个汉字</div>
-			  </div>
-			  <div class="layui-form-item">
-			    <label class="layui-form-label"><i style="color:red;margin-right:5px;">*</i>海报模板</label>
-			    <div class="layui-input-inline">
-			      <select name="postertempletid" lay-search="">
-			        <option value="">全部</option>
-			      </select>
-			    </div>
-			  </div>
-			  <div class="layui-form-item">
-			    <label class="layui-form-label">位置</label>
-			   <!--  <div class="layui-input-inline">
-			      <input type="text" name="lng"  readonly lay-verify="required" placeholder="经度"  class="layui-input" style="background-color:#f5f5f5;color:#666;">
-			    </div>
-			    <div class="layui-input-inline">
-			      <input type="text" name="lat" readonly lay-verify="required" placeholder="纬度"  class="layui-input" style="background-color:#f5f5f5;color:#666;">
-			    </div> -->
-			    <div class="layui-input-inline">
-			      <input type="number" name="lng"   lay-verify="required" placeholder="经度"  class="layui-input" >
-			    </div>
-			    <div class="layui-input-inline">
-			      <input type="number" name="lat"  lay-verify="required" placeholder="纬度"  class="layui-input" >
-			    </div>
-			  </div>
-			  <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=V45f8fZO8HiU1gLflQdrpv81D4gXKGRH"></script>
-			   <div class="layui-form-mid layui-word-aux" style="padding-bottom:0;">提示：可以在地图上点击位置获取坐标（鼠标滚动放大缩小地图）</div>
-			    <div id="allmap"></div>
-			   <div class="layui-form-item" style="margin-top: 30px;">
-			   <button class="layui-btn" lay-submit lay-filter="submit">提交</button>
-				<button class="layui-btn layui-btn-primary resetBtn">重置</button>
-				</div>
-  </div>
-		
-		
-		
-		
-	</body>
-
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-	<script>
-	// 百度地图API功能
-	 var map = new BMap.Map("allmap");            
-	var map = new BMap.Map("allmap",{minZoom:4,maxZoom:18}); // 创建Map实例,设置地图允许的最小/大级别
-	map.enableScrollWheelZoom(true);
-	
-	//单击获取点击的经纬度
-	map.addEventListener("click",function(e){
-		$("input[name=lng]").val(e.point.lng);
-		$("input[name=lat]").val(e.point.lat);
-		var allOverlay = map.getOverlays();
-		if(allOverlay.length>0){
-			function deletePoint(){
-				for (var i = 0; i < allOverlay.length ; i++){
-					map.removeOverlay(allOverlay[i]);
-				}
-			}
-			deletePoint()
-			var point = new BMap.Point(e.point.lng,e.point.lat);
-			var marker = new BMap.Marker(point);  // 创建标注
-			map.addOverlay(marker);              // 将标注添加到地图中
-			marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
-		}
-	}); 
-		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
-			var form = layui.form(),
-				element = layui.element(),
-				laydate = layui.laydate,
-				layer = layui.layer,
-				laypage = layui.laypage;
-			
-			$("input[name=lng],input[name=lat]").blur(function(){
-				var plng=$("input[name=lng]").val();
-				var plat=$("input[name=lat]").val();
-				var allOverlay = map.getOverlays();
-				if(allOverlay.length>0){
-					function deletePoint(){
-						for (var i = 0; i < allOverlay.length ; i++){
-							map.removeOverlay(allOverlay[i]);
-						}
-					}
-					deletePoint()
-					var point = new BMap.Point(plng,plat);
-					var marker = new BMap.Marker(point);  // 创建标注
-					map.addOverlay(marker);              // 将标注添加到地图中
-					marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
-					
-				}
-			});
-			
-			//下拉海报
-			$.post("/zzhnc/poster/getAllPostertemplet",function(data){
-				console.log(data);
-				var str="";
-				for(var i=0;i<data.data.length;i++){
-					str+='<option value='+ data.data[i].id +'>'+ data.data[i].name +'</option>';
-				}
-				$("select[name=postertempletid]").append(str);
-				form.render();
-			})
-			$(".resetBtn").on("click",function(){
-				$("input[name=name]").val("");
-				$("select[name=postertempletid]").val("0");
-				var allOverlay = map.getOverlays();
-				if(allOverlay.length>0){
-					function deletePoint(){
-						for (var i = 0; i < allOverlay.length ; i++){
-							map.removeOverlay(allOverlay[i]);
-						}
-					}
-					deletePoint()
-				}
-				$("input[name=lng]").val(113.754653);
-				$("input[name=lat]").val(23.025333);
-				map.centerAndZoom(new BMap.Point(113.754653,23.025333),13); 
-				var point = new BMap.Point(113.754653,23.025333);
-				var marker = new BMap.Marker(point);  // 创建标注
-				map.addOverlay(marker);              // 将标注添加到地图中
-				marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
-				form.render();
-			})
-			var id=getUrl_G("id");
-			if(id>0){
-				$.post("/zzhnc/project/getProject",{
-					id:id
-				},function(data){
-					console.log(data);
-					 if(data.code==0){
-						$("input[name=name]").val(data.data.name);
-						$("select[name=postertempletid]").val(data.data.postertempletid);
-						$("input[name=lng]").val(data.data.lng);
-						$("input[name=lat]").val(data.data.lat);
-						map.centerAndZoom(new BMap.Point(data.data.lng,data.data.lat),13); 
-						var point = new BMap.Point(data.data.lng,data.data.lat);
-						var marker = new BMap.Marker(point);  // 创建标注
-						map.addOverlay(marker);              // 将标注添加到地图中
-						marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
-						form.render();
-					} 
-				})
-				 
-			}else{
-				$("input[name=lng]").val(113.754653);
-				$("input[name=lat]").val(23.025333);
-				map.centerAndZoom(new BMap.Point(113.754653,23.025333),13); 
-				var point = new BMap.Point(113.754653,23.025333);
-				var marker = new BMap.Marker(point);  // 创建标注
-				map.addOverlay(marker);              // 将标注添加到地图中
-				marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
-				
-				
-			}
-			
-		
-			form.on('submit(submit)', function(data){
-				    var name=$("input[name=name]").val();
-					var templetid=$("select[name=postertempletid]").val();
-					var lng=$("input[name=lng]").val();
-					var lat=$("input[name=lat]").val();
-				 	if(name==""){
-						top.layer.msg("请填写项目名称");
-						return false;
-					}else{
-						if(strlen(name) > 40) {
-				    		top.layer.msg("项目名称不超过20个汉字");
-				    		return false;
-						}
-					}
-					if(templetid==""||templetid=="0"){
-						top.layer.msg("请选择海报");
-						return false;
-					}
-					
-					if(id>0){
-						//修改项目
-						$.post("/zzhnc/project/updateProject",{
-							id:id,
-							name:name,
-							templetid:templetid,
-							lng:lng,
-							lat:lat
-						},function(data){
-							console.log(data);
-							 if(data.code==0){
-								top.layer.msg("修改成功");
-								
-							} else{
-								top.layer.msg(data.msg);
-							}
-						})  
-					}else{
-						//添加项目
-						$.post("/zzhnc/project/addProject",{
-							name:name,
-							templetid:templetid,
-							lng:lng,
-							lat:lat
-						},function(data){
-							console.log(data);
-							if(data.code==0){
-								top.layer.msg("添加成功");
-								form.render();
-							}else{
-								top.layer.msg(data.msg);
-							}
-						}) 
-					}
-					return false;
-					
-			  });
-			
-
-		})
-	</script>
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/project/projectlist.jsp b/WebContent/WEB-INF/jsp/pc/project/projectlist.jsp
deleted file mode 100644
index 958838f..0000000
--- a/WebContent/WEB-INF/jsp/pc/project/projectlist.jsp
+++ /dev/null
@@ -1,235 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>项目列表</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
-	</head>
-	<style>
-		.layui-form-select dl{
-			max-height:190px;
-		}
-		#allmap {top:10px;width:100%;height: 200px;overflow: hidden;margin:0;font-family:"微软雅黑";}
-	</style>
-	<body class="wrap">
-		<div class="layui-form">
-			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
-				
-				<!-- <div class="layui-input-inline producttype" style="width: 140px;">
-					<select name="producttype" >
-						<option value="">项目名称</option>
-					</select>
-				</div>
-				<div class="layui-input-inline productid" style="width: 140px;">
-					<select name="productid">
-						<option value="">海报模板id</option>
-					</select>
-				</div>
-				<div class="layui-input-inline" style="width: 150px;">
-					<input name="date1" class="layui-input" placeholder="更新时间" onclick="layui.laydate({elem: this,format: 'YYYY-MM-DD hh:mm:ss',istime: true})" />
-				</div> -->
-				<div class="layui-input-inline" style="width: 140px;">
-					<input type="text" class="layui-input" name="keyword" placeholder="关键字" />
-				</div>
-				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
-				<button class="layui-btn layui-btn-primary resetBtn">重置</button>
-				<a class="layui-btn layui-btn-warm createBtn" href="#"><i class="layui-icon">&#xe61f;</i> 添加项目</a>
-			</div>
-		</div>
-		
-		<table class="layui-table">
-			<thead>
-				<tr>
-					<th style="width: 30px;">No</th>
-					<th style="min-width:120px;">项目名称</th>
-					<th style="min-width: 80px;">经度</th>
-					<th style="min-width: 80px;">纬度</th>
-					<th style="min-width: 80px;">海报模板id</th>
-					<th style="min-width: 80px;">更新时间</th>
-					<th style="min-width: 80px;">操作</th>
-				</tr>
-			</thead>
-				
-			<tbody id="tablelist">
-			<!-- 	<tr>
-					<td>1</td>
-					<td>项目名称</td>
-					<td>经度</td>
-					<td>纬度</td>
-					<td>海报模板id</td>
-					<td>更新时间</td>
-					<td>
-						<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>
-						<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>
-					</td>
-				</tr> -->
-			</tbody>
-		</table>
-		<div class="nulldata">暂无数据</div>
-		<div id="page"></div>
-		
-	</body>
-<form class="layui-form Detailbtn" >
-  <div class="layui-form-item">
-    <label class="layui-form-label">项目名称</label>
-    <div class="layui-input-inline" style="width:390px;">
-      <input type="text" name="name"   lay-verify="required" placeholder="项目名称"  class="layui-input">
-    </div>
-  </div>
-  <div class="layui-form-item">
-    <label class="layui-form-label">海报模板id</label>
-    <div class="layui-input-inline">
-      <select name="postertempletid" lay-verify="required">
-        <option value=""></option>
-        <option value="0">1</option>
-        <option value="1">2</option>
-        <option value="2">3</option>
-        <option value="3">4</option>
-        <option value="4">5</option>
-      </select>
-    </div>
-  </div>
-  <div class="layui-form-item">
-    <label class="layui-form-label">位置</label>
-    <div class="layui-input-inline">
-      <input type="text" name="lng"  lay-verify="required" placeholder="经度"  class="layui-input">
-    </div>
-    <div class="layui-input-inline">
-      <input type="text" name="lat"  lay-verify="required" placeholder="纬度"  class="layui-input">
-    </div>
-    <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=V45f8fZO8HiU1gLflQdrpv81D4gXKGRH"></script>
-    <div id="allmap"></div>
-  </div>
-  </form>
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-	<script>
-	// 百度地图API功能
-	var map = new BMap.Map("allmap");            
-	map.centerAndZoom("重庆",12);           
-	//单击获取点击的经纬度
-	map.addEventListener("click",function(e){
-		alert(e.point.lng + "," + e.point.lat);
-	});
-		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
-			var form = layui.form(),
-				element = layui.element(),
-				laydate = layui.laydate,
-				layer = layui.layer,
-				laypage = layui.laypage;
-				var page=1;
-				var keyword="";
-				//查询
-				 form.on('submit(querybtn)', function(data){
-					  var keyword=$("input[name=keyword]").val();
-				      Initdata(page,keyword)
-				  });
-				$(".resetBtn").on("click",function(){
-					$("input[name=keyword]").val("");
-					 Initdata(page,keyword)
-				})
-			//初始化数据
-			Initdata(page,keyword);
-			function Initdata(page,keyword){
-				
-				$.post("/zzhnc/project/getProjectList",{page:page,keyword:keyword},function(data){
-					data=data.data;
-					console.log(data)
-					laypage({
-						cont: 'page',
-						pages: data.totalPages, //总页数
-						curr: page,
-						skip: true,
-						jump: function(obj, first) {
-							if(!first) {
-								page = obj.curr
-								Initdata(page,keyword);
-							}
-
-						}
-					});
-					var str="";
-					if(data.rows.length<1){
-						$(".nulldata").show();
-					}else{
-						$(".nulldata").hide();
-						for(var i=0;i<data.rows.length;i++){
-							str+='<tr data-id='+ data.rows[i].id +'>'
-								+'<td>'+ ((data.page - 1) * data.pageSize + i + 1) +'</td>'
-								+'<td style="text-align:left;">'+ data.rows[i].name+'</td>'
-								+'<td>'+ data.rows[i].lng+'</td>'
-								+'<td>'+ data.rows[i].lat+'</td>'
-								+'<td>'+ data.rows[i].postertempletid+'</td>'
-								+'<td>'+ toTime_G(data.rows[i].updatedtime) +'</td>'
-								+'<td>'
-								+'<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>'
-								+'<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>'
-								+'</td>'
-								+'</tr>';
-						}
-					}
-					
-					
-					$("#tablelist").html(str);
-					toNull_G();
-				})
-			}
-			
-			//添加项目
-			$(document).on("click",".createBtn",function(){
-				if(parent.tab.exists("添加项目")>0){
-					var tabid=parent.tab.getTabId("添加项目");
-					parent.tab.deleteTab(tabid);
-				}
-				parent.tab.tabAdd({
-					href: "/zzhnc/project/projectEdit?id=0",
-					icon: "fa-cubes",
-					title: "添加项目" 
-				});
-			})
-			//修改项目
-			$(document).on("click",".updataBtn",function(){
-				var id=$(this).parents("tr").attr("data-id");    
-				  if(parent.tab.exists("修改项目")>0){
-					var tabid=parent.tab.getTabId("修改项目");
-					parent.tab.deleteTab(tabid);
-				}
-				parent.tab.tabAdd({
-					href: "/zzhnc/project/projectEdit?id="+ id ,
-					icon: "fa-cubes",
-					title: "修改项目" 
-				});  
-			})
-			//删除项目
-			$(document).on("click", ".deleteBtn", function() {
-				var id=$(this).parents("tr").attr("data-id");
-				layer.confirm('您确定要删除该项目吗？', {
-					btn: ['确定', '取消'] //按钮
-				}, function(index, layero) {
-					$.post( "/zzhnc/project/deleteProject",{id:id}, function(data) {
-						console.log(data)
-						if(data.code == 0) {
-							top.layer.msg("删除成功");
-							Initdata(1,keyword)
-							layer.close(index);
-						}else{
-							top.layer.msg(data.msg);
-						}
-					})
-				
-			}, function(index, layero) {
-				layer.close(index);
-			});
-			});
-			
-
-		})
-	</script>
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/report/callreport.jsp b/WebContent/WEB-INF/jsp/pc/report/callreport.jsp
deleted file mode 100644
index a297f47..0000000
--- a/WebContent/WEB-INF/jsp/pc/report/callreport.jsp
+++ /dev/null
@@ -1,132 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>万小二</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
-	</head>
-	<style>
-	.Detailbtn .layui-form-label{
-		width:90px;	
-	}
-	.Detailbtn .layui-input-inline{
-		width:380px !important;
-	}
-	</style>
-	<body class="wrap">
-		<div class="layui-form">
-			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
-				<div class="layui-input-inline" style="width: 140px;">
-					<input type="text" class="layui-input" name="keyword" placeholder="关键字" />
-				</div>
-				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
-				<button class="layui-btn layui-btn-primary resetBtn" >重置</button>
-			</div>
-		</div>
-		<table class="layui-table">
-			<thead>
-				<tr>
-					<th style="width:30px;">No</th>
-					<th style="min-width: 130px;max-width:320px;">头像昵称</th>
-					<th style="min-width: 80px;">销售人员</th>
-					<th style="min-width: 80px;">楼盘</th>
-					<th style="min-width: 80px;">拨打时间 </th>
-				</tr>
-			</thead>
-				
-			<tbody id="tablelist">
-				
-			</tbody>
-		</table>
-		<div class="nulldata">暂无数据</div>
-		<div id="page"></div>
-		
-	</body>
-	
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-	<script>
-		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
-			var form = layui.form(),
-				element = layui.element(),
-				laydate = layui.laydate,
-				layer = layui.layer,
-				laypage = layui.laypage;
-
-			var queryObj = {
-					page: 1,
-					keyword: null
-				} //查询条件
-			//查询
-			 form.on('submit(querybtn)', function(data){
-				 queryObj=data.field;
-				 queryObj.page=1;
-			      initdata(queryObj);
-			      form.render();
-			  });
-			 $(".resetBtn").on("click",function(){
-				$("input[name=keyword]").val("");
-				form.render();
-				queryObj.keyword=null;
-				initdata(queryObj);
-			}) 
-			//初始化数据
-			initdata(queryObj);
-			function initdata(queryObj){
-				$.post("/zzhnc/report/getCalllogList",queryObj,function(data){
-					data=data.data;
-					console.log(data)
-					  laypage({
-						cont: 'page',
-						pages: data.totalPages, //总页数
-						curr: queryObj.page,
-						skip: true,
-						jump: function(obj, first) {
-							if(!first) {
-								queryObj.page = obj.curr
-								initdata(queryObj);
-							}
-
-						}
-					});  
-					var str="";
-					 if(data.rows.length<1){
-						$(".nulldata").show();
-					}else{
-						$(".nulldata").hide();
-						for(var i=0;i<data.rows.length;i++){
-							var nick="";
-							if((data.rows[i].nickname==null||data.rows[i].nickname=="")&&(data.rows[i].logo==null||data.rows[i].logo=="")){
-								nick='<div style="text-align:left;">未授权（id：'+ data.rows[i].id +'）</div>';
-							}else{
-								if(data.rows[i].logo==null||data.rows[i].logo==""){
-									nick='<div class="nickbox"><div id="wlogo" style="background:url(/zzhnc/res/images/default_user.png) no-repeat center;-webkit-background-size:contain;background-size:contain;"></div><span class="nick"> '+ data.rows[i].nickname +'</span></div>';
-								}else{
-									nick='<div class="nickbox"><div id="wlogo" style="background:url('+data.rows[i].logo+') no-repeat center;-webkit-background-size:contain;background-size:contain;"></div><span class="nick"> '+ data.rows[i].nickname +'</span></div>';
-								}
-							}
-							str+='<tr data-id='+ data.rows[i].id +'>'
-								+'<td>'+ ((data.page - 1) * data.pageSize + i + 1) +'</td>'
-								+'<td style="padding-left:40px;">'+ nick +'</td>'
-								+'<td>'+ data.rows[i].salename+'</td>'
-								+'<td>'+ data.rows[i].projectname+'</td>'
-								+'<td>'+ toTime_G(data.rows[i].createdtime)+'</td>'
-								+'</tr>';
-						}
-					} 
-					
-					$("#tablelist").html(str);
-					toNull_G();
-				})
-			}
-
-		})
-	</script>
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/report/chatrecord.jsp b/WebContent/WEB-INF/jsp/pc/report/chatrecord.jsp
deleted file mode 100644
index 982a070..0000000
--- a/WebContent/WEB-INF/jsp/pc/report/chatrecord.jsp
+++ /dev/null
@@ -1,330 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-	<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-	<html>
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<meta name="referrer" content="no-referrer" />
-		<title>客服记录</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
-		<link rel="stylesheet" href="/zzhnc/res/plugins/photoswipe/photoswipe.css">
-        <link rel="stylesheet" href="/zzhnc/res/plugins/photoswipe/default-skin/default-skin.css">
-	</head>
-	<style>
-		.layui-table td,
-		.layui-table th {
-			padding: 9px 9px;
-		}
-		.userimg {
-			max-height: 40px;
-			max-width: 100px;
-			cursor: pointer;
-			border: 1px solid #999;
-		}
-		.toChatBox{
-			float: right;
-		}
-		.nickbox{
-			cursor: pointer;
-		}
-	</style>
-	<body class="wrap">
-		<form class="layui-form">
-			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
-				<div class="layui-input-inline" style="width: 150px;">
-					<select name="replytype">
-						<option value="">答复类别</option>
-						<option value="1">机器人</option>
-						<option value="2">自动回复</option>
-						<option value="3">逻辑判断</option>
-						<option value="4">人工客服</option>
-					</select>
-				</div>
-				<div class="layui-input-inline" style="width: 150px;">
-					<input name="date1" class="layui-input" placeholder="开始时间" onclick="layui.laydate({elem: this,format: 'YYYY-MM-DD hh:mm:ss',istime: true})">
-				</div>
-				<div class="layui-input-inline" style="width: 150px;">
-					<input name="date2" class="layui-input" placeholder="结束时间" onclick="layui.laydate({elem: this,format: 'YYYY-MM-DD hh:mm:ss',istime: true})">
-				</div>
-				<div class="layui-input-inline" style="width: 150px;">
-					<input type="text" class="layui-input" name="keyword" placeholder="关键字" />
-				</div>
-				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
-				<button class="layui-btn layui-btn-primary" lay-submit lay-filter="resetbtn">重置</button>
-				<div class="toChatBox">
-					<button type="button" id="toNewChat" class="layui-btn">对话版界面</button>
-				</div>
-			</div>
-			
-		</form>
-		<table class="layui-table">
-			<thead>
-				<tr>
-					<th style="width:30px;">No</th>
-					<th style="min-width: 130px;width: 130px;max-width:220px;">头像昵称</th>
-					<th style="min-width:200px;">问题</th>
-					<th style="min-width: 200px;">答复</th>
-					<th style="min-width: 70px;width: 70px;">答复类别 </th>
-					<th style="min-width: 76px;width: 76px;">问题时间</th>
-					<th style="min-width: 70px;width: 70px;">销售人员</th>
-					<th style="min-width: 76px;width: 76px;">答复时间</th>
-					<!-- <th style="min-width: 70px;width: 70px;">粉丝图片 </th>
-					<th style="min-width: 70px;width: 70px;">客服图片</th> -->
-				</tr>
-			</thead>
-			<tbody id="noticelist">
-			</tbody>
-		</table>
-		<div class="nulldata">暂无数据</div>
-		<div id="page"></div>
-		<div class="pswp" tabindex="-1" role="dialog" aria-hidden="true">
-				<div class="pswp__bg"></div>
-				<div class="pswp__scroll-wrap">
-					<div class="pswp__container">
-						<div class="pswp__item"></div>
-						<div class="pswp__item"></div>
-						<div class="pswp__item"></div>
-					</div>
-					<div class="pswp__ui pswp__ui--hidden">
-						<div class="pswp__top-bar">
-							<div class="pswp__counter"></div>
-							<button class="pswp__button pswp__button--close" title="Close (Esc)"></button>
-							<button class="pswp__button pswp__button--zoom" title="Zoom in/out"></button>
-							<div class="pswp__preloader">
-								<div class="pswp__preloader__icn">
-									<div class="pswp__preloader__cut">
-										<div class="pswp__preloader__donut"></div>
-									</div>
-								</div>
-							</div>
-						</div>
-						<div class="pswp__share-modal pswp__share-modal--hidden pswp__single-tap">
-							<div class="pswp__share-tooltip"></div>
-						</div>
-						<button class="pswp__button pswp__button--arrow--left" title="Previous (arrow left)"></button>
-						<button class="pswp__button pswp__button--arrow--right" title="Next (arrow right)"></button>
-						<div class="pswp__caption">
-							<div class="pswp__caption__center"></div>
-						</div>
-					</div>
-				</div>
-			</div>
-	</body>
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-	<script src="/zzhnc/res/plugins/photoswipe/photoswipe-ui-default.min.js"></script>
-	<script src="/zzhnc/res/plugins/photoswipe/photoswipe.min.js"></script>
-	<script>
-		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function () {
-			var form = layui.form(),
-				element = layui.element(),
-				laydate = layui.laydate,
-				layer = layui.layer,
-				laypage = layui.laypage;
-			var queryObj = {
-				page: 1,
-				replytype: "",
-				date1: "",
-				date2: "",
-				keyword: ""
-			};
-			var faceText = ["微笑", "撇嘴", "色", "发呆", "得意", "流泪", "害羞", "闭嘴", "睡", "大哭", "尴尬", "发怒", "调皮", "呲牙", "惊讶", "难过", "酷", "囧", "抓狂", "吐", "偷笑", "愉快", "白银", "傲慢", "饥饿", "困", "恐慌", "流汗", "憨笑", "悠闲", "奋斗", "咒骂", "疑问", "嘘", "晕", "疯了", "哀", "骷髅", "敲打", "再见", "擦汗", "抠鼻", "鼓掌", "糗大了", "坏笑", "左哼哼", "右哼哼", "哈欠", "鄙视", "委屈", "快哭了", "阴险", "亲亲", "吓", "可怜", "菜刀", "西瓜", "啤酒", "篮球", "乒乓", "咖啡", "饭", "猪头", "玫瑰", "凋谢", "嘴唇", "爱心", "心碎", "蛋糕", "闪电", "炸弹", "刀", "足球", "瓢虫", "便便", "月亮", "太阳", "礼物", "拥抱", "强", "弱", "握手", "胜利", "抱拳", "勾引", "拳头", "差劲", "爱你", "NO", "OK", "爱情", "飞吻", "跳跳", "发抖", "怄火", "转圈", "磕头", "回头", "跳绳", "投降", "激动", "乱舞", "献吻", "左太极", "右太极"]
-			var faceText2 = ["/微笑", "/撇嘴", "/色", "/发呆", "/得意", "/流泪", "/害羞", "/闭嘴", "/睡", "/大哭", "/尴尬", "/发怒", "/调皮", "/呲牙", "/惊讶", "/难过", "/酷", "/囧", "/抓狂", "/吐", "/偷笑", "/愉快", "/白银", "/傲慢", "/饥饿", "/困", "/恐慌", "/流汗", "/憨笑", "/悠闲", "/奋斗", "/咒骂", "/疑问", "/嘘", "/晕", "/疯了", "/哀", "/骷髅", "/敲打", "/再见", "/擦汗", "/抠鼻", "/鼓掌", "/糗大了", "/坏笑", "/左哼哼", "/右哼哼", "/哈欠", "/鄙视", "/委屈", "/快哭了", "/阴险", "/亲亲", "/吓", "/可怜", "/菜刀", "/西瓜", "/啤酒", "/篮球", "/乒乓", "/咖啡", "/饭", "/猪头", "/玫瑰", "/凋谢", "/嘴唇", "/爱心", "/心碎", "/蛋糕", "/闪电", "/炸弹", "/刀", "/足球", "/瓢虫", "/便便", "/月亮", "/太阳", "/礼物", "/拥抱", "/强", "/弱", "/握手", "/胜利", "/抱拳", "/勾引", "/拳头", "/差劲", "/爱你", "/NO", "/OK", "/爱情", "/飞吻", "/跳跳", "/发抖", "/怄火", "/转圈", "/磕头", "/回头", "/跳绳", "/投降", "/激动", "/乱舞", "/献吻", "/左太极", "/右太极"]
-			var faceImg = ["http://www.onegreen.net/QQ/UploadFiles/201404/20140427102755304.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102806118.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102811204.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102816272.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102821779.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102826616.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102831909.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102836860.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102841446.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102846605.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102851155.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102856815.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102901326.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102906485.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102911867.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102916775.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102921112.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102926579.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102931107.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102936174.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102941562.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102946241.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102951305.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102956983.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103001341.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103006230.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103011620.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103016770.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103021180.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103026333.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103031826.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103036856.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103041851.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103046204.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103051515.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103056368.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103101584.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103106639.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103111714.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103116995.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103121307.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103126628.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103131537.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103136922.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103141708.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103146409.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103151786.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103156150.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103201493.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103206968.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103211938.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103216563.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103221494.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103226447.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103231181.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103236908.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103241610.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103246942.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103251889.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103256822.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103301730.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103306315.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103311631.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103316218.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103321727.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103326466.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103331391.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103336293.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103341727.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103346519.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103351983.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103356315.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103401393.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103406284.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103411342.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103416889.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103421513.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103426896.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103431815.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103436286.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103441411.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103446541.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103451461.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103456248.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103501861.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103506188.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103511436.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103516890.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103521415.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103526248.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103531694.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103536789.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103541535.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103546800.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103551956.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103556647.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103601489.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103606571.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103611997.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103616555.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103621939.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103626894.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103636123.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103641405.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103646322.png"]
-			//初始化数据
-			initData(queryObj);
-			function initData(queryObj) {
-				$.post("/zzhnc/report/getChatLogList", queryObj, function (data) {
-					console.log(data)
-					data = data.data;
-					laypage({
-						cont: 'page',
-						pages: data.totalPages,
-						curr: queryObj.page,
-						skip: true,
-						jump: function (obj, first) {
-							if (!first) {
-								queryObj.page = obj.curr
-								initData(queryObj)
-							}
-						}
-					});
-					$("#noticelist").html("")
-					if (data.rows.length > 0) {
-						$(".nulldata").hide()
-						var str = "";
-						for (var i = 0; i < data.rows.length; i++) {
-							var nick = "";
-							if ((data.rows[i].nickname == null || data.rows[i].nickname == "") && (data.rows[i].logo == null || data.rows[i].logo == "")) {
-								nick = '<div class="nickbox" style="text-align:left;">未授权（id：' + data.rows[i].fansid + '）</div>';
-							} else {
-								if (data.rows[i].logo == null || data.rows[i].logo == "") {
-									nick = '<div class="nickbox"><div id="wlogo" style="background:url(/zzhnc/res/images/default_user.png) no-repeat center;-webkit-background-size:contain;background-size:contain;"></div><span class="nick"> ' + data.rows[i].nickname + '</span></div>';
-								} else {
-									nick = '<div class="nickbox"><div id="wlogo" style="background:url(' + data.rows[i].logo + ') no-repeat center;-webkit-background-size:contain;background-size:contain;"></div><span class="nick"> ' + data.rows[i].nickname + '</span></div>';
-								}
-							}
-							str += '<tr data-fansid="'+ data.rows[i].fansid +'" data-saleid="'+ data.rows[i].salesid +'">'
-								+ '<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>'
-								+ '<td style="text-align:left;">' + nick + '</td>'
-								+ '<td style="text-align:left;color:#ce7414;">' + (data.rows[i].imgurl ? createImgTag(data.rows[i].imgurl) : toFace(data.rows[i].ask)) + '</td>'
-								+ '<td style="text-align:left;color:#119323;">' + (data.rows[i].imgurl2 ? createImgTag(data.rows[i].imgurl2) : toFace(data.rows[i].reply)) + '</td>'
-								+ '<td>' + replyType(data.rows[i].replytype) + '</td>'
-								+ '<td>' + toTime_G(data.rows[i].asktime).substring(5) + '</td>'
-								+ '<td>' + data.rows[i].salename + '</td>'
-								+ '<td>' + toTime_G(data.rows[i].replytime).substring(5) + '</td>'
-								// +'<td><div class="logoimg" style="background:url('+ data.rows[i].imgurl +') no-repeat center;-webkit-background-size:contain;background-size:contain;"></div></td>'
-								// +'<td><div class="logoimg" style="background:url('+ data.rows[i].imgurl2 +') no-repeat center;-webkit-background-size:contain;background-size:contain;"></div></td>'
-								+ '</tr>'
-						}
-						$("#noticelist").html(str)
-						toNull_G();
-						showimg.bind()
-					} else {
-						$(".nulldata").show()
-						return false;
-					}
-				})
-			}
-
-			$("#toNewChat").click(function(){
-				location.href='/zzhnc/report/chatrecordCopy'
-			})
-			$(document).on('click','.nickbox',function(){
-				var fansid = $(this).parents('tr').data('fansid')
-				var saleid = $(this).parents('tr').data('saleid')
-				var logo = $(this).find('div').css('backgroundImage')
-				var name = $(this).find('span').text()
-				name = encodeURIComponent(name)
-				location.href='/zzhnc/report/chatrecordCopy?fansid='+ fansid +'&saleid=' + saleid + '&fansname=' + name + '&logo=' + logo
-				
-			})
-			form.on("submit(querybtn)", function (e) {
-				queryObj = e.field;
-				queryObj.page = 1;
-				initData(queryObj)
-				return false
-			})
-			form.on("submit(resetbtn)", function (e) {
-				$("[name=replytype]").val("0")
-				$("[name=date1]").val("")
-				$("[name=date2]").val("")
-				$("[name=keyword]").val("")
-				queryObj = {
-					page: 1,
-					replytype: "",
-					date1: "",
-					date2: "",
-					keyword: ""
-				};
-				form.render();
-				initData(queryObj)
-				return false
-			})
-			function replyType(t) {
-				if (t == 1) {
-					return "机器人"
-				} else if (t == 2) {
-					return "自动回复"
-				} else if (t == 3) {
-					return "逻辑判断"
-				} else if (t == 4) {
-					return "人工客服"
-				} else {
-					return ""
-				}
-			}
-			function askfrom(f) {
-				if (f == 1) {
-					return "销售助手"
-				} else if (f == 2) {
-					return "万小二"
-				} else {
-					return "";
-				}
-			}
-			function toFace(msg) {
-				var _msg = msg
-				var reg = /\[.*?\]/g;
-				var some = reg.exec(_msg);                //匹配到的字段
-				var isReset = false
-				while (some) {
-					var _some = some[0].replace(/\[/, "")
-					_some = _some.replace(/\]/, "")
-					var index = faceText.indexOf(_some)
-					if (index > -1) {
-						msg = msg.replace(new RegExp(_some, 'g'), '<image src="' + faceImg[index] + '" alt="">')
-					} else {
-						isReset = "[" + _some + "]"
-					}
-					some = reg.exec(_msg);
-				}
-				faceText2.forEach(function (e, i) {
-					var reg2 = new RegExp(e, "g")
-					if (reg2.test(msg)) {
-						msg = msg.replace(reg2, '<image src="' + faceImg[i] + '" alt="">')
-					}
-				})
-				msg = !!msg ? msg : ""
-				msg = msg.replace(/\[/g, "")
-				msg = msg.replace(/\]/g, "")
-				msg = msg.replace(/</g, "&lt;")
-				msg = msg.replace(/&lt;image/g, "<img")
-				if (isReset) {
-					return isReset
-				} else {
-					return msg
-				}
-			}
-			function createImgTag(e) {
-				var randomVal = Math.random().toString(36).substr(2);
-				var tag = '<span>图片消息 : </span><img class="userimg" src="' + e + '?'+ randomVal +'">'
-				return tag
-			}
-		})
-		function Showimg(el) {
-			this.el = el
-		}
-		Showimg.prototype = {
-			getitems: function (el) { //获取items数组对象
-				var list = document.querySelectorAll(el)
-				var items = []
-				for (i = 0; i < list.length; i++) {
-					var obj = {}
-					obj.src = list[i].src
-					obj.h = list[i].naturalHeight
-					obj.w = list[i].naturalWidth
-					items.push(obj)
-				}
-				return items
-			},
-			ceratePhoto: function (i) { //初始化新的相册框
-				var pswpElement = document.querySelectorAll('.pswp')[0];
-				var items = this.getitems(this.el);
-				var options = {
-					history: false,
-					focus: false,
-					index: i,
-					showAnimationDuration: 0,
-					hideAnimationDuration: 0
-				};
-				gallery = new PhotoSwipe(pswpElement, PhotoSwipeUI_Default, items, options);
-				gallery.init()
-			},
-			bind: function () { //绑定click事件
-				var that = this
-				$(document).off("click", this.el)
-				$(document).on("click", this.el, function () {
-					var index = $(this).index(that.el)
-					that.ceratePhoto(index)
-				})
-				$(this.el).click(function () { })
-			}
-		}
-		var showimg = new Showimg(".userimg")
-		showimg.bind()
-	</script>
-	</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/report/chatrecord_copy.jsp b/WebContent/WEB-INF/jsp/pc/report/chatrecord_copy.jsp
deleted file mode 100644
index c1cb974..0000000
--- a/WebContent/WEB-INF/jsp/pc/report/chatrecord_copy.jsp
+++ /dev/null
@@ -1,1020 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>聊天记录</title>
-
-    <style>
-        html,
-        body {
-            height: 100%;
-        }
-
-        body {
-            background-image: url("../res/images/chat_bg.png");
-            background-size: 100% 100%;
-        }
-
-        html,
-        body,
-        ul,
-        li,
-        dd,
-        dl,
-        p {
-            margin: 0;
-            padding: 0;
-            list-style: none;
-        }
-
-        section,
-        footer,
-        header,
-        article {
-            display: block;
-            padding: 0;
-            margin: 0;
-        }
-
-        .main {
-            width: 800px;
-            height: 600px;
-            margin: 0 auto;
-            margin-top: 20px;
-        }
-
-        .main header {
-            background-color: #42494b;
-            height: 60px;
-            border-radius: 4px 4px 0 0;
-        }
-
-        header #selectSale {
-            line-height: 60px;
-            padding-right: 40px;
-            color: #fff;
-            float: right;
-            cursor: pointer;
-        }
-
-        .main article {
-            height: 540px;
-            /* border: 1px solid red; */
-            box-sizing: border-box;
-            display: flex;
-            position: relative;
-        }
-
-        article .saleListBox {
-            display: none;
-            position: absolute;
-            top: 0;
-            left: 0;
-            width: 100%;
-            height: 100%;
-            background-color: #efefef;
-            z-index: 1;
-        }
-        article .saleListBox .saleList_scroll{
-            height: 480px;
-            overflow-y: scroll;
-        }
-        
-        article .saleListBox .queryBar {
-            text-align: right;
-            margin: 10px 10px 10px 0;
-        }
-        article .saleListBox .queryBar .closeSaleListBox{
-            float: left;
-            margin-left: 20px;
-            display: block;
-            width: 20px;
-            height: 20px;
-            text-align: center;
-            line-height: 18px;
-            border-radius: 50%;
-            border: 1px solid #999;
-            color: #999;
-            cursor: pointer;
-        }
-        article .saleListBox .saleList {
-            display: flex;
-            flex-wrap: wrap;
-        }
-
-        article .saleListBox .saleList li,article .saleListBox .saleList div {
-            padding: 5px;
-            border: 1px solid #999;
-            background-color: #fff;
-            border-radius: 4px;
-            margin: 10px;
-            cursor: pointer;
-        }
-        article .saleListBox .saleList li.on{
-            border: 2px solid #009688;
-        }
-
-        article .saleListBox .saleList .saleLogo {
-            width: 78px;
-            height: 78px;
-            border-radius: 50%;
-        }
-        article .saleListBox .saleList li.on .saleName{
-            color: #009688;
-        }
-        article .saleListBox .saleList .saleName {
-            width: 78px;
-            text-align: center;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            word-wrap: normal;
-
-            vertical-align: middle;
-            font-size: 12px;
-            color: #999;
-        }
-        article .fansListBox{
-            height: 540px;
-            overflow-y: scroll;
-            overflow-x: hidden;
-            border-left: 1px solid #f5f5f5;
-            border-bottom: 1px solid #f5f5f5;
-            background-color: #fff;
-            box-sizing: border-box;
-        }
-        article .fansList {
-            width: 230px;
-            padding: 0;
-            margin: 0;
-            background-color: #fff;
-            
-        }
-        ::-webkit-scrollbar{width: 0px;}
-        article .chatLogListBox{
-            height: 100%;
-            width: 580px;
-            /* border: 1px solid red; */
-            padding: 10px;
-            box-sizing: border-box;
-            background-color: #f5f5f5;
-            overflow-y: scroll!important;
-            overflow-x: hidden!important;
-            position: relative;
-        }
-        .backTop{
-            font-size: 14px;
-            display: block;
-            background-color: #fff;
-            border: none;
-            width: 20px;
-            text-align: center;
-            height: 20px;
-            line-height: 19px;
-            border-radius: 50%;
-            transform: rotateZ(90deg);
-            float: right;
-            position: relative;
-            top: 20px;
-            right: 20px;
-            cursor: pointer;
-        }
-        article .chatLog {
-            display: none;
-            
-        }
-
-        article .fansList li {
-            /* text-align: center; */
-            padding: 10px;
-            border-bottom: 1px solid #f5f5f5;
-            box-sizing: border-box;
-            cursor: pointer;
-
-        }
-
-        article ul li.on {
-            background-color: #f5f5f5;
-        }
-
-        .chatListCard {
-            display: flex;
-        }
-
-        .chatListCard .userlogo {
-            width: 40px;
-            margin-right: 6px;
-        }
-        .chatListCard .fansname{
-            width: 150px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            word-wrap: normal;
-            display: inline-block;
-            vertical-align: middle;
-            font-size: 12px;
-            line-height: 20px;
-            color: #333;
-        }
-        .lastContent {
-            width: 90px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            word-wrap: normal;
-            display: inline-block;
-            vertical-align: middle;
-            font-size: 12px;
-            color: #999;
-        }
-
-        .chatListCardTime {
-
-            font-size: 10px;
-            color: #aaaaaa;
-        }
-
-        /* layui */
-
-        article .chatLog li {
-            position: relative;
-            font-size: 14px;
-            margin-bottom: 10px;
-            padding-left: 60px;
-            min-height: 68px;
-        }
-
-        article .chatLog li.layim-chat-mine {
-            text-align: right;
-            padding-left: 0;
-            padding-right: 60px
-        }
-
-        .layim-chat-main ul li {
-            position: relative;
-            font-size: 0;
-            margin-bottom: 10px;
-            padding-left: 60px;
-            min-height: 68px;
-        }
-
-        .layim-chat-mine .layim-chat-user {
-            left: auto;
-            right: 3px;
-        }
-
-        .layim-chat-mine .layim-chat-text {
-            margin-left: 0;
-            text-align: left;
-            background-color: #5FB878;
-            color: #fff;
-        }
-
-        .layim-chat-mine .layim-chat-user cite {
-            left: auto;
-            right: 60px;
-            text-align: right;
-        }
-
-        .layim-chat-mine .layim-chat-user cite i {
-            padding-left: 0;
-            padding-right: 15px;
-        }
-
-        .layim-chat-user {
-            position: absolute;
-            left: 3px;
-        }
-
-        .layim-chat-text {
-            position: relative;
-            line-height: 22px;
-            margin-top: 25px;
-            padding: 8px 15px;
-            background-color: #e2e2e2;
-            border-radius: 3px;
-            color: #333;
-            word-break: break-all;
-        }
-        .layim-chat-text img{
-            max-width: 100%;
-        }
-        
-
-        .layim-chat-user img {
-            width: 40px;
-            height: 40px;
-            border-radius: 100%;
-            vertical-align: middle;
-        }
-
-        .layim-chat-user cite {
-            position: absolute;
-            left: 60px;
-            top: -2px;
-            width: 500px;
-            line-height: 24px;
-            font-size: 12px;
-            white-space: nowrap;
-            color: #999;
-            text-align: left;
-            font-style: normal;
-        }
-
-        .layim-chat-user cite i {
-            padding-left: 15px;
-            font-style: normal;
-        }
-
-        .layim-chat-text,
-        .layim-chat-user {
-            display: inline-block;
-            vertical-align: top;
-            font-size: 14px;
-        }
-
-        .layim-chat-text:after {
-            content: '';
-            position: absolute;
-            left: -10px;
-            top: 13px;
-            width: 0;
-            height: 0;
-            border-style: solid dashed dashed;
-            border-color: #e2e2e2 transparent transparent;
-            overflow: hidden;
-            border-width: 10px;
-        }
-
-        .layim-chat-mine .layim-chat-text:after {
-            left: auto;
-            right: -10px;
-            border-top-color: #5FB878;
-        }
-
-        .layui-input:hover,
-        .layui-textarea:hover {
-            border-color: #D2D2D2!important;
-        }
-
-        .layui-input,
-        .layui-textarea {
-            border-color: #eee!important;
-            padding-left: 10px;
-        }
-
-        .layui-input,
-        .layui-select,
-        .layui-textarea {
-            height: 30px;
-            line-height: 1.3;
-            line-height: 30px\9;
-            border-width: 1px;
-            border-style: solid;
-            background-color: #fff;
-            border-radius: 2px;
-        }
-
-        .layui-btn {
-            display: inline-block;
-            height: 34px;
-            line-height: 34px;
-            padding: 0 18px;
-            background-color: #009688;
-            color: #fff;
-            white-space: nowrap;
-            text-align: center;
-            font-size: 14px;
-            border: none;
-            border-radius: 2px;
-            cursor: pointer;
-        }
-
-        .layui-btn:hover {
-            opacity: .8;
-            filter: alpha(opacity=80);
-            color: #fff;
-        }
-        .layim-chat-system {
-            min-height: 0;
-            margin: 20px 0 5px 0;
-            padding: 0 !important;
-            text-align: center;
-        }
-        .layim-chat-system span {
-            display: inline-block;
-            line-height: 30px;
-            padding: 0 15px;
-            border-radius: 3px;
-            background-color: #ddd;
-            color: #fff;
-            font-size: 14px;
-            cursor: pointer;
-        }
-        .layui-btn-primary {
-            border: 1px solid #C9C9C9;
-            background-color: #fff;
-            color: #555;
-        }
-        .layui-btn-primary:hover{
-            border: 1px solid #009688;
-            color: #555;
-        }
-    </style>
-    <link rel="stylesheet" href="/zzhnc/res/plugins/photoswipe/photoswipe.css">
-    <link rel="stylesheet" href="/zzhnc/res/plugins/photoswipe/default-skin/default-skin.css">
-</head>
-
-<body>
-    <section class="main">
-        <header>
-            <button class="backTop" title="返回顶部">&lt;</button>
-            <span id="selectSale" title="选择其他销售">选择销售</span>
-        </header>
-        <article>
-            <div class="fansListBox">
-                <ul class="fansList">
-                    <!-- <li class="on">
-                        <div class="chatListCard">
-                            <div>
-                                <img class="userlogo" src="http://wx.qlogo.cn/mmhead/Q3auHgzwzM5MJh8ohcmrmClwAw5fty11bQUJw4LsePfldibjGcicDZeQ/132" alt="">
-                            </div>
-                            <div>
-                                <p>微信昵称</p>
-                                <p>
-                                    <span class="lastContent">最近的一条消息</span>
-                                    <span class="chatListCardTime">14:21:20</span>
-                                </p>
-                            </div>
-                        </div>
-                    </li> -->
-                    
-                </ul>
-            </div>
-            
-            <div class="saleListBox">
-                <div class="queryBar">
-                    <span class="closeSaleListBox" id="closeSaleListBox">x</span>
-                    <input type="text" id="querySaleListVal" class="layui-input" placeholder="请输入销售名称">
-                    <button class="layui-btn" id="querySaleListBtn">查找</button>
-                    <button class="layui-btn layui-btn-primary" id="resetSaleListBtn">重置</button>
-                </div>
-                <div class="saleList_scroll">
-                    <ul class="saleList">
-                        <!-- <li class="on">
-                            <img class="saleLogo" src="http://wx.qlogo.cn/mmhead/Q3auHgzwzM5MJh8ohcmrmClwAw5fty11bQUJw4LsePfldibjGcicDZeQ/132" alt="">
-                            <p class="saleName">我是销售</p>
-                        </li>
-                        <li>
-                            <img class="saleLogo" src="http://wx.qlogo.cn/mmhead/Q3auHgzwzM5MJh8ohcmrmClwAw5fty11bQUJw4LsePfldibjGcicDZeQ/132" alt="">
-                            <p class="saleName">我是销售</p>
-                        </li>
-                        <li>
-                            <img class="saleLogo" src="http://wx.qlogo.cn/mmhead/Q3auHgzwzM5MJh8ohcmrmClwAw5fty11bQUJw4LsePfldibjGcicDZeQ/132" alt="">
-                            <p class="saleName">我是销售</p>
-                        </li> -->
-                        
-                    </ul>
-                </div>
-            </div>
-            <div class="chatLogListBox">
-                
-                <!-- <ul class="chatLog">
-                    <li>
-                        <div class="layim-chat-user">
-                            <img src="http://tva1.sinaimg.cn/crop.0.0.118.118.180/5db11ff4gw1e77d3nqrv8j203b03cweg.jpg">
-                            <cite>贤心
-                                <i>2017-06-30 17:44:43</i>
-                            </cite>
-                        </div>
-                        <div class="layim-chat-text">洗澡中，请勿打扰，偷窥请购票，个体四十，团体八折，订票电话：一般人我不告诉他！
-                            <img alt="[哈哈]" title="[哈哈]" src="http://res.layui.com/layui/dist/images/face/2.gif"> </div>
-                    </li>
-                    <li class="layim-chat-mine">
-                        <div class="layim-chat-user">
-                            <img src="http://res.layui.com/images/fly/avatar/00.jpg">
-                            <cite>
-                                <i>2017-06-30 17:44:42</i>纸飞机</cite>
-                        </div>
-                        <div class="layim-chat-text">大撒撒旦</div>
-                    </li>
-                    <li>
-                        <div class="layim-chat-user">
-                            <img src="http://tva1.sinaimg.cn/crop.0.0.118.118.180/5db11ff4gw1e77d3nqrv8j203b03cweg.jpg">
-                            <cite>贤心
-                                <i>2017-06-30 17:44:43</i>
-                            </cite>
-                        </div>
-                        <div class="layim-chat-text">洗澡中，，个体四十，团体话：一般人我不告诉他！
-                        </div>
-                    </li>
-                    <li class="layim-chat-mine">
-                        <div class="layim-chat-user">
-                            <img src="http://res.layui.com/images/fly/avatar/00.jpg">
-                            <cite>
-                                <i>2017-06-30 17:44:42</i>纸飞机</cite>
-                        </div>
-                        <div class="layim-chat-text">大撒撒asdas大三大四阿斯达岁的阿大使,阿斯达斯d旦</div>
-                    </li>
-                </ul> -->
-            </div>
-            
-
-        </article>
-    </section>
-    <div class="pswp" tabindex="-1" role="dialog" aria-hidden="true">
-            <div class="pswp__bg"></div>
-            <div class="pswp__scroll-wrap">
-                <div class="pswp__container">
-                    <div class="pswp__item"></div>
-                    <div class="pswp__item"></div>
-                    <div class="pswp__item"></div>
-                </div>
-                <div class="pswp__ui pswp__ui--hidden">
-                    <div class="pswp__top-bar">
-                        <div class="pswp__counter"></div>
-                        <button class="pswp__button pswp__button--close" title="Close (Esc)"></button>
-                        <button class="pswp__button pswp__button--zoom" title="Zoom in/out"></button>
-                        <div class="pswp__preloader">
-                            <div class="pswp__preloader__icn">
-                                <div class="pswp__preloader__cut">
-                                    <div class="pswp__preloader__donut"></div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="pswp__share-modal pswp__share-modal--hidden pswp__single-tap">
-                        <div class="pswp__share-tooltip"></div>
-                    </div>
-                    <button class="pswp__button pswp__button--arrow--left" title="Previous (arrow left)"></button>
-                    <button class="pswp__button pswp__button--arrow--right" title="Next (arrow right)"></button>
-                    <div class="pswp__caption">
-                        <div class="pswp__caption__center"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    <script src='http://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js'></script>
-    <script src="/zzhnc/res/plugins/photoswipe/photoswipe-ui-default.min.js"></script>
-	<script src="/zzhnc/res/plugins/photoswipe/photoswipe.min.js"></script>
-    <script>
-        function Chat() {
-            this.saleid_select = 0              //当前的销售ID
-            this.sale_query_page = 1            //销售查询后的页码
-            this.fans_query_page = 1            //粉丝查询后的页码
-            this.chat_query_page = 1            //聊天查询后的页码
-            this.fansInfo = {}
-            this.faceCode = ["/::)", "/::~", "/::B", "/::|", "/:8-)", "/::<", "/::$", "/::X", "/::Z", "/::'(", "/::-|", "/::@", "/::P", "/::D", "/::O", "/::(", "/::+", "/:–b", "/::Q", "/::T", "/:,@P", "/:,@-D", "/::d", "/:,@o", "/::g", "/:|-)", "/::!", "/::L", "/::>", "/::,@", "/:,@f", "/::-S", "/:?", "/:,@x", "/:,@@", "/::8", "/:,@!", "/:!!!", "/:xx", "/:bye", "/:wipe", "/:dig", "/:handclap", "/:&-(", "/:B-)", "/:<@", "/:@>", "/::-O", "/:>-|", "/:P-(", "/::'|", "/:X-)", "/::*", "/:@x", "/:8*", "/:pd", "/:<W>", "/:beer", "/:basketb", "/:oo", "/:coffee", "/:eat", "/:pig", "/:rose", "/:fade", "/:showlove", "/:heart", "/:break", "/:cake", "/:li", "/:bome", "/:kn", "/:footb", "/:ladybug", "/:shit", "/:moon", "/:sun", "/:gift", "/:hug", "/:strong", "/:weak", "/:share", "/:v", "/:@)", "/:jj", "/:@@", "/:bad", "/:lvu", "/:no", "/:ok", "/:love", "/:<L>", "/:jump", "/:shake", "/:<O>", "/:circle", "/:kotow", "/:turn", "/:skip", "/:oy", "/:#-0", "/:oy", "/:kiss", "/:<&", "/:&>"]
-                this.faceText = ["微笑", "撇嘴", "色", "发呆", "得意", "流泪", "害羞", "闭嘴", "睡", "大哭", "尴尬", "发怒", "调皮", "呲牙", "惊讶", "难过", "酷", "冷汗", "抓狂", "吐", "偷笑", "愉快", "白银", "傲慢", "饥饿", "困", "恐慌", "流汗", "憨笑", "悠闲", "奋斗", "咒骂", "疑问", "嘘", "晕", "疯了", "哀", "骷髅", "敲打", "再见", "擦汗", "抠鼻", "鼓掌", "糗大了", "坏笑", "左哼哼", "右哼哼", "哈欠", "鄙视", "委屈", "快哭了", "阴险", "亲亲", "吓", "可怜", "菜刀", "西瓜", "啤酒", "篮球", "乒乓", "咖啡", "饭", "猪头", "玫瑰", "凋谢", "嘴唇", "爱心", "心碎", "蛋糕", "闪电", "炸弹", "刀", "足球", "瓢虫", "便便", "月亮", "太阳", "礼物", "拥抱", "强", "弱", "握手", "胜利", "抱拳", "勾引", "拳头", "差劲", "爱你", "NO", "OK", "爱情", "飞吻", "跳跳", "发抖", "怄火", "转圈", "磕头", "回头", "跳绳", "投降", "激动", "乱舞", "献吻", "左太极", "右太极"]
-                this.faceText2 = ["/微笑","/撇嘴","/色","/发呆","/得意","/流泪","/害羞","/闭嘴","/睡","/大哭","/尴尬","/发怒","/调皮","/呲牙","/惊讶","/难过","/酷","/冷汗","/抓狂","/吐","/偷笑","/愉快","/白银","/傲慢","/饥饿","/困","/恐慌","/流汗","/憨笑","/悠闲","/奋斗","/咒骂","/疑问","/嘘","/晕","/疯了","/哀","/骷髅","/敲打","/再见","/擦汗","/抠鼻","/鼓掌","/糗大了","/坏笑","/左哼哼","/右哼哼","/哈欠","/鄙视","/委屈","/快哭了","/阴险","/亲亲","/吓","/可怜","/菜刀","/西瓜","/啤酒","/篮球","/乒乓","/咖啡","/饭","/猪头","/玫瑰","/凋谢","/嘴唇","/爱心","/心碎","/蛋糕","/闪电","/炸弹","/刀","/足球","/瓢虫","/便便","/月亮","/太阳","/礼物","/拥抱","/强","/弱","/握手","/胜利","/抱拳","/勾引","/拳头","/差劲","/爱你","/NO","/OK","/爱情","/飞吻","/跳跳","/发抖","/怄火","/转圈","/磕头","/回头","/跳绳","/投降","/激动","/乱舞","/献吻","/左太极","/右太极"]
-                this.faceImg = ["http://www.onegreen.net/QQ/UploadFiles/201404/20140427102755304.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102806118.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102811204.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102816272.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102821779.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102826616.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102831909.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102836860.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102841446.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102846605.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102851155.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102856815.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102901326.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102906485.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102911867.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102916775.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102921112.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102926579.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102931107.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102936174.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102941562.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102946241.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102951305.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102956983.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103001341.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103006230.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103011620.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103016770.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103021180.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103026333.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103031826.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103036856.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103041851.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103046204.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103051515.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103056368.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103101584.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103106639.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103111714.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103116995.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103121307.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103126628.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103131537.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103136922.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103141708.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103146409.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103151786.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103156150.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103201493.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103206968.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103211938.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103216563.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103221494.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103226447.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103231181.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103236908.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103241610.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103246942.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103251889.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103256822.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103301730.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103306315.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103311631.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103316218.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103321727.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103326466.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103331391.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103336293.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103341727.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103346519.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103351983.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103356315.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103401393.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103406284.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103411342.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103416889.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103421513.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103426896.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103431815.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103436286.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103441411.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103446541.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103451461.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103456248.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103501861.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103506188.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103511436.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103516890.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103521415.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103526248.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103531694.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103536789.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103541535.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103546800.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103551956.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103556647.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103601489.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103606571.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103611997.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103616555.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103621939.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103626894.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103636123.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103641405.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103646322.png"]
-
-            this.bind()
-            this.init()
-        }
-        Chat.prototype = {
-            init:function(){
-                var _fansid = this._getUrl_G('fansid')
-                var _saleid = this._getUrl_G('saleid')
-                var _name =  '${fansname}'
-                var _logo = this._getUrl_G('logo')
-                this.fansInfo.name = _name
-                this.fansInfo.logo = this._toLogoUrl(_logo)
-                this.fansInfo.id = _fansid
-                if(!!_fansid){
-                   
-                    this.fans_query_page = 1        
-                    this.saleid_select = _saleid
-                    this.getUserList(_saleid, 1)
-                    $(".fansList").html('')
-                    $(".chatLog").hide()
-
-
-                    var _messageid = _saleid + "_" + _fansid
-                    $('.fansList li').removeClass('on')
-                    $('.fansList li[data-id="'+ _fansid +'"]').addClass("on")
-                    if(this._isNewChat(_messageid)){
-                        this.createChatBox(_messageid)
-                        this.getUserChatLogList(1,_fansid,_messageid)     //需要把当前的page置为1
-                    }
-                    $(".chatLog").hide()
-                    $('[data-messageid="'+ _messageid +'"]').show()
-                }
-            },
-            getSaleList: function (page_, keyword_,isReset_) {                                                  //---获取销售列表
-                keyword_ = keyword_ || ""
-                page_ = page_ || 1
-                
-                $.post("/zzhnc/sale/getSalesList",{keyword:keyword_,page:page_,projectid:null,isvanker:null},function(data){
-                    if(data.code == 0){
-                        data.data.rows = data.data.rows ? data.data.rows : []
-                        var str =""
-                        data.data.rows.forEach(function(e,i) {
-                            str += '<li data-id="'+ e.id +'">'+
-                                        '<img class="saleLogo" src="../res/images/default_user.png" alt="">'+
-                                        '<p class="saleName">'+ e.name +'</p>'+
-                                    '</li>'
-                        });
-                        if(data.data.page < data.data.totalPages){
-                            str += '<div data-page="'+ (data.data.page+1) +'" class="getMoreSale">'+
-                                        '<img class="saleLogo" src="../res/images/chat_add_sale.png" alt="">'+
-                                        '<p class="saleName">更多</p>'+
-                                    '</li>'
-                        }
-                        if(!!isReset_){
-                            $(".saleList").html(str)
-                        }else{
-                            $(".saleList").append(str)
-
-                        }
-                    }
-                })
-            },
-            getUserList: function (salesId_,page_) {                                                            //---获取粉丝列表
-                var that = this
-                $.post('/zzhnc/sale/chatlogList?salesId='+ salesId_ + '&page=' + page_, function (data) {
-                    if(data.code == 0){
-                        $(".saleListBox").hide()
-                        data.data = data.data ? data.data : []
-                        var str = ''
-                        data.data.forEach(function(e,i){
-                            str += '<li data-id="'+ e.fansid +'">'+
-                                        '<div class="chatListCard">'+
-                                            '<div>'+
-                                                '<img class="userlogo" src="'+ (e.logo ? e.logo : '../res/images/default_user.png' ) +'" alt="">'+
-                                            '</div>'+
-                                            '<div>'+
-                                                '<p class="fansname">'+ (e.nickname ? e.nickname : ('客户 : ' + e.fansid)) +'</p>'+
-                                                '<p>'+
-                                                    '<span class="lastContent">'+ (e.reply || e.ask) +'</span>'+
-                                                    '<span class="chatListCardTime">'+ that._toTime_G(e.asktime) +'</span>'+
-                                                '</p>'+
-                                            '</div>'+
-                                        '</div>'+
-                                    '</li>'
-                        })
-                        $(".fansList").append(str)
-                    }
-                })
-            },
-            getUserChatLogList: function (_page,_fansid,_messageid) {                                           //---获取聊天记录
-                var that = this 
-                var _saleid = this.saleid_select
-                $.post('/zzhnc/sale/chatlogList?salesId='+ _saleid +'&page='+ _page +'&fansId=' + _fansid,function(data){
-                    if(data.code == 0){
-                        var str = ''
-                        data.data.data = data.data.data ? data.data.data : []
-                        data.data.data.reverse().forEach(function(e){
-                            str += that.fansChatLogTemplate(e)
-                        })
-                        $('[data-messageid="'+ _messageid +'"]').prepend(str)
-
-
-
-                        var page_item = Math.ceil(data.data.count / 20)          //当前粉丝的聊天记录的总页数
-                            
-                            
-                        if(page_item > _page){
-                            _page = _page + 1
-                            that.create_getMore({
-                                messageid:_messageid,
-                                saleid : _saleid,
-                                fansid : _fansid,
-                                message:"查看更多",
-                                page:_page
-                            })
-                        }else{
-                           
-
-                            that.create_warn({messageid:_messageid,message:"没有更多记录",sort:"sort"})
-                        }
-                        var showimg = new Showimg('[data-messageid="'+ _messageid +'"].userimg')
-		                showimg.bind()
-                    }
-                })
-            },
-            create_Img:function(msg){                                                                           //---创建一个图片标签并返回
-                var randomVal = Math.random().toString(36).substr(2);
-                var str = '<image src="'+ msg +'?'+ randomVal +'" class="userimg" alt="">'
-                return str
-            },
-            create_warn: function (msg) {                                                                       //---创建一个警告提示消息
-                var template = '<li class="layim-chat-system">' +
-                    '<span>' + msg.message + '</span>' +
-                    '</li>'
-                
-                var _height = $("[data-messageid='" + msg.messageid + "']").height()
-                if(msg.sort){
-                    $("[data-messageid='" + msg.messageid + "']").prepend(template)
-                }else{
-                    $("[data-messageid='" + msg.messageid + "']").append(template)
-                    $("[data-messageid='" + msg.messageid + "']").parent().scrollTop(_height)
-
-                }
-            },
-            create_getMore:function(msg){                                                                       //---创建一个拉取更多的按钮
-                var that = this
-                console.log(msg)
-                var template = '<li class="layim-chat-system postMore" data-messageid="'+ msg.messageid +'" data-saleid="'+ msg.saleid +'" data-fansid="'+ msg.fansid +'"  data-page="'+msg.page+'">' +
-                    '<span>' + msg.message + '</span>' +
-                    '</li>'
-                $("[data-messageid='" + msg.messageid + "']").prepend(template)
-                
-            },
-            toFaceCode: function (msg) {                                                                        //---表情文字转代码
-                var _msg = msg
-                var reg = /\[.*?\]/g;
-                var some = reg.exec(_msg);                //匹配到的字段
-
-                while (some) {
-                    var _some = some[0].replace(/\[/, "")
-                    _some = _some.replace(/\]/, "")
-                    var index = this.faceText.indexOf(_some)
-                    msg = msg.replace(new RegExp(_some, 'g'), this.faceCode[index])
-                    some = reg.exec(_msg);
-                }
-                msg = msg.replace(/\[/g, "")
-                msg = msg.replace(/\]/g, "")
-                return msg
-            },
-            toFaceImg: function (msg) {                                                                         //---表情文字转图片
-                var _msg = msg
-                var reg = /\[.*?\]/g;
-                var some = reg.exec(_msg);                //匹配到的字段
-                var isReset = false
-
-                while (some) {
-                    var _some = some[0].replace(/\[/, "")
-                    _some = _some.replace(/\]/, "")
-                    var index = this.faceText.indexOf(_some)
-                    if(index >-1){
-                        msg = msg.replace(new RegExp(_some, 'g'), '<image src="'+ this.faceImg[index] +'" alt="">') 
-
-                    }else{
-                        isReset = "[" + _some + "]"
-                    }
-                    some = reg.exec(_msg);
-                }
-                var that = this
-                this.faceText2.forEach(function(e,i){
-                    var reg2 = new RegExp(e,"g")
-                    if(reg2.test(msg)){
-                        msg = msg.replace(reg2,'<image src="'+ that.faceImg[i] +'" alt="">'   )
-
-                    }
-                })
-                
-                msg = msg.replace(/\[/g, "")
-                msg = msg.replace(/\]/g, "")
-                msg = msg.replace(/</g,"&lt;")
-                msg = msg.replace(/&lt;image/g,"<img")
-                if(isReset){
-                    return isReset
-                }else{
-                    return msg
-                }
-                
-            },
-            fansChatLogTemplate:function(msg){                                                                  //---消息模版
-                var that = this
-                var b_isMe = !(msg.replytype == 9 || msg.replytype == 11)       //是否是销售本人(Boolean )    f废弃 (至判断是否有消息内容)
-                
-                    b_isMe = (!!msg.reply && !!!msg.ask)
-                
-
-                var isMeClass = b_isMe ? "layim-chat-mine" : ""                 //是否是销售本人(ClassName)
-                var msg__ = b_isMe ? msg.reply : msg.ask                        //对应的选择消息
-                var logo = (function(){
-                    var _logo = ""
-                    if(msg.replytype == 1 || msg.replytype == 2 || msg.replytype == 3){
-                        _logo = "../res/images/robot_logo.png"
-                    }else{
-                        _logo = (b_isMe ? '../res/images/vanke_logo.png' : (that.fansInfo.logo || "../res/images/default_user.png"))
-                    }
-                    return _logo
-                })()
-                
-                var name = (function(){
-                    var _name = ""
-                    if(msg.replytype == 1 || msg.replytype == 2 || msg.replytype == 3 ){
-                        _name = "机器人"
-                    }else{
-                        _name = (b_isMe ? (msg.salename || "vanke" ): (that.fansInfo.name || "客户 : " + msg.fansid))
-                    }
-                    return _name
-                })()
-                if(msg.replytype == 9){
-                    b_isMe = false
-                    msg__ = this.create_Img(msg)
-                }else{
-                    msg__ = this.toFaceImg(msg__)
-                }
-                var template = ""
-                if(!!msg.ask || !!msg.imgurl){
-                    template += '<li>'+
-                                    '<div class="layim-chat-user">'+
-                                        '<img src="' + (that.fansInfo.logo || "../res/images/default_user.png") + '">'+
-                                        '<cite>'+ (that.fansInfo.name || "客户 : " + msg.fansid) +
-                                            '<i>'+ this._toTime_G(msg.asktime) +'</i>'+
-                                        '</cite>'+
-                                    '</div>'+
-                                    '<div class="layim-chat-text">'+ (!!msg.imgurl ? this.create_Img(msg.imgurl) : this.toFaceImg(msg.ask)) + '</div>'+
-                                '</li>'
-                }
-                if(!!msg.reply || !!msg.imgurl2){
-                    template += '<li class="layim-chat-mine">'+
-                                '<div class="layim-chat-user">'+
-                                    '<img src="'+ (msg.replytype < 4 ? "../res/images/robot_logo.png" : "../res/images/vanke_logo.png") +'">'+
-                                    '<cite>'+
-                                        '<i>'+  this._toTime_G(msg.asktime) +'</i>'+ (msg.replytype < 4 ? "机器人" : (msg.salename || "vanke" )) +'</cite>'+
-                                '</div>'+
-                                '<div class="layim-chat-text">'+ (!!msg.imgurl2 ? this.create_Img("http://" + msg.imgurl2) : this.toFaceImg(msg.reply)) +'</div>'+
-                            '</li>'
-                }
-                
-                
-                
-                
-                return template
-            },
-            createChatBox: function (messageid) {                                                               //---创建一个消息盒子
-                var str ='<ul class="chatLog" data-messageid="'+ messageid +'"><ul>'
-                $('.chatLogListBox').append(str)
-            },
-            _toLogoUrl:function(v){
-                
-                if(!!v && v != 'undefined'){
-                    return v.substring(5,v.length-1)
-                }else{
-                    return '../res/images/default_user.png'
-                }
-                
-                
-            },
-            _toTime_G: function (v) {                                                                           //--- 转时间
-                var time = new Date(v)
-                var year = time.getFullYear()
-                var mon = time.getMonth() + 1;
-                var day = time.getDate();
-                var hour = time.getHours();
-                var min = time.getMinutes();
-                if (mon < 10) mon = "0" + mon
-                if (day < 10) day = "0" + day
-                if (hour < 10) hour = "0" + hour
-                if (min < 10) min = "0" + min
-                return mon + "-" + day + " " + hour + ":" + min
-            },
-            _isNewChat: function (msg) {                                                                        //---是否是新的会话
-                    var _isNew = true
-                    $("[data-messageid]").each(function () {
-                        if ($(this).data("messageid") == msg) {
-                            _isNew = false
-                        }
-                    })
-                    return _isNew
-            },
-            _getUrl_G: function(name) {                                                                         //---获取Url参数
-                var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");  
-                var r = window.location.search.substr(1).match(reg);  
-                if (r != null) return unescape(r[2]); return null;  
-            },
-            bind: function () {                                                                                 //---绑定元素
-
-                var that = this
-                //唤起销售列表
-                $("#selectSale").click(function(){
-                    
-                    if($(".saleList li").length < 1){
-                        that.getSaleList()
-                    }
-                    $(".saleListBox").show()
-                })
-                $("#closeSaleListBox").click(function(){
-                    $(".saleListBox").hide()
-                })
-                //选择销售
-                $(document).on("click",".saleList li",function(){     
-                    $(".saleList li").removeClass("on")
-                    $(this).addClass("on")
-                    var _saleid = $(this).data("id")
-                    that.fans_query_page = 1        
-                    that.saleid_select = $(this).data("id")
-                    that.getUserList(_saleid, 1)
-                    $(".fansList").html('')
-                    $(".chatLog").hide()
-                })
-                //查询销售
-                $("#querySaleListBtn").click(function(){
-                    var _work =  $("#querySaleListVal").val()
-                    that.sale_query_page = 1
-                    that.getSaleList(1,_work,"reset")
-                })
-                //重置查询条件
-                $("#resetSaleListBtn").click(function(){
-                    $("#querySaleListVal").val("")
-                    that.sale_query_page = 1
-                    that.getSaleList(1,"","reset")
-                })
-
-                //查询销售列表下一页
-                $(document).on("click",".getMoreSale",function(){
-                    var _page = $(this).data("page")
-                    var _word = $("#querySaleListVal").val()
-                    that.getSaleList(_page,_word)
-                    $(this).remove()
-                })
-                //查询聊天记录下一页
-                $(document).on("click",".postMore",function(){
-                    var _page = $(this).data("page")
-                    var _fansid = $(this).data("fansid")
-                    var _messageid = $(this).data("messageid")
-                    that.getUserChatLogList (_page,_fansid,_messageid) 
-                    $(this).remove()
-                })
-                
-                //切换粉丝对话框
-                $(document).on("click",".fansList li",function(){
-                    var _fansid = $(this).data("id")
-                    var _saleid = that.saleid_select
-                    var _logo = $(this).find('.chatListCard img').attr('src')
-                    var _name = $(this).find('.fansname').text()
-                    var _messageid = _saleid + "_" + _fansid
-                    that.fansInfo={
-                        id:_fansid,
-                        name:_name,
-                        logo:_logo
-                    }
-                    
-                    $('.fansList li').removeClass('on')
-                    $(this).addClass("on")
-                    if(that._isNewChat(_messageid)){
-                        that.createChatBox(_messageid)
-                        that.getUserChatLogList(1,_fansid,_messageid)     //需要把当前的page置为1
-                    }
-                    $(".chatLog").hide()
-                    $('[data-messageid="'+ _messageid +'"]').show()
-                })
-                $(".backTop").on("click",function(){
-                    $(this).attr("disabled",true)
-                    $(".chatLogListBox").animate({scrollTop:0},500,function(){
-                        $(".backTop").attr("disabled",false)
-                    })
-                })
-                $("#selectSale").click()
-            }
-        }
-        var chat = new Chat()
-
-        function Showimg(el) {
-			this.el = el
-		}
-
-		Showimg.prototype = {
-			getitems: function (el) { //获取items数组对象
-				var list = document.querySelectorAll(el)
-				var items = []
-				for (i = 0; i < list.length; i++) {
-					var obj = {}
-					obj.src = list[i].src
-					obj.h = list[i].naturalHeight
-					obj.w = list[i].naturalWidth
-					items.push(obj)
-				}
-				return items
-			},
-			ceratePhoto: function (i) { //初始化新的相册框
-				var pswpElement = document.querySelectorAll('.pswp')[0];
-				var items = this.getitems(this.el);
-				var options = {
-					history: false,
-					focus: false,
-					index: i,
-					showAnimationDuration: 0,
-					hideAnimationDuration: 0
-				};
-				gallery = new PhotoSwipe(pswpElement, PhotoSwipeUI_Default, items, options);
-				gallery.init()
-			},
-			bind: function () { //绑定click事件
-				var that = this
-				$(document).off("click", this.el)
-				$(document).on("click", this.el, function () {
-					var index = $(this).index(that.el)
-					that.ceratePhoto(index)
-				})
-				$(this.el).click(function () { })
-			}
-		}
-
-		var showimg = new Showimg(".userimg")
-		showimg.bind()
-        
-    </script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/report/goods.jsp b/WebContent/WEB-INF/jsp/pc/report/goods.jsp
new file mode 100644
index 0000000..22e2e31
--- /dev/null
+++ b/WebContent/WEB-INF/jsp/pc/report/goods.jsp
@@ -0,0 +1,150 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<meta http-equiv="X-UA-Compatible" content="ie=edge">
+		<title>粉丝列表</title>
+		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
+		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
+	</head>
+
+	<body class="wrap">
+		<form class="layui-form">
+			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
+				<div class="layui-input-inline" style="width: 150px;">
+					<input class="layui-input" name="keyword" placeholder="关键字" />
+				</div>
+				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
+				<button class="layui-btn layui-btn-primary" lay-submit lay-filter="resetbtn">重置</button>
+			</div>		
+		</form>
+		<table class="layui-table">
+			<thead>
+				<tr>
+					<th style="width:30px;">No</th>
+					<th style="min-width:120px;">头像昵称</th>
+					<th style="width:160px;">地区</th>
+					<th style="min-width:80px;">上级粉丝</th>
+					<th style="min-width:60px;">销售人员</th>
+					<th style="min-width:60px;">小程序 openid</th>
+					<th style="min-width:80px;">创建时间</th>
+					<th style="min-width:80px;">上次登录时间</th>
+				</tr>
+			</thead>
+			<tbody id="fanslist">
+				
+			</tbody>
+		</table>
+		<div class="nulldata">暂无数据</div>
+		<div id="page"></div>
+		
+	</body>
+	<script src='/zzhnc/res/js/jquery.min.js'></script>
+	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
+	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
+	<script>
+		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
+			var form = layui.form(),
+				element = layui.element(),
+				laydate = layui.laydate,
+				layer = layui.layer,
+				laypage = layui.laypage;
+				
+			var page = 1,keyword = ""
+			
+			//初始化数据
+			initData(page, keyword)
+			
+			function initData(page, keyword){
+				$.post("/zzhnc/report/getFansList",{page:page,keyword:keyword},function(data){
+					console.log(data)
+					data=data.data;
+					
+					laypage({
+						cont: 'page',
+						pages: data.totalPages, 
+						curr: page,
+						skip: true,
+						jump: function(obj, first) {
+							if(!first) {
+								page = obj.curr
+								initData(page, keyword)
+							}
+						}
+					});
+					
+					$("#fanslist").html("")
+					
+					if(data.rows.length>0){
+						$(".nulldata").hide();
+						var str="";
+						for(var i=0;i<data.rows.length;i++){
+							var nick="";
+							if((data.rows[i].nickname==null||data.rows[i].nickname=="")&&(data.rows[i].logo==null||data.rows[i].logo=="")){
+								nick='<div style="text-align:left;">未授权（id：'+ data.rows[i].id +'）</div>';
+							}else{
+								if(data.rows[i].logo==null||data.rows[i].logo==""){
+									nick='<div class="nickbox"><div id="wlogo" style="background:url(/zzhnc/res/images/default_user.png) no-repeat center;-webkit-background-size:contain;background-size:contain;"></div><span class="nick"> '+ data.rows[i].nickname +'</span></div>';
+								}else{
+									nick='<div class="nickbox"><div id="wlogo" style="background:url('+data.rows[i].logo+') no-repeat center;-webkit-background-size:contain;background-size:contain;"></div><span class="nick"> '+ data.rows[i].nickname +'</span></div>';
+								}
+							}
+							
+							str+='<tr data-id='+ data.rows[i].id +'>'
+								+'<td>'+ ((data.page - 1) * data.pageSize + i + 1) +'</td>'
+								+'<td style="text-align:left;">'+ nick +'</td>'
+								+'<td>'+ ToAddress(data.rows[i]) +'</td>'
+								+'<td>'+ data.rows[i].parentfans+'</td>'
+								+'<td>'+ data.rows[i].salesname+'</td>'
+								+'<td>'+ data.rows[i].miniopenid+'</td>'
+								+'<td>'+ toTime_G(data.rows[i].createdtime) +'</td>'
+								+'<td>'+ toTime_G(data.rows[i].lastlogintime) +'</td>'
+								+'</tr>'
+						}
+						$("#fanslist").html(str)
+						toNull_G();
+					}else{
+						$(".nulldata").show()
+						return false;
+					}
+					
+					
+				})
+			}
+			
+			form.on("submit(querybtn)", function(e){
+				initData(1, e.field.keyword)
+				return false
+			})
+			
+			form.on("submit(resetbtn)", function(e){
+				$("[name=keyword]").val("")
+				initData(1, "");
+				return false
+			})
+			
+			
+			function fanstype(t){
+				if(t == 1){
+					return "销售助手粉丝"
+				}else if(t == 2){
+					return "万小二粉丝"	
+				}else{
+					return ""
+				}
+			}
+
+			function ToAddress(data){
+				var p = data.province || ""
+				var c = data.city || ""
+				var d = data.district || ""
+				return !!(p + c + d) ? (p+c+d) : "未知城市"
+			}
+			
+		})
+	</script>
+
+</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/report/posterrecord.jsp b/WebContent/WEB-INF/jsp/pc/report/posterrecord.jsp
deleted file mode 100644
index d74d22d..0000000
--- a/WebContent/WEB-INF/jsp/pc/report/posterrecord.jsp
+++ /dev/null
@@ -1,156 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>海报记录</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
-	</head>
-
-	<body class="wrap">
-		<form class="layui-form">
-			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
-				
-				<!-- <div class="layui-input-inline producttype" style="width: 140px;">
-					<select name="producttype" >
-						<option value="">海报类别</option>
-					</select>
-				</div>
-				<div class="layui-input-inline productid" style="width: 140px;">
-					<select name="productid">
-						<option value="">人员名称</option>
-					</select>
-				</div>
-				<div class="layui-input-inline productid" style="width: 140px;">
-					<select name="productid">
-						<option value="">海报名称</option>
-					</select>
-				</div> -->
-				<div class="layui-input-inline" style="width: 140px;">
-					<input type="text" class="layui-input" name="keyword" placeholder="关键字" />
-				</div>
-				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
-				<button class="layui-btn layui-btn-primary" lay-submit lay-filter="resetbtn" type="reset">重置</button>
-			</div>
-		</form>
-		<table class="layui-table">
-			<thead>
-				<tr>
-					<th style="width:30px;">No</th>
-					<th style="min-width: 80px;">海报类别</th>
-					<th style="min-width: 60px;">人员名称</th>
-					<th style="min-width: 60px;">海报图片 </th>
-					<th style="min-width: 80px;">更新时间</th>
-				</tr>
-			</thead>
-				
-			<tbody id="tablelist">
-				<!-- <tr>
-					<td>No</td>
-					<td style="min-widtd: 56px;">海报类别</td>
-					<td style="min-widtd: 84px;">人员名称</td>
-					<td style="min-widtd: 56px;">海报地址 </td>
-					<td style="min-widtd: 56px;">更新时间 </td>
-				</tr> -->
-			</tbody>
-		</table>
-		<div id="page"></div>
-		
-	</body>
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-    <script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-	<script>
-		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
-			var form = layui.form(),
-				element = layui.element(),
-				laydate = layui.laydate,
-				layer = layui.layer,
-				laypage = layui.laypage;
-
-			var queryObj = {
-					page: 1,
-					keyword:null
-					
-				} //查询条件
-			//查询
-			  form.on('submit(querybtn)', function(data){
-				 queryObj=data.field;
-				 queryObj.page=1;
-			      initdata(queryObj);
-			      form.render();
-			      return false;
-			  });
-			 $(".resetBtn").on("click",function(){
-				$("input[name=keyword]").val("");
-				$("select[name=projectid]").val("");
-				form.render();
-				initdata(queryObjd)
-				return false;
-			})  
-			//初始化数据
-			initdata(queryObj);
-			function initdata(queryObj){
-				
-				$.post("/zzhnc/report/getPosterLog",queryObj,function(data){
-					data=data.data;
-					console.log(data)
-					  laypage({
-						cont: 'page',
-						pages: data.totalPages, //总页数
-						curr: queryObj.page,
-						skip: true,
-						jump: function(obj, first) {
-							if(!first) {
-								queryObj.page = obj.curr
-								initdata(queryObj);
-							}
-
-						}
-					});  
-					var str="";
-					if(data.rows.length<1){
-						$(".nulldata").show();
-					}else{
-						$(".nulldata").hide();
-						for(var i=0;i<data.rows.length;i++){
-							str+='<tr data-id='+ data.rows[i].id +'>'
-								+'<td>'+ ((data.page - 1) * data.pageSize + i + 1) +'</td>'
-								+'<td>'+ postertype(data.rows[i].postertype)+'</td>'
-								+'<td>'+ data.rows[i].name+'</td>'
-								+'<td><div style="background:url('+ data.rows[i].imgurl +') no-repeat center;-webkit-background-size:contain;background-size:contain;width:40px;height:40px;margin:0 auto;"></div></td>'
-								+'<td>'+ toTime_G(data.rows[i].updatedtime) +'</td>'
-								+'</tr>';
-						}
-					}
-					
-					$("#tablelist").html(str);
-					toNull_G();
-				})
-			}
-
-		})
-		function postertype(v){
-			if(v!==null&&v!==""){
-				switch(v){
-					case 1:
-					 return "项目海报";
-					  break;
-					case 2:
-						 return "销售助手首页";
-					  break;
-					case 3:
-						 return "万小二首页";
-					  break;
-				}
-			}else{
-				return "";
-			}
-		}
-	</script>
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/report/prize.jsp b/WebContent/WEB-INF/jsp/pc/report/prize.jsp
new file mode 100644
index 0000000..22e2e31
--- /dev/null
+++ b/WebContent/WEB-INF/jsp/pc/report/prize.jsp
@@ -0,0 +1,150 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<meta http-equiv="X-UA-Compatible" content="ie=edge">
+		<title>粉丝列表</title>
+		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
+		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
+	</head>
+
+	<body class="wrap">
+		<form class="layui-form">
+			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
+				<div class="layui-input-inline" style="width: 150px;">
+					<input class="layui-input" name="keyword" placeholder="关键字" />
+				</div>
+				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
+				<button class="layui-btn layui-btn-primary" lay-submit lay-filter="resetbtn">重置</button>
+			</div>		
+		</form>
+		<table class="layui-table">
+			<thead>
+				<tr>
+					<th style="width:30px;">No</th>
+					<th style="min-width:120px;">头像昵称</th>
+					<th style="width:160px;">地区</th>
+					<th style="min-width:80px;">上级粉丝</th>
+					<th style="min-width:60px;">销售人员</th>
+					<th style="min-width:60px;">小程序 openid</th>
+					<th style="min-width:80px;">创建时间</th>
+					<th style="min-width:80px;">上次登录时间</th>
+				</tr>
+			</thead>
+			<tbody id="fanslist">
+				
+			</tbody>
+		</table>
+		<div class="nulldata">暂无数据</div>
+		<div id="page"></div>
+		
+	</body>
+	<script src='/zzhnc/res/js/jquery.min.js'></script>
+	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
+	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
+	<script>
+		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
+			var form = layui.form(),
+				element = layui.element(),
+				laydate = layui.laydate,
+				layer = layui.layer,
+				laypage = layui.laypage;
+				
+			var page = 1,keyword = ""
+			
+			//初始化数据
+			initData(page, keyword)
+			
+			function initData(page, keyword){
+				$.post("/zzhnc/report/getFansList",{page:page,keyword:keyword},function(data){
+					console.log(data)
+					data=data.data;
+					
+					laypage({
+						cont: 'page',
+						pages: data.totalPages, 
+						curr: page,
+						skip: true,
+						jump: function(obj, first) {
+							if(!first) {
+								page = obj.curr
+								initData(page, keyword)
+							}
+						}
+					});
+					
+					$("#fanslist").html("")
+					
+					if(data.rows.length>0){
+						$(".nulldata").hide();
+						var str="";
+						for(var i=0;i<data.rows.length;i++){
+							var nick="";
+							if((data.rows[i].nickname==null||data.rows[i].nickname=="")&&(data.rows[i].logo==null||data.rows[i].logo=="")){
+								nick='<div style="text-align:left;">未授权（id：'+ data.rows[i].id +'）</div>';
+							}else{
+								if(data.rows[i].logo==null||data.rows[i].logo==""){
+									nick='<div class="nickbox"><div id="wlogo" style="background:url(/zzhnc/res/images/default_user.png) no-repeat center;-webkit-background-size:contain;background-size:contain;"></div><span class="nick"> '+ data.rows[i].nickname +'</span></div>';
+								}else{
+									nick='<div class="nickbox"><div id="wlogo" style="background:url('+data.rows[i].logo+') no-repeat center;-webkit-background-size:contain;background-size:contain;"></div><span class="nick"> '+ data.rows[i].nickname +'</span></div>';
+								}
+							}
+							
+							str+='<tr data-id='+ data.rows[i].id +'>'
+								+'<td>'+ ((data.page - 1) * data.pageSize + i + 1) +'</td>'
+								+'<td style="text-align:left;">'+ nick +'</td>'
+								+'<td>'+ ToAddress(data.rows[i]) +'</td>'
+								+'<td>'+ data.rows[i].parentfans+'</td>'
+								+'<td>'+ data.rows[i].salesname+'</td>'
+								+'<td>'+ data.rows[i].miniopenid+'</td>'
+								+'<td>'+ toTime_G(data.rows[i].createdtime) +'</td>'
+								+'<td>'+ toTime_G(data.rows[i].lastlogintime) +'</td>'
+								+'</tr>'
+						}
+						$("#fanslist").html(str)
+						toNull_G();
+					}else{
+						$(".nulldata").show()
+						return false;
+					}
+					
+					
+				})
+			}
+			
+			form.on("submit(querybtn)", function(e){
+				initData(1, e.field.keyword)
+				return false
+			})
+			
+			form.on("submit(resetbtn)", function(e){
+				$("[name=keyword]").val("")
+				initData(1, "");
+				return false
+			})
+			
+			
+			function fanstype(t){
+				if(t == 1){
+					return "销售助手粉丝"
+				}else if(t == 2){
+					return "万小二粉丝"	
+				}else{
+					return ""
+				}
+			}
+
+			function ToAddress(data){
+				var p = data.province || ""
+				var c = data.city || ""
+				var d = data.district || ""
+				return !!(p + c + d) ? (p+c+d) : "未知城市"
+			}
+			
+		})
+	</script>
+
+</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/report/remarksreport.jsp b/WebContent/WEB-INF/jsp/pc/report/remarksreport.jsp
deleted file mode 100644
index 7b0d4c8..0000000
--- a/WebContent/WEB-INF/jsp/pc/report/remarksreport.jsp
+++ /dev/null
@@ -1,228 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-	<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-	<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>评论列表</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
-	</head>
-	<style>
-		.Detailbtn .layui-form-label {
-			width: 90px;
-		}
-
-		.Detailbtn .layui-input-inline {
-			width: 380px !important;
-		}
-	</style>
-
-	<body class="wrap">
-		<form class="layui-form">
-			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
-				<div class="layui-input-inline" style="width: 150px;">
-					<select name="estateid">
-						<option value="">楼盘名称</option>
-						<option value="1">万科·皇马郦宫</option>
-						<option value="2">万科·四季松湖</option>
-						<option value="3">南部湾万科城</option>
-						<option value="4">万科·翡丽山</option>
-						<option value="5">万科·东江之星</option>
-						<option value="6">万科·幸福城</option>
-						<option value="7">万科·云城</option>
-						<option value="8">万科·城市花园</option>
-						<option value="9">万科·中央公园</option>
-						<option value="10">万科·珠江东岸</option>
-					</select>
-				</div>
-				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
-				<button class="layui-btn layui-btn-primary" lay-submit lay-filter="resetbtn" type="reset">重置</button>
-			</div>
-
-			<table class="layui-table">
-				<thead>
-					<tr>
-						<th style="width:30px;">No</th>
-						<th style="width: 160px;">粉丝</th>
-						<th style="width: 120px;">楼盘名称</th>
-						<th style="min-width: 120px;">评论内容</th>
-						<th style="min-width: 56px;">评论时间</th>
-						<th style="width:80px;">是否显示</th>
-					</tr>
-				</thead>
-
-				<tbody id="remarklist">
-
-				</tbody>
-			</table>
-		</form>
-		<div class="nulldata">暂无数据</div>
-		<div id="page"></div>
-
-	</body>
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-	<script>
-		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function () {
-			var form = layui.form(),
-				element = layui.element(),
-				laydate = layui.laydate,
-				layer = layui.layer,
-				laypage = layui.laypage;
-
-			var queryObj = {
-				page: 1,
-				pagesize: 10,
-				estateid: ''
-			};
-
-			initData(queryObj);
-
-			function initData(queryObj) {
-				$.post("/zzhnc/report/getRemarksList", queryObj, function (data) {
-					console.log(data)
-					data = data.data;
-
-					laypage({
-						cont: 'page',
-						pages: data.totalPages,
-						curr: queryObj.page,
-						skip: true,
-						jump: function (obj, first) {
-							if (!first) {
-								queryObj.page = obj.curr
-								initData(queryObj)
-							}
-						}
-					});
-
-					$("#remarklist").html("")
-
-					if (data.rows.length > 0) {
-						$(".nulldata").hide()
-						var str = "";
-						for (var i = 0; i < data.rows.length; i++) {
-							var nick = "";
-							if ((data.rows[i].nickname == null || data.rows[i].nickname == "") && (data.rows[i].logo == null || data.rows[i].logo == "")) {
-								nick = '<div style="text-align:left;">未授权（id：' + data.rows[i].id + '）</div>';
-							} else {
-								if (data.rows[i].logo == null || data.rows[i].logo == "") {
-									nick = '<div class="nickbox"><div id="wlogo" style="background:url(/zzhnc/res/images/default_user.png) no-repeat center;-webkit-background-size:contain;background-size:contain;"></div><span class="nick"> ' + ToName(data.rows[i].nickname) + '</span></div>';
-								} else {
-									nick = '<div class="nickbox"><div id="wlogo" style="background:url(' + data.rows[i].logo + ') no-repeat center;-webkit-background-size:contain;background-size:contain;"></div><span class="nick"> ' + ToName(data.rows[i].nickname) + '</span></div>';
-								}
-							}
-							str += '<tr data-id=' + data.rows[i].id + '>'
-								+ '<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>'
-								+ '<td style="text-align:left;">' + nick + '</td>'
-								+ '<td>' + estateName(data.rows[i].estateid) + '</td>'
-								+ '<td style="text-align:left;">' + data.rows[i].content + '</td>'
-								+ '<td>' + toTime_G(data.rows[i].createdtime) + '</td>'
-								+ '<td>' + ' <input type="checkbox"  '+ (data.rows[i].status ? "checked" : "" ) +' name="open" lay-skin="switch" lay-filter="switchTest" lay-text="ON|OFF">' + '</td>'
-								+ '</tr>'
-						}
-						$("#remarklist").html(str)
-						toNull_G();
-					} else {
-						$(".nulldata").show()
-						return false;
-					}
-					form.render()
-				})
-			}
-
-			//查询
-			form.on("submit(querybtn)", function (e) {
-				queryObj.estateid = e.field.estateid;
-				queryObj.page = 1;
-				initData(queryObj)
-				return false
-			})
-			//评论审核
-			form.on('switch',function(e){
-				
-				var isShow = e.elem.checked ? 1 : 0
-				var id = $(e.elem).parents('tr').data('id')
-				$.post('/zzhnc/report/remarkAuditing', {
-						status:isShow,
-						remarkId:id
-					}, function(res){
-						
-						if(res.code == 0){
-							layer.msg('审核成功')
-						}else{
-							layer.msg(res.msg)
-						}
-				})
-				return false
-			})
-
-			//重置
-			form.on("submit(resetbtn)", function (e) {
-				$("[name=estateid]").val("")
-				queryObj = {
-					page: 1,
-					pagesize: 10,
-					estateid: ""
-				};
-				form.render();
-				initData(queryObj)
-				return false
-			})
-			//楼盘id转名称
-			function estateName(v) {
-				if (v !== null && v !== "") {
-					switch (v) {
-						case 1:
-							return "万科·皇马郦宫"
-							break;
-						case 2:
-							return "万科·四季松湖"
-							break;
-						case 3:
-							return "南部湾万科城"
-							break;
-						case 4:
-							return "万科·翡丽山"
-							break;
-						case 5:
-							return "万科·东江之星"
-							break;
-						case 6:
-							return "万科·幸福城"
-							break;
-						case 7:
-							return "万科·云城"
-							break;
-						case 8:
-							return "万科·城市花园"
-							break;
-						case 9:
-							return "万科·中央公园"
-							break;
-						case 10:
-							return "万科·珠江东岸"
-							break;
-						default:
-							return ""
-					}
-				}
-			}
-
-
-		})
-		function ToName(v) {
-			if (typeof (v) == 'string') {
-				v = (v.length > 8 ? v.substring(0, 8) : v)
-				return v
-			} else {
-				return v
-			}
-		}
-	</script>
-
-	</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/report/salereport.jsp b/WebContent/WEB-INF/jsp/pc/report/salereport.jsp
deleted file mode 100644
index b449601..0000000
--- a/WebContent/WEB-INF/jsp/pc/report/salereport.jsp
+++ /dev/null
@@ -1,134 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>销售报表</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
-	</head>
-	<style>
-	.Detailbtn .layui-form-label{
-		width:90px;	
-	}
-	.Detailbtn .layui-input-inline{
-		width:380px !important;
-	}
-	</style>
-	<body class="wrap">
-		<form class="layui-form">
-			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
-				<div class="layui-input-inline" style="width: 150px;">
-					<input type="text" class="layui-input" name="keyword" placeholder="关键字" />
-				</div>
-				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
-				<button class="layui-btn layui-btn-primary" lay-submit lay-filter="resetbtn" type="reset">重置</button>
-			</div>
-		</form>
-		<table class="layui-table">
-			<thead>
-				<tr>
-					<th style="width:30px;">No</th>
-					<th style="min-width: 60px;">销售人员</th>
-					<th style="min-width: 80px;">楼盘</th>
-					<th style="min-width: 56px;">粉丝数量</th>
-					<th style="min-width: 70px;">拨打电话数</th>
-					<th style="min-width: 84px;">回复信息数量</th>
-				</tr>
-			</thead>
-				
-			<tbody id="salelist">
-			
-			</tbody>
-		</table>
-		<div class="nulldata">暂无数据</div>
-		<div id="page"></div>
-		
-	</body>
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-	<script>
-		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
-			var form = layui.form(),
-				element = layui.element(),
-				laydate = layui.laydate,
-				layer = layui.layer,
-				laypage = layui.laypage;
-			
-			var queryObj={
-				page : 1,
-				keyword : ""
-			};
-			
-			initData(queryObj);
-
-			function initData(queryObj){
-				$.post("/zzhnc/report/getSalesReportList",queryObj,function(data){
-					console.log(data)
-					data=data.data;
-					
-					laypage({
-						cont: 'page',
-						pages: data.totalPages, 
-						curr: queryObj.page,
-						skip: true,
-						jump: function(obj, first) {
-							if(!first) {
-								queryObj.page = obj.curr
-								initData(queryObj)
-							}
-						}
-					});
-					
-					$("#salelist").html("")
-					
-					if(data.rows.length>0){
-						$(".nulldata").hide()
-						var str="";
-						for(var i=0;i<data.rows.length;i++){
-							str+='<tr>'
-								+'<td>'+ ((data.page - 1) * data.pageSize + i + 1) +'</td>'
-								+'<td>'+ data.rows[i].name +'</td>'
-								+'<td>'+ data.rows[i].projectname +'</td>'
-								+'<td>'+ data.rows[i].fanscount +'</td>'
-								+'<td>'+ data.rows[i].callcount +'</td>'
-								+'<td>'+ data.rows[i].chatcount +'</td>'
-								+'</tr>'
-						}
-						$("#salelist").html(str)
-						toNull_G();
-					}else{
-						$(".nulldata").show()
-						return false;
-					}
-				})
-			}
-			
-			//查询
-			form.on("submit(querybtn)", function(e){
-				queryObj.keyword=e.field.keyword;
-				queryObj.page=1;
-				initData(queryObj)
-				return false
-			})
-			
-			//重置
-			form.on("submit(resetbtn)", function(e){
-				$("[name=keyword]").val("")
-				queryObj={
-						page : 1,
-						keyword : ""
-				};
-				form.render();
-				initData(queryObj)
-				return false
-			})
-
-		})
-	</script>
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/report/winningrecord.jsp b/WebContent/WEB-INF/jsp/pc/report/winningrecord.jsp
deleted file mode 100644
index ac2cd6a..0000000
--- a/WebContent/WEB-INF/jsp/pc/report/winningrecord.jsp
+++ /dev/null
@@ -1,167 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>中奖记录</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
-	</head>
-	<style>
-	.Detailbtn .layui-form-label{
-		width:90px;	
-	}
-	.Detailbtn .layui-input-inline{
-		width:380px !important;
-	}
-	.floatR{
-		float: right;
-		line-height: 36px;
-    	padding-right: 40px;
-		margin-top: 20px;
-	}
-	.floatR span{
-		color: red;
-		font-size: 1.4em;
-	}
-	</style>
-	<body class="wrap">
-		<div class="layui-form">
-			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
-				<div class="layui-input-inline" style="width: 140px;">
-					<input type="number" class="layui-input" name="turn" placeholder="轮次（数字）" />
-				</div>
-				<div class="layui-input-inline" style="width: 140px;">
-					<select name="status">
-						
-						<option value="100">全部</option>
-						<option value="0">未中奖</option>
-						<option value="1" selected>中奖</option>
-					</select>
-				</div>
-				<div class="layui-input-inline" style="width: 140px;">
-					<input type="text" class="layui-input" name="keyword" placeholder="关键字" />
-				</div>
-				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
-				<button class="layui-btn layui-btn-primary resetBtn" type="reset">重置</button>
-				<div class="floatR">已中奖金额：<span id="moneySum"></span></div>
-			</div>
-			
-		</div>
-		<table class="layui-table">
-			<thead>
-				<tr>
-					<th style="width:30px;">No</th>
-					<th style="min-width: 200px;">中奖人员</th>
-					<th style="width:50px">轮次</th>
-					<th style="min-width: 80px;">红包</th>
-					<th style="min-width: 120px;">时间 </th>
-				</tr>
-			</thead>
-				
-			<tbody id="tablelist">
-				
-			</tbody>
-		</table>
-		<div class="nulldata">暂无数据</div>
-		<div id="page"></div>
-		
-	</body>
-	
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-	<script>
-		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
-			var form = layui.form(),
-				element = layui.element(),
-				laydate = layui.laydate,
-				layer = layui.layer,
-				laypage = layui.laypage;
-
-			var queryObj = {
-					page: 1,
-					pagesize:10,
-					turn:"0",
-					status:1,
-					keyword: null
-				} //查询条件
-			//查询
-			 form.on('submit(querybtn)', function(data){
-				 queryObj=data.field;
-				 queryObj.page=1;
-				 queryObj.keyword=$("input[name=keyword]").val();
-				 queryObj.turn=$("input[name=turn]").val();
-				 queryObj.status = (queryObj.status == 100 ? "" : queryObj.status)
-				 queryObj.pagesize=10,
-			      initdata(queryObj);
-			      form.render();
-			  });
-			 $(".resetBtn").on("click",function(){
-				$("input[name=keyword]").val("");
-				$("input[name=turn]").val("");
-				$('select[name=status]').val("")
-				queryObj.turn="";
-				queryObj.keyword=null;
-				queryObj.status = ''
-				form.render();
-				initdata(queryObj);
-			}) 
-			//初始化数据
-			initdata(queryObj);
-			function initdata(queryObj){
-				$.post("/zzhnc/activity/getLotteryLogList",queryObj,function(data){
-					data=data.data;
-					$('#moneySum').text(data.sum + '元')
-					console.log(data)
-					  laypage({
-						cont: 'page',
-						pages: data.totalPages, //总页数
-						curr: queryObj.page,
-						skip: true,
-						jump: function(obj, first) {
-							if(!first) {
-								queryObj.page = obj.curr
-								initdata(queryObj);
-							}
-
-						}
-					});   
-					var str="";
-					 if(data.rows.length<1){
-						$(".nulldata").show();
-					}else{
-						$(".nulldata").hide();
-						for(var i=0;i<data.rows.length;i++){
-							var nick="";
-							if((data.rows[i].nickname==null||data.rows[i].nickname=="")&&(data.rows[i].logo==null||data.rows[i].logo=="")){
-								nick='<div style="text-align:left;">未授权（id：'+ data.rows[i].id +'）</div>';
-							}else{
-								if(data.rows[i].logo==null||data.rows[i].logo==""){
-									nick='<div class="nickbox"><div id="wlogo" style="background:url(/zzhnc/res/images/default_user.png) no-repeat center;-webkit-background-size:contain;background-size:contain;"></div><span class="nick"> '+ data.rows[i].nickname +'</span></div>';
-								}else{
-									nick='<div class="nickbox"><div id="wlogo" style="background:url('+data.rows[i].logo+') no-repeat center;-webkit-background-size:contain;background-size:contain;"></div><span class="nick"> '+ data.rows[i].nickname +'</span></div>';
-								}
-							}
-							str+='<tr data-id='+ data.rows[i].id +'>'
-								+'<td>'+ ((data.page - 1) * data.pageSize + i + 1) +'</td>'
-								+'<td style="padding-left:40px;">'+ nick +'</td>'
-								+'<td>'+ data.rows[i].turn +'</td>'
-								+'<td>'+ data.rows[i].mny+'元</td>'
-								+'<td>'+ toTime_G(data.rows[i].createdtime)+'</td>'
-								+'</tr>';
-						}
-					} 
-					
-					$("#tablelist").html(str);
-					toNull_G();
-				})
-			}
-
-		})
-	</script>
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/sale/sale.jsp b/WebContent/WEB-INF/jsp/pc/sale/sale.jsp
deleted file mode 100644
index db67dca..0000000
--- a/WebContent/WEB-INF/jsp/pc/sale/sale.jsp
+++ /dev/null
@@ -1,575 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>销售人员</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc//res/css/basic.css">
-		<link rel="stylesheet" href="http://at.alicdn.com/t/font_450595_ep4v634hi0vbo6r.css">
-		
-	</head>
-	<style>
-	.Detailbtn .layui-form-label{
-		width:90px;	
-	}
-	/* .Detailbtn .layui-input-inline{
-		width:380px !important;
-	} */
-	#upload .layui-upload-file{
-		display:none;
-	}
-	.Detailbtn .layui-form-selected dl{
-		max-height:200px;
-		width:320px;
-	}
-	.layui-form-checkbox i{
-		margin-top:4px;
-	}
-	.layui-form-radio{
-		margin:0;
-		padding:0;
-	}
-	.layui-form-radio i{
-		margin-right:0;
-	}
-	</style>
-	<body class="wrap">
-		<div class="layui-form">
-			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
-				
-				 <div class="layui-input-inline" style="width: 140px;">
-					<select name="projectid" class="productid1" lay-search="">
-						<option value="">项目名称</option>
-					</select>
-				</div> 
-				<div class="layui-input-inline" style="width: 140px;">
-					<select name="isvanker" >
-						<option value="">是否为万小二</option>
-						<option value="true">是</option>
-						<option value="false">否</option>
-					</select>
-				</div> 
-				<div class="layui-input-inline" style="width: 140px;">
-					<input type="text" class="layui-input" name="keyword" placeholder="关键字" />
-				</div>
-				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
-				<button class="layui-btn layui-btn-primary resetBtn" >重置</button> 
-				<a class="layui-btn layui-btn-warm createBtn" href="#"><i class="iconfont icon-jia"></i> 添加销售员</a>
-				<div id="upload" style="display:inline-block;"><a class="layui-btn layui-btn-warm" href="#"><i class="iconfont icon-daoru"></i> 导入销售员</a></div>
-			</div>
-		</div>
-		<table class="layui-table">
-			<thead>
-				<tr>
-					<th style="width:30px;">No</th>
-					<th style="min-width: 60px;">姓名</th>
-					<th style="min-width: 80px;">手机</th>
-					<th style="min-width: 120px;">项目名称</th>
-					<th style="min-width:100px;">是否为万小二</th>
-					<td style="min-width: 120px;">小程序openid </td>
-					<td style="min-width: 120px;">公众号openid</td>
-					<td style="min-width: 120px;">海报地址 </td>
-					<td style="min-width: 120px;">海报临时素材</td>
-					<th style="min-width:80px;">是否有效</th>
-					<th style="min-width: 80px;">修改时间 </th>
-					<th style="min-width: 90px;">上次登录时间</th>
-					<th style="min-width: 146px;">操作</th>
-				</tr>
-			</thead>
-				
-			<tbody id="tablelist">
-				
-			</tbody>
-		</table>
-		<div class="nulldata">暂无数据</div>
-		<div class="layui-form-mid layui-word-aux" style="padding-top:0px;color:#666;">注意：导入销售员数据时，请上传以<i style="color:red;">.xls</i>或<i style="color:red;">.xlsx</i>为后缀名的文件</div>
-		<div id="page"></div>
-	</body>
-	<form class="layui-form Detailbtn" >
-	 <div class="layui-form-item">
-		    <label class="layui-form-label">项目名称</label>
-		    <div class="layui-input-inline" style="width:320px;">
-		      <select name="projectid" lay-verify="required" class="projectid2" lay-search="">
-		        <option value="0">全部</option>
-		      </select>
-		    </div>
-		  </div>
-		  <div class="layui-form-item">
-		    <label class="layui-form-label"><i style="color:red;margin-right:5px;">*</i>姓名</label>
-		    <div class="layui-input-inline" style="width:320px;">
-		      <input type="text" name="name" required  lay-verify="required" placeholder="姓名" autocomplete="off" class="layui-input">
-		    </div>
-		</div>
-		  <div class="layui-form-item">
-		    <label class="layui-form-label"><i style="color:red;margin-right:5px;">*</i>手机</label>
-		    <div class="layui-input-inline" style="width:320px;">
-		      <input type="text" name="phone" required  lay-verify="required" placeholder="手机" autocomplete="off" class="layui-input">
-		    </div>
-		</div>
-		
-		<div class="layui-form-item" style="margin-left:120px;">
-		    <div class="layui-input-inline">
-			 	<input type="checkbox" name="isVanker" title="标记为万小二" lay-skin="primary" >
-			 </div>
-			  <div class="layui-input-inline">
-			  	<input type="checkbox" name="isValid" title="标记为无效" lay-skin="primary" >
-			 </div>
-		</div>
-	  </form>
-	 <div class="layui-form transferFans" style="padding:10px; display: none;">
-	  	<div class="layui-input-inline" style="width: 140px;">
-			<input type="text" name="keyword1" class="layui-input" />
-		</div> 
-		<button class="layui-btn querybtn1" lay-submit lay-filter="querybtn1" style="margin-left:10px;">查询</button>
-		 <table class="layui-table">
-		 	<thead>
-		 		<tr>
-		 			<th></th>
-		 			<th>姓名</th>
-		 			<th>手机</th>
-		 			<th>项目名称</th>
-		 		</tr>
-		 	</thead>
-		 	<tbody class="salelist">
-		 		
-		 	</tbody>
-		 </table>
-		 <div class="nodata">暂无数据</div>
-		 <div id="salePage"></div>
-	  </div>
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="/zzhnc//res/plugins/layui/layui.js" charset="utf-8"></script>
-	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-	<script>
-	
-	layui.use(['form', 'element', 'laydate', 'layer', 'laypage',"upload"], function() {
-		var form = layui.form(),
-			element = layui.element(),
-			laydate = layui.laydate,
-			layer = layui.layer,
-			laypage = layui.laypage,
-			$ = layui.jquery,
-			upload = layui.upload;
-		
-		//下拉项目
-		$.post("/zzhnc/project/getAllProjects",function(data){
-			console.log(data);
-			var str="";
-			for(var i=0;i<data.data.length;i++){
-				str+='<option value='+ data.data[i].id +'>'+ data.data[i].name +'</option>';
-			}
-			//$("select[name=projectid]").append('<option value="0">全部</option>');
-			$("select[name=projectid]").append(str);
-			form.render();
-		})
-		
-		var queryObj = {
-				page: 1,
-				keyword: null,
-				projectid: null,
-				isvanker:null
-			} //查询条件
-		//查询
-		 form.on('submit(querybtn)', function(data){
-			 queryObj.productid=$(".queryObj").val();
-			 queryObj=data.field;
-			 queryObj.page=1;
-		      initdata(queryObj);
-		      form.render();
-		  });
-		
-		 $(".resetBtn").on("click",function(){
-			$("input[name=keyword]").val("");
-			$("select[name=projectid]").val("");
-			$("select[name=isvanker]").val("");
-			form.render();
-			queryObj.keyword=null;
-			queryObj.projectid=null;
-			queryObj.isvanker=null;
-			initdata(queryObj);
-		}) 
-		//导入销售员
-		 //指定允许上传的文件类型
-		  upload.render({
-		    elem: '#upload'
-		    ,url: '/zzhnc/sale/ExcelSales'
-		    ,accept: 'file' //普通文件
-		   	,exts: 'xls|xlsx' //只允许表格
-		    ,done: function(data){
-		      console.log(data);
-		      if(data.code==0){
-					top.layer.msg("导入成功");
-					initdata(queryObj);
-				}else{
-					top.layer.msg(data.msg);
-				}
-		    }
-		  });
-		//初始化数据
-		initdata(queryObj);
-		function initdata(queryObj){
-			
-			$.post("/zzhnc/sale/getSalesList",queryObj,function(data){
-				data=data.data;
-				console.log(data)
-				  laypage({
-					cont: 'page',
-					pages: data.totalPages, //总页数
-					curr: queryObj.page,
-					skip: true,
-					jump: function(obj, first) {
-						if(!first) {
-							queryObj.page = obj.curr
-							initdata(queryObj);
-						}
-
-					}
-				});  
-				var str="";
-				if(data.rows.length<1){
-					$(".nulldata").show();
-				}else{
-					$(".nulldata").hide();
-					for(var i=0;i<data.rows.length;i++){
-						str+='<tr data-id='+ data.rows[i].id +'>'
-							+'<td>'+ ((data.page - 1) * data.pageSize + i + 1) +'</td>'
-							+'<td>'+ data.rows[i].name+'</td>'
-							+'<td>'+ data.rows[i].phone+'</td>'
-							+'<td style="text-align:left;">'+ data.rows[i].projectname +'</td>'
-							+'<td>'+ Judge(data.rows[i].isvanker) +'</td>'
-							+'<td>'+ data.rows[i].miniopenid +'</td>'
-							+'<td>'+ data.rows[i].wxopenid +'</td>'
-							+'<td>'+ data.rows[i].imgurl +'</td>'
-							+'<td>'+ data.rows[i].mediaid +'</td>'
-							+'<td>'+ virfil(data.rows[i].isvalid) +'</td>'
-							+'<td>'+ toTime_G(data.rows[i].updatedtime) +'</td>'
-							+'<td>'+ toTime_G(data.rows[i].lastlogintime) +'</td>'
-							+'<td>'
-							+'<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>'
-							+'<a href="#" class="layui-btn layui-btn-mini transferBtn">转移粉丝</a>'
-							+'<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>'
-							+'</td>'
-							+'</tr>';
-					}
-				}
-				
-				$("#tablelist").html(str);
-				toNull_G();
-			})
-		}
-			
-		//添加销售
-		$(document).on("click",".createBtn",function(){
-			layer.open({
-				type:1,
-				title:'添加销售',
-				area:["600px","380px"],
-				content:$(".Detailbtn"),
-				btnAlign:'c',
-				btn:["确定","取消"],
-				yes:function(index,layero){
-					var name=$("input[name=name]").val();
-					var phone=$("input[name=phone]").val();
-					var projectid=$(".projectid2").val();
-					var isVanker=false;//默认不是万小二
-					var isValid=true;//默认有效
-					if($("input[name=isVanker]").is(":checked")){
-						isVanker=true;
-					}
-					
-					if($("input[name=isValid]").is(":checked")){
-						isValid=false;
-					}
-					if(name==""){
-						top.layer.msg("请填写姓名");
-						return false;
-					}
-					if(phone==""){
-						top.layer.msg("请填写手机号");
-						return false;
-					}else{
-						if(!(/^1[34578]\d{9}$/.test(phone))) {
-							top.layer.msg("手机号码有误，请重填");
-							return false;
-						}
-					}
-					if(projectid==""||projectid==null){
-						projectid="0"
-					}
-					$.post("/zzhnc/sale/addsales",{
-						name:name,
-						phone:phone,
-						projectid:projectid,
-						isVanker:isVanker,
-						isValid:isValid
-					},function(data){
-						console.log(data);
-						if(data.code==0){
-							top.layer.msg("添加成功");
-							layer.close(index);
-							queryObj.page=1;
-							initdata(queryObj)
-							$("input[name=name]").val("");
-							$("input[name=phone]").val("");
-							$(".projectid2").val("");
-							$("input[name=isVanker]").attr("checked",false);
-							$("input[name=isValid]").attr("checked",false);
-							form.render();
-						}else{
-							top.layer.msg(data.msg);
-						}
-					}) 
-					
-					
-				},
-				btn2:function(index,layero){
-					layer.close(index);
-				},
-				success:function(){
-					$("input[name=name]").val("");
-					$("input[name=phone]").val("");
-					$(".projectid2").val("");
-					form.render();
-				}
-					
-			})
-		})
-		
-		//修改销售
-		$(document).on("click",".updataBtn",function(){
-			var id=$(this).parents("tr").attr("data-id");
-			layer.open({
-				type:1,
-				title:'修改销售',
-				area:["600px","380px"],
-				content:$(".Detailbtn"),
-				btnAlign:'c',
-				btn:["确定","取消"],
-				yes:function(index,layero){
-					var name=$("input[name=name]").val();
-					var phone=$("input[name=phone]").val();
-					var projectid=$(".projectid2").val();
-					var isVanker=false;//默认不是万小二
-					var isValid=true;//默认有效
-					if($("input[name=isVanker]").is(":checked")){
-						isVanker=true;
-					}
-					
-					if($("input[name=isValid]").is(":checked")){
-						isValid=false;
-					}
-					if(name==""){
-						top.layer.msg("请填写姓名");
-						return false;
-					}
-					if(phone==""){
-						top.layer.msg("请填写手机号");
-						return false;
-					}else{
-						if(!(/^1[34578]\d{9}$/.test(phone))) {
-							top.layer.msg("手机号码有误，请重填");
-							return false;
-						}
-					}
-					if(projectid==""||projectid==null){
-						projectid="0"
-					}
-						$.post("/zzhnc/sale/updatesales",{
-							id:id,
-							name:name,
-							phone:phone,
-							projectid:projectid,
-							isVanker:isVanker,
-							isValid:isValid
-						},function(data){
-							console.log(data);
-							 if(data.code==0){
-								top.layer.msg("修改成功");
-								layer.close(index);
-								queryObj.page=1;
-								initdata(queryObj)
-							}else{
-								top.layer.msg(data.msg);
-							}
-						})
-				},
-				btn2:function(index,layero){
-					layer.close(index);
-				},
-				success:function(){
-					$.post("/zzhnc/sale/getSales",{
-						id:id
-					},function(data){
-						console.log(data);
-						  if(data.code==0){
-							$("input[name=name]").val(data.data.name);
-							$("input[name=phone]").val(data.data.phone);
-							$(".projectid2").val(data.data.projectid);
-							$("[name=isVanker]").attr("checked", data.data.isvanker);
-							$("[name=isValid]").attr("checked", !data.data.isvalid);
-							form.render();
-						}  
-					}) 
-				}
-			})
-		})
-		
-		//转移粉丝
-		$(document).on("click",".transferBtn",function(){
-			var id=$(this).parents("tr").attr("data-id");
-			layer.open({
-				type:1,
-				title:'转移粉丝到',
-				area:["600px","380px"],
-				content:$(".transferFans"),
-				btnAlign:'c',
-				btn:["确定","取消"],
-				maxmin: true,
-				yes:function(index,layero){
-					var saleid = null;
-					$(".salelist input").each(function(i,e){
-						if(e.checked){
-							saleid = $(e).val();
-						}
-					})
-					if(id == saleid){
-						top.layer.msg("不能转移粉丝给自己");
-					}else{
-						$.post("/zzhnc/sale/transferSales2Sales",{
-							oldSalesId:id,
-							salesId: saleid,
-							fansId:0
-						},function(data){
-							console.log(data); 
-							if(data.code == 0){
-								top.layer.msg("粉丝转移成功！");
-								setTimeout(function(){
-									layer.close(index);
-								},3000)
-							}else{
-								top.layer.msg(data.msg);
-							}
-						})
-					} 
-				},
-				btn2:function(index,layero){
-					layer.close(index);
-				},
-				success:function(){
-					$("[name=keyword1]").val("")
-					form.render()
-					showSaleList(1,null);
-					form.on("submit(querybtn1)", function(data){
-						showSaleList(1,data.field.keyword1);
-					})
-				}
-			})
-		})
-		
-		function showSaleList(page,keyword){
-			$.post("/zzhnc/sale/getSalesList",{
-				page:page,
-				keyword:keyword,
-				projectid:null,
-				isvanker:null
-			},function(data){
-				console.log(data);  
-				if(data.code == 0){
-					data = data.data;
-					laypage({
-						cont: "salePage",
-						pages: data.totalPages, //总页数
-						curr: page,
-						skip: true,
-						jump: function(obj, first) {
-							if(!first) {
-								page = obj.curr
-								showSaleList(page, keyword);
-							}
-						}
-					}); 
-					if(data.rows.length > 0){
-						$(".nodata").hide()
-						var str = ""
-						for(var i=0;i<data.rows.length;i++){
-							str+= '<tr>'
-				 			+'<td><input type="radio" name="salename" title=" " value="'+ data.rows[i].id +'"></td>'
-				 			+'<td>'+ data.rows[i].name +'</td>'
-				 			+'<td>'+ data.rows[i].phone +'</td>'
-				 			+'<td>'+ data.rows[i].projectname +'</td>'
-				 			+'</tr>'
-						}
-						$(".salelist").html(str)
-						form.render()
-					}else{
-						$(".nodata").show()
-						$(".salelist").html("")
-					}
-					toNull_G();
-				}else{
-					top.layer.msg(data.msg);
-				}
-			}) 
-		}
-		
-		//删除项目
-		$(document).on("click", ".deleteBtn", function() {
-			var id=$(this).parents("tr").attr("data-id");
-			layer.confirm('您确定要删除该销售吗？', {
-				btn: ['确定', '取消'] //按钮
-			}, function(index, layero) {
-				$.post( "/zzhnc/sale/deletesales",{id:id}, function(data) {
-					console.log(data)
-					if(data.code == 0) {
-						top.layer.msg("删除成功");
-						queryObj.page=1;
-						initdata(queryObj)
-						layer.close(index);
-					}else{
-						top.layer.msg(data.msg);
-					}
-				})
-			}, function(index, layero) {
-				layer.close(index);
-			});
-		});
-		
-
-	})
-	
-	function Judge(v){
-		if(v!==null&&v!==""){
-			switch(v){
-				case true:
-				 return "<div style='color:red;'>是</div>";
-				  break;
-				case false:
-					 return "否";
-				  break;
-			}
-		}else{
-			return "";
-		}
-	}
-	//是否有效
-	function virfil(v){
-		if(v!==null&&v!==""){
-			switch(v){
-				case true:
-				 return "是";
-				  break;
-				case false:
-					 return "否";
-				  break;
-			}
-		}else{
-			return "";
-		}
-	}
-	</script>
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/testue.jsp b/WebContent/WEB-INF/jsp/pc/testue.jsp
deleted file mode 100644
index 75d7565..0000000
--- a/WebContent/WEB-INF/jsp/pc/testue.jsp
+++ /dev/null
@@ -1,86 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>富文本测试</title>
-<style type="text/css">
-#connect-container {
-	float: left;
-	width: 400px
-}
-
-#connect-container div {
-	padding: 5px;
-}
-
-#console-container {
-	float: left;
-	margin-left: 15px;
-	width: 400px;
-}
-
-#console {
-	border: 1px solid #CCCCCC;
-	border-right-color: #999999;
-	border-bottom-color: #999999;
-	height: 170px;
-	overflow-y: scroll;
-	padding: 5px;
-	width: 100%;
-}
-
-#console p {
-	padding: 0;
-	margin: 0;
-}
-</style>
-
-<script src="http://cdn.sockjs.org/sockjs-0.3.min.js"></script>
-
-<script type="text/javascript">
-	 
-</script>
-</head>
-<body>
-
-	 <!-- 加载编辑器的容器 -->
-    <script id="container" name="content" type="text/plain">
-                                       这里写你的初始化内容
-    </script>
-    <!-- 配置文件 -->
-    <script type="text/javascript" src="/zzhnc/res/UE/ueditor.config.js"></script>
-    <!-- 编辑器源码文件 -->
-    <script type="text/javascript" src="/zzhnc/res/UE/ueditor.all.js"></script>
-    <!-- 实例化编辑器 -->
-    <script type="text/javascript">
-    
-    UE.Editor.prototype._bkGetActionUrl = UE.Editor.prototype.getActionUrl;
-    UE.Editor.prototype.getActionUrl = function(action) {
-        if (action == 'uploadimage' || action == 'uploadscrawl' || action == 'uploadimage') {
-            return '/zzhnc/upload/NewUploadImg';
-        } else {
-            return this._bkGetActionUrl.call(this, action);
-        }
-    }
-      //  var ue = UE.getEditor('container');
-         //实例化加入参数
-        var ue = UE.getEditor('container', {
-            autoHeight: false
-        });
-        var ue = UE.getContent();
-         //对编辑器的操作最好在编辑器ready之后再做
-        ue.ready(function() {
-          //设置编辑器的内容
-          ue.setContent('hello');
-          //获取html内容，返回: <p>hello</p>
-          var html = ue.getContent();
-          console.log("html:"+html);
-          //获取纯文本内容，返回: hello
-          var txt = ue.getContentTxt();
-          console.log("text:"+txt);
-      });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/vanker/vanker.jsp b/WebContent/WEB-INF/jsp/pc/vanker/vanker.jsp
deleted file mode 100644
index 77c0772..0000000
--- a/WebContent/WEB-INF/jsp/pc/vanker/vanker.jsp
+++ /dev/null
@@ -1,296 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>项目列表</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
-	</head>
-	<style>
-		 .layui-form-label{
-			width:90px;	
-		}
-		.Detailbtn .layui-input-inline{
-			width:380px !important;
-		} 
-	</style>
-	<body class="wrap">
-		<form class="layui-form">
-			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
-				
-				<!-- <div class="layui-input-inline producttype" style="width: 140px;">
-					<select name="producttype" >
-						<option value="">姓名</option>
-					</select>
-				</div>
-				<div class="layui-input-inline productid" style="width: 140px;">
-					<select name="productid">
-						<option value="">项目id</option>
-					</select>
-				</div>
-				<div class="layui-input-inline" style="width: 140px;">
-					<input type="text" class="layui-input" name="keyword" placeholder="关键字" />
-				</div>
-				<button class="layui-btn" lay-submit lay-filter="querybtn">查询</button>
-				<button class="layui-btn layui-btn-primary resetBtn">重置</button> -->
-				<a class="layui-btn layui-btn-warm createBtn" href="#"><i class="layui-icon">&#xe61f;</i> 添加万小二</a>
-			</div>
-		</form>
-		<table class="layui-table">
-			<thead>
-				<tr>
-					<th style="width:30px;">No</th>
-					<th style="min-width: 60px;">姓名</th>
-					<th style="min-width: 100px;">手机</th>
-					<th style="min-width: 80px;">修改时间 </th>
-					<th style="min-width: 80px;">上次登录时间</th>
-					<th style="min-width: 80px;">操作</th>
-				</tr>
-			</thead>
-				
-			<tbody id="tablelist">
-				<!-- <tr>
-					<td>No</td>
-					<td style="min-widtd: 56px;">姓名</td>
-					<td style="min-widtd: 56px;">手机</td>
-					<td style="min-widtd: 56px;">小程序openid </td>
-					<td style="min-widtd: 160px;">公众号openid</td>
-					<td style="min-widtd: 56px;">修改时间 </td>
-					<td style="min-widtd: 160px;">上次登录时间</td>
-					<td>
-						<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>
-						<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>
-					</td>
-				</tr> -->
-			</tbody>
-			</tbody>
-		</table>
-		<div class="nulldata">暂无数据</div>
-		<div id="page"></div>
-		
-	</body>
-	
-	<form class="layui-form Detailbtn" >
-		  <div class="layui-form-item">
-		    <label class="layui-form-label">姓名</label>
-		    <div class="layui-input-inline">
-		      <input type="text" name="name" required  lay-verify="required" placeholder="姓名" autocomplete="off" class="layui-input">
-		    </div>
-		</div>
-		  <div class="layui-form-item">
-		    <label class="layui-form-label">手机</label>
-		    <div class="layui-input-inline">
-		      <input type="text" name="phone" required  lay-verify="required" placeholder="手机" autocomplete="off" class="layui-input">
-		    </div>
-		</div>
-		<!--   <div class="layui-form-item">
-		    <label class="layui-form-label">小程序openid</label>
-		    <div class="layui-input-inline">
-		      <input type="text" name="title" required  lay-verify="required" placeholder="项目名称" autocomplete="off" class="layui-input">
-		    </div>
-		</div>
-		  <div class="layui-form-item">
-		    <label class="layui-form-label">公众号openid</label>
-		    <div class="layui-input-inline">
-		      <input type="text" name="title" required  lay-verify="required" placeholder="项目名称" autocomplete="off" class="layui-input">
-		    </div>
-		</div> -->
-	  
-	  </form>
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-	<script>
-		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
-			var form = layui.form(),
-				element = layui.element(),
-				laydate = layui.laydate,
-				layer = layui.layer,
-				laypage = layui.laypage;
-				var page=1;
-				
-				//初始化数据
-				initdata(page);
-				function initdata(page){
-					
-					$.post("/zzhnc/vanker/getList",{page:page},function(data){
-						data=data.data;
-						console.log(data)
-						 laypage({
-							cont: 'page',
-							pages: data.totalPages, //总页数
-							curr: page,
-							skip: true,
-							jump: function(obj, first) {
-								if(!first) {
-									page = obj.curr
-									initdata(page);
-								}
-	
-							}
-						}); 
-						var str="";
-						if(data.rows.length<1){
-							$(".nulldata").show();
-						}else{
-							$(".nulldata").hide();
-							for(var i=0;i<data.rows.length;i++){
-								str+='<tr data-id='+ data.rows[i].id +'>'
-									+'<td>'+ ((data.page - 1) * 5 + i + 1) +'</td>'
-									+'<td>'+ data.rows[i].name+'</td>'
-									+'<td>'+ data.rows[i].phone+'</td>'
-									+'<td>'+ toTime_G(data.rows[i].createdtime) +'</td>'
-									+'<td>'+ toTime_G(data.rows[i].lastlogintime) +'</td>'
-									+'<td>'
-									+'<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>'
-									+'<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>'
-									+'</td>'
-									+'</tr>';
-							}
-						}
-						
-						$("#tablelist").html(str);
-					})
-				}
-				//添加万小二
-			$(document).on("click",".createBtn",function(){
-				layer.open({
-					type:1,
-					title:'添加万小二',
-					area:["600px","380px"],
-					content:$(".Detailbtn"),
-					btnAlign:'c',
-					btn:["确定","取消"],
-					yes:function(index,layero){
-						var name=$("input[name=name]").val();
-						var phone=$("input[name=phone]").val();
-						if(name==""){
-							top.layer.msg("请填写名称");
-							return false;
-						}
-						if(phone==""){
-							top.layer.msg("请填写手机号");
-							return false;
-						}else{
-							if(!(/^1[34578]\d{9}$/.test(phone))) {
-								top.layer.msg("手机号码有误，请重填");
-								return false;
-							}
-						}
-						$.post("/zzhnc/vanker/addvanker",{
-							name:name,
-							phone:phone
-						},function(data){
-							console.log(data);
-							if(data.code==0){
-								top.layer.msg("添加成功");
-								layer.close(index);
-								initdata(page);
-							}else{
-								top.layer.msg(data.msg);
-							}
-						}) 
-					},
-					btn2:function(index,layero){
-						layer.close(index);
-					},
-					success:function(){
-						$("input[name=name]").val("");
-						$("input[name=phone]").val("");
-					}
-						
-				})
-			})
-			//修改万小二
-			$(document).on("click",".updataBtn",function(){
-				var id=$(this).parents("tr").attr("data-id");
-				layer.open({
-					type:1,
-					title:'修改万小二',
-					area:["600px","380px"],
-					content:$(".Detailbtn"),
-					btnAlign:'c',
-					btn:["确定","取消"],
-					yes:function(index,layero){
-						var name=$("input[name=name]").val();
-						var phone=$("input[name=phone]").val();
-						if(name==""){
-							top.layer.msg("请填写名称");
-							return false;
-						}
-						if(phone==""){
-							top.layer.msg("请填写手机号");
-							return false;
-						}else{
-							if(!(/^1[34578]\d{9}$/.test(phone))) {
-								top.layer.msg("手机号码有误，请重填");
-								return false;
-							}
-						}
-						$.post("/zzhnc/vanker/updatevanker",{
-							id:id,
-							name:name,
-							phone:phone
-						},function(data){
-							console.log(data);
-							 if(data.code==0){
-								top.layer.msg("修改成功");
-								layer.close(index);
-								initdata(page);
-							}else{
-								top.layer.msg(data.msg);
-							}
-						})
-					},
-					btn2:function(index,layero){
-						layer.close(index);
-					},
-					success:function(){
-						
-						$.post("/zzhnc/vanker/getVanker",{
-							id:id
-						},function(data){
-							console.log(data);
-							  if(data.code==0){
-								$("input[name=name]").val(data.data.name);
-								$("input[name=phone]").val(data.data.phone);
-							}  
-						}) 
-					}
-				})
-			})
-			
-			//删除项目
-			$(document).on("click", ".deleteBtn", function() {
-				var id=$(this).parents("tr").attr("data-id");
-				layer.confirm('您确定要删除该万小二吗？', {
-					btn: ['确定', '取消'] //按钮
-				}, function(index, layero) {
-					$.post( "/zzhnc/vanker/deletevanker",{id:id}, function(data) {
-						console.log(data)
-						if(data.code == 0) {
-							top.layer.msg("删除成功");
-							initdata(page);
-							layer.close(index);
-						}else{
-							top.layer.msg(data.msg);
-						}
-					})
-				}, function(index, layero) {
-					layer.close(index);
-				});
-			});
-
-		})
-	//验证变量是否为null
-	function nullToSpace (v) {
-	　　 return  !v && v != '0' ? '' : v;
-	}
-		
-	</script>
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/wx/wxmanage.jsp b/WebContent/WEB-INF/jsp/pc/wx/wxmanage.jsp
deleted file mode 100644
index d972669..0000000
--- a/WebContent/WEB-INF/jsp/pc/wx/wxmanage.jsp
+++ /dev/null
@@ -1,92 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-	<head>
-		<meta charset="UTF-8">
-		<title>公众号管理</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/Layuiglobal.css">
-		<link rel="stylesheet" href="/zzhnc/res/plugins/font-awesome/css/font-awesome.min.css">
-		<link rel="stylesheet" href="http://at.alicdn.com/t/font_191348_aee57zbh6jyk3xr.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">	
-	</head>
-<body>
-	<div class="layui-container" style="width: 100%;">
-		<ul class="publicbox">
-			<!-- <li class="publicbos">
-				<span style="background:url(/zzhnc/res/images/moren.jpg) no-repeat center;-webkit-background-size:contain;background-size:contain;"></span>
-				<p>微会互动</p>
-			</li>  -->
-		</ul>
-		<div style="margin-left:20px;">
-			<a type="button" class="layui-btn" id="add" href="${url}" target="_blank">添加公众号</a>
-		</div>
-		<div>
-			
-		</div>
-		<div>
-			<br/><br/>
-			<input id="mpOpenid" style="widht:150px" title="测试者的公众号openid" value="oXqmKwSoVLT31zRncvr9Q5pWiLFI"/>
-			<br/><br/>
-			<a type="button" class="layui-btn"  id="test" href="javascript:;" target="_blank" >测试发送模板消息</a>
-		</div>
-			
-	</div>
-	
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script type="text/javascript" src="/zzhnc/res/js/jquery.qqFace.js"></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-	<script src="/zzhnc/res/js/me.js"></script>
-	<script>
-	layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function(){	
-		var template_id_short="OPENTM412547082"; //客户咨询通知的模板短ID。
-		 
-		/*
-		$.post("/zzhnc/pcwx/getTemplate",{template_id_short:template_id_short},function(data){
-			if(data.msg!="") $("#info").html("模板消息已添加,TempletID=" + data.msg);			
-		})
-		*/
-		
-		 $("#addTemplate").click(function(){
-				$.post("/zzhnc/pcwx/addTemplate",{template_id_short:template_id_short},function(data){
-					console.log(data);
-					if (data.msg.indexOf("error")>-1){						
-						alert("添加失败,原因：" + data.msg);					
-					}
-					else
-					{
-						$("#info").html("模板消息已添加,TempletID=" + data.msg);	
-						alert("添加成功!");
-					}
-				})
-		})
-		
-		$("#test").click(function(){
-			var openid = $("#mpOpenid").val();
-			$.post("/zzhnc/pcwx/testSendTemplate",{mpOpenid:openid,rand:new Date().toString()},function(data){
-				alert(data);
-			})
-		})
-		
-	
-		//获取公众号
-		 $.post("/zzhnc/pcwx/getwx",function(data){
-			console.log(data)
-			if(data.code==0){
-				var str ='<li class="publicbos">'
-					+'<span style="background:url('+ data.data.headimg +') no-repeat center;-webkit-background-size:contain;background-size:contain;"></span>'
-					+'<p>'+ data.data.wxname +'</p>'
-				+'</li>';
-				$(".publicbox").html(str);
-			}else{
-				top.layer.msg(data.msg)
-			}
-			
-			
-		}) 
-		
-	})
-
-	</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/weixin/binding.jsp b/WebContent/WEB-INF/jsp/weixin/binding.jsp
deleted file mode 100644
index 6f14deb..0000000
--- a/WebContent/WEB-INF/jsp/weixin/binding.jsp
+++ /dev/null
@@ -1,181 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
-		<title>绑定销售</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/style.css" />
-		<link rel="stylesheet" href="http://at.alicdn.com/t/font_450595_9jeyu0zh091cerk9.css" />
-		<style>
-		.layui-layer-btn{
-		    padding: 0 10px 30px !important;
-		}
-		</style>
-		
-	</head>
-	<body style="background-color:#fff;">
-	<div class="bindingsection">
-		<div class="wrap">
-			<div class="bindingbox">
-					<div class="bindingbos">
-						<span>手&nbsp;&nbsp;&nbsp;机：</span><input type="tel" name="phone" /> 
-					</div>
-					<div style="position:relative;"  class="bindingbos">
-						<span>验证码：</span><input type="tel" name="verifycode" /> <button  id="getcode">获取验证码</button>
-					</div>
-				
-				<a class="sumbitbtn">绑定</a>
-			</div>
-		</div>
-		<input type="text" value="${wxCode}" name="wxCode" style="display:none;">
-		<input type="text" value="${wxMiniCode}" name="wxMiniCode" style="display:none;">
-		<input type="text" value="${linkurl}" name="linkurl" style="display:none;">
-	</div>	
-	<div class="bindinged" style="display:none;">
-		<h4><i class="iconfont icon-iconfontzhizuobiaozhun023132"></i>温馨提示</h4>
-		您的身份已认证，将为您跳转到客服页面...
-	</div>
-	</body>
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-	<script>
-	
-	var linkurl=$("input[name=linkurl]").val();
-	var wxCode=$("input[name=wxCode]").val();
-	var wxMiniCode=$("input[name=wxMiniCode]").val();
-	layui.use(['form', 'element','layer', ], function() {     
-		var form = layui.form(),
-			element = layui.element(),
-			layer = layui.layer;
-			 if(linkurl!==null&&linkurl!==""){
-				$(".bindingsection").hide();
-				$(".bindinged").show();
-				//top.layer.msg("您的身份已认证，将为您跳转到客服页面...");
-				setTimeout(function(){
-					window.location.href=linkurl;
-				},1000)
-			}else{
-				$(".bindingsection").show();
-				$(".bindinged").hide();
-			} 
-		
-			//获取手机验证码
-			$("#getcode").on("click",function(){
-				var phone=$("input[name=phone]").val();
-				if(phone==""){
-					top.layer.msg("请填写手机号");
-					return false;
-				}else{
-					if(!(/^1[34578]\d{9}$/.test(phone))) {
-						top.layer.msg("手机号码有误，请重填");
-						return false;
-					}
-					$.post("http://www.w1hd.com/api/useragent/agentcode",{phone:phone},function(data){
-						console.log(data);
-						if(data.code == 0) {
-							top.layer.msg('获取验证码成功');
-							$("#getcode").addClass('layui-btn-disabled').attr('disabled', true).css({
-								"border":"1px solid #ccc",
-								"background-color": "#eee",
-								"color": "#ccc",
-								"pointer-events": "none"
-							});
-							var i = 60;
-							var time = setInterval(function() {
-								i--;
-								$("#getcode").text(i + ' S')
-								if(i == 0) {
-									clearInterval(time);
-									$("#getcode").removeClass('layui-btn-disabled').attr('disabled', false).css({
-										"border":"1px solid #0069FE",
-										"background-color": "#fff",
-										"color": "#0069FE",
-										"pointer-events": "auto"
-									});
-									$("#getcode").text('获取验证码')
-								}
-							}, 1000)
-						}else{
-							top.layer.msg(data.msg);
-						}
-					})
-				}
-				
-				
-			})
-		
-		//提交
-		$(".sumbitbtn").on("click",function(){
-			var phone=$("input[name=phone]").val();
-			var verifycode=$("input[name=verifycode]").val();
-			if(phone==""){
-				top.layer.msg("请填写手机号");
-				return false;
-			}else{
-				if(!(/^1[34578]\d{9}$/.test(phone))) {
-					top.layer.msg("手机号码有误，请重填");
-					return false;
-				}
-			}
-			if(verifycode==""){
-				top.layer.msg("请填写验证码");
-				return false;
-			}
-		$.post("http://www.w1hd.com/api/useragent/verifycode",{
-				phone:phone,
-				verifycode:verifycode
-			},function(data){
-				console.log(data);
-				if(data.code==0){
-					//top.layer.msg("绑定成功！")
-					 $.get("/zzhnc/wx/doRegist",{
-							phone:phone,
-							wxCode:wxCode,
-							wxMiniCode:wxMiniCode
-						},function(data){
-							console.log(data);
-							if(data.code==0){
-								var saleid=data.data.id;
-								layer.open({
-									type:1,
-									title:false,
-									offset:'30%',
-									content:'<div style="text-align:center;padding:3rem 5rem 2rem;font-size:1.04rem; ">恭喜您，绑定成功</div>',
-									btnAlign:'c',
-									btn:["确定"],
-									yes:function(index,layero){
-										layer.close(index);
-										/* $("input[name=phone]").val("");
-										$("input[name=verifycode]").val(""); */
-
-										window.location.href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx093940730981162c&redirect_uri="+encodeURI("http://mini.weiyisz.com/wx/chatListView?salesId="+saleid+"")+"&response_type=code&scope=snsapi_base&state=&component_appid=wxce99a8296784e3cc#wechat_redirect";
-
-									}
-								})
-							}else{
-								layer.open({
-									type:1,
-									title:false,
-									offset:'30%',
-									content:'<div style="text-align:center;padding:3rem 5rem 2rem;font-size:1.04rem; ">很遗憾，绑定失败</div>',
-									btnAlign:'c',
-									btn:["确定"],
-									yes:function(index,layero){
-										layer.close(index);
-									}
-								})
-							}
-						})  
-					
-				}else{
-					top.layer.msg(data.msg);
-				}
-			})
-		})
-		
-		  });
-	</script>
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/weixin/chat.1.jsp b/WebContent/WEB-INF/jsp/weixin/chat.1.jsp
deleted file mode 100644
index 3d8e793..0000000
--- a/WebContent/WEB-INF/jsp/weixin/chat.1.jsp
+++ /dev/null
@@ -1,1225 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-    <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-
-    <html>
-
-    <head>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
-        <meta name="apple-mobile-web-app-capable" content="yes">
-        <meta name="apple-mobile-web-app-status-bar-style" content="black">
-        <meta name="format-detection" content="telephone=no">
-        <meta http-equiv="X-UA-Compatible" content="ie=edge">
-        <title>在线客服</title>
-        <link rel="stylesheet" href="../res/css/layui.mobile.css">
-        <link rel="stylesheet" href="../res/css/layim.css">
-        <link rel="stylesheet" href="http://at.alicdn.com/t/font_191348_e0uxemmn36myrpb9.css">
-        <style>
-            html,
-            body {
-                height: 100%;
-                overflow: hidden;
-                background-color: #efefef;
-            }
-
-            .icon-fanhuijiantou {
-                font-size: 18px;
-            }
-
-            #faceBox {
-                display: none;
-            }
-
-            .isShow {
-                /* display: none; */
-            }
-
-            #backChat {
-                position: fixed;
-                width: 20px;
-                height: 20px;
-                top: 20px;
-                left: 20px;
-                background: rgba(153, 153, 153, 0.5);
-                border-radius: 50%;
-                z-index: 198910141;
-            }
-
-            .dot {
-                position: absolute;
-                top: 2px;
-                left: 36px;
-                border-radius: 50%;
-                background-color: red;
-                display: inline-block;
-                width: 16px;
-                height: 16px;
-                font-size: 8px !important;
-                text-align: center;
-                line-height: 16px;
-                color: #fff;
-            }
-
-            .icon-xiaolian {
-                color: #666;
-                font-size: 24px;
-                line-height: 40px;
-                padding-right: 4px;
-                background-color: #fff;
-                border-radius: 0 3px 3px 0;
-            }
-
-            .model_box {
-                position: fixed;
-                top: 0;
-                left: 0;
-                width: 100%;
-                height: 100%;
-                display: none;
-                text-align: center;
-                flex-direction: column;
-                align-items: center;
-                justify-content: center;
-                z-index: 198910141;
-                color: #666;
-                padding: 0 20px;
-                box-sizing: border-box;
-            }
-
-            .tip_box {
-                font-size: 24px;
-            }
-
-            .tip_content_box {
-                font-size: 16px;
-            }
-
-            .layim-chat-footer {
-                height: 50px;
-            }
-
-            .layim-user-box {
-                display: flex;
-            }
-
-            .layim-chat-mine .layim-user-box {
-                justify-content: flex-end;
-            }
-
-            .username_box {
-                display: inline-block;
-                max-width: 100px;
-                overflow: hidden;
-                text-overflow: ellipsis;
-            }
-
-            .time_box {
-                margin: 0 20px;
-                display: inline-block;
-            }
-
-            .layim-chat-main,
-            .layim-content {
-                top: 10px;
-                /* bottom: 70px; */
-            }
-            .contInfo img{
-                position: initial !important;
-                width: 16px !important;
-                height: 16px !important;
-            }
-            .isRobot{
-                display: none;
-                width: 100%;
-                background-color: #2f9833 !important;
-            }
-            /* 加大列表行高 */
-            #chatListBox li{        
-                padding: 8px 15px 8px 60px;
-                border-bottom: 1px solid #efefef;
-            }
-
-            .layui-layim-list li img{
-                top:11px;
-            }
-            .layui-m-layerchild,.layim-panel, .layim-title,.layim-chat-main, .layim-content,.layui-layim,.layim-chat-footer,.layim-chat-main ul li,
-            .layui-layim-face,.layim-chat-user,.layim-chat-user cite,.layim-chat-text{
-                z-index: 1;
-            }
-            *{
-                z-index: 1;
-            }
-        </style>
-    </head>
-
-    <body>
-
-        <div id="main" class="layui-m-layer layui-m-layer1" index="0">
-            <div class="layui-m-layermain" style="z-index:19891014">
-                <div class="layui-m-layersection">
-                    <div class="layui-m-layerchild  layui-m-anim--1">
-                        <div class="layui-m-layercont">
-                            <div class="layim-panel layui-m-anim-right">
-                                <!-- <div class="layim-title" style="background-color: #36373C;">
-                                    <p>我的IM
-                                        <span class="layim-chat-status"></span>
-                                    </p>
-                                </div> -->
-                                <div class="layui-unselect layim-content">
-                                    <div class="layui-layim" style="top:0;bottom:0;overflow-y:initial">
-                                        <div class="layim-tab-content layui-show" style="overflow-y:scroll;width:100%;height:100%;">
-                                            <ul class="layim-list-friend">
-                                                <ul class="layui-layim-list layui-show layim-list-history" id="chatListBox">
-                                                    <!-- <li layim-event="chat" data-type="history" data-index="0">
-                                                        <div>
-                                                            <img src="http://tp1.sinaimg.cn/1571889140/180/40030060651/1">
-                                                            <span class="dot">4</span>
-                                                        </div>
-                                                        <span class="name">客户11111</span>
-                                                        <p>123</p>
-                                                        <span class="layim-msg-status">new</span>
-                                                    </li>
-                                                    <li layim-event="chat" data-type="history" data-index="1001">
-                                                        <div>
-                                                            <img src="http://tp1.sinaimg.cn/1571889140/180/40030060651/1">
-                                                            <span class="dot">12</span>
-                                                        </div>
-                                                        <span class="name">客户11113</span>
-                                                        <p>123</p>
-                                                        <span class="layim-msg-status">new</span>
-                                                    </li> -->
-                                                </ul>
-                                            </ul>
-                                        </div>
-
-                                    </div>
-
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-
-
-
-
-
-        <div id="chatBox" class="layui-m-layer layui-m-layer1 layui-hide ">
-            <div class="layui-m-layermain" style="z-index:19891014">
-                <div class="layui-m-layersection">
-                    <div class="layui-m-layerchild  layui-m-anim--1">
-                        <div class="layui-m-layercont">
-                            <div class="layim-panel layui-m-anim-left">
-                                <div id="backChat">
-                                    <i class="iconfont icon-fanhuijiantou"></i>
-                                    <span id="chatName" style="display:none;"></span>
-                                    <span class="layim-chat-status" style="display:none;"></span>
-                                </div>
-
-                                <div class="layui-unselect layim-content">
-                                    <div class="layim-chat layim-chat-friend" id="chatInfoBox">
-                                        <div class="layim-chat-main layui-hide" data-fansid="0">
-                                            <ul>
-                                                <li class="layim-chat-system">
-                                                    <span>10-27 16:30</span>
-                                                </li>
-                                                <li class="layim-chat-li layim-chat-mine">
-                                                    <div class="layim-chat-user">
-                                                        <img src="http://tp4.sinaimg.cn/1345566427/180/5730976522/0">
-                                                        <cite>万小二</cite>
-                                                    </div>
-                                                    <div class="layim-chat-text">我是第一条</div>
-                                                </li>
-
-                                                <li class="layim-chat-li">
-                                                    <div class="layim-chat-user">
-                                                        <img src="http://tp4.sinaimg.cn/1345566427/180/5730976522/0">
-                                                        <cite>我是客户</cite>
-                                                    </div>
-                                                    <div class="layim-chat-text">嗨，欢迎体验LayIM。演示标记：1508565819152</div>
-                                                </li>
-
-                                            </ul>
-                                        </div>
-                                        <div class="layim-chat-main layui-hide" data-fansid="1001">
-                                            <ul>
-                                                <li class="layim-chat-system">
-                                                    <span>10-27 16:30</span>
-                                                </li>
-                                                <li class="layim-chat-li layim-chat-mine">
-                                                    <div class="layim-chat-user">
-                                                        <img src="http://tp4.sinaimg.cn/1345566427/180/5730976522/0">
-                                                        <cite>万小二</cite>
-                                                    </div>
-                                                    <div class="layim-chat-text">第二条</div>
-                                                </li>
-
-                                                <li class="layim-chat-li">
-                                                    <div class="layim-chat-user">
-                                                        <img src="http://tp4.sinaimg.cn/1345566427/180/5730976522/0">
-                                                        <cite>我是客户</cite>
-                                                    </div>
-                                                    <div class="layim-chat-text">嗨，欢迎体验LayIM。演示标记：1508565819152</div>
-                                                </li>
-
-                                            </ul>
-                                        </div>
-                                        <div class="layim-chat-footer">
-                                            <div class="layim-chat-send">
-                                                <input class="noRobot" type="text" autocomplete="off" id="content">
-                                                <span class="noRobot iconfont icon-xiaolian" title="选择表情"></span>
-                                                <button class="noRobot layim-send layui-disabled" id="send">发送</button>
-                                                <button class="isRobot" id="killRobot">接入</button>
-                                            </div>
-                                            <!-- <div class="layim-chat-tool">
-                                                
-                                                <span class="iconfont icon-xiangji layim-tool-image" title="上传图片" layim-event="image"><input type="file" name="file" accept="image/*"></span>
-                                            </div> -->
-                                            
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-
-
-        <div id="faceBox" class="layui-m-layer layui-m-layer1" style="height:88%;">
-            <div class="layui-m-layermain" style="z-index:19891014">
-                <div class="layui-m-layersection">
-                    <div class="layui-m-layerchild layim-layer layui-m-anim-scale">
-                        <div class="layui-m-layercont">
-                            <ul class="layui-layim-face">
-
-                                        
-                                <li title="[微笑]" data-code="/::)">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102755304.png">
-                                </li>
-                                <li title="[撇嘴]" data-code="/::~">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102806118.png">
-                                </li>
-                                <li title="[色]" data-code="/::B">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102811204.png">
-                                </li>
-                                <li title="[发呆]" data-code="/::|">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102816272.png">
-                                </li>
-                                <li title="[得意]" data-code="/:8-)">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102821779.png">
-                                </li>
-                                <li title="[流泪]" data-code="/::<">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102826616.png">
-                                </li>
-                                <li title="[害羞]" data-code="/::$">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102831909.png">
-                                </li>
-                                <li title="[闭嘴]" data-code="/::X">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102836860.png">
-                                </li>
-                                <li title="[睡]" data-code="/::Z">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102841446.png">
-                                </li>
-                                <li title="[大哭]" data-code="/::’(">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102846605.png">
-                                </li>
-                                <li title="[尴尬]" data-code="/::-|">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102851155.png">
-                                </li>
-                                <li title="[发怒]" data-code="/::@">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102856815.png">
-                                </li>
-                                <li title="[调皮]" data-code="/::P">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102901326.png">
-                                </li>
-                                <li title="[呲牙]" data-code="/::D">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102906485.png">
-                                </li>
-                                <li title="[惊讶]" data-code="/::O">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102911867.png">
-                                </li>
-                                <li title="[难过]" data-code="/::(">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102916775.png">
-                                </li>
-                                <li title="[酷]" data-code="/::+">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102921112.png">
-                                </li>
-                                <li title="[冷汗]" data-code="/:–b">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102926579.png">
-                                </li>
-                                <li title="[抓狂]" data-code="/::Q">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102931107.png">
-                                </li>
-                                <li title="[吐]" data-code="/::T">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102936174.png">
-                                </li>
-                                <li title="[偷笑]" data-code="/:,@P">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102941562.png">
-                                </li>
-                                <li title="[愉快]" data-code="/:,@-D">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102946241.png">
-                                </li>
-                                <li title="[白银]" data-code="/::d">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102951305.png">
-                                </li>
-                                <li title="[傲慢]" data-code="/:,@o">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102956983.png">
-                                </li>
-                                <li title="[饥饿]" data-code="/::g">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103001341.png">
-                                </li>
-                                <li title="[困]" data-code="/:|-)">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103006230.png">
-                                </li>
-                                <li title="[恐慌]" data-code="/::!">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103011620.png">
-                                </li>
-                                <li title="[流汗]" data-code="/::L">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103016770.png">
-                                </li>
-                                <li title="[憨笑]" data-code="/::>">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103021180.png">
-                                </li>
-                                <li title="[悠闲]" data-code="/::,@">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103026333.png">
-                                </li>
-                                <li title="[奋斗]" data-code="/:,@f">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103031826.png">
-                                </li>
-                                <li title="[咒骂]" data-code="/::-S">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103036856.png">
-                                </li>
-                                <li title="[疑问]" data-code="/:?">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103041851.png">
-                                </li>
-                                <li title="[嘘]" data-code="/:,@x">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103046204.png">
-                                </li>
-                                <li title="[晕]" data-code="/:,@@">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103051515.png">
-                                </li>
-                                <li title="[疯了]" data-code="/::8">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103056368.png">
-                                </li>
-                                <li title="[哀]" data-code="/:,@!">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103101584.png">
-                                </li>
-                                <li title="[骷髅]" data-code="/:!!!">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103106639.png">
-                                </li>
-                                <li title="[敲打]" data-code="/:xx">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103111714.png">
-                                </li>
-                                <li title="[再见]" data-code="/:bye">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103116995.png">
-                                </li>
-                                <li title="[擦汗]" data-code="/:wipe">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103121307.png">
-                                </li>
-                                <li title="[抠鼻]" data-code="/:dig">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103126628.png">
-                                </li>
-                                <li title="[鼓掌]" data-code="/:handclap">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103131537.png">
-                                </li>
-                                <li title="[糗大了]" data-code="/:&amp;-(">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103136922.png">
-                                </li>
-                                <li title="[坏笑]" data-code="/:B-)">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103141708.png">
-                                </li>
-                                <li title="[左哼哼]" data-code="/:<@">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103146409.png">
-                                </li>
-                                <li title="[右哼哼]" data-code="/:@>">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103151786.png">
-                                </li>
-                                <li title="[哈欠]" data-code="/::-O">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103156150.png">
-                                </li>
-                                <li title="[鄙视]" data-code="/:>-|">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103201493.png">
-                                </li>
-                                <li title="[委屈]" data-code="/:P-(">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103206968.png">
-                                </li>
-                                <li title="[快哭了]" data-code="/::’|">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103211938.png">
-                                </li>
-                                <li title="[阴险]" data-code="/:X-)">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103216563.png">
-                                </li>
-                                <li title="[亲亲]" data-code="/::*">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103221494.png">
-                                </li>
-                                <li title="[吓]" data-code="/:@x">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103226447.png">
-                                </li>
-                                <li title="[可怜]" data-code="/:8*">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103231181.png">
-                                </li>
-                                <li title="[菜刀]" data-code="/:pd">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103236908.png">
-                                </li>
-                                <li title="[西瓜]" data-code="/:<W>">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103241610.png">
-                                </li>
-                                <li title="[啤酒]" data-code="/:beer">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103246942.png">
-                                </li>
-                                <li title="[篮球]" data-code="/:basketb">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103251889.png">
-                                </li>
-                                <li title="[乒乓]" data-code="/:oo">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103256822.png">
-                                </li>
-                                <li title="[咖啡]" data-code="/:coffee">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103301730.png">
-                                </li>
-                                <li title="[饭]" data-code="/:eat">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103306315.png">
-                                </li>
-                                <li title="[猪头]" data-code="/:pig">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103311631.png">
-                                </li>
-                                <li title="[玫瑰]" data-code="/:rose">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103316218.png">
-                                </li>
-                                <li title="[凋谢]" data-code="/:fade">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103321727.png">
-                                </li>
-                                <li title="[嘴唇]" data-code="/:showlove">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103326466.png">
-                                </li>
-                                <li title="[爱心]" data-code="/:heart">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103331391.png">
-                                </li>
-                                <li title="[心碎]" data-code="/:break">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103336293.png">
-                                </li>
-                                <li title="[蛋糕]" data-code="/:cake">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103341727.png">
-                                </li>
-                                <li title="[闪电]" data-code="/:li">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103346519.png">
-                                </li>
-                                <li title="[炸弹]" data-code="/:bome">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103351983.png">
-                                </li>
-                                <li title="[刀]" data-code="/:kn">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103356315.png">
-                                </li>
-                                <li title="[足球]" data-code="/:footb">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103401393.png">
-                                </li>
-                                <li title="[瓢虫]" data-code="/:ladybug">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103406284.png">
-                                </li>
-                                <li title="[便便]" data-code="/:shit">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103411342.png">
-                                </li>
-                                <li title="[月亮]" data-code="/:moon">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103416889.png">
-                                </li>
-                                <li title="[太阳]" data-code="/:sun">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103421513.png">
-                                </li>
-                                <li title="[礼物]" data-code="/:gift">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103426896.png">
-                                </li>
-                                <li title="[拥抱]" data-code="/:hug">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103431815.png">
-                                </li>
-                                <li title="[强]" data-code="/:strong">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103436286.png">
-                                </li>
-                                <li title="[弱]" data-code="/:weak">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103441411.png">
-                                </li>
-                                <li title="[握手]" data-code="/:share">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103446541.png">
-                                </li>
-                                <li title="[胜利]" data-code="/:v">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103451461.png">
-                                </li>
-                                <li title="[抱拳]" data-code="/:@)">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103456248.png">
-                                </li>
-                                <li title="[勾引]" data-code="/:jj">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103501861.png">
-                                </li>
-                                <li title="[拳头]" data-code="/:@@">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103506188.png">
-                                </li>
-                                <li title="[差劲]" data-code="/:bad">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103511436.png">
-                                </li>
-                                <li title="[爱你]" data-code="/:lvu">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103516890.png">
-                                </li>
-                                <li title="[NO]" data-code="/:no">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103521415.png">
-                                </li>
-                                <li title="[OK]" data-code="/:ok">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103526248.png">
-                                </li>
-                                <li title="[爱情]" data-code="/:love">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103531694.png">
-                                </li>
-                                <li title="[飞吻]" data-code="/:<L>">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103536789.png">
-                                </li>
-                                <li title="[跳跳]" data-code="/:jump">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103541535.png">
-                                </li>
-                                <li title="[发抖]" data-code="/:shake">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103546800.png">
-                                </li>
-                                <li title="[怄火]" data-code="/:<O>">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103551956.png">
-                                </li>
-                                <li title="[转圈]" data-code="/:circle">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103556647.png">
-                                </li>
-                                <li title="[磕头]" data-code="/:kotow">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103601489.png">
-                                </li>
-                                <li title="[回头]" data-code="/:turn">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103606571.png">
-                                </li>
-                                <li title="[跳绳]" data-code="/:skip">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103611997.png">
-                                </li>
-                                <li title="[投降]" data-code="/:oy">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103616555.png">
-                                </li>
-                                <li title="[激动]" data-code="/:#-0">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103621939.png">
-                                </li>
-                                <li title="[乱舞]" data-code="/:hiphot">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103626894.png">
-                                </li>
-                                <li title="[献吻]" data-code="/:kiss">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103636123.png">
-                                </li>
-                                <li title="[左太极]" data-code="/:<&amp;">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103641405.png">
-                                </li>
-                                <li title="[右太极]" data-code="/:&amp;>">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103646322.png">
-                                </li>
-                                        
-                                        
-                                        
-                                            
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-
-        
-        <div class="model_box">
-
-            <span class="tip_box">暂无客服消息</span>
-            <br>
-            <br>
-            <br>
-            <span class="tip_content_box">如有客户消息,您将收到模板消息通知，点开即可回复。</span>
-            <br>
-            <br>
-        </div>
-
-
-        <script src='../res/js/jquery.min.js'></script>
-
-        <script>
-
-            function Chat() {
-                this.socket = null
-                this.salesid = '${salesId}'
-                this.isvank = '${isVanker}' == "true" ? 0 : 1
-                this.host = (location.host.indexOf("192") > -1 || location.host.indexOf("localhost") > -1) ? location.host + "/zzhnc" : location.host
-                this.url = "ws://" + this.host + "/web/socket/" + '${salesId}' + "/" + ('${isVanker}' == "true" ? 0 : 1)         //  mini.weiyisz.com
-
-
-                this.pages = {}     //所有的粉丝记录所在的当前的
-                this.faceCode = ["/::)", "/::~", "/::B", "/::|", "/:8-)", "/::<", "/::$", "/::X", "/::Z", "/::’(", "/::-|", "/::@", "/::P", "/::D", "/::O", "/::(", "/::+", "/:–b", "/::Q", "/::T", "/:,@P", "/:,@-D", "/::d", "/:,@o", "/::g", "/:|-)", "/::!", "/::L", "/::>", "/::,@", "/:,@f", "/::-S", "/:?", "/:,@x", "/:,@@", "/::8", "/:,@!", "/:!!!", "/:xx", "/:bye", "/:wipe", "/:dig", "/:handclap", "/:&-(", "/:B-)", "/:<@", "/:@>", "/::-O", "/:>-|", "/:P-(", "/::’|", "/:X-)", "/::*", "/:@x", "/:8*", "/:pd", "/:<W>", "/:beer", "/:basketb", "/:oo", "/:coffee", "/:eat", "/:pig", "/:rose", "/:fade", "/:showlove", "/:heart", "/:break", "/:cake", "/:li", "/:bome", "/:kn", "/:footb", "/:ladybug", "/:shit", "/:moon", "/:sun", "/:gift", "/:hug", "/:strong", "/:weak", "/:share", "/:v", "/:@)", "/:jj", "/:@@", "/:bad", "/:lvu", "/:no", "/:ok", "/:love", "/:<L>", "/:jump", "/:shake", "/:<O>", "/:circle", "/:kotow", "/:turn", "/:skip", "/:oy", "/:#-0", "/:oy", "/:kiss", "/:<&", "/:&>"]
-                this.faceText = ["微笑", "撇嘴", "色", "发呆", "得意", "流泪", "害羞", "闭嘴", "睡", "大哭", "尴尬", "发怒", "调皮", "呲牙", "惊讶", "难过", "酷", "冷汗", "抓狂", "吐", "偷笑", "愉快", "白银", "傲慢", "饥饿", "困", "恐慌", "流汗", "憨笑", "悠闲", "奋斗", "咒骂", "疑问", "嘘", "晕", "疯了", "哀", "骷髅", "敲打", "再见", "擦汗", "抠鼻", "鼓掌", "糗大了", "坏笑", "左哼哼", "右哼哼", "哈欠", "鄙视", "委屈", "快哭了", "阴险", "亲亲", "吓", "可怜", "菜刀", "西瓜", "啤酒", "篮球", "乒乓", "咖啡", "饭", "猪头", "玫瑰", "凋谢", "嘴唇", "爱心", "心碎", "蛋糕", "闪电", "炸弹", "刀", "足球", "瓢虫", "便便", "月亮", "太阳", "礼物", "拥抱", "强", "弱", "握手", "胜利", "抱拳", "勾引", "拳头", "差劲", "爱你", "NO", "OK", "爱情", "飞吻", "跳跳", "发抖", "怄火", "转圈", "磕头", "回头", "跳绳", "投降", "激动", "乱舞", "献吻", "左太极", "右太极"]
-                this.faceImg = ["http://www.onegreen.net/QQ/UploadFiles/201404/20140427102755304.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102806118.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102811204.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102816272.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102821779.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102826616.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102831909.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102836860.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102841446.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102846605.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102851155.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102856815.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102901326.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102906485.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102911867.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102916775.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102921112.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102926579.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102931107.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102936174.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102941562.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102946241.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102951305.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427102956983.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103001341.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103006230.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103011620.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103016770.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103021180.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103026333.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103031826.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103036856.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103041851.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103046204.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103051515.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103056368.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103101584.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103106639.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103111714.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103116995.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103121307.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103126628.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103131537.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103136922.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103141708.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103146409.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103151786.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103156150.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103201493.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103206968.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103211938.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103216563.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103221494.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103226447.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103231181.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103236908.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103241610.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103246942.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103251889.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103256822.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103301730.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103306315.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103311631.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103316218.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103321727.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103326466.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103331391.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103336293.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103341727.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103346519.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103351983.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103356315.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103401393.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103406284.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103411342.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103416889.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103421513.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103426896.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103431815.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103436286.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103441411.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103446541.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103451461.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103456248.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103501861.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103506188.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103511436.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103516890.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103521415.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103526248.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103531694.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103536789.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103541535.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103546800.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103551956.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103556647.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103601489.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103606571.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103611997.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103616555.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103621939.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103626894.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103636123.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103641405.png", "http://www.onegreen.net/QQ/UploadFiles/201404/20140427103646322.png"]
-            }
-            Chat.prototype = {
-                init: function () {                                                                                 //---获取聊天记录
-                    var that = this
-                    $.post("http://" + this.host + "/sale/chatlogList?salesId=" + this.salesid + "&page=1", function (data) {
-                        console.log(data)
-                        if (data.code == 0) {
-                            for (var x in data.data) {
-
-                                that.create_newChat_list({
-                                    fansid: x,
-                                    logo: data.data[x].list[0].logo,
-                                    nickname: data.data[x].list[0].nickname,
-                                    ask: "",
-                                    asktime: data.data[x].list[0].asktime
-                                })
-
-                                that.isLook({ fansid: x }, data.data[x].unread)
-                                that.create_newChat_info({ fansid: x })
-                                var page_item = Math.ceil(data.data[x].count / 20)          //当前粉丝的聊天记录的总页数
-                                if(page_item>1){
-                                    
-                                    that.create_getMore({fansid:x,message:"查看更多",page:2})
-                                }else{
-                                    that.create_warn({fansid:x,message:"没有更多记录"})
-                                }
-                                data.data[x].list.reverse().forEach(function (e, i) {
-                                    that.create_newChat_(e)
-                                    if (i == data.data[x].list.length - 1) {
-                                        that.updataChatList(e)
-                                    }
-                                });
-                            }
-                        }
-                        if (!data.data) {
-                            $(".model_box").css("display", "flex")
-                        }
-                    })
-
-                    
-                },
-
-                connect: function () {                                                                              //---socket链接
-                    var that = this
-                    this.socket = new WebSocket(this.url)
-                    this.socket.onopen = function () {
-                        console.log("socket run..")
-                    }
-                    this.socket.onmessage = function (msg) {
-
-                        var data = null
-                        try {
-                            data = JSON.parse(msg.data)
-                            that.process(data)
-                        } catch (error) {
-
-                        }
-                    }
-                    this.socket.onclose = function () {
-                        console.log("socket close..")
-                    }
-                },
-
-                process: function (msg) {                                                                           //---处理socket发来的消息(逻辑控制层)
-                    
-                    
-                    if (!!msg.reply && !!!msg.ask) {
-                        this.create_newChat_(msg)
-                        this.updataChatList(msg)
-                    } else {
-                        var _isNew = this._isNewChat(msg)        //是否新会话
-                        if (_isNew) {
-                            this.create_newChat_list(msg)
-                            this.create_newChat_info(msg)
-                            this.create_newChat_(msg)
-                            this.isLook(msg)
-                        } else {
-                            this.create_newChat_(msg)
-                            this.updataChatList(msg)
-                            if (!this._isInThisPage(msg)) {
-                                this.isLook(msg)
-                            }
-                        }
-                    }
-                    if (false) {
-                        this.create_warn(msg)
-                    }
-                },
-                isLook: function (msg, reset) {                                                                     //---处理未读标识( 用到了 localStorage )
-
-                    var localData = localStorage.getItem("look")
-                    var obj = {}
-                    if (!!localData) {
-                        obj = JSON.parse(localStorage.getItem("look"))
-                    }
-
-                    var count = obj["_" + msg.fansid] || 0
-                    count++
-                    if (reset != undefined) {
-                        if (reset == "reset") {
-                            count = 0
-                        } else {
-
-                            count = reset
-                        }
-                    }
-
-                    obj["_" + msg.fansid] = count
-                    for (x in obj) {
-
-                        var a = x.substring(1, x.length)
-                        if (a == msg.fansid) {
-
-                            $("[data-index='" + a + "']").find(".dot").text(obj[x])
-                        }
-
-
-                    }
-                    var _json = JSON.stringify(obj)
-                    localStorage.setItem("look", _json)
-                    $("[data-index='" + a + "'] .dot").text()
-
-                    if ($("[data-index='" + msg.fansid + "'] .dot").text() == 0) {
-                        $("[data-index='" + msg.fansid + "'] .dot").hide()
-                    } else {
-                        $("[data-index='" + msg.fansid + "'] .dot").show()
-                    }
-
-                },
-                create_newChat_list: function (msg) {                                                               //---创建一个列表会话
-                    var template = '<li layim-event="chat" data-type="history" onclick="aa()" data-index="' + msg.fansid + '" >' +
-                        '<div>' +
-                        '<img src=' + (msg.logo || "../res/images/default_user.png") + '>' +
-                        '<span class="dot"></span>' +
-                        '</div>' +
-                        '<span class="name">' + (msg.nickname || "客户 : " + msg.fansid) + '</span>' +
-                        '<span class="time" style="float:right;color:#999;font-size:14px;">' + this._toTimeText_G(msg.asktime) + '</span>' +
-                        '<p class="contInfo">' + this.toFaceImg(msg.ask)  + '</p>' +
-                        '<span class="layim-msg-status">new</span>' +
-                        '</li>'
-                    $("#chatListBox").prepend(template)
-                    $(".model_box").hide()
-                },
-                create_newChat_info: function (msg) {                                                               //---创建一个对话会话                
-                    var template = '<div class="layim-chat-main layui-hide" data-fansid="' + msg.fansid + '" style="overflow-y:initial;bottom:50px;top:0">' +
-                        '<div style="width:100%;height:100%;overflow-y:scroll">'+
-                        '<ul> ' +
-                        '</ul>' +
-                        '</div>'+
-                        '</div>'
-                    $("#chatInfoBox").append(template)
-                },
-                create_warn: function (msg) {                                                                       //---创建一个警告提示消息
-                    var template = '<li class="layim-chat-system">' +
-                        '<span>' + msg.message + '</span>' +
-                        '</li>'
-                    
-                    var _height = $("[data-fansid='" + msg.fansid + "']").find("ul").height()
-                    if(msg.sort){
-                        $("[data-fansid='" + msg.fansid + "']").find("ul").prepend(template)
-                    }else{
-                        $("[data-fansid='" + msg.fansid + "']").find("ul").append(template)
-                        $("[data-fansid='" + msg.fansid + "']").find("div").scrollTop(_height)
-
-                    }
-                },
-                create_getMore:function(msg){
-                    var that = this
-                    console.log(msg)
-                    var template = '<li class="layim-chat-system postMore"  data-page="'+msg.page+'">' +
-                        '<span>' + msg.message + '</span>' +
-                        '</li>'
-                    $("[data-fansid='" + msg.fansid + "']").find("ul").prepend(template)
-                    
-                },
-                postMore:function(fansid,page){
-                    var that = this
-                    $.post("http://" + this.host + "/sale/chatlogList?salesId=" + this.salesid + "&page=" + page + "&fansid=" + fansid, function (data) {
-                        console.log(data)
-                        var page_ = page+1
-                        if(data.data[fansid]){
-                            var page_item = Math.ceil(data.data[fansid].count / 20)          //当前粉丝的聊天记录的总页数
-                            
-                            data.data[fansid].list.forEach(function (e, i) {
-                                that.create_newChat_(e,"sort")
-                                
-                            });
-                            if(page_item >= page_){
-                                
-                                that.create_getMore({fansid:fansid,message:"查看更多",page:page_})
-                            }else{
-                                console.log(page_)
-
-                                that.create_warn({fansid:fansid,message:"没有更多记录",sort:"sort"})
-                            }
-                        }
-                    })
-                },
-
-                create_Img:function(msg){
-                    var str = '<image src="'+ msg.imgurl +'" alt="">'
-                    return str
-                },
-                create_newChat_: function (msg,sort) {                                                                   //---插入一条消息
-                    var template = this.msgTemplate(msg)           
-                    if(sort){
-                        $("[data-fansid='" + msg.fansid + "']").find("ul").prepend(template)
-                    }else{
-                        $("[data-fansid='" + msg.fansid + "']").find("ul").append(template)
-                    }
-                   
-                    var b_isMe = !(msg.replytype == 9 || msg.replytype == 11)       //是否是销售本人(Boolean )
-                    if(!msg.replytype){
-                        b_isMe = (!!msg.reply && !!!msg.ask)
-                    }
-                    if (b_isMe) {
-                        $("#content").val("")
-                        if (!$("#send").is(".layui-disabled")) {
-                            $("#send").addClass("layui-disabled")
-                        }
-                    }
-                    if(!sort){
-                        var _height = $("[data-fansid='" + msg.fansid + "']").find("ul").height()
-                        $("[data-fansid='" + msg.fansid + "']").find("div").scrollTop(_height)
-                    }
-                    
-
-                },
-                msgTemplate:function(msg){                                                                         //创建一条消息模版
-
-                    if(msg.replytype == 45015){
-                        this.create_warn({
-                            fansid:msg.fansid,
-                            message: "发送失败: 回应已超过48小时"
-                        })      
-                        return false 
-                    } 
-                    if(msg.replytype == 45047){
-                        this.create_warn({
-                            fansid:msg.fansid,
-                            message:"发送失败: 连续下发超过5条"    
-                        })      
-                        return false 
-                    }
-                    if(msg.replytype == 40001 || msg.replytype == 40002 || msg.replytype == 40003 || msg.replytype == 48001 ){
-                        this.create_warn({
-                            fansid:msg.fansid,
-                            message:"参数错误,请截图联系管理员--> " + msg.replytype
-                        })     
-                        return false 
-                    }
-
-                    var b_isMe = !(msg.replytype == 9 || msg.replytype == 11)       //是否是销售本人(Boolean )
-                    if(!msg.replytype){
-                        b_isMe = (!!msg.reply && !!!msg.ask)
-                    }
-
-                    var isMeClass = b_isMe ? "layim-chat-mine" : ""                 //是否是销售本人(ClassName)
-                    var msg__ = b_isMe ? msg.reply : msg.ask                        //对应的选择消息
-                    var logo = (function(){
-                        var _logo = ""
-                        if(msg.replytype == 1 || msg.replytype == 2 || msg.replytype == 3){
-                            _logo = "../res/images/robot_logo.png"
-                        }else{
-                            _logo = (b_isMe ? '../res/images/vanke_logo.png' : (msg.logo || "../res/images/default_user.png"))
-                        }
-                        return _logo
-                    })()
-                    
-                    var name = (function(){
-                        var _name = ""
-                        if(msg.replytype == 1 || msg.replytype == 2 || msg.replytype == 3 ){
-                            _name = "Robot"
-                        }else{
-                            _name = (b_isMe ? (msg.salename || "vanke" ): (msg.nickname || "客户 : " + msg.fansid))
-                        }
-                        return _name
-                    })()
-                    if(msg.replytype == 9){
-                        b_isMe = false
-                        msg__ = this.create_Img(msg)
-                    }else{
-                        msg__ = this.toFaceImg(msg__)
-                    }
-                    
-                    var template = '<li class="layim-chat-li ' + isMeClass + '">' +
-                                    '<div class="layim-chat-user">' +
-                                    '<img src="' + logo + '">' +
-                                    '<cite class="layim-user-box">' + (b_isMe ? "<span class='time_box'>" + this._toTime_G(msg.asktime) + "</span>" : "") + '<span class="username_box">' + name + '</span>' + (b_isMe ? "" : "<span class='time_box'>" + this._toTime_G(msg.asktime) + "</span>") + '</cite>' +
-                                    '</div>' +
-                                    '<div class="layim-chat-text">' + msg__ + '</div>' +
-                                    '</li>'
-                    
-                    
-                    return template
-                },
-                updataChatList: function (msg) {                                                                    //---更新聊天列表( 时间 , 消息体)
-                    var msg_ = (!!msg.reply && !!!msg.ask) ? msg.reply : msg.ask
-                    $("[data-index='" + msg.fansid + "']").find(".contInfo").html(this.toFaceImg(msg_))
-                    $("[data-index='" + msg.fansid + "']").find(".time").text(this._toTimeText_G(msg.asktime))
-                    $("#chatListBox").prepend($("[data-index='" + msg.fansid + "']").detach());
-                },
-                _isNewChat: function (msg) {                                                                        //---是否是新的会话
-                    var _isNew = true
-                    $("[data-fansid]").each(function () {
-                        if ($(this).data("fansid") == msg.fansid) {
-                            _isNew = false
-                        }
-                    })
-                    return _isNew
-                },
-                _isInThisPage: function (msg) {                                                                     //---是否在当前聊天页
-                    var _isThis = !$("[data-fansid='" + msg.fansid + "']").is(".layui-hide")
-                    return _isThis
-                },
-                
-                _toTimeText_G: function (str) {                                                                     //---时间转换函数
-                    if (typeof (str) != "string" && typeof (str) != "number") {
-                        console.log(str + ":No is a String")
-                        return str
-                    }
-                    try {
-                        if (new Date(str) == "Invalid Date") {
-                            str = str.replace(/-/g, "/")
-                        }
-                        var timeStamp = new Date(str).getTime()
-
-                    } catch (error) {
-                        console.log("请传入正确的事件格式")
-                        return str
-                    }
-                    var new_timeStamp = new Date().getTime()
-                    var diff = new_timeStamp - timeStamp
-
-                    diff = diff / 1000
-                    if (diff < 0) {
-                        console.log("超出当前日期")
-                        // return str
-                        return "刚刚"
-                    }
-                    if (diff < 3600) {
-                        if (diff < 60) {
-                            return "刚刚"
-                        } else {
-                            return Math.floor(diff / 60) + "分钟前"
-                        }
-                    } else if (diff < 86400) {
-
-                        return Math.floor(diff / 3600) + "小时前"
-                    } else if (diff < 864000) {
-                        return Math.floor(diff / 86400) + "天前"
-                    } else {
-
-                        return str
-                    }
-                },  
-                _toTime_G: function (v) {                                                                           //--- 转时间
-                    var time = new Date(v)
-                    var year = time.getFullYear()
-                    var mon = time.getMonth() + 1;
-                    var day = time.getDate();
-                    var hour = time.getHours();
-                    var min = time.getMinutes();
-                    if (mon < 10) mon = "0" + mon
-                    if (day < 10) day = "0" + day
-                    if (hour < 10) hour = "0" + hour
-                    if (min < 10) min = "0" + min
-                    return mon + "-" + day + " " + hour + ":" + min
-                },
-                toFaceCode: function (msg) {                                                                        //---表情文字转代码
-                    var _msg = msg
-                    var reg = /\[.*?\]/g;
-                    var some = reg.exec(_msg);                //匹配到的字段
-
-                    while (some) {
-                        var _some = some[0].replace(/\[/, "")
-                        _some = _some.replace(/\]/, "")
-                        var index = this.faceText.indexOf(_some)
-                        msg = msg.replace(new RegExp(_some, 'g'), this.faceCode[index])
-                        some = reg.exec(_msg);
-                    }
-                    msg = msg.replace(/\[/g, "")
-                    msg = msg.replace(/\]/g, "")
-                    return msg
-                },
-                toFaceImg: function (msg) {                                                                         //---表情文字转图片
-                    var _msg = msg
-                    var reg = /\[.*?\]/g;
-                    var some = reg.exec(_msg);                //匹配到的字段
-                    var isReset = false
-
-                    while (some) {
-                        var _some = some[0].replace(/\[/, "")
-                        _some = _some.replace(/\]/, "")
-                        var index = this.faceText.indexOf(_some)
-                        if(index >-1){
-                            msg = msg.replace(new RegExp(_some, 'g'), '<image src="'+ this.faceImg[index] +'" alt="">') 
-
-                        }else{
-                            isReset = "[" + _some + "]"
-                        }
-                        some = reg.exec(_msg);
-                    }
-                    msg = msg.replace(/\[/g, "")
-                    msg = msg.replace(/\]/g, "")
-                    msg = msg.replace(/</g,"&lt;")
-                    msg = msg.replace(/&lt;image/g,"<img")
-                    if(isReset){
-                        return isReset
-                    }else{
-                        return msg
-                    }
-                    
-                },
-                resetCountMsg:function(id){                                                                         //---重置未读条数
-                    $.post("../sale/cleanCatlogList?salesId=" + this.salesid + "&fansId=" + id, function (data) {
-                        console.log(data)
-                    })
-                },
-                bind: function () {                                                                                 //---用户操作相关
-                    var that = this
-
-                    //点击消息列表
-                    $(document).on("click", "[layim-event='chat']", function () {
-                        
-                        var id = $(this).data("index")
-                        var name = $(this).find(".name").text()
-                        that.resetCountMsg(id)
-
-                        $("#chatBox").removeClass("layui-hide")               //显示对话
-                        $("#chatBox").find("[data-fansid='" + id + "']").removeClass("layui-hide")
-                        $("#chatName").text(name)
-                        $("#content").data("id", id)
-                        that.isLook({ fansid: id }, "reset")
-                        var _height = $("[data-fansid='" + id + "']").find("ul").height()
-                        $("[data-fansid='" + id + "']").find("div").scrollTop(_height)
-                        
-                        $.post("http://" + that.host + "/sale/checkChatStatus?salesId="+ that.salesid +"&fansId=" + id ,function(data){
-                            if(data){
-                                $(".noRobot").show()
-                                $(".isRobot").hide()
-                            }else{
-                                $(".noRobot").hide()
-                                $(".isRobot").show()
-                            }
-                        })
-                    })
-                    //点击返回按钮
-                    $("#backChat").click(function () {
-                        $("#chatBox").addClass("layui-hide")
-                        $("#chatBox").find("[data-fansid]").removeClass("layui-hide").addClass("layui-hide")
-                        $("#content").val("")
-                        var id = $("#content").data("id")
-                        that.resetCountMsg(id)
-                    })
-
-                    //点击发送按钮
-                    $("#send").click(function () {
-                        if ($(this).is(".layui-disabled")) {
-                            return false
-                        }
-                        var msg = $("#content").val()
-                        $("#faceBox").slideUp(100)
-                        msg = that.toFaceCode(msg)
-                        var id = $("#content").data("id")
-                        var _ask = '${isVanker}' == "true" ? 2 : 1
-                        var _obj = {
-                            "fansid": id,
-                            "ask": "",
-                            "reply": msg,
-                            "salesid": that.salesid,//销售id
-                            "salename": "vanke",
-                            "askfrom": _ask,
-                            "readed": true,
-                            "replytype":1
-                        }
-                        _obj = JSON.stringify(_obj)
-                        that.socket.send(_obj)
-                    })
-
-                    //监听按键事件
-                    $("#content").keyup(function (e) {
-                        var msg = $(this).val()
-                        msg = msg.replace(/ /g, "")
-                        if (msg.length < 1) {
-                            if (!$("#send").is(".layui-disabled")) {
-                                $("#send").addClass("layui-disabled")
-                            }
-                        } else {
-                            $("#send").removeClass("layui-disabled")
-                        }
-                        if (e.which == 13) {
-                            $("#send").click()
-                        }
-                    })
-
-                    //点击输入框事件
-                    $("#content").click(function(){
-                        var that = this
-                        setTimeout(function () {
-                            that.scrollIntoView(true);
-                            var id = $(that).data("id")
-                            var _height = $("[data-fansid='" + id + "']").find("ul").height()
-                            $("[data-fansid='" + id + "']").find("div").scrollTop(_height)
-                            document.body.scrollTop = document.body.scrollHeight;
-                        }, 300);
-                        $("#faceBox").slideUp(100)
-                    })
-                    //点击呼出表情事件
-                    $(".icon-xiaolian").click(function (e) {
-                        e.stopPropagation()
-                        $("#faceBox").slideDown(100)
-                    })
-                    //点击表情model隐藏
-                    $("#faceBox").click(function () {
-                        $("#faceBox").slideUp(100)
-                    })
-                    //点击单个表情
-                    $("ul.layui-layim-face li").click(function (e) {
-                        e.stopPropagation()
-                        var oldVal = $("#content").val()
-                        oldVal += $(this).attr("title")
-                        $("#content").val(oldVal)
-                        console.log($(this))
-
-                        if (oldVal.length < 1) {
-                            if (!$("#send").is(".layui-disabled")) {
-                                $("#send").addClass("layui-disabled")
-                            }
-                        } else {
-                            $("#send").removeClass("layui-disabled")
-                        }
-                    })
-
-                    //人工接入
-                    $("#killRobot").click(function(){
-                        var id = $("#content").data("id")
-                        $.post("http://" + that.host + "/sale/checkoutStatus?salesId="+ that.salesid +"&fansId=" + id ,function(data){
-                            if(data){
-                                that.create_warn({fansid:id,message:"接入成功"})
-                                $("#killRobot").hide()
-                                $(".noRobot").show()
-                                
-                            }
-                        })
-                        
-                    })
-
-                    //查看更多聊天记录
-                    $(document).on("click",".postMore",function(){
-                        var page = $(this).data("page")
-                        var fansid = $(this).parents("[data-fansid]").data("fansid")
-                        that.postMore(fansid,page)
-                        $(this).remove()
-                        console.log(page + "----" + fansid)
-                    })
-                }
-            }
-
-            var chat = new Chat()
-            chat.init()
-            chat.bind()
-            chat.connect()
-            function aa(){ }
-        </script>
-    </body>
-
-    </html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/weixin/chat.jsp b/WebContent/WEB-INF/jsp/weixin/chat.jsp
deleted file mode 100644
index 126dc14..0000000
--- a/WebContent/WEB-INF/jsp/weixin/chat.jsp
+++ /dev/null
@@ -1,1410 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-    <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-
-    <html>
-
-    <head>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
-        <meta name="apple-mobile-web-app-capable" content="yes">
-        <meta name="apple-mobile-web-app-status-bar-style" content="black">
-        <meta name="format-detection" content="telephone=no">
-        <meta name="referrer" content="no-referrer" />
-        <meta http-equiv="X-UA-Compatible" content="ie=edge">
-        <title>在线客服</title>
-        <link rel="stylesheet" href="../res/css/layui.mobile.css">
-        <link rel="stylesheet" href="../res/css/layim.css">
-        <link rel="stylesheet" href="http://at.alicdn.com/t/font_191348_42dv3asrg9jrwwmi.css">
-        <link rel="stylesheet" href="../res/plugins/photoswipe/photoswipe.css">
-        <link rel="stylesheet" href="../res/plugins/photoswipe/default-skin/default-skin.css">
-        <style>
-            
-            .G_model{position: fixed;top: 0;left: 0;width: 100%;height: 100%;background: rgba(0, 0, 0, 0.3);z-index: 100000000;display: flex;justify-content: center;align-items: center;}
-            .G_model .G_loading{width: 60px;height: 60px;position: relative;}
-            .G_model .G_loading>div{ width: 100%;height: 100%;background-color:#fff;border: 1px solid rgb(13, 119, 54);position: absolute;top: 0;left: 0;animation: loading1 ease-in 2s infinite;}
-            .G_model .G_loading>div.G_load2{ width: 67%;height: 67%;top: 16.5%;left: 16.5%;border: 1px solid rgb(44, 82, 59);animation: loading2 ease-in 2s infinite; }
-            @keyframes loading1{ 0%{transform: rotateZ(0deg);}100%{transform: rotateZ(360deg);} }
-            @keyframes loading2{ 0%{transform: rotateZ(360deg);}100%{transform: rotateZ(0deg);} }
-
-            
-            html,
-            body {
-                height: 100%;
-                overflow: hidden;
-                background-color: #efefef;
-            }
-            img[src=""],img[src="null"],img[src="undefined"]{
-                opacity: 0; 
-            }
-            input,textarea{
-                outline: none;
-                -webkit-appearance: none;
-            }
-            .icon-fanhuijiantou {
-                font-size: 18px;
-            }
-
-            #faceBox {
-                display: none;
-            }
-            .layim-title{
-                padding: 0 10px;
-                background-color: #eee;
-            }
-            .layui-title-query{
-                height: 30px;
-                background-color: #fff;
-                margin-top: 10px;
-                border-radius: 4px;
-                color: #999;
-                font-size: 14px;
-                text-align: center;
-                line-height: 30px;
-            }
-            .layui-title-query .icon-sousuo{
-                font-size: 14px;
-            }
-
-            .topToolSBox {
-                position: fixed;
-                width: 100%;
-                height: 40px;
-                top: 0;
-                left: 0;
-                background: rgba(153, 153, 153, 0.5);
-                padding-top: 5px;
-                z-index: 198910141;
-                display: flex;
-                justify-content: space-around;
-            }
-            #backChat{
-                background: #fff;
-                color: #666;
-            }
-            .topToolSBox button{
-                width: 40%;
-                height: 30px;
-                background-color: #b50005;
-                
-                border: none;
-                
-                border-radius: 4px;
-                color: #fff;
-            }
-            .topToolSBox button.on{
-                background-color: #999;
-                color: #fff;
-
-            }
-            .dot {
-                position: absolute;
-                top: 2px;
-                left: 36px;
-                border-radius: 50%;
-                background-color: red;
-                display: inline-block;
-                width: 16px;
-                height: 16px;
-                font-size: 8px !important;
-                text-align: center;
-                line-height: 16px;
-                color: #fff;
-            }
-
-            .icon-xiaolian {
-                color: #666;
-                font-size: 24px;
-                line-height: 40px;
-                padding-right: 4px;
-                background-color: #fff;
-                
-            }
-
-            .model_box {
-                position: fixed;
-                top: 0;
-                left: 0;
-                width: 100%;
-                height: 100%;
-                display: none;
-                text-align: center;
-                flex-direction: column;
-                align-items: center;
-                justify-content: center;
-                z-index: 198910141;
-                color: #666;
-                padding: 0 20px;
-                box-sizing: border-box;
-            }
-
-            .tip_box {
-                font-size: 24px;
-            }
-
-            .tip_content_box {
-                font-size: 14px;
-            }
-
-            .layim-chat-footer {
-                height: 50px;
-            }
-
-            .layim-user-box {
-                display: flex;
-            }
-
-            .layim-chat-mine .layim-user-box {
-                justify-content: flex-end;
-            }
-            .moreFansBox{
-                background-color: #efefef;
-                padding: 10px !important;
-                line-height: 28px;
-                text-align: center;
-            }
-            .moreFansBox>span{
-                background-color: #fff;
-                color: #999;
-                padding: 4px 10px;
-                border-radius: 4px;
-            }
-            .username_box {
-                display: inline-block;
-                max-width: 100px;
-                overflow: hidden;
-                text-overflow: ellipsis;
-            }
-
-            .time_box {
-                margin: 0 20px;
-                display: inline-block;
-            }
-
-            .layim-chat-main{
-                padding: 0 15px;
-            }
-            .layim-chat-main,
-            .layim-content {
-                top: 50px;
-                /* bottom: 70px; */
-            }
-            .contInfo img{
-                position: initial !important;
-                width: 16px !important;
-                height: 16px !important;
-            }
-            .isRobot{
-                display: none;
-                width: 100%;
-                background-color: #2f9833 !important;
-            }
-            /* 加大列表行高 */
-            #chatListBox li{        
-                padding: 10px 15px 10px 60px;
-                border-bottom: 1px solid #efefef;
-            }
-
-            .layui-layim-list li img{
-                top:13px;
-            }
-            .layui-m-layerchild,.layim-panel, .layim-title,.layim-chat-main, .layim-content,.layui-layim,.layim-chat-footer,.layim-chat-main ul li,
-            .layui-layim-face,.layim-chat-user,.layim-chat-user cite,.layim-chat-text{
-                z-index: 1;
-            }
-            *{
-                z-index: 1;
-            }
-
-
-            .pswp{
-                z-index: 1500000000;
-            }
-
-
-            @keyframes rotateZ{
-                0%{
-                    transform: rotateZ(0deg);
-                }
-                100%{
-                    transform: rotateZ(360deg);
-                }
-            }
-
-            .rotateZAnimated{
-                display: inline-block;
-                animation: rotateZ 1s infinite ease-out;
-                
-            }
-            .rotateZAnimated .iconfont{
-                padding-right:0 !important;
-            }
-            .icon-weibiaoti-{
-                color: red;
-            }
-            .editBox{
-                background-color: #fff;
-                line-height: 40px;
-                padding: 0 6px;
-                border-radius: 0 3px 3px 0;
-                position: relative;
-            }
-            .editBox i.on{
-                transform: rotateZ(0deg) !important;
-            }
-            /* 底部加号按钮相关 */
-            #chatBox .icon-guanbi{
-                display: inline-block;
-                transform: rotateZ(45deg);
-                font-size: 24px;
-                color: #666;
-                transition: transform 0.2s;
-            }
-            .layim-chat-footer{
-                z-index: 2;
-            }
-            .posStyle{
-                position: absolute;
-                bottom: 40px;
-                left: 0;
-                display: none;
-                
-            }
-            .posStyle:nth-child(2){
-                bottom: 80px;
-            }
-            .icon-xiangji,.icon-fasonghongbaocopy{
-                
-                background-color: rgba(239,239,239,0.5);
-                font-size: 24px;
-                line-height: 40px;
-                padding: 0 6px;
-                color: #666;
-            }
-            .bounceInUp{
-                animation: bounceInUp 0.3s;
-            }
-            @keyframes bounceInUp{
-                0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}
-                60%{opacity:1;-webkit-transform:translateY(-30px);transform:translateY(-30px)}
-                80%{-webkit-transform:translateY(10px);transform:translateY(10px)}
-                100%{-webkit-transform:translateY(0);transform:translateY(0)}
-            }
-            /* end */
-
-            /* 楼盘卡片发送相关 */
-            #floorListCard{
-                position: fixed;
-                top: 0;
-                left: 0;
-                width: 100%;
-                height: 100%;
-                background: rgba(0, 0, 0, 0.5);
-                z-index: 100000000;
-                display: none;
-                align-items: center;
-
-            }
-            #floorListCard .content{
-                
-                width: 100%;
-            }
-            #floorListCard .closeBox{
-                margin-top: 30px;
-                text-align: center;
-            }
-            #floorListCard .content .icon-guanbi1{
-                font-size: 30px;
-                color: #eee;
-            }
-            #floorListCard ul{
-                background-color: #fff;
-                width: 80%;
-                margin: 0 auto;
-                border-radius: 4px;
-                padding: 10px;
-                box-sizing: border-box;
-            }
-            #floorListCard ul li{
-                height: 40px;
-                line-height: 40px;
-                color: #333;
-                font-size: 14px;
-                border-bottom: 1px solid #eee;
-            }
-            #floorListCard ul li span{
-                float: right;
-                display: block;
-                font-size: 14px;
-                background: #2f9833 !important;
-                height: 26px;
-                line-height: 26px;
-                color: #fff;
-                width: 48px;
-                text-align: center;
-                border-radius: 4px;
-                position: relative;
-                top: 6px;
-            }
-            .fadeInUp{
-                animation: fadeInUp 0.3s;
-            }
-            @keyframes fadeInUp{
-                0%{opacity:0;-webkit-transform:translateY(20px);transform:translateY(20px)}
-                100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}
-            }
-
-            [contenteditable]{
-                outline: none;
-                -webkit-appearance: none;
-            }
-
-
-            /* 搜索相关 */
-
-
-            #fansInfoBox {
-                position: fixed;
-                top: 0;
-                left: 0;
-                width: 100%;
-                height: 100%;
-                background: #efefef;
-                z-index: 100000000;
-                display: none;
-                align-items: center;
-                color: #333;
-                overflow-y: scroll;
-            }
-
-            #fansInfoBox .section {
-                padding: 10px 20px;
-                /* border: 1px solid #999; */
-                background-color: #fff;
-                margin: 10px 0;
-            }
-
-            #fansInfoBox .flexBox {
-                display: flex;
-            }
-
-            #fansInfoBox .userLogo {
-                width: 70px;
-                height: 70px;
-                border-radius: 4px;
-                
-            }
-
-            #fansInfoBox .userLogo img {
-                width: 100%;
-                height: 100%;
-            }
-
-            #fansInfoBox .userInfo {
-                
-                flex: 1;
-            }
-
-            #fansInfoBox .userInfo>p:first-child {
-                margin-bottom: 12px;
-                padding-left: 10px;
-                box-sizing: border-box;
-            }
-
-            #fansInfoBox .labels span {
-                background-color: #b50005;
-                color: #fff;
-                font-size: 0.8em;
-                padding: 1px 8px;
-                margin: 2px;
-                display: inline-block;
-            }
-
-            #fansInfoBox .noteStyle {
-                margin-top: 4px;
-                font-size: 0.9em;
-                color: #666;
-            }
-
-            #fansInfoBox .noteStyle>div:first-child {
-                width: 80px;
-                padding-left: 10px;
-                box-sizing: border-box;
-            }
-
-            #fansInfoBox .labels {
-                flex: 1;
-            }
-
-            #fansInfoBox .labelTitle {
-                width: 80px;
-            }
-
-            #fansInfoBox .subSection {
-                padding: 10px 0;
-                border-bottom: 1px solid #eee;
-            }
-
-            #fansInfoBox .editStyle {
-                justify-content: space-between;
-            }
-
-            #fansInfoBox .editStyle .iconfont {
-                color: #333;
-                font-size: 1.2em;
-            }
-
-            #fansInfoBox textarea {
-                width: 100%;
-                height: 80px;
-                margin-top: 20px;
-                border-radius: 6px;
-                resize: none;
-                padding: 10px;
-                box-sizing: border-box;
-                background: none;
-                border: 1px solid #eee;
-                outline: none;
-                -webkit-appearance: none;
-            }
-
-            #fansInfoBox .btnBox {
-                width: 100%;
-                padding: 0 20px;
-                box-sizing: border-box;
-                margin: 40px 0 20px 0;
-                
-            }
-
-            #fansInfoBox button {
-                background: none;
-                border: none;
-                background-color: #b50005;
-                color: #fff;
-                width: 100%;
-                height: 40px;
-                border-radius: 2px;
-                font-size: 14px;
-            }
-            #fansInfoBox #closeLabelFn{
-                background-color: #fff;
-                margin-top: 10px;
-                color: #b50005;
-            }
-            #fansInfoBox .editLabels {
-                display: flex;
-                justify-content: space-between;
-                display: none;
-            }
-
-            #fansInfoBox .editLabels input {
-                flex: 1;
-                height: 100%;
-                border: 1px solid #eee;
-                margin-right: 8px;
-                box-sizing: border-box;
-                outline: none;
-                -webkit-appearance: none;
-            }
-
-            #fansInfoBox .editLabels .iconfont {
-                color: #b50005;
-            }
-
-            #fansInfoBox .telValue,#fansInfoBox .nameValue{
-                width: 100%;
-                border: none;
-                background: none;
-                font-size: 1em;
-                padding: 0;
-                color: #333;
-            }
-            #fansInfoBox .fansInfoBox_label{
-                position: absolute;
-                top: 0;
-                left: 0;
-                width: 100%;
-                height: 100%;
-                background: #eee;
-                display: none;
-                box-sizing: border-box;
-            }
-            #fansInfoBox .fansInfoBox_label .labelConent{
-                background-color: #fff;
-                padding: 10px;
-                border-bottom: 1px solid #ccc;
-            }
-
-            #fansInfoBox .fansInfoBox_label .tagInput{
-                display: flex;
-            }
-            #fansInfoBox .fansInfoBox_label .tagInput input{
-                height: 24px;
-                border: 1px solid #eee;
-                box-sizing: border-box;
-                padding-left: 10px;
-                flex:1;
-                
-            }
-
-            #fansInfoBox .fansInfoBox_label .tagInput .addTag{
-                width: 50px;
-                height: 24px;
-                font-size: 12px;
-                margin-left: 10px;
-            }
-            #fansInfoBox .fansInfoBox_label .userTags{
-                margin-bottom: 10px;
-                background-color: #fff;
-            }
-            #fansInfoBox .fansInfoBox_label .userTags span,.tagListBox span{
-                border: 1px solid rgba(181, 0, 5, 0.4);
-                border-radius: 20px;
-                color: #b50005;
-                font-size: 0.8em;
-                padding: 2px 8px;
-                margin: 2px;
-                margin-top: 10px;
-                display: inline-block;
-            }
-            #fansInfoBox .fansInfoBox_label .tagHistory span.unSelect{
-                color:  rgba(181, 0, 5, 0.4);
-                border: 1px solid #aaa;
-            }
-            #fansInfoBox .tagHistory{
-                
-                padding: 10px;
-                box-sizing: border-box;
-            }
-            #fansInfoBox .tagHistory .title{
-                color: #999;
-            }
-            #fansInfoBox .tagListBox{
-                margin-top: 10px;
-            }
-
-            #fansInfoBox .saveTagBtnBox {
-                padding: 10px;
-                box-sizing: border-box;
-                margin-top: 50px;
-            }
-            #fansInfoBox .saveTagBtnBox .close{
-                background-color: #fff;
-                color: #b50005;
-                margin-top: 10px;
-            }
-
-
-            #queryFansBox {
-                width: 100%;
-                height: 100%;
-                background-color: #fff;
-                position: absolute;
-                top: 0;
-                left: 0;
-                z-index: 100000000;
-                display: none;
-            }
-
-
-            .qeruySection {
-                width: 100%;
-                height: 46px;
-                background-color: #efefef;
-                display: flex;
-                padding: 8px;
-                box-sizing: border-box;
-
-            }
-
-            .qeruySection>div:first-child {
-                background-color: #fff;
-                height: 30px;
-                padding-left: 20px;
-                border-radius: 4px;
-                flex: 1;
-            }
-            .qeruySection>div:first-child>div{
-                margin-top: 5px;
-                height: 20px;
-                position: relative;
-                /* background-color: red; */
-            }
-            .qeruySection>div:nth-child(2) {
-                width: 50px;
-                text-align: center;
-                height: 30px;
-                line-height: 30px;
-            }
-            .qeruySection>div:nth-child(2) .icon-duihao{
-                color: #1AAD19;
-                display: none;
-            }
-            .qeruySection>div:nth-child(2) button {
-                background: none;
-                border: none;
-                color: #1AAD19;
-                height: 30px;
-            }
-
-            .qeruySection>div:first-child .iconfont {
-                color: #999;
-                font-size: 14px;
-            }
-
-            #queryFansBox input {
-                outline: none;
-                -webkit-appearance: none;
-                border: none;
-                background: none;
-                height: 100%;
-                width: calc(100% - 38px);
-            }
-
-            .queryLabelsBox {
-                padding: 20px;
-            }
-
-            .queryLabelsBox .title {
-                text-align: center;
-                color: #999;
-                font-size: 14px;
-            }
-            .qeruySection .icon-guanbi{
-                position: absolute;
-                right:10px;
-                top: 0;
-                font-size: 18px;
-                display: none;
-            }
-            .queryLabelsBox .labelsList span{
-                border: 1px solid #1AAD19;
-                border-radius: 20px;
-                color: #1AAD19;
-                font-size: 0.8em;
-                padding: 2px 8px;
-                margin: 6px;
-                margin-top: 10px;
-                display: inline-block;
-            }
-
-            .queryFansItemBox{
-                display: flex;
-                padding: 10px 20px;
-                background-color: #fff;
-                border-bottom: 1px solid #eee;
-            }
-            .queryFansItemBox .userLogo{
-                width: 36px;
-                height: 36px;
-                border-radius: 50%;
-            }
-            .queryFansItemBox .content{
-                flex: 1;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-            }
-            .queryFansItemBox .content p{
-                padding-left: 10px;
-            }
-            .queryFansItemBox .content p:nth-child(2){
-                color: #999;
-                font-size: 0.8em;
-                margin-top: 6px;
-                width: 100%;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-            }
-            .queryFansItemBox .lastTime{
-                color: #999;
-                font-size: 0.8em;
-            }
-            .eruda-container .eruda-entry-btn{
-                z-index: 999999999999999 !important;
-            }
-        </style>
-    </head>
-
-    <body>
-
-        <div class="G_model"><div class="G_loading"><div class="G_load1"></div><div class="G_load2"></div></div></div>
-
-        <div id="main" class="layui-m-layer layui-m-layer1" index="0">
-            <div class="layui-m-layermain" style="z-index:19891014">
-                <div class="layui-m-layersection">
-                    <div class="layui-m-layerchild  layui-m-anim--1">
-                        <div class="layui-m-layercont">
-                            <div class="layim-panel layui-m-anim-right">
-                                <div class="layim-title">
-                                    <p class="layui-title-query">
-                                        <i class="iconfont icon-sousuo"></i>
-                                        <span>搜索</span>
-                                    </p>
-                                </div>
-                                <div class="layui-unselect11 layim-content">
-                                    <div class="layui-layim" style="bottom:0;overflow-y:initial">
-                                        <div class="layim-tab-content layui-show" style="overflow-y:scroll;width:100%;height:100%;">
-                                            <ul class="layim-list-friend">
-                                                <ul class="layui-layim-list layui-show layim-list-history" id="chatListBox">
-                                                    <!-- <li layim-event="chat" data-type="history" data-index="0">
-                                                        <div>
-                                                            <img src="http://tp1.sinaimg.cn/1571889140/180/40030060651/1">
-                                                            <span class="dot">4</span>
-                                                        </div>
-                                                        <span class="name">客户11111</span>
-                                                        <p>123</p>
-                                                        <span class="layim-msg-status">new</span>
-                                                    </li>
-                                                    <li layim-event="chat" data-type="history" data-index="1001">
-                                                        <div>
-                                                            <img src="http://tp1.sinaimg.cn/1571889140/180/40030060651/1">
-                                                            <span class="dot">12</span>
-                                                        </div>
-                                                        <span class="name">客户11113</span>
-                                                        <p>123</p>
-                                                        <span class="layim-msg-status">new</span>
-                                                    </li> -->
-                                                </ul>
-                                            </ul>
-                                        </div>
-
-                                    </div>
-
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div id="chatBox" class="layui-m-layer layui-m-layer1 layui-hide ">
-            <div class="layui-m-layermain" style="z-index:19891014">
-                <div class="layui-m-layersection">
-                    <div class="layui-m-layerchild  layui-m-anim--1">
-                        <div class="layui-m-layercont">
-                            <div class="layim-panel layui-m-anim-left">
-                                <div class="topToolSBox">
-                                    <!-- <i id="backChat" class="iconfont icon-fanhuijiantou"></i> -->
-                                    <button id="backChat">返回</button>
-                                    <button id="activationRobot">机器人托管</button>
-                                    <span id="chatName" style="display:none;"></span>
-                                    <span class="layim-chat-status" style="display:none;"></span>
-                                </div>
-
-                                <div class="layui-unselect11 layim-content">
-                                    <div class="layim-chat layim-chat-friend" id="chatInfoBox">
-                                        <div class="layim-chat-main layui-hide" data-fansid="0">
-                                            <ul>
-                                                <!-- <li class="layim-chat-system">
-                                                    <span>10-27 16:30</span>
-                                                </li>
-                                                <li class="layim-chat-li layim-chat-mine">
-                                                    <div class="layim-chat-user">
-                                                        <img src="http://tp4.sinaimg.cn/1345566427/180/5730976522/0">
-                                                        <cite>万小二</cite>
-                                                    </div>
-                                                    <div class="layim-chat-text">我是第一条</div>
-                                                </li>
-
-                                                <li class="layim-chat-li">
-                                                    <div class="layim-chat-user">
-                                                        <img src="http://tp4.sinaimg.cn/1345566427/180/5730976522/0">
-                                                        <cite>我是客户</cite>
-                                                    </div>
-                                                    <div class="layim-chat-text">嗨，欢迎体验LayIM。演示标记：1508565819152</div>
-                                                </li> -->
-
-                                            </ul>
-                                        </div>
-                                        <div class="layim-chat-main layui-hide" data-fansid="1001">
-                                            <ul>
-                                                <!-- <li class="layim-chat-system">
-                                                    <span>10-27 16:30</span>
-                                                </li>
-                                                <li class="layim-chat-li layim-chat-mine">
-                                                    <div class="layim-chat-user">
-                                                        <img src="http://tp4.sinaimg.cn/1345566427/180/5730976522/0">
-                                                        <cite>万小二</cite>
-                                                    </div>
-                                                    <div class="layim-chat-text">第二条</div>
-                                                </li>
-
-                                                <li class="layim-chat-li">
-                                                    <div class="layim-chat-user">
-                                                        <img src="http://tp4.sinaimg.cn/1345566427/180/5730976522/0">
-                                                        <cite>我是客户</cite>
-                                                    </div>
-                                                    <div class="layim-chat-text">嗨，欢迎体验LayIM。演示标记：1508565819152</div>
-                                                </li> -->
-
-                                            </ul>
-                                        </div>
-                                        <div class="layim-chat-footer">
-                                            <div class="layim-chat-send">
-                                                <input class="noRobot" type="text" autocomplete="off" id="content">
-                                                <span class="noRobot iconfont icon-xiaolian" title="选择表情"></span>
-                                                <span class="noRobot editBox">
-                                                    <i class="iconfont icon-guanbi"></i>
-                                                    <span class="posStyle bounceInUp iconfont icon-fasonghongbaocopy"></span>
-                                                    <span class="posStyle bounceInUp iconfont icon-xiangji"></span>
-                                                </span>
-
-                                                <button class="noRobot layim-send layui-disabled" id="send" style="margin-left:6px;">发送</button>
-                                                <button class="isRobot" id="killRobot">接入</button>
-                                            </div>
-                                            <!-- <div class="layim-chat-tool">
-                                                
-                                                <span class="iconfont icon-xiangji layim-tool-image" title="上传图片" layim-event="image"><input type="file" name="file" accept="image/*"></span>
-                                            </div> -->
-                                            
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div id="fansInfoBox">
-            <div class="section flexBox">
-                <div class="userLogo">
-                    <img id="fansInfo_logo" src="https://wx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTIqB293AAwVib6hz27EEn005RXndYSzj0icpyoI4yW8sOTCudKAckfuH7ibOKAHXmYA1bEM2GXWQvl9A/0"
-                        alt="">
-                </div>
-                <div class="userInfo">
-                    <p>
-                        <span id="fansInfo_nickname">西瓜昵称</span>
-                    </p>
-                    <div class="noteStyle flexBox">
-                        <div>ID　：</div>
-                        <div id="fansInfo_id"></div>
-                    </div>
-                    <div class="noteStyle flexBox">
-                        <div>备注：</div>
-                        <div style="flex:1;"><input type="text" id="fansInfo_name" class="nameValue" ></div>
-                        <div>
-                            <i class="iconfont icon-youjiantou"></i>
-                        </div>
-                    </div>
-    
-                </div>
-            </div>
-            <div class="section flexBox editStyle" id="editLabelsFn">
-                <div class="labelTitle">标签</div>
-                <p id="fansInfo_labels" class="labels noeditLabels" >
-                    
-                </p>
-                
-                <div class="noeditLabels">
-                    <i class="iconfont icon-youjiantou"></i>
-                </div>
-            </div>
-            <div class="section">
-                <div class="flexBox subSection">
-                    <div class="labelTitle">地区</div>
-                    <div id="fansInfo_add"></div>
-                </div>
-                <div class="flexBox subSection editStyle editFn">
-                    <div class="flexBox" style="flex:1">
-                        <div class="labelTitle">电话</div>
-                        <input type="tel" id="fansInfo_tel" class="telValue" style="flex:1">
-                        
-                    </div>
-                    <div>
-                        <i class="iconfont icon-youjiantou"></i>
-                    </div>
-                </div>
-            </div>
-            <div class="section">
-                <div class="labelTitle">描述</div>
-                <div>
-                    <textarea id="fansInfo_note"></textarea>
-                </div>
-            </div>
-            <div class="flexBox section">
-                <div class="labelTitle">更新时间</div>
-                <div id="fansInfo_upDate"></div>
-            </div>
-            <div class="btnBox">
-                <button id="saveLabelFn">保存</button>
-                <button id="closeLabelFn">取消</button>
-            </div>
-    
-            <div class="fansInfoBox_label">
-                <div class="labelConent">
-                    <div class="userTags">
-                        
-                    </div>
-                    <div class="tagInput">
-                        <input type="text" placeholder="输入标签"> <button class="addTag">新增</button>
-                    </div>
-                    
-                </div>
-                <div class="tagHistory">
-                    <div class="title">
-                        所有标签
-                    </div>
-                    <div class="tagListBox">
-                
-                    </div>
-                </div>
-                <div class="saveTagBtnBox">
-                    <button class="save">保存</button>
-                    <button class="close">取消</button>
-                </div>
-            </div>
-        </div>
-        <div id="queryFansBox">
-            <div class="qeruySection">
-                <div>
-                    <div>
-                        <i class="iconfont icon-sousuo"></i>
-                        <input type="text" placeholder="搜索">
-                        <i class="iconfont icon-guanbi"></i>
-                    </div>
-                </div>
-                <div>
-                    <i class="iconfont icon-duihao"></i>
-                    <button>取消</button>
-                </div>
-    
-            </div>
-            <div class="queryLabelsBox">
-                <div class="title">
-                    <span>指定的标签</span>
-                </div>
-                <div class="labelsList">
-    
-                </div>
-            </div>
-            <div class="queryFansResult">
-                <div style="text-align:center;color:#999;display:none;">
-                    <span>搜索结果</span>
-                </div>
-                <ul>
-
-                </ul>
-            </div>
-        </div>
-
-        <div id="faceBox" class="layui-m-layer layui-m-layer1" style="height:88%;">
-            <div class="layui-m-layermain" style="z-index:19891014">
-                <div class="layui-m-layersection">
-                    <div class="layui-m-layerchild layim-layer layui-m-anim-scale" style="bottom:58px;">
-                        <div class="layui-m-layercont">
-                            <ul class="layui-layim-face">
-
-                                        
-                                <li title="[微笑]" data-code="/::)">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102755304.png">
-                                </li>
-                                <li title="[撇嘴]" data-code="/::~">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102806118.png">
-                                </li>
-                                <li title="[色]" data-code="/::B">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102811204.png">
-                                </li>
-                                <li title="[发呆]" data-code="/::|">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102816272.png">
-                                </li>
-                                <li title="[得意]" data-code="/:8-)">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102821779.png">
-                                </li>
-                                <li title="[流泪]" data-code="/::<">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102826616.png">
-                                </li>
-                                <li title="[害羞]" data-code="/::$">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102831909.png">
-                                </li>
-                                <li title="[闭嘴]" data-code="/::X">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102836860.png">
-                                </li>
-                                <li title="[睡]" data-code="/::Z">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102841446.png">
-                                </li>
-                                <li title="[大哭]" data-code="/::'(">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102846605.png">
-                                </li>
-                                <li title="[尴尬]" data-code="/::-|">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102851155.png">
-                                </li>
-                                <li title="[发怒]" data-code="/::@">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102856815.png">
-                                </li>
-                                <li title="[调皮]" data-code="/::P">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102901326.png">
-                                </li>
-                                <li title="[呲牙]" data-code="/::D">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102906485.png">
-                                </li>
-                                <li title="[惊讶]" data-code="/::O">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102911867.png">
-                                </li>
-                                <li title="[难过]" data-code="/::(">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102916775.png">
-                                </li>
-                                <li title="[酷]" data-code="/::+">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102921112.png">
-                                </li>
-                                <li title="[冷汗]" data-code="/:–b">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102926579.png">
-                                </li>
-                                <li title="[抓狂]" data-code="/::Q">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102931107.png">
-                                </li>
-                                <li title="[吐]" data-code="/::T">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102936174.png">
-                                </li>
-                                <li title="[偷笑]" data-code="/:,@P">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102941562.png">
-                                </li>
-                                <li title="[愉快]" data-code="/:,@-D">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102946241.png">
-                                </li>
-                                <li title="[白银]" data-code="/::d">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102951305.png">
-                                </li>
-                                <li title="[傲慢]" data-code="/:,@o">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427102956983.png">
-                                </li>
-                                <li title="[饥饿]" data-code="/::g">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103001341.png">
-                                </li>
-                                <li title="[困]" data-code="/:|-)">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103006230.png">
-                                </li>
-                                <li title="[恐慌]" data-code="/::!">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103011620.png">
-                                </li>
-                                <li title="[流汗]" data-code="/::L">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103016770.png">
-                                </li>
-                                <li title="[憨笑]" data-code="/::>">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103021180.png">
-                                </li>
-                                <li title="[悠闲]" data-code="/::,@">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103026333.png">
-                                </li>
-                                <li title="[奋斗]" data-code="/:,@f">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103031826.png">
-                                </li>
-                                <li title="[咒骂]" data-code="/::-S">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103036856.png">
-                                </li>
-                                <li title="[疑问]" data-code="/:?">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103041851.png">
-                                </li>
-                                <li title="[嘘]" data-code="/:,@x">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103046204.png">
-                                </li>
-                                <li title="[晕]" data-code="/:,@@">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103051515.png">
-                                </li>
-                                <li title="[疯了]" data-code="/::8">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103056368.png">
-                                </li>
-                                <li title="[哀]" data-code="/:,@!">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103101584.png">
-                                </li>
-                                <li title="[骷髅]" data-code="/:!!!">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103106639.png">
-                                </li>
-                                <li title="[敲打]" data-code="/:xx">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103111714.png">
-                                </li>
-                                <li title="[再见]" data-code="/:bye">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103116995.png">
-                                </li>
-                                <li title="[擦汗]" data-code="/:wipe">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103121307.png">
-                                </li>
-                                <li title="[抠鼻]" data-code="/:dig">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103126628.png">
-                                </li>
-                                <li title="[鼓掌]" data-code="/:handclap">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103131537.png">
-                                </li>
-                                <li title="[糗大了]" data-code="/:&amp;-(">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103136922.png">
-                                </li>
-                                <li title="[坏笑]" data-code="/:B-)">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103141708.png">
-                                </li>
-                                <li title="[左哼哼]" data-code="/:<@">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103146409.png">
-                                </li>
-                                <li title="[右哼哼]" data-code="/:@>">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103151786.png">
-                                </li>
-                                <li title="[哈欠]" data-code="/::-O">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103156150.png">
-                                </li>
-                                <li title="[鄙视]" data-code="/:>-|">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103201493.png">
-                                </li>
-                                <li title="[委屈]" data-code="/:P-(">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103206968.png">
-                                </li>
-                                <li title="[快哭了]" data-code="/::'|">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103211938.png">
-                                </li>
-                                <li title="[阴险]" data-code="/:X-)">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103216563.png">
-                                </li>
-                                <li title="[亲亲]" data-code="/::*">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103221494.png">
-                                </li>
-                                <li title="[吓]" data-code="/:@x">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103226447.png">
-                                </li>
-                                <li title="[可怜]" data-code="/:8*">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103231181.png">
-                                </li>
-                                <li title="[菜刀]" data-code="/:pd">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103236908.png">
-                                </li>
-                                <li title="[西瓜]" data-code="/:<W>">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103241610.png">
-                                </li>
-                                <li title="[啤酒]" data-code="/:beer">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103246942.png">
-                                </li>
-                                <li title="[篮球]" data-code="/:basketb">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103251889.png">
-                                </li>
-                                <li title="[乒乓]" data-code="/:oo">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103256822.png">
-                                </li>
-                                <li title="[咖啡]" data-code="/:coffee">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103301730.png">
-                                </li>
-                                <li title="[饭]" data-code="/:eat">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103306315.png">
-                                </li>
-                                <li title="[猪头]" data-code="/:pig">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103311631.png">
-                                </li>
-                                <li title="[玫瑰]" data-code="/:rose">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103316218.png">
-                                </li>
-                                <li title="[凋谢]" data-code="/:fade">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103321727.png">
-                                </li>
-                                <li title="[嘴唇]" data-code="/:showlove">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103326466.png">
-                                </li>
-                                <li title="[爱心]" data-code="/:heart">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103331391.png">
-                                </li>
-                                <li title="[心碎]" data-code="/:break">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103336293.png">
-                                </li>
-                                <li title="[蛋糕]" data-code="/:cake">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103341727.png">
-                                </li>
-                                <li title="[闪电]" data-code="/:li">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103346519.png">
-                                </li>
-                                <li title="[炸弹]" data-code="/:bome">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103351983.png">
-                                </li>
-                                <li title="[刀]" data-code="/:kn">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103356315.png">
-                                </li>
-                                <li title="[足球]" data-code="/:footb">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103401393.png">
-                                </li>
-                                <li title="[瓢虫]" data-code="/:ladybug">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103406284.png">
-                                </li>
-                                <li title="[便便]" data-code="/:shit">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103411342.png">
-                                </li>
-                                <li title="[月亮]" data-code="/:moon">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103416889.png">
-                                </li>
-                                <li title="[太阳]" data-code="/:sun">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103421513.png">
-                                </li>
-                                <li title="[礼物]" data-code="/:gift">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103426896.png">
-                                </li>
-                                <li title="[拥抱]" data-code="/:hug">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103431815.png">
-                                </li>
-                                <li title="[强]" data-code="/:strong">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103436286.png">
-                                </li>
-                                <li title="[弱]" data-code="/:weak">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103441411.png">
-                                </li>
-                                <li title="[握手]" data-code="/:share">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103446541.png">
-                                </li>
-                                <li title="[胜利]" data-code="/:v">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103451461.png">
-                                </li>
-                                <li title="[抱拳]" data-code="/:@)">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103456248.png">
-                                </li>
-                                <li title="[勾引]" data-code="/:jj">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103501861.png">
-                                </li>
-                                <li title="[拳头]" data-code="/:@@">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103506188.png">
-                                </li>
-                                <li title="[差劲]" data-code="/:bad">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103511436.png">
-                                </li>
-                                <li title="[爱你]" data-code="/:lvu">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103516890.png">
-                                </li>
-                                <li title="[NO]" data-code="/:no">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103521415.png">
-                                </li>
-                                <li title="[OK]" data-code="/:ok">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103526248.png">
-                                </li>
-                                <li title="[爱情]" data-code="/:love">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103531694.png">
-                                </li>
-                                <li title="[飞吻]" data-code="/:<L>">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103536789.png">
-                                </li>
-                                <li title="[跳跳]" data-code="/:jump">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103541535.png">
-                                </li>
-                                <li title="[发抖]" data-code="/:shake">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103546800.png">
-                                </li>
-                                <li title="[怄火]" data-code="/:<O>">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103551956.png">
-                                </li>
-                                <li title="[转圈]" data-code="/:circle">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103556647.png">
-                                </li>
-                                <li title="[磕头]" data-code="/:kotow">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103601489.png">
-                                </li>
-                                <li title="[回头]" data-code="/:turn">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103606571.png">
-                                </li>
-                                <li title="[跳绳]" data-code="/:skip">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103611997.png">
-                                </li>
-                                <li title="[投降]" data-code="/:oy">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103616555.png">
-                                </li>
-                                <li title="[激动]" data-code="/:#-0">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103621939.png">
-                                </li>
-                                <li title="[乱舞]" data-code="/:hiphot">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103626894.png">
-                                </li>
-                                <li title="[献吻]" data-code="/:kiss">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103636123.png">
-                                </li>
-                                <li title="[左太极]" data-code="/:<&amp;">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103641405.png">
-                                </li>
-                                <li title="[右太极]" data-code="/:&amp;>">
-                                    <img src="http://www.onegreen.net/QQ/UploadFiles/201404/20140427103646322.png">
-                                </li>
-                                        
-                                        
-                                        
-                                            
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        
-        
-        <div id="floorListCard" class="fadeInUp">
-            <div class="content">
-                <ul>
-                    <!-- <li>皇马郦宫 <span data-id="1">发送</span></li> -->
-                    <li>四季松湖 <span data-id="2">发送</span></li>
-                    <li>万科城 <span data-id="3">发送</span></li>
-                    <li>万科翡丽山 <span data-id="4">发送</span></li>
-                    <li>万科首铸·东江之星 <span data-id="5">发送</span></li>
-                    <li>万科幸福城 <span data-id="6">发送</span></li>
-                    <li>万科云城 <span data-id="7">发送</span></li>
-                    <li>万科中天·城市花园 <span data-id="8">发送</span></li>
-                    <li>万科中央公园 <span data-id="9">发送</span></li>
-                    <li>万科珠江东岸 <span data-id="10">发送</span></li>
-                </ul>
-                <div class="closeBox">
-                    <span class="iconfont icon-guanbi1"></span>
-                </div>
-            </div>
-            
-        </div>
-        
-        <div class="model_box">
-
-            <span class="tip_box">暂无客服消息</span>
-            <br>
-            <br>
-            <br>
-            <span class="tip_content_box">新消息将会通过模板消息通知您，点开即可回复。</span>
-            <br>
-            <br>
-        </div>
-
-        <div class="pswp" tabindex="-1" role="dialog" aria-hidden="true">
-            <div class="pswp__bg"></div>
-            <div class="pswp__scroll-wrap">
-                <div class="pswp__container">
-                    <div class="pswp__item"></div>
-                    <div class="pswp__item"></div>
-                    <div class="pswp__item"></div>
-                </div>
-                <div class="pswp__ui pswp__ui--hidden">
-                    <div class="pswp__top-bar">
-                        <div class="pswp__counter"></div>
-                        <button class="pswp__button pswp__button--close" title="Close (Esc)"></button>
-                        <button class="pswp__button pswp__button--zoom" title="Zoom in/out"></button>
-                        <div class="pswp__preloader">
-                            <div class="pswp__preloader__icn">
-                                <div class="pswp__preloader__cut">
-                                    <div class="pswp__preloader__donut"></div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="pswp__share-modal pswp__share-modal--hidden pswp__single-tap">
-                        <div class="pswp__share-tooltip"></div>
-                    </div>
-                    <button class="pswp__button pswp__button--arrow--left" title="Previous (arrow left)"></button>
-                    <button class="pswp__button pswp__button--arrow--right" title="Next (arrow right)"></button>
-                    <div class="pswp__caption">
-                        <div class="pswp__caption__center"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <script src='../res/js/jquery.min.js'></script>
-        <script src="../res/js/up.js"></script>
-        
-        <script src="../res/plugins/photoswipe/photoswipe-ui-default.min.js"></script>
-        <script src="../res/plugins/photoswipe/photoswipe.min.js"></script>
-        <script>
-            var G_salesid = '${salesId}';
-            var G_fansid = '${fansId}';
-            var G_isvank = '${isVanker}' == "true" ? 0 : 1;
-            var G_isAsk = '${isVanker}' == "true" ? 2 : 1;
-        </script>
-        <script src="../res/js/mobileChat.min.js"></script>
-        <script src="../res/js/mobileChatBind.js"></script>
-        
-    </body>
-
-    </html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/weixin/error.jsp b/WebContent/WEB-INF/jsp/weixin/error.jsp
deleted file mode 100644
index a159b0d..0000000
--- a/WebContent/WEB-INF/jsp/weixin/error.jsp
+++ /dev/null
@@ -1,12 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Error(出错了)</title>
-</head>
-<body>
-	<div style="width:0 auto;text-align:center;margin-top:10%;text-color:red;font-size:1.5em;">${message}</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/weixin/redpackage.jsp b/WebContent/WEB-INF/jsp/weixin/redpackage.jsp
deleted file mode 100644
index bb7d96c..0000000
--- a/WebContent/WEB-INF/jsp/weixin/redpackage.jsp
+++ /dev/null
@@ -1,181 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-
-<head>
-<meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta http-equiv="X-UA-Compatible" content="ie=edge">
-<title>领取红包</title>
-<style>
-body {
-	margin: 0;
-	background-color: #f1f1f1;
-}
-
-@media screen and (max-width: 321px) {
-	html {
-		font-size: 13px;
-	}
-}
-
-@media ( min-width : 321px) and (max-width: 480px) {
-	html {
-		font-size: 15px;
-	}
-}
-
-@media screen and (min-width: 481px) {
-	html {
-		font-size: 18px;
-	}
-}
-
-.header {
-	position: relative;
-}
-
-.h1 {
-	background-color: rgb(216, 89, 64);
-	color: rgb(255, 226, 177);
-	width: 100%;
-	height: 4.67rem;
-	line-height: 4.67rem;
-	text-align: center;
-	position: absolute;
-	top: 0;
-	left: 0;
-	z-index: 2
-}
-
-.yuan {
-	width: 100%;
-	height: 9.34rem;
-	background-color: rgb(216, 89, 64);
-	border-radius: 100%;
-	position: absolute;
-	top: 0px;
-	left: 0;
-	z-index: 1;
-}
-
-.logo {
-	width: 4rem;
-	height: 4rem;
-	border: 1px solid rgb(255, 226, 177);
-	position: absolute;
-	top: 6.67rem;
-	left: 50%;
-	transform: translateX(-50%);
-	z-index: 3;
-	border-radius: 4px;
-}
-
-.logo img {
-	width: 100%;
-	height: 100%;
-	border-radius: 4px;
-}
-
-.content {
-	background-color: #f1f1f1;
-	width: 100%;
-	height: 23.67rem;
-	padding-top: 12rem;
-	box-sizing: border-box;
-	text-align: center;
-}
-
-.title {
-	font-size: 1.2rem;
-	letter-spacing: 4px;
-	font-weight: bold;
-}
-
-.subTitle {
-	font-size: 0.8rem;
-	margin-top: 0.8rem;
-	letter-spacing: 3px;
-}
-
-.money {
-	font-size: 2.6rem;
-	font-weight: bold;
-	font-family: '黑体'
-}
-
-.moneyBox {
-	margin-top: 1rem;
-}
-
-.tip {
-	margin: 1.4rem 0;
-	font-size: 0.8rem;
-	color: rgb(87, 118, 179);
-	letter-spacing: 2px;
-}
-
-.closeBox {
-	height: 4.67rem;
-	line-height: 4.67rem;
-	font-size: 1.1rem;
-	font-weight: bold;
-	color: #666;
-	text-align: center;
-	border-bottom: 1px solid #eee;
-}
-
-.closeBox button {
-	border: none;
-	background-color: #1AAD19;
-	border: 1px solid #179B16;
-	color: #fff;
-	width: 80%;
-	height: 40px;
-	border-radius: 4px;
-}
-</style>
-</head>
-
-<body>
-	<div class="header">
-		<div class="h1">微信红包</div>
-		<div class="yuan"></div>
-		<div class="logo">
-			<img src="../../res/images/vanke_logo.png" alt="">
-		</div>
-	</div>
-	<div class="content">
-		<div class="title">万小二的红包</div>
-		<div class="subTitle">买房就找万小二</div>
-		<div class="moneyBox">
-			<span class="money">0</span> <span>元</span>
-		</div>
-			<div class="tip">
-				红包已入帐,请到【微信支付】消息处查收。
-			</div>
-	</div>
-	<div class="closeBox">
-		<button onclick="fn()">我知道了</button>
-	</div>
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js" type="text/javascript"></script>
-	<script type="text/javascript">
-		function getUrl_G(name) {  
-		    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");  
-		    var r = window.location.search.substr(1).match(reg);  
-		    if (r != null) return unescape(r[2]); return null;  
-		}
-		
-		var mny = getUrl_G("mny");
-		$(".money").html(mny);
-		
-		function fn() {
-			wx.closeWindow();
-		}
-		
-		
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/res/images/Group2Copy.png b/WebContent/WEB-INF/res/images/Group2Copy.png
deleted file mode 100644
index c45262f..0000000
Binary files a/WebContent/WEB-INF/res/images/Group2Copy.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/acedit1.png b/WebContent/WEB-INF/res/images/acedit1.png
deleted file mode 100644
index fd2941f..0000000
Binary files a/WebContent/WEB-INF/res/images/acedit1.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/acedit2.png b/WebContent/WEB-INF/res/images/acedit2.png
deleted file mode 100644
index 9718c84..0000000
Binary files a/WebContent/WEB-INF/res/images/acedit2.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/acedit3.png b/WebContent/WEB-INF/res/images/acedit3.png
deleted file mode 100644
index 9e9a521..0000000
Binary files a/WebContent/WEB-INF/res/images/acedit3.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/browser.png b/WebContent/WEB-INF/res/images/browser.png
deleted file mode 100644
index cd93e47..0000000
Binary files a/WebContent/WEB-INF/res/images/browser.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/chat_add_sale.png b/WebContent/WEB-INF/res/images/chat_add_sale.png
deleted file mode 100644
index 6f9ad83..0000000
Binary files a/WebContent/WEB-INF/res/images/chat_add_sale.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/chat_bg.png b/WebContent/WEB-INF/res/images/chat_bg.png
deleted file mode 100644
index bd111a6..0000000
Binary files a/WebContent/WEB-INF/res/images/chat_bg.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/code.png b/WebContent/WEB-INF/res/images/code.png
deleted file mode 100644
index 1f2913e..0000000
Binary files a/WebContent/WEB-INF/res/images/code.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/confirm.jpg b/WebContent/WEB-INF/res/images/confirm.jpg
deleted file mode 100644
index 1ab27e2..0000000
Binary files a/WebContent/WEB-INF/res/images/confirm.jpg and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/dafaultlogo.png b/WebContent/WEB-INF/res/images/dafaultlogo.png
deleted file mode 100644
index 76fdcd7..0000000
Binary files a/WebContent/WEB-INF/res/images/dafaultlogo.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/default_user.png b/WebContent/WEB-INF/res/images/default_user.png
deleted file mode 100644
index 57ff740..0000000
Binary files a/WebContent/WEB-INF/res/images/default_user.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/fail1.png b/WebContent/WEB-INF/res/images/fail1.png
deleted file mode 100644
index dc8294e..0000000
Binary files a/WebContent/WEB-INF/res/images/fail1.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/hongbao.png b/WebContent/WEB-INF/res/images/hongbao.png
deleted file mode 100644
index e77bb55..0000000
Binary files a/WebContent/WEB-INF/res/images/hongbao.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/icon01_active.png b/WebContent/WEB-INF/res/images/icon01_active.png
deleted file mode 100644
index b47a7e9..0000000
Binary files a/WebContent/WEB-INF/res/images/icon01_active.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/iphone.png b/WebContent/WEB-INF/res/images/iphone.png
deleted file mode 100644
index 86c015b..0000000
Binary files a/WebContent/WEB-INF/res/images/iphone.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/loginimg.png b/WebContent/WEB-INF/res/images/loginimg.png
deleted file mode 100644
index e228fb1..0000000
Binary files a/WebContent/WEB-INF/res/images/loginimg.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/logo.jpg b/WebContent/WEB-INF/res/images/logo.jpg
deleted file mode 100644
index aae8820..0000000
Binary files a/WebContent/WEB-INF/res/images/logo.jpg and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/moren.jpg b/WebContent/WEB-INF/res/images/moren.jpg
deleted file mode 100644
index ff08828..0000000
Binary files a/WebContent/WEB-INF/res/images/moren.jpg and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/pg_bottom.jpg b/WebContent/WEB-INF/res/images/pg_bottom.jpg
deleted file mode 100644
index 8ce3533..0000000
Binary files a/WebContent/WEB-INF/res/images/pg_bottom.jpg and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/pg_top.jpg b/WebContent/WEB-INF/res/images/pg_top.jpg
deleted file mode 100644
index b61a33e..0000000
Binary files a/WebContent/WEB-INF/res/images/pg_top.jpg and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/phicon.png b/WebContent/WEB-INF/res/images/phicon.png
deleted file mode 100644
index 8edbbac..0000000
Binary files a/WebContent/WEB-INF/res/images/phicon.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/photo.png b/WebContent/WEB-INF/res/images/photo.png
deleted file mode 100644
index 523194f..0000000
Binary files a/WebContent/WEB-INF/res/images/photo.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/redpackage.png b/WebContent/WEB-INF/res/images/redpackage.png
deleted file mode 100644
index 2403749..0000000
Binary files a/WebContent/WEB-INF/res/images/redpackage.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/robot_logo.png b/WebContent/WEB-INF/res/images/robot_logo.png
deleted file mode 100644
index 5bf58a3..0000000
Binary files a/WebContent/WEB-INF/res/images/robot_logo.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/status1.png b/WebContent/WEB-INF/res/images/status1.png
deleted file mode 100644
index 95075ec..0000000
Binary files a/WebContent/WEB-INF/res/images/status1.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/status2.png b/WebContent/WEB-INF/res/images/status2.png
deleted file mode 100644
index 45e1d58..0000000
Binary files a/WebContent/WEB-INF/res/images/status2.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/status3.png b/WebContent/WEB-INF/res/images/status3.png
deleted file mode 100644
index f32f41f..0000000
Binary files a/WebContent/WEB-INF/res/images/status3.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/succ1.png b/WebContent/WEB-INF/res/images/succ1.png
deleted file mode 100644
index f7bbb60..0000000
Binary files a/WebContent/WEB-INF/res/images/succ1.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/vanke_logo.png b/WebContent/WEB-INF/res/images/vanke_logo.png
deleted file mode 100644
index 8d88ac7..0000000
Binary files a/WebContent/WEB-INF/res/images/vanke_logo.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/weixin.png b/WebContent/WEB-INF/res/images/weixin.png
deleted file mode 100644
index 45d33fa..0000000
Binary files a/WebContent/WEB-INF/res/images/weixin.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/xiazai.png b/WebContent/WEB-INF/res/images/xiazai.png
deleted file mode 100644
index bf37564..0000000
Binary files a/WebContent/WEB-INF/res/images/xiazai.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/images/xzicon.png b/WebContent/WEB-INF/res/images/xzicon.png
deleted file mode 100644
index 11eab8d..0000000
Binary files a/WebContent/WEB-INF/res/images/xzicon.png and /dev/null differ
diff --git a/WebContent/WEB-INF/res/plugins/datas/nav.js b/WebContent/WEB-INF/res/plugins/datas/nav.js
index 07e6b56..33ac368 100644
--- a/WebContent/WEB-INF/res/plugins/datas/nav.js
+++ b/WebContent/WEB-INF/res/plugins/datas/nav.js
@@ -1,7 +1,12 @@
 var navs2 = [{
-		"title": "项目管理",
+		"title": "商品管理",
 		"icon": "icon-xiangmu",
-		"href": "/zzhnc/project/projectIndex"
+		"href": "/zzhnc/goods/goodsList"
+	},
+	{
+		"title": "活动介绍",
+		"icon": "icon-haibao1",
+		"href": "/zzhnc/activity/activityList"
 	},
 	{
 		"title": "自动回复",
@@ -9,43 +14,18 @@ var navs2 = [{
 		"href": "/zzhnc/autoreply/autoresponse"
 	},
 	{
-		"title": "海报模板",
-		"icon": "icon-haibao1",
-		"href": "/zzhnc/poster/posterlist"
-	},
-	{
-		"title": "销售人员",
+		"title": "奖品管理",
 		"icon": "icon-xiaoshou1",
-		"href": "/zzhnc/sale/saleIndex"
-	},
-	{
-		"title": "公众号管理",
-		"icon": "icon-gzh",
-		"href": "/zzhnc/pcwx/wxmanage"
-	},
-	{
-		"title": "文章管理",
-		"icon": "icon-wenzhang-copy",
-		"href": "/zzhnc/article/articleIndex"
-	},
-	{
-		"title": "红包配置",
-		"icon": "icon-Shape",
-		"href": "/zzhnc/activity/activityindex"
+		"href": "/zzhnc/prize/prizeList"
 	},
 	{
 		"title": "报表",
 		"icon": "icon-baobiao1",
 		"children":[
 			{
-				"title": "聊天记录",
+				"title": "商品报表",
 				"icon": "icon-kefu",
-				"href": "/zzhnc/report/chatrecord"
-			},
-			{
-				"title": "拨打记录",
-				"icon": "icon-dianhua",
-				"href": "/zzhnc/report/callreport"
+				"href": "/zzhnc/report/goods"
 			},
 			{
 				"title": "粉丝列表",
@@ -53,19 +33,9 @@ var navs2 = [{
 				"href": "/zzhnc/report/fans"
 			},
 			{
-				"title": "销售报表",
-				"icon": "icon-xiaoshou",
-				"href": "/zzhnc/report/salereport"
-			},
-			{
-				"title": "评论列表",
-				"icon": "icon-pinglun1",
-				"href": "/zzhnc/report/remarksreport"
-			},
-			{
 				"title": "抽奖记录",
 				"icon": "icon-jiangpin",
-				"href": "/zzhnc/report/winningrecord"
+				"href": "/zzhnc/report/prize"
 			}
 			
 		
diff --git a/WebContent/index.jsp b/WebContent/index.jsp
index c5e232e..2ca9c04 100644
--- a/WebContent/index.jsp
+++ b/WebContent/index.jsp
@@ -1,98 +1,86 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html class="loginblock">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>登录到万小二后台</title>
-    <link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-    <link rel="stylesheet" href="/zzhnc/res/css/basic.css">	
-    <style>
-   
-    </style>
-</head>
-<!-- hehe -->
-<body onkeydown="keydown();">
-    <div class="main">
-       
-        <div class="loginlogo">
-            <img src="/zzhnc/res/images/logo.png" alt="">
-        </div>
-        <div class="loginBox">
-            <div class="formBox">
-                <div class="box">
-                  
-			        <h3>东万楼盘小程序管理后台</h3>
-                    <div class="loginbos">
-                    	<div class="layui-form-item">
-                    
-                    		<img src="/zzhnc/res/images/Group2.png" class="loginicon">
-                    	
-							<div class="layui-input-inline" style="width:auto;">
-								<input type="text" placeholder="账号" name="account">
+
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<meta http-equiv="X-UA-Compatible" content="ie=edge">
+		<title>华南城小程序后台</title>
+		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
+		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
+	</head>
+
+	<body onkeydown="keydown();">
+		<div class="main">
+			<div class="loginlogo">
+				<img src="/zzhnc/res/images/logo.png" alt="">
+			</div>
+			<div class="loginBox">
+				<div class="formBox">
+					<div class="box">
+						<h3>华南城小程序管理后台</h3>
+						<div class="loginbos">
+							<div class="layui-form-item">
+								<img src="/zzhnc/res/images/Group2.png" class="loginicon">
+								<div class="layui-input-inline" style="width:auto;">
+									<input type="text" placeholder="账号" name="account">
+								</div>
 							</div>
-                    	</div>
-                    	
-                        <div class="layui-form-item">
-                    		 <img src="/zzhnc/res/images/Group1.png" class="loginicon">
-	                       <div class="layui-input-inline" style="width:auto;">
-								 <input type="password" placeholder="密码" name="pwd">
+							<div class="layui-form-item">
+								<img src="/zzhnc/res/images/Group1.png" class="loginicon">
+								<div class="layui-input-inline" style="width:auto;">
+									<input type="password" placeholder="密码" name="pwd">
+								</div>
 							</div>
-                    	</div>
-                       
-                        <div class="submitBox">
-	                        <button>登录</button>
-	                    </div>
-                    </div>
-                   
-                    <!--  -->
-                </div>
-                
-            </div>
-        </div>
-        
-    </div>
-   <script src='/zzhnc/res/js/jquery.min.js'></script>
-    <script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-    <script>
-       /*  $(".submitBox button").click(function(){
-            window.location.href="index.html"
-        }) */
-        layui.use(['element',  'layer'], function() {
-				element = layui.element(),
-				layer = layui.layer;
-	        	$(".submitBox").on("click",function(){
-	        	 var account=$("input[name=account]").val();
-	             var pwd=$("input[name=pwd]").val();
-	             if(account==""){
-	            	 top.layer.msg("请填写账号");
-	            	 return false;
-	             }
-	             if(pwd==""){
-	            	 top.layer.msg("请填写密码");
-	            	 return false;
-	             }
-	             $.post("/zzhnc/loginIn",{account:account,pwd:pwd},function(data){
-	             	console.log(data)
-	              	if(data.code==0){
-	              		top.layer.msg("登陆成功");
-	              		window.location.href="/zzhnc/home/index";
-	              	}else{
-	              		top.layer.msg(data.data);
-	              	}
-	             	
-	             });
-	        });
-        });
-       
-        function keydown(e)   { 
-			var currKey=0,e=e||event;   
-			if(e.keyCode==13){
-				$(".submitBox").click()
-			};
-		} 
-		document.onkeydown=keydown;
-    </script>
-</body>
+							<div class="submitBox">
+								<button>登录</button>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<script src='/zzhnc/res/js/jquery.min.js'></script>
+		<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
+		<script>
+			layui.use(['layer'], function() {
+				var layer = layui.layer;
+				$(".submitBox").on("click", function() {
+					var account = $("input[name=account]").val();
+					var pwd = $("input[name=pwd]").val();
+					if(account == "") {
+						top.layer.msg("请填写账号");
+						return false;
+					}
+					if(pwd == "") {
+						top.layer.msg("请填写密码");
+						return false;
+					}
+					$.post("/zzhnc/loginIn", {
+						account: account,
+						pwd: pwd
+					}, function(data) {
+						console.log(data)
+						if(data.code == 0) {
+							top.layer.msg("登陆成功");
+							window.location.href = "/zzhnc/home/index";
+						} else {
+							top.layer.msg(data.data);
+						}
+					});
+				});
+			});
+
+			function keydown(e) {
+				var currKey = 0,
+					e = e || event;
+				if(e.keyCode == 13) {
+					$(".submitBox").click()
+				};
+			}
+			document.onkeydown = keydown;
+		</script>
+	</body>
+
 </html>
\ No newline at end of file
--
libgit2 0.24.0