diff --git a/src/api/operation/activity/index.js b/src/api/operation/activity/index.js
new file mode 100644
index 0000000..f060367
--- /dev/null
+++ b/src/api/operation/activity/index.js
@@ -0,0 +1,53 @@
+import httpService from "@/request"
+
+// 活动列表
+export function activityList(params) {
+ return httpService({
+ url: `/user/activity/list`,
+ method: 'get',
+ params: params,
+ })
+}
+export function organizerSelect(params) {
+ return httpService({
+ url: `/user/activityOrganizer/allList`,
+ method: 'get',
+ params: params,
+ })
+}
+// 报名人
+export function registrationList(params) {
+ return httpService({
+ url: `/user/activity/registrationList`,
+ method: 'get',
+ params: params,
+ })
+}
+export function activityInfo(params) {
+ return httpService({
+ url: `/user/activity/findById`,
+ method: 'get',
+ params: params,
+ })
+}
+export function activityInsert(params) {
+ return httpService({
+ url: `/user/activity/insert`,
+ method: 'post',
+ data: params,
+ })
+}
+export function activityUpdate(params) {
+ return httpService({
+ url: `/user/activity/update`,
+ method: 'post',
+ data: params,
+ })
+}
+export function activityDel(params) {
+ return httpService({
+ url: `/user/activity/delete`,
+ method: 'post',
+ data: params,
+ })
+}
diff --git a/src/api/operation/activity/organizer.js b/src/api/operation/activity/organizer.js
new file mode 100644
index 0000000..392b3b8
--- /dev/null
+++ b/src/api/operation/activity/organizer.js
@@ -0,0 +1,38 @@
+import httpService from "@/request"
+
+// 主办方列表
+export function organizerList(params) {
+ return httpService({
+ url: `/user/activityOrganizer/list`,
+ method: 'get',
+ params: params,
+ })
+}
+export function organizerInfo(params) {
+ return httpService({
+ url: `/user/activityOrganizer/findById`,
+ method: 'post',
+ params: params,
+ })
+}
+export function organizerInsert(params) {
+ return httpService({
+ url: `/user/activityOrganizer/insert`,
+ method: 'get',
+ data: params,
+ })
+}
+export function organizerUpdate(params) {
+ return httpService({
+ url: `/user/activityOrganizer/update`,
+ method: 'post',
+ data: params,
+ })
+}
+export function organizerDel(params) {
+ return httpService({
+ url: `/user/activityOrganizer/delete`,
+ method: 'post',
+ data: params,
+ })
+}
diff --git a/src/views/Operation/Activity/_activityManage/depend/config.js b/src/views/Operation/Activity/_activityManage/depend/config.js
new file mode 100644
index 0000000..4246630
--- /dev/null
+++ b/src/views/Operation/Activity/_activityManage/depend/config.js
@@ -0,0 +1,122 @@
+export const formItem = [
+ {
+ type: 'input',
+ label:'话题标题',
+ prop:'title',
+ placeholder:'请输入标题'
+ },
+ {
+ type: 'select',
+ label:'状态',
+ prop:'status',
+ option:[{ id:1,name:'启用中'},{ id:2,name:'禁用中'}],
+ placeholder:'请选择状态'
+ },
+ {
+ type: 'select',
+ label:'是否公开',
+ prop:'isPublic',
+ placeholder:'请选择',
+ option:[{ id:1,name:'是'},{ id:0,name:'否'}]
+ },
+]
+export const columns = [
+ {
+ title: "发布时间",
+ dataIndex: "createDate",
+ width: "12%",
+ },
+ {
+ title: "图片",
+ dataIndex: "imgpic",
+ width: "10%",
+ scopedSlots: { customRender: "imgpic"}
+ },
+ {
+ title: "活动状态",
+ dataIndex: "status",
+ width: "6%",
+ customRender: function (status) {
+ switch (status) {
+ case 1:
+ return '报名未开始'
+ case 2:
+ return '报名进行中'
+ case 3:
+ return '活动未开始'
+ case 4:
+ return '活动进行中'
+ case 5:
+ return '活动已结束'
+ }
+ }
+ },
+ {
+ title: "活动标题",
+ dataIndex: "title",
+ width: "8%",
+ },
+ {
+ title: "活动地点",
+ dataIndex: "activityAddress",
+ width: "8%",
+ },
+ {
+ title: "是否显示在app",
+ dataIndex: "isShow",
+ width: "5%",
+ customRender: function (isShow) {
+ switch (isShow) {
+ case true:
+ return '显示'
+ case false:
+ return '不显示'
+ }
+ }
+ },
+ {
+ title: "主办方",
+ dataIndex: "organizerName",
+ width: "8%",
+ },
+ {
+ title: "活动内容",
+ dataIndex: "content",
+ width: "8%",
+ },
+ {
+ title: "报名人数",
+ dataIndex: "registrationNum",
+ width: "5%",
+ },
+ {
+ title: "报名时间",
+ width: "12%",
+ customRender: function (data) {
+ return (data.registrationStartTime + '——' + data.registrationEndTime)
+ }
+ },
+ {
+ title: "活动时间",
+ width: "12%",
+ customRender: function (data) {
+ return (data.activityStartTime + '——' + data.activityEndTime)
+ }
+ },
+ {
+ title: "操作",
+ dataIndex: "action",
+ key: "action",
+ width: "180",
+ fixed: "right",
+ scopedSlots: { customRender: "action" },
+ },
+]
+export const pagination = {
+ current: 1,
+ total: 0,
+ pageSize: 10,
+ showTotal: (total) => `共 ${total} 条`,
+ showSizeChanger: true,
+ showQuickJumper: true,
+}
\ No newline at end of file
diff --git a/src/views/Operation/Activity/_activityManage/depend/form.js b/src/views/Operation/Activity/_activityManage/depend/form.js
new file mode 100644
index 0000000..3756e94
--- /dev/null
+++ b/src/views/Operation/Activity/_activityManage/depend/form.js
@@ -0,0 +1,47 @@
+export const form = {
+ title:undefined,
+ organizerId:undefined,
+ isShow:false,
+ activityObject:undefined,
+ content:undefined,
+ registrationStartTime:undefined,
+ registrationEndTime:undefined,
+ activityStartTime:undefined,
+ activityEndTime:undefined,
+ activityAddress:undefined,
+ registrationNumMax:undefined,
+ registrationCost:undefined,
+ activityContact:undefined,
+ activityTel:undefined,
+ imgUrls:[]
+}
+export const rules = {
+ title:[{required:true,message:'请输入标题',trigger:'blur'}],
+ organizerId:[{required:true,message:'请选择',trigger:'change'}],
+ isShow:[{required:true,message:'请选择',trigger:'change'}],
+ activityObject:[{required:true,message:'请选择活动对象',trigger:'change'}],
+ content:[{required:true,message:'请输入内容',trigger:'blur'}],
+ registrationStartTime:[{required:true,message:'请选择',trigger:'change'}],
+ registrationEndTime:[{required:true,message:'请选择',trigger:'change'}],
+ activityStartTime:[{required:true,message:'请选择',trigger:'change'}],
+ activityEndTime:[{required:true,message:'请选择',trigger:'change'}],
+ activityAddress:[{required:true,message:'请输入活动地址',trigger:'blur'}],
+ registrationNumMax:[{required:true,message:'请输入人数上限',trigger:'blur'}],
+ registrationCost:[{required:true,message:'请输入报名费用',trigger:'blur'}],
+ activityContact:[{required:true,message:'请输入活动联系人',trigger:'blur'}],
+ activityTel:[{required:true,message:'请输入活动联系方式',trigger:'blur'}],
+}
+export const options = {
+ isShow:[
+ { id:true, name:'显示' },
+ { id:false, name:'不显示' },
+ ],
+ activityObject: [
+ { id:1, name:'全部' },
+ { id:2, name:'住户' },
+ { id:3, name:'业主' },
+ { id:4, name:'租户' },
+ { id:5, name:'管家' },
+ ],
+ organizer:[]
+}
\ No newline at end of file
diff --git a/src/views/Operation/Activity/_activityManage/depend/form.vue b/src/views/Operation/Activity/_activityManage/depend/form.vue
new file mode 100644
index 0000000..4f4c404
--- /dev/null
+++ b/src/views/Operation/Activity/_activityManage/depend/form.vue
@@ -0,0 +1,263 @@
+
+
+
+
+ 基本信息
+
+
+
+
+
+
+
+
+
+
+
+ {{item.unit}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 活动图片
+
+
+
+
+
+
+
活动管理
+
+
新增活动
+
+
+
+ 修改
+ 删除
+
+
+
+ ![]()
+ 无图片
+
+
+
+
+
+
+
+
+ 批量删除
+
+ 批量操作
+
+
+
+ {{ `已选择 ${selectedRowKeys.length} 条` }}
+
+
+
+
+