2022112 添加招募等...

api/recruit.js

@@ -0,0 +1,18 @@
+import request from './request.js';
+const getList = async (data) => {
+	const res = await request.get({ url: `/recruit/list`, data });
+	return res.data;
+}
+const getDetails = async ({ id }) => {
+	const res = await request.get({ url: `/recruit/details/${id}` });
+	return res.data;
+}
+const getStatus = async ({ id }) => {
+	const res = await request.get({ url: `/recruit/status/${id}` });
+	return res.data;
+}
+const report = async ({ id }) => {
+	const res = await request.post({ url: `/recruit/report/${id}` });
+	return res.data;
+}
+export default { getList, getDetails, getStatus, report };

api/report.js

@@ -0,0 +1,22 @@
+import request from './request.js';
+const getDict = async (dictType) => {
+	const res = await request.get({ url: `/dict/data/type/${dictType}` });
+	return res.data;
+}
+const submitgb = async (data) => {
+	const res = await request.post({ url: `/dangjian/xiachenganbu`, data });
+	return res.data;
+}
+const submitdy = async (data) => {
+	const res = await request.post({ url: `/dangjian/dangyuan`, data });
+	return res.data;
+}
+const getGbStatus = async () => {
+	const res = await request.get({ url: `/dangjian/xiachenganbu-status` });
+	return res.data;
+}
+const getDyStatus = async () => {
+	const res = await request.get({ url: `/dangjian/dangyuan-status` });
+	return res.data;
+}
+export default { getDict, submitgb, submitdy, getDyStatus, getGbStatus };

env.js

@@ -1,9 +1,10 @@
 const ENV_API_URL = {
 	development: {
-		url: 'https://fuyu.scapp.cn/wx-api/api',
-		// url: 'http://192.168.0.63/wx-api/api',
+		// url: 'https://fuyu.scapp.cn/wx-api/api',
+		url: 'http://192.168.0.70:7070/api',
 		imgUrl: 'https://fuyu.scapp.cn/static/wxa/',
-		fileUrl: 'https://fuyu.scapp.cn'
+		// fileUrl: 'https://fuyu.scapp.cn'
+		fileUrl: 'http://192.168.0.71'
 	},
 	production: {
 		url: 'https://fuyu.scapp.cn/wx-api/api',

pages.json

@@ -21,7 +21,7 @@
 		{
 			"path": "pages/policy/index",
 			"style": {
-				"navigationBarTitleText": "党建引领",
+				"navigationBarTitleText": "风采展示",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -121,6 +121,42 @@
 			"style": {
 				"navigationBarTitleText": "获取积分"
 			}
+		},
+		{
+			"path": "pages/property/index",
+			"style": {
+				"navigationBarTitleText": "红色物业"
+			}
+		},
+		{
+			"path": "pages/property/butler",
+			"style": {
+				"navigationBarTitleText": "红管家风采展示"
+			}
+		},
+		{
+			"path": "pages/report/index",
+			"style": {
+				"navigationBarTitleText": "下沉干部报到"
+			}
+		},
+		{
+			"path": "pages/report/double",
+			"style": {
+				"navigationBarTitleText": "党员“双报到”"
+			}
+		},
+		{
+			"path": "pages/recruit/index",
+			"style": {
+				"navigationBarTitleText": "应急招募"
+			}
+		},
+		{
+			"path": "pages/recruit/details",
+			"style": {
+				"navigationBarTitleText": "招募详情"
+			}
 		}
 	],
 	"globalStyle": {
@@ -153,7 +189,7 @@
 		"pagePath": "pages/policy/index",
 		"iconPath": "static/policy1.png",
 		"selectedIconPath": "static/policy2.png",
-		"text": "党建引领"
+		"text": "风采展示"
 	},
 	{
 		"pagePath": "pages/my/index",

pages/activity/index.vue

@@ -4,22 +4,22 @@
 			<uni-list-item v-for="(item, index) in list" :key="index">
 				<!-- 自定义 header -->
 				<template v-slot:header>
-					<view class="slot-box">
+					<view class="slot-box" @click="btn(item)">
 						<image class="slot-image" :src=" item.image"></image>
 						<text class="status">{{ item.statusText }}</text>
 					</view>
 				</template>
 				<!-- 自定义 body -->
 				<template v-slot:body>
-					<view class="slot-body">
+					<view class="slot-body" @click="btn(item)">
 						<view class="slot-box slot-title">{{ item.topic }}</view>
 						<view class="slot-box slot-text">人数限制: {{ item.regMaxCount }}人</view>
 					</view>
 				</template>
 				<!-- 自定义 footer-->
 				<template v-slot:footer>
-					<view class="slot-footer">
-						<uni-icons class="footerIcon" type="forward" size="35"  @click="btn(item)"></uni-icons>
+					<view class="slot-footer" @click="btn(item)">
+						<uni-icons class="footerIcon" type="forward" size="35"></uni-icons>
 					</view>
 				</template>
 			</uni-list-item>

pages/details/cmsinfo.vue

@@ -5,7 +5,7 @@
 			<text>{{ info.title }}</text>
 		</view>
 		<!-- <text class="time">创建时间：{{ info.createTime }}</text> -->
-		<rich-text image-menu-prevent="true" :nodes="info.content || info.noticeContent" class="content"></rich-text>
+		<rich-text image-menu-prevent="true" :nodes="info.content || info.noticeContent" class="content" :style="{ marginTop: height + top + 'px' }"></rich-text>
 		<!-- <view class="content" v-html="info.content || info.noticeContent"> -->
 		</view>
 	</view>
@@ -44,9 +44,11 @@
 
 <style>
 	.title {
-		display: flex;
+		position: fixed;
 		color: #fff;
 		background-color: #fd6b18;
+		top: 0;
+		width: 100%;
 	}
 	.back {
 		margin: 0 15px 0 5px;

pages/index/index.vue

@@ -8,6 +8,13 @@
 			</swiper>
 		</view>
 		<uni-notice-bar moreColor="#000" scrollable show-get-more show-icon :text="notice" more-text="更多>>" @getmore="getMore" />
+		<!-- 党建 -->
+		<uni-section titleFontSize="16px"  class="mb-10 sectionBox" title="党建引领" type="line">
+			<view class="card" v-for="(item, index) in construct" :key="index" :border="false" @click="illnessBtn(item)">
+				<image style="width: 50%; height: 55px; margin: 0 auto; display: block;" :src="item.url"></image>
+				<text class="title">{{ item.title }}</text>
+			</view>
+		</uni-section>
 		<!-- 治理 -->
 		<uni-section titleFontSize="16px"  class="mb-10 sectionBox" title="精细治理" type="line">
 			<view class="card" v-for="(item, index) in govern" :key="index" :border="false" @click="illnessBtn(item)">
@@ -40,15 +47,17 @@
 				duration: 500,
 				indicatorDots: false,
 				bannerList: [],
-				govern: []
+				govern: [],
+				construct: []
 			}
 		},
 		async mounted() {
 			const config = await requestLogin.getJson();
-			const { list, bannerList, governList } = config.data;
+			const { list, bannerList, governList, construct } = config.data;
 			this.list = list;
 			this.bannerList = bannerList;
 			this.govern = governList;
+			this.construct = construct;
 			const _this = this;
 			wx.login({
 				 success: async ({ code }) => {
@@ -156,7 +165,7 @@
 		margin: 0 auto;
 		width: 100%;
 		text-align: center;
-		font-size: 16px;
+		font-size: 14px;
 	}
 	.cardText {
 		display: block;

pages/my/index.vue

@@ -26,11 +26,11 @@
 					<uni-list-item :showExtraIcon="true" :extra-icon="extraIconList[3]" title="我的积分" link clickable @click="onClick(3)"></uni-list-item>
 				</uni-list>
 			</uni-card>
-			<uni-card>
+			<!-- <uni-card>
 				<uni-list :border="false">
 					<uni-list-item :showExtraIcon="true" :extra-icon="extraIconList[4]" title="意见反馈" link clickable @click="onClick(4)"></uni-list-item>
 				</uni-list>
-			</uni-card>
+			</uni-card> -->
 			<!-- <uni-card class="logoutBox">
 				<uni-list :border="false">
 					<uni-list-item size="mini" class="logout" title="退出登录" clickable @click="onClick(4)"></uni-list-item>

pages/property/butler.vue

@@ -0,0 +1,69 @@
+<template>
+	<view class="container">
+		<view class="box">
+			<view class="imgBox" v-for="(item, index) in dataList" :key="index">
+				<image class="imgs" mode="scaleToFill" :src="filesUrl + item.blogPic"></image>
+				<text class="name">张曦汐</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import request from '../../api/cms.js';
+	import { BASE_URL } from '../../env.js';
+	export default {
+		data() {
+			return {
+				filesUrl: BASE_URL.fileUrl,
+				dataList: []
+			}
+		},
+		onShow: function() {},
+		async mounted() {
+			this.getPolicyList({ typeName: 'policy' });
+		},
+		methods: {
+			// 列表点击函数
+			listItemBtn(e) {
+				return;
+				uni.navigateTo({ url: `/pages/details/index?id=${e.id}` })
+			},
+			// 搜索函数
+			async getPolicyList(e) {
+				const res = await request.getArticleList({ pageNum: 1, pageSize: 100, typeName: 'hgjfc' });
+				this.dataList = res.rows;
+			}
+		}
+	}
+</script>
+
+<style>
+	.container {
+		width: 100%;
+		height: 100vh;
+		overflow-y: auto;
+		background-color: darkred;
+	}
+	.box {
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.imgBox {
+		width: 30%;
+		height: 36vw;
+		margin-left: 2.5%;
+		margin-top: 20px;
+	}
+	.imgs {
+		display: block;
+		width: 100%;
+		height: 90%;
+	}
+	.name {
+		width: 100%;
+		display: block;
+		text-align: center;
+		color: #fff;
+	}
+</style>

pages/property/index.vue

@@ -0,0 +1,72 @@
+<template>
+	<view class="container">
+		<uni-card class="card card2" v-for="(item, index) in policyList" :key="index" @click="policyBtn(item)">
+			<image class="cover" :src="item.url"></image>
+			<h2>{{ item.title }}</h2>
+			<text class="cardText">{{ item.text }}</text>
+		</uni-card>
+	</view>
+</template>
+
+<script>
+	import requestLogin from '../../api/login.js';
+	export default {
+		data() {
+			return {
+				policyList: []
+			}
+		},
+		async mounted() {
+			const config = await requestLogin.getJson();
+			const { property } = config.data;
+			this.policyList = property;
+		},
+		onShow: function() {},
+		methods: {
+			policyBtn(e) {
+				uni.navigateTo({ url: e.path });
+			},
+		},
+		// 页面生命周期中onReachBottom（页面滚动到底部的事件）
+		onReachBottom() {}
+	}
+</script>
+
+<style>
+	.container {
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.card {
+		display: block;
+		margin: 10px;
+		width: 27%;
+	}
+	.cover {
+		display: block;
+		width: 40px;
+		height: 40px;
+		margin: 5px auto;
+	}
+	.uni-card {
+		padding: 0 !important;
+		margin: 0 !important;
+	}
+	.uni-card__content {
+		padding: 0 !important;
+	}
+	h2 {
+		font-weight: 700;
+		width: 100%;
+		text-align: center;
+		font-size: 16px;
+	}
+	.cardText {
+		display: block;
+		width: 100%;
+		text-align: center;
+		font-size: 12px;
+		margin-bottom: 5px;
+		color: #999;
+	}
+</style>

pages/recruit/details.vue

@@ -0,0 +1,111 @@
+<template>
+	<view class="container">
+		<uni-section :title="info.topic" titleFontSize="18" type="line">
+			<uni-list>
+				<uni-list-item :show-extra-icon="true" :extra-icon="extraIcon[1]" title="负责人" :rightText="info.sponsorName"></uni-list-item>
+				<uni-list-item :show-extra-icon="true" :extra-icon="extraIcon[2]" title="联系电话" :rightText="info.sponsorPhone"></uni-list-item>
+				<uni-list-item :show-extra-icon="true" title="招募人数" :rightText="info.count"></uni-list-item>
+			</uni-list>
+		</uni-section>
+		<uni-section title="活动详情" titleFontSize="18" type="line">
+			<rich-text image-menu-prevent="true" :nodes="info.content" class="content"></rich-text>
+		</uni-section>
+		<uni-goods-nav class="goodNav" :fill="true" :options="options" :buttonGroup="buttonGroup" @buttonClick="buttonClick" />
+	</view>
+</template>
+
+<script>
+	import request from '../../api/recruit.js';
+	export default {
+		onLoad: function (option) {
+			this.id = option.id;
+		},
+		data() {
+			return {
+				id: '',
+				info: null,
+				options: [],
+				extraIcon: [
+					{
+						color: '#c60814',
+						size: '22',
+						type: 'calendar'
+					},
+					{
+						color: '#c60814',
+						size: '22',
+						type: 'person-filled'
+					},
+					{
+						color: '#c60814',
+						size: '22',
+						type: 'phone'
+					}
+				],
+				buttonGroup: [
+					{
+					  text: '报名活动',
+					  backgroundColor: '#ff0000',
+					  color: '#fff'
+					}
+				],
+				statusInfo: true
+			}
+		},
+		mounted() {
+			this.query();
+		},
+		methods: {
+			async query() {
+				const res = await request.getDetails({ id: this.id });
+				const statusInfo = await request.getStatus({ id: this.id });
+				this.info = res.data;
+				if (statusInfo.data) {
+					this.buttonGroup[0].text = '报名成功';
+					this.buttonGroup[0].backgroundColor = '#999';
+					this.buttonGroup[0].disable = true;
+				}
+				
+			},
+			buttonClick(e) {
+				if (e.index == 0){
+					if (e.content.disable) return;
+					this.report();
+				}
+			},
+			async report() {
+				const res = await request.report({ id: this.id });
+				if (res.code == 200) {
+					wx.showToast({
+						title: '报名成功'
+					})
+					this.query();
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+	.container {
+		position: relative;
+		padding-bottom: 12vw;
+		background-color: #fff;
+	}
+	.banner {
+		width: 100%;
+		height: 50vw;
+	}
+	.content {
+		display: block;
+		width: 90%;
+		margin: 10px auto;
+	}
+	.goodNav {
+		width: 100%;
+		height: 12vw;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+	}
+</style>

pages/recruit/index.vue

@@ -0,0 +1,94 @@
+<template>
+	<view class="container">
+		<uni-list>
+			<uni-list-item v-for="(item, index) in list" :key="index">
+				<!-- 自定义 body -->
+				<template v-slot:body>
+					<view class="slot-body" @click="btn(item)">
+						<view class="slot-box slot-title">{{ item.topic }}</view>
+						<text class="status">{{ item.statusText }}</text>
+						<view class="slot-box slot-text">
+							人数限制: {{ item.count }}人
+						</view>
+					</view>
+				</template>
+				<!-- 自定义 footer-->
+				<template v-slot:footer>
+					<view class="slot-footer" @click="btn(item)">
+						<uni-icons class="footerIcon" type="forward" size="35"></uni-icons>
+					</view>
+				</template>
+			</uni-list-item>
+		</uni-list>
+		<uni-load-more :status="more" />
+	</view>
+</template>
+
+<script>
+	import request from '../../api/recruit.js';
+	export default {
+		data() {
+			return {
+				list: [],
+				more: 'more',
+				page: 0,
+				size: 12,
+			}
+		},
+		mounted() {
+			this.query();
+		},
+		methods: {
+			async query() {
+				this.page += 1;
+				this.more = 'loading';
+				const res = await request.getList({ pageNum: this.page, pageSize: this.size });
+				res.rows?.map(e => {
+					if (e.status == 1) e.statusText = '未开始';
+					if (e.status == 2) e.statusText = '报名中';
+					if (e.status == 3) e.statusText = '已结束';
+					return e;
+				})
+				this.list.push(...res.rows)
+				// 根据总数 算页数  如果当前页 = 总页数就是没有数据  否则就是上拉加载
+				this.more = this.page >= Math.ceil(res.total / this.size) ? 'noMore' : 'more';
+			},
+			btn(e) {
+				uni.navigateTo({ url: `/pages/recruit/details?id=${e.recruitId}` })
+			}
+		},
+		// 页面生命周期中onReachBottom（页面滚动到底部的事件）
+		onReachBottom() {
+			if(this.more != 'noMore') {
+				this.more = 'more';
+				this.query();
+			}
+		}
+	}
+</script>
+
+<style>
+.slot-box {
+	position: relative;
+}
+.status {
+	font-size: 12px;
+	color: #999;
+}
+.slot-body {
+	width: 90%;
+	margin-left: 10px;
+}
+.slot-title {
+	font-size: 1.2em;
+	font-weight: 600;
+	color: #000;
+}
+.slot-text {
+	font-size: 14px;
+	color: #999;
+}
+.footerIcon {
+	line-height: 4em;
+}
+</style>

pages/register/index.vue

@@ -52,7 +52,7 @@
 			return {
 				// 勾选成为居民
 				isShowAddr: 0,
-				isShowArr: [{ text: '是否富裕街道居民', value: 1 }],
+				isShowArr: [{ text: '我是富裕街道居民', value: 1 }],
 				role: '',
 				path: null,
 				formData: {},

pages/report/double.vue

@@ -0,0 +1,146 @@
+<template>
+	<view class="container">
+		<uni-forms ref="baseForm" :modelValue="formData" :label-width="100">
+			<uni-forms-item v-for="item in fileds" :label="item.title" :name="item.name"  :key="item.name">
+				<uni-easyinput v-if="!item.formatter && !item.type" type="text" v-model="formData[item.name]" :placeholder="`请输入${item.title}`" />
+				<uni-data-checkbox v-model="formData[item.name]" v-if="item.formatter && item.type == 'checkbox'" :multiple="item.multiple || false" :localdata="item.dict" />
+				<uni-data-select v-model="formData[item.name]" v-if="item.formatter && item.type == 'select'" :localdata="item.dict"></uni-data-select>
+				<view class="upVideo" v-if="item.type == 'video' && !formData[item.name]" @click="upVideo">
+					<uni-icons color="#cacaca" class="videoIcon" type="videocam" size="30"></uni-icons>
+				</view>
+				<video controls v-if="item.type == 'video' && formData[item.name]" class="uploadVideo" :src="filesUrl + formData[item.name]"></video>
+			</uni-forms-item>
+		</uni-forms>
+		<button class="btn" type="primary" @click="submitForm">提交</button>
+	</view>
+</template>
+
+<script>
+	import request from '../../api/report.js';
+	import { BASE_URL } from '../../env.js';
+	export default {
+		data() {
+			return {
+				baseUrl: BASE_URL.url,
+				filesUrl: BASE_URL.fileUrl,
+				formData: {},
+				fileds: [
+					{ name: 'name', title: '姓名' },
+					{ name: 'sex', title: '性别', formatter: 'dict:user_sex_type', type: 'checkbox' },
+					{ name: 'phone', title: '联系电话' },
+					{ name: 'workUnit', title: '工作单位' },
+					{ name: 'reportLocation', title: '报道位置' },
+					{ name: 'reportType', title: '报道类别', formatter: 'dict:baodao_type', type: 'select' },
+					{ name: 'residence', title: '居住地' },
+					{ name: 'content', title: '报道内容' },
+					{ name: 'videoPath', title: '影片', type: 'video' },
+				]
+			}
+		},
+		async mounted() {
+			const res = await request.getDyStatus();
+			if (res.data) {
+				uni.showToast({
+					title: '不能重复报道',
+					icon: 'error',
+					duration: 2000,
+				});
+				setTimeout(() => {
+					uni.navigateBack();
+				}, 1000)
+				return;
+			}
+			await this.setDict();
+		},
+		onShow() {},
+		methods: {
+			async setDict() {
+				this.fileds = await Promise.all(this.fileds.map(async e => {
+					if (e.formatter && e.formatter.includes('dict')) {
+						const dictType = e.formatter.split(':')[1];
+						const res = await request.getDict(dictType);
+						if (res.code == 200) e.dict = res.data.map(l => ({ ...l, value: l.dictValue, text: l.dictLabel }));
+					}
+					return e;
+				}));
+			},
+			async upVideo() {
+				const _this = this;
+				wx.chooseMedia({
+					  count: 1,  //上传视频的个数
+					  mediaType:['video'],  //限制上传的类型为video
+					  sourceType:['album', 'camera'], //视频选择来源
+					  maxDuration: 30, //拍摄限制时间
+					  camera: 'back',  //采用后置摄像头
+					  success:function(res){
+						const token = uni.getStorageSync('token');
+						//获取临时存放的视频资源
+						let tempFilePath=res.tempFiles[0].tempFilePath
+						// 上传视频
+						uni.uploadFile({
+							url: _this.baseUrl + '/api/activity/photo',
+							name: 'file',
+							header: {
+								'Authorization': `Bearer ${token}`
+							},
+							filePath: tempFilePath,
+							success: (uploadFileRes) => {
+								const obj = JSON.parse(uploadFileRes.data);
+								_this.$set(_this.formData, 'videoPath', obj.imgUrl);
+							},
+							fail() {
+								wx.showToast({
+									title: '上传失败'
+								})
+							},
+							complete() {
+								wx.hideLoading();
+							}
+						});
+					  },
+					})
+			},
+			async submitForm() {
+				const res = await request.submitdy(this.formData);
+				if (res.code == 200) {
+					uni.showToast({
+						title: '提交成功',
+						icon: 'success',
+						duration: 2000,
+					});
+					setTimeout(() => {
+						uni.navigateBack();
+					}, 1000)
+				}
+			}
+		},
+		// 页面生命周期中onReachBottom（页面滚动到底部的事件）
+		onReachBottom() {}
+	}
+</script>
+
+<style>
+	.uni-forms {
+		width: 90%;
+		margin: 10px auto;
+	}
+	.btn {
+		width: 90%;
+		margin: 0 auto;
+	}
+	.upVideo {
+		width: 100px;
+		height: 100px;
+		border: 1px solid #cacaca;
+		border-radius: 12px;
+	}
+	.videoIcon {
+		display: block;
+		text-align: center;
+		line-height: 100px;
+	}
+	.uploadVideo {
+		width: 100px;
+		height: 100px;
+	}
+</style>

pages/report/index.vue

@@ -0,0 +1,84 @@
+<template>
+	<view class="container">
+		<uni-forms ref="baseForm" :modelValue="formData" :label-width="100">
+			<uni-forms-item v-for="item in fileds" :label="item.title" :name="item.name"  :key="item.name">
+				<uni-easyinput v-if="!item.formatter && !item.type" type="text" v-model="formData[item.name]" :placeholder="`请输入${item.title}`" />
+				<uni-data-checkbox v-model="formData[item.name]" v-if="item.formatter && item.type == 'checkbox'" :multiple="item.multiple || false" :localdata="item.dict" />
+			</uni-forms-item>
+		</uni-forms>
+		<button class="btn" type="primary" @click="submitForm">提交</button>
+	</view>
+</template>
+
+<script>
+	import request from '../../api/report.js';
+	export default {
+		data() {
+			return {
+				formData: {},
+				fileds: [
+					{ name: 'name', title: '姓名' },
+					{ name: 'sex', title: '性别', formatter: 'dict:user_sex_type', type: 'checkbox' },
+					{ name: 'workUnit', title: '工作单位' },
+					{ name: 'baobaoloudong', title: '包保楼栋' },
+					{ name: 'phone', title: '联系电话' },
+					{ name: 'jianrensanzhang', title: '是否兼任三长', formatter: 'dict:jianrensanzhang_type', type: 'checkbox' },
+				]
+			}
+		},
+		async mounted() {
+			const res = await request.getGbStatus();
+			if (res.data) {
+				uni.showToast({
+					title: '不能重复报道',
+					icon: 'error',
+					duration: 2000,
+				});
+				setTimeout(() => {
+					uni.navigateBack();
+				}, 1000)
+				return;
+			}
+			await this.setDict();
+		},
+		onShow() {},
+		methods: {
+			async setDict() {
+				this.fileds = await Promise.all(this.fileds.map(async e => {
+					if (e.formatter && e.formatter.includes('dict')) {
+						const dictType = e.formatter.split(':')[1];
+						const res = await request.getDict(dictType);
+						if (res.code == 200) e.dict = res.data.map(l => ({ ...l, value: l.dictValue, text: l.dictLabel }));
+					}
+					return e;
+				}));
+			},
+			async submitForm() {
+				const res = await request.submitgb(this.formData);
+				if (res.code == 200) {
+					uni.showToast({
+						title: '提交成功',
+						icon: 'success',
+						duration: 2000,
+					});
+					setTimeout(() => {
+						uni.navigateBack();
+					}, 1000)
+				}
+			}
+		},
+		// 页面生命周期中onReachBottom（页面滚动到底部的事件）
+		onReachBottom() {}
+	}
+</script>
+
+<style>
+	.uni-forms {
+		width: 90%;
+		margin: 10px auto;
+	}
+	.btn {
+		width: 90%;
+		margin: 0 auto;
+	}
+</style>

pages/user/index.vue

@@ -89,7 +89,7 @@
 				},
 				// 勾选成为居民
 				isShowAddr: 0,
-				isShowArr: [{ text: '是否富裕街道居民', value: 1 }],
+				isShowArr: [{ text: '我是富裕街道居民', value: 1 }],
 			}
 		},
 		async mounted() {

uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue

@@ -332,7 +332,7 @@
 		border: 1px solid #EBEEF5;
 		border-radius: 6px;
 		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-		z-index: 2;
+		z-index: 99;
 		padding: 4px 0;
 	}
 

unpackage/dist/build/mp-weixin/app.json

@@ -19,7 +19,13 @@
     "pages/integral/index",
     "pages/activity/index",
     "pages/activity/details",
-    "pages/activity/uploadFiel"
+    "pages/activity/uploadFiel",
+    "pages/property/index",
+    "pages/property/butler",
+    "pages/report/index",
+    "pages/report/double",
+    "pages/recruit/index",
+    "pages/recruit/details"
   ],
   "subPackages": [],
   "window": {
@@ -50,7 +56,7 @@
         "pagePath": "pages/policy/index",
         "iconPath": "static/policy1.png",
         "selectedIconPath": "static/policy2.png",
-        "text": "党建引领"
+        "text": "风采展示"
       },
       {
         "pagePath": "pages/my/index",

unpackage/dist/build/mp-weixin/pages/details/cmsinfo.wxss

@@ -1 +1 @@
-.title{display:flex;color:#fff;background-color:#fd6b18}.back{margin:0 15px 0 5px}.time{width:100%;text-align:center;display:block;font-size:12px}.content{display:block;width:90%;margin:10px auto}
+.title{position:fixed;color:#fff;background-color:#fd6b18;top:0;width:100%}.back{margin:0 15px 0 5px}.time{width:100%;text-align:center;display:block;font-size:12px}.content{display:block;width:90%;margin:10px auto}

unpackage/dist/build/mp-weixin/pages/policy/index.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "党建引领",
+  "navigationBarTitleText": "风采展示",
   "enablePullDownRefresh": true,
   "usingComponents": {
     "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",

unpackage/dist/build/mp-weixin/pages/property/butler.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "红管家风采展示",
+  "usingComponents": {}
+}

unpackage/dist/build/mp-weixin/pages/property/butler.wxml

@@ -0,0 +1 @@
+<view class="container"><view class="box"><block wx:for="{{dataList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="imgBox"><image class="imgs" mode="scaleToFill" src="{{filesUrl+item.blogPic}}"></image><text class="name">张曦汐</text></view></block></view></view>

unpackage/dist/build/mp-weixin/pages/property/butler.wxss

@@ -0,0 +1 @@
+.container{width:100%;height:100vh;overflow-y:auto;background-color:#8b0000}.box{display:flex;flex-wrap:wrap}.imgBox{width:30%;height:36vw;margin-left:2.5%;margin-top:20px}.imgs{display:block;width:100%;height:90%}.name{width:100%;display:block;text-align:center;color:#fff}

unpackage/dist/build/mp-weixin/pages/property/index.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "红色物业",
+  "usingComponents": {
+    "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card"
+  }
+}

unpackage/dist/build/mp-weixin/pages/property/index.wxml

@@ -0,0 +1 @@
+<view class="container"><block wx:for="{{policyList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><uni-card class="card card2" bind:click="__e" vue-id="{{'2b678e55-1-'+index}}" data-event-opts="{{[['^click',[['policyBtn',['$0'],[[['policyList','',index]]]]]]]}}" bind:__l="__l" vue-slots="{{['default']}}"><image class="cover" src="{{item.url}}"></image><view class="_h2">{{item.title}}</view><text class="cardText">{{item.text}}</text></uni-card></block></view>

unpackage/dist/build/mp-weixin/pages/property/index.wxss

@@ -0,0 +1 @@
+.container{display:flex;flex-wrap:wrap}.card{display:block;margin:10px;width:27%}.cover{display:block;width:40px;height:40px;margin:5px auto}.uni-card{padding:0!important;margin:0!important}.uni-card__content{padding:0!important}._h2{font-weight:700;width:100%;text-align:center;font-size:16px}.cardText{display:block;width:100%;text-align:center;font-size:12px;margin-bottom:5px;color:#999}

unpackage/dist/build/mp-weixin/pages/recruit/details.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "招募详情",
+  "usingComponents": {
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
+    "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
+    "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item",
+    "uni-goods-nav": "/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav"
+  }
+}

unpackage/dist/build/mp-weixin/pages/recruit/details.wxss

@@ -0,0 +1 @@
+.container{position:relative;padding-bottom:12vw;background-color:#fff}.banner{width:100%;height:50vw}.content{display:block;width:90%;margin:10px auto}.goodNav{width:100%;height:12vw;position:fixed;left:0;bottom:0}

unpackage/dist/build/mp-weixin/pages/recruit/index.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "应急招募",
+  "usingComponents": {
+    "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
+    "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "uni-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more"
+  }
+}

unpackage/dist/build/mp-weixin/pages/recruit/index.wxss

@@ -0,0 +1 @@
+.slot-box{position:relative}.status{font-size:12px;color:#999}.slot-body{width:90%;margin-left:10px}.slot-title{font-size:1.2em;font-weight:600;color:#000}.slot-text{font-size:14px;color:#999}.footerIcon{line-height:4em}

unpackage/dist/build/mp-weixin/pages/report/double.json

@@ -0,0 +1,11 @@
+{
+  "navigationBarTitleText": "党员“双报到”",
+  "usingComponents": {
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
+    "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}

unpackage/dist/build/mp-weixin/pages/report/double.wxss

@@ -0,0 +1 @@
+.uni-forms{width:90%;margin:10px auto}.btn{width:90%;margin:0 auto}.upVideo{width:100px;height:100px;border:1px solid #cacaca;border-radius:12px}.videoIcon{display:block;text-align:center;line-height:100px}.uploadVideo{width:100px;height:100px}

unpackage/dist/build/mp-weixin/pages/report/index.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "下沉干部报到",
+  "usingComponents": {
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox"
+  }
+}

unpackage/dist/build/mp-weixin/pages/report/index.wxss

@@ -0,0 +1 @@
+.uni-forms{width:90%;margin:10px auto}.btn{width:90%;margin:0 auto}

unpackage/dist/build/mp-weixin/project.private.config.json

@@ -0,0 +1,4 @@
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "setting": {}
+}

unpackage/dist/build/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  },
+  "component": true
+}

unpackage/dist/dev/mp-weixin/app.json

@@ -19,7 +19,13 @@
     "pages/integral/index",
     "pages/activity/index",
     "pages/activity/details",
-    "pages/activity/uploadFiel"
+    "pages/activity/uploadFiel",
+    "pages/property/index",
+    "pages/property/butler",
+    "pages/report/index",
+    "pages/report/double",
+    "pages/recruit/index",
+    "pages/recruit/details"
   ],
   "subPackages": [],
   "window": {
@@ -50,7 +56,7 @@
         "pagePath": "pages/policy/index",
         "iconPath": "static/policy1.png",
         "selectedIconPath": "static/policy2.png",
-        "text": "党建引领"
+        "text": "风采展示"
       },
       {
         "pagePath": "pages/my/index",