活动调整

src/projects/business/apis/Master/activity.js

@@ -0,0 +1,76 @@
+import request from '@/utils/request'
+import Qs from 'qs';
+
+//获取所有活动列表
+export function getActivityList(params) {
+	return request({
+		url: '/mobile/activityApi/getActivityList',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+//获取我发起的活动列表
+export function getMyActivityList(params) {
+	return request({
+		url: '/mobile/activityApi/getMyActivityList',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+//获取活动详情
+export function getActivityInfo(id) {
+	return request({
+		url: '/mobile/activityApi/detail',
+		data: Qs.stringify({
+			id: id
+		}),
+		method: 'post',
+	})
+}
+
+//新增活动
+export function addActivity(params) {
+	return request({
+		url: '/mobile/activityApi/addActivity',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+//设置活动
+export function setActivity(params) {
+	return request({
+		url: '/mobile/activityApi/setActivity',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+//修改活动
+export function editActivity(params) {
+	return request({
+		url: '/mobile/activityApi/updateActivity',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+//审核活动列表
+export function getExamineActivityList(params) {
+	return request({
+		url: '/mobile/activityApi/getVerifyActivityList',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+//审核活动
+export function examineActivity(params) {
+	return request({
+		url: '/mobile/activityApi/verifyActivity',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}

src/projects/business/router/master.js

@@ -331,17 +331,17 @@ const routesMaster = [
 				path: 'live',
 				component: () => import('../views/Layout.vue'),
 				children: [
-                    //账单详情
-                    {
-                        path: 'infobak',
-                        name: 'MasterLiveInfobak',
-                        component: () => import('../views/Master/Live/Infobak.vue'),
-                        meta: {
-                            requireAuth: false,
-                            role: [],
-                            title: '账单详情',
-                        }
-                    },
+					//账单详情
+					{
+						path: 'infobak',
+						name: 'MasterLiveInfobak',
+						component: () => import('../views/Master/Live/Infobak.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '账单详情',
+						}
+					},
 					//直播主页
 					{
 						path: 'info',
@@ -1180,6 +1180,17 @@ const routesMaster = [
 							title: '我发起的活动',
 						}
 					},
+					//我的申请详情
+					{
+						path: 'myInfo',
+						name: 'MasterActivityMyInfo',
+						component: () => import('@/views/Master/Activity/MyInfo.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '我的申请详情',
+						}
+					},
 					//发起活动
 					{
 						path: 'add',
@@ -1259,6 +1270,17 @@ const routesMaster = [
 							title: '活动详情',
 						}
 					},
+					//活动模板详情
+					{
+						path: 'template',
+						name: 'MasterActivityTemplate',
+						component: () => import('@/views/Master/Activity/Template.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '活动模板详情',
+						}
+					},
 				],
 			},
 

src/projects/business/views/Master/Activity/MyInfo.vue

@@ -0,0 +1,89 @@
+<template>
+	<div>
+		<header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">申请详情</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content">
+			<div class="mui-content-padded vongi-editme vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>申请人</label>
+						<span>孙鹏</span>
+					</div>
+					<div class="mui-input-row">
+						<label>房号</label>
+						<span>1-1-2201</span>
+					</div>
+					<div class="mui-input-row">
+						<label>申请时间</label>
+						<span>2020-10-10 10:00:00</span>
+					</div>
+				</form>
+			</div>
+
+			<div class="vongi-hdsq-dat">
+				<h5>活动标题封面</h5>
+				<div class="mui-card">
+					<div class="mui-card-content">
+						<div class="mui-card-content-inner">
+							<img src="~$project/assets/img/huodo.png" />
+						</div>
+					</div>
+					<div class="mui-card-footer">
+						<a class="mui-navigate-right">
+							欢迎加入恒大名都业主羽毛球群——羽你同行！
+						</a>
+					</div>
+				</div>
+				<div class="flew-sp">
+					活动起止日期
+					<span>2020-10-25 至 2020-11-24</span>
+				</div>
+			</div>
+			<div class="fyy-scon-botton">
+				<div class="examine-btn examine-btn1">离开</div>
+				<div class="examine-btn examine-btn2">进入</div>
+			</div>
+			<!--状态-->
+			<div class="mui-content-padded vongi-editme vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>申请状态</label>
+						<span class="color55f868">已通过</span>
+						<!--<span class="colorfe616c">已拒绝</span>-->
+					</div>
+					<div class="mui-input-row">
+						<label>审核意见</label>
+						<span class="vongi-span">同意</span>
+					</div>
+					<div class="mui-input-row">
+						<label>申请时间</label>
+						<span>2020-10-10 10:00:00</span>
+					</div>
+				</form>
+			</div>
+			<!--弹窗-->
+			<div class="mui-popup mui-popup-in vongi-mui-pop" style="display: block;">
+				<div class="mui-popup-inner vongi-pop-inner">
+					<div class="mui-popup-title">审核意见</div>
+					<div class="mui-popup-input">
+						<textarea id="textarea" rows="3" placeholder="可输入审核意见"></textarea>
+					</div>
+				</div>
+				<div class="mui-popup-buttons"><span class="mui-popup-button">取消</span><span class="mui-popup-button mui-popup-button-bold">确定</span></div>
+			</div>
+			<div class="mui-popup-backdrop mui-active" style="display: block;"></div>
+		</div>
+	</div>
+</template>
+
+<script>
+</script>
+
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
+<style>
+</style>
+
+

src/projects/business/views/Master/Activity/MyList.vue

@@ -1,59 +1,130 @@
 <template>
-<div>
-    <header class="mui-bar mui-bar-nav">
-			<h1 class="mui-title">我发起的活动</h1>
-			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-		</header>
+	<div>
+		<common ref="common" @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
 		<div class="mui-content vongi-hdsq">
 			<div class="mui-slider-group">
 				<ul class="mui-table-view">
-					<li class="mui-table-view-cell">
-						<a href="">
+					<li v-for="(item,index) in recordList" class="mui-table-view-cell">
+						<router-link :to="{name:'MasterActivityMyInfo',query:{id:item.id}}">
 							<div class="mui-media-body flew-sp">
-								<div class="mui-col-xs-9">欢迎加入恒大名都业主羽毛球群！</div>
+								<div class="mui-col-xs-9" v-text="item.title"></div>
 								<div class="mui-col-xs-3"><button type="button" class="mui-btn mui-btn-greye mui-btn-outlined">待审核</button></div>
 							</div>
 							<p class="flew-items flew-sp">
-								活动时间：2020-10-25至2020-11-25
-								<span class='mui-ellipsis'>10-15</span>
-							</p>
-						</a>
-					</li>
-					<li class="mui-table-view-cell">
-						<a href="">
-							<div class="mui-media-body flew-sp">
-								<div class="mui-col-xs-9">欢迎加入恒大名都业主羽毛球群——羽你同行！欢迎加入恒大名都业主羽毛球群——羽你同行！</div>
-								<div class="mui-col-xs-3"><button type="button" class="mui-btn mui-btn-success mui-btn-outlined">已批准</button></div>
-							</div>
-							<p class="flew-items flew-sp">
-								活动时间：2020-10-25至2020-11-25
-								<span class='mui-ellipsis'>10-15</span>
-							</p>
-						</a>
-					</li>
-					<li class="mui-table-view-cell">
-						<a href="">
-							<div class="mui-media-body flew-sp">
-								<div class="mui-col-xs-9">欢迎加入恒大名都业主羽毛球群——羽你同行！欢迎加入恒大名都业主羽毛球群——羽你同行！</div>
-								<div class="mui-col-xs-3"><button type="button" class="mui-btn mui-btn-danger mui-btn-outlined">未批准</button></div>
-							</div>
-							<p class="flew-items flew-sp">
-								活动时间：2020-10-25至2020-11-25
-								<span class='mui-ellipsis'>10-15</span>
+								活动时间：{{item.startTime}}至{{item.endTime}}
+								<span class='mui-ellipsis'>{{item.createTime.substring(5,9)}}</span>
 							</p>
-						</a>
+						</router-link>
 					</li>
 				</ul>
 			</div>
 
 		</div>
 		<div class="fyy-footer">
-			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary ">发起活动</button></div>
+			<div class="bindfyy-btn"><button @click="goToAdd" type="button" class="mui-btn mui-btn-primary ">发起活动</button></div>
 		</div>
-</div>
+	</div>
 </template>
 
 <script>
+	import * as API_Activity from '@/apis/Master/activity'
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import NavMenu from '@/components/NavMenu.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	export default {
+		name: 'MasterActivityMyList',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+			NavMenu
+		},
+		data() {
+			return {
+				isLoading: false,
+
+				pageTitle: '我发起的活动',
+
+				listForm: {
+					pageIndex: 1,
+					pageSize: 20,
+					totalPage: 1,
+				},
+				recordList: [],
+			}
+		},
+		created() {},
+		methods: {
+			//获取列表
+			getList() {
+				this.isLoading = true;
+				API_Activity.getMyActivityList(this.listForm).then(response => {
+					if (response) {
+						if (this.listForm.pageIndex == 1) {
+							this.recordList = response.data;
+							this.listForm.pageIndex = response.pageNumber;
+							this.listForm.totalPage = response.totalPage;
+						} else {
+							this.recordList = [
+								...this.recordList,
+								...response.data
+							];
+						}
+					}
+					this.listForm.pageIndex++;
+					this.isLoading = false;
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			//下拉事件
+			handleScrool() {
+				if (isReachBottom()) {
+					console.log('到达底部')
+					if (this.listForm.pageIndex <= this.listForm.totalPage && this.isLoading == false) {
+						this.getList();
+					} else {
+						return;
+					}
+				}
+			},
+			goToAdd() {
+				this.$router.push({
+					name: 'MasterActivityAdd'
+				})
+			},
+			asynCallBack() {
+
+			},
+		},
+		mounted() {
+			this.getList();
+			//监控下拉加载事件
+			var _this = this;
+			window.addEventListener('scroll', _this.handleScrool);
+		},
+		destroyed() {
+			//销毁监听事件
+			var _this = this;
+			window.removeEventListener('scroll', _this.handleScrool);
+		},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				person_popedom: 'person_popedom',
+			})
+		}
+	}
 </script>
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>

src/projects/business/views/Master/Activity/Template.vue

@@ -0,0 +1,42 @@
+<template>
+	<div>
+		<header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">活动详情</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content">
+			<div class="vongi-hddat-tit">
+				<h1>欢迎加入恒大名都业主羽毛球群</h1>
+				<h1>——羽你同行！</h1>
+				<h5>活动起止日期：2020-10-25 至 2020-11-25</h5>
+			</div>
+			<div class="vongi-hddat-text">
+				<div class="vongi-hddat-cont">
+					<p><img src="~$project/assets/img/huodo.png" width="100%" /></p>
+					<p>名都喜欢羽毛球的业主朋友们，快快投入组织的怀抱吧——名都业主“羽你同行”俱乐部欢迎你！</p>
+					<p>扫码入群，为健康动起来 ↓</p>
+				</div>
+				<div class="vongi-hddat-cont vongi-hddat-center">
+					<p><img src="~$project/assets/img/huodoma.png" width="40%" /></p>
+					<p>咨询热线：13687155078</p>
+					<p>本活动发起人：12栋业主 李军 13687155078</p>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script scoped>
+    export default {
+        mounted() {
+            document.body.style.backgroundColor = '#fff';
+        },
+    }
+</script>
+
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
+<style>
+</style>
+
+