From 3200777e4961cf67ba5e1465e1ede13f8c21c178 Mon Sep 17 00:00:00 2001
From: zhengzheng <18918765049@163.com>
Date: Fri, 15 Apr 2022 22:03:13 +0800
Subject: [PATCH] Changes

---
 .../resources/templates/active/info/edit.html  |  2 +-
 .../resources/templates/active/info/index.html | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/zt-admin/src/main/resources/templates/active/info/edit.html b/zt-admin/src/main/resources/templates/active/info/edit.html
index de23ac839..6705c0d68 100644
--- a/zt-admin/src/main/resources/templates/active/info/edit.html
+++ b/zt-admin/src/main/resources/templates/active/info/edit.html
@@ -96,7 +96,7 @@
 			var activeEndDate = $("input[name='activeEndDate']").val();
 			var activeType = $("select[name='activeType']").val();
 			var activePic = $("input[name='activePic']").val();
-			var status = $("input[id='status']").is(':checked') == true ? 0 : 1;
+			var status =  $("select[name='status']").val();
 			var remark = $("input[name='remark']").val();
 			$.ajax({
 				cache : true,
diff --git a/zt-admin/src/main/resources/templates/active/info/index.html b/zt-admin/src/main/resources/templates/active/info/index.html
index 542d9be76..9c5d99f69 100644
--- a/zt-admin/src/main/resources/templates/active/info/index.html
+++ b/zt-admin/src/main/resources/templates/active/info/index.html
@@ -109,7 +109,23 @@
                     }
 		        },
 		         {
-		            field: 'activeType',
+		            field: 'status',
+		            title: '活动状态',
+		            sortable: true,
+                      formatter: function(value, item, index) {
+                        if (item.status == '1') {
+                            return '进行中';
+                        }
+                        else if (item.status == '2') {
+                            return '报名中';
+                        } else if (item.status == '3') {
+                            return '已结束';
+                        }
+
+                    }
+		        },
+		         {
+		            field: 'isFristPage',
 		            title: '是否设置首页',
 		            sortable: true,
                       formatter: function(value, item, index) {