From cf0d4acb223ff9d88aa8f452901997ed6f2804ff Mon Sep 17 00:00:00 2001
From: shenzi <shenzi@theyeasy.com>
Date: Tue, 9 Jan 2018 16:51:47 +0800
Subject: [PATCH] 更新

---
 WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp | 8 ++++++--
 WebContent/WEB-INF/jsp/pc/report/fans.jsp           | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp b/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp
index 564184d..e5c30e7 100644
--- a/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp
+++ b/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp
@@ -201,7 +201,7 @@
 							console.log(data);
 							if(data.code == 0) {
 								top.layer.msg("添加成功");
-								form.render();
+								clearForm();
 							} else {
 								top.layer.msg(data.msg);
 							}
@@ -212,13 +212,17 @@
 
 				//重置
 				$(".resetBtn").on("click", function() {
+					clearForm();
+				})
+				
+				function clearForm(){
 					$("[name=title]").val("");
 					$("[name=content]").val("");
 					$("[name=type]").val("");
 					$("[name=imgurl]").val("");
 					$(".mainpictrue").attr("src", "").css("margin", "0");
 					form.render();
-				})
+				}
 
 			})
 		</script>
diff --git a/WebContent/WEB-INF/jsp/pc/report/fans.jsp b/WebContent/WEB-INF/jsp/pc/report/fans.jsp
index e319eb8..b235e6a 100644
--- a/WebContent/WEB-INF/jsp/pc/report/fans.jsp
+++ b/WebContent/WEB-INF/jsp/pc/report/fans.jsp
@@ -27,6 +27,7 @@
 					<th>No</th>
 					<th>头像昵称</th>
 					<th>地区</th>
+					<th>上级粉丝id</th>
 					<th>小程序 openid</th>
 					<th style="min-width: 84px;">创建时间</th>
 					<th style="min-width: 84px;">上次登录时间</th>
@@ -69,6 +70,7 @@
 								'<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>' +
--
libgit2 0.24.0