diff --git a/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp b/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp
index 6ee3edd..0213ba2 100644
--- a/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp
+++ b/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp
@@ -28,18 +28,27 @@
 				max-width: 80%;
 			}
 		</style>
-		<script src="http://cdn.sockjs.org/sockjs-0.3.min.js"></script>
 
 		<body class="wrap">
 			<div class="layui-form">
 				<div class="layui-form-item">
-					<label class="layui-form-label"><i class="redrequired">*</i>文章标题</label>
+					<label class="layui-form-label">文章标题</label>
 					<div class="layui-input-inline" style="width: 400px;">
 						<input type="text" name="title" lay-verify="required|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 class="redrequired">*</i>专区类型</label>
+					<div class="layui-input-inline" style="width: 400px;">
+						<select name="type" lay-verify="required">
+							<option value="">请选择</option>
+							<option value="1">活动预告</option>
+							<option value="2">福利专区</option>
+						</select>
+					</div>
+				</div>
+				<div class="layui-form-item">
 					<label class="layui-form-label"><i class="redrequired">*</i>上传主图</label>
 					<div class="layui-input-inline" style="width: 400px;">
 						<div class="layui-upload">
@@ -52,8 +61,8 @@
 						</div>
 					</div>
 				</div>
-				<div class="layui-form-item">
-					<label class="layui-form-label"><i class="redrequired">*</i>文章内容</label>
+				<div class="layui-form-item" style="display: none">
+					<label class="layui-form-label">文章内容</label>
 					<div class="layui-input-block" style="margin-left: 130px;"> 
 						<!-- 加载编辑器的容器 -->
 						<script id="container" name="content" type="text/plain">
@@ -75,7 +84,7 @@
 		<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() {
+			/*window.onload = function() {
 				UE.Editor.prototype._bkGetActionUrl = UE.Editor.prototype.getActionUrl;
 				UE.Editor.prototype.getActionUrl = function(action) {
 					if(action == 'uploadimage' || action == 'uploadscrawl' || action == 'uploadimage') {
@@ -89,8 +98,7 @@
 				var ue = UE.getEditor('container', {
 					autoHeight: false
 				});
-
-			}
+			}*/
 
 			layui.use(['form', 'element', 'layer', 'upload'], function() {
 				var form = layui.form,
@@ -108,9 +116,10 @@
 						console.log(data);
 						if(data.code == 0) {
 							$("[name=title]").val(data.data.title);
-							UE.getEditor("container").ready(function() {
+							/*UE.getEditor("container").ready(function() {
 								UE.getEditor("container").setContent(unescape(data.data.content));
-							})
+							})*/
+							$("[name=type]").val(data.data.type);
 							$("[name=imgurl]").val(data.data.imgurl);
 							$(".mainpictrue").attr("src", data.data.imgurl).css("margin-top", "15px");
 							form.render();
@@ -141,9 +150,10 @@
 				//提交
 				form.on('submit(submit)', function(data) {
 					var title = $("[name=title]").val();
-					var content = UE.getEditor('container').getContent();
+					//var content = UE.getEditor('container').getContent();
 					var imgurl = $("[name=imgurl]").val();
-					if(title == "") {
+					var type = $("[name=type]").val();
+					/*if(title == "") {
 						top.layer.msg("请填写文章标题");
 						return false;
 					} else {
@@ -151,21 +161,30 @@
 							top.layer.msg("文章标题不超过20个汉字");
 							return false;
 						}
+					}*/
+					if(strlen(title) > 40) {
+						top.layer.msg("文章标题不超过20个汉字");
+						return false;
+					}
+					if(type < 1){
+						top.layer.msg("请选择专区类型");
+						return false;
 					}
 					if(imgurl == "") {
 						top.layer.msg("请上传主图");
 						return false;
 					}
-					if(content == "") {
+					/*if(content == "") {
 						top.layer.msg("请输入内容");
 						return false;
-					}
+					}*/
 					if(id > 0) {
 						//修改项目
 						$.post("/zzhnc/article/updateArticle", {
 							id: id,
 							title: title,
-							content: content,
+							//content: content,
+							type: type,
 							imgurl: imgurl
 						}, function(data) {
 							console.log(data);
@@ -179,7 +198,8 @@
 						//添加项目
 						$.post("/zzhnc/article/addArticle", {
 							title: title,
-							content: content,
+							//content: content,
+							type: type,
 							imgurl: imgurl
 						}, function(data) {
 							console.log(data);
@@ -197,7 +217,8 @@
 				//重置
 				$(".resetBtn").on("click", function() {
 					$("[name=title]").val("");
-					$("[name=content]").val("");
+					//$("[name=content]").val("");
+					$("[name=type]").val("");
 					$("[name=imgurl]").val("");
 					$(".mainpictrue").attr("src", "").css("margin-top", "0");
 					form.render();
diff --git a/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp b/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp
index 801671e..9bf68ad 100644
--- a/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp
+++ b/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp
@@ -28,6 +28,7 @@
 					<th>No</th>
 					<th style="width: 130px;">主图</th>
 					<th>标题</th>
+					<th>类型</th>
 					<th>更新时间</th>
 					<th>操作</th>
 				</tr>
@@ -74,6 +75,7 @@
 								'<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' +
 								'<td><img src="' + data.rows[i].imgurl + '" style="width: 100px; height: 100px;" /></td>' +
 								'<td>' + data.rows[i].title + '</td>' +
+								'<td>' + toType(data.rows[i].type) + '</td>' +
 								'<td>' + toTime_G(data.rows[i].createdtime) + '</td>' +
 								'<td>' +
 								'<a href="#" class="layui-btn layui-btn-sm updataBtn">修改</a>' +
@@ -170,6 +172,15 @@
 					layer.close(index);
 				});
 			});
+			
+			//专区类型转换
+			function toType(t){
+				if(t == 1){
+					return t = "活动介绍"
+				}else{
+					return t = "福利专区"
+				}
+			}
 
 		})
 	</script>
diff --git a/WebContent/WEB-INF/jsp/pc/index.jsp b/WebContent/WEB-INF/jsp/pc/index.jsp
index f333bc3..bc87995 100644
--- a/WebContent/WEB-INF/jsp/pc/index.jsp
+++ b/WebContent/WEB-INF/jsp/pc/index.jsp
@@ -11,7 +11,7 @@
 		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
 		<link rel="stylesheet" href="/zzhnc/res/css/layout.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_450595_ifme6z69cizwu3di.css">
+		<link rel="stylesheet" href="https://at.alicdn.com/t/font_450595_ifme6z69cizwu3di.css">
 		<style>
 			#chromeTip {
 				position: fixed;
diff --git a/WebContent/WEB-INF/jsp/pc/report/fans.jsp b/WebContent/WEB-INF/jsp/pc/report/fans.jsp
index a5f9d43..67414ef 100644
--- a/WebContent/WEB-INF/jsp/pc/report/fans.jsp
+++ b/WebContent/WEB-INF/jsp/pc/report/fans.jsp
@@ -27,7 +27,6 @@
 					<th>No</th>
 					<th>头像昵称</th>
 					<th>地区</th>
-					<th>上级粉丝</th>
 					<th>小程序 openid</th>
 					<th>创建时间</th>
 					<th>上次登录时间</th>
@@ -70,7 +69,6 @@
 								'<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' +
 								'<td><img class="fansImg" src="' + data.rows[i].logo + '" />' + data.rows[i].nickname + '</td>' +
 								'<td>' + ToAddress(data.rows[i]) + '</td>' +
-								'<td>' + data.rows[i].parentfansid + '</td>' +
 								'<td>' + data.rows[i].miniopenid + '</td>' +
 								'<td>' + toTime_G(data.rows[i].createdtime) + '</td>' +
 								'<td>' + toTime_G(data.rows[i].lastlogintime) + '</td>' +
