Merge branch 'jly/task002' into shibei

# Conflicts: # miniprogram/app.json
2 years ago · 85a4a2f106
14 changed files with 1030 additions and 78 deletions
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
    "pages": [
        "pages/home/home",
        "pages/message/message",
@ -299,4 +300,305 @@
    ],
    "sitemapLocation": "sitemap.json",
    "serviceProviderTicket": "BhBC8k6Lkgi+6uDaV2haUUUH7ZC81tEpXdNMtSxiPnrYRxkRxMu5f6gprJ5i+leAKUxHM1E5YWc3P9vtgTtu2BULafIVikYURVk="
+=======
+	"pages": [
+		"pages/home/home",
+		"pages/message/message",
+		"pages/my/my",
+		"pages/index/index",
+		"pages/toRegister/toRegister",
+		"pages/heart/heart",
+		"pages/mine/mine",
+		"pages/association/association",
+		"pages/discussion/discussion",
+		"pages/toScan/toScan",
+		"pages/complete/complete",
+		"pages/formid/formid",
+		"pages/fromVirus/fromVirus",
+		"pages/register/register",
+		"pages/detail/detail",
+		"pages/fromVirus/detail/detail",
+		"pages/accept/accept",
+		"pages/gridLeaderRegister/gridLeaderRegister",
+		"pages/navigatetoApp/navigatetoApp"
+	],
+	"subPackages": [{
+			"root": "subpages/redSail",
+			"name": "redSail",
+			"pages": [
+				"pages/redSail/redSail",
+				"pages/registerParty/registerParty",
+				"pages/flowParty/flowParty",
+				"pages/event/event"
+			]
+		},
+		{
+			"root": "subpages/knight",
+			"name": "knight",
+			"pages": [
+				"pages/knight/knight",
+				"pages/knight/brief/brief"
+			]
+		},
+		{
+			"root": "subpages/redGrider",
+			"name": "redGrider",
+			"pages": [
+				"pages/redGrider/redGrider",
+				"components/demeanor/index"
+			]
+		},
+		{
+			"root": "subpages/pioneer",
+			"name": "pioneer",
+			"pages": [
+				"pages/pioneer/pioneer"
+			]
+		},
+		{
+			"root": "subpages/checkIn",
+			"name": "checkIn",
+			"pages": [
+				"pages/checkIn/checkIn",
+				"pages/checkIn/register/register"
+			]
+		},
+		{
+			"root": "subpages/volunteer",
+			"name": "volunteer",
+			"pages": [
+				"pages/volunteer/volunteer",
+				"components/recruitOrder/index",
+				"components/demeanor/index"
+			]
+		},
+		{
+			"root": "subpages/home",
+			"name": "home",
+			"pages": [
+				"pages/webview/webview",
+				"pages/agreement/agreement",
+				"pages/notice/notice",
+				"pages/consultation/consultation",
+				"pages/info/info",
+				"pages/noticeDetail/noticeDetail",
+				"pages/newsDetail/newsDetail"
+			]
+		},
+		{
+			"root": "subpages/changegrid",
+			"name": "changeGrid",
+			"pages": [
+				"pages/changeGrid/changeGrid"
+			]
+		},
+		{
+			"root": "subpages/association",
+			"name": "association",
+			"pages": [
+				"pages/joinassociation/joinassociation",
+				"pages/createassociation/createassociation",
+				"pages/associationMember/associationMember",
+				"pages/associationDetail/associationDetail",
+				"pages/inviteFriend/inviteFriend",
+				"pages/incomingVerify/incomingVerify",
+				"pages/unpassAssociation/unpassAssociation",
+				"pages/topicList/topicList",
+				"pages/addTopic/addTopic",
+				"pages/topicDetail/topicDetail",
+				"pages/replyOrRemark/replyOrRemark",
+				"pages/changeToIssue/changeToIssue"
+			]
+		},
+		{
+			"root": "subpages/heart",
+			"pages": [
+				"pages/heartDetail/heartDetail",
+				"pages/leaderboard/leaderboard",
+				"pages/myNews/myNews",
+				"pages/clockIn/clockIn",
+				"pages/volunteer/volunteer",
+				"pages/signed/signed",
+				"pages/refusedOrEndedDetail/refusedOrEndedDetail",
+				"pages/cancelDetail/cancelDetail"
+			]
+		},
+		{
+			"root": "subpages/discussion",
+			"name": "discussion",
+			"pages": [
+				"pages/anytimeSay/anytimeSay",
+				"pages/addIssue/addIssue",
+				"pages/discussionDetail/discussionDetail",
+				"pages/publishEvaluation/publishEvaluation",
+				"pages/remarkOrReply/remarkOrReply",
+				"pages/searchDiscussion/searchDiscussion",
+				"pages/categoryList/categoryList"
+			]
+		},
+		{
+			"root": "subpages/mine",
+			"name": "mine",
+			"pages": [
+				"pages/eventDetail/eventDetail",
+				"pages/company/company",
+				"pages/companyInfo/companyInfo",
+				"pages/inviteRecord/inviteRecord",
+				"pages/gridManage/gridManage"
+			]
+		},
+		{
+			"root": "subpages/integralCentre",
+			"name": "integralCentre",
+			"pages": [
+				"pages/eshop/eshop"
+			]
+		},
+		{
+			"root": "subpages/demand",
+			"name": "demand",
+			"pages": [
+				"pages/demandList/demandList",
+				"pages/myDemand/myDemand",
+				"pages/demandCreate/demandCreate",
+				"pages/demandDetail/demandDetail",
+				"pages/demandFinish/demandFinish"
+			]
+		},
+		{
+			"root": "subpages/partyMassesServiceCenter",
+			"name": "partyMassesServiceCenter",
+			"pages": [
+				"pages/partyMassesList/partyMassesList",
+				"pages/partyMassesDetail/partyMassesDetail",
+				"pages/bookList/bookList",
+				"pages/partyMassesMap/partyMassesMap"
+			]
+		},
+		{
+			"root": "subpages/extend",
+			"name": "extend",
+			"pages": [
+				"pages/tripReport/tripReport",
+				"pages/moreList/moreList"
+			]
+		},
+		{
+			"root": "subpages/questionnaire",
+			"name": "questionnaire",
+			"pages": [
+				"pages/index/index",
+				"pages/detail/detail"
+			]
+		},
+		{
+			"root": "subpages/workguide",
+			"name": "workguide",
+			"pages": [
+				"pages/index/index",
+				"pages/collect/collect",
+				"pages/detail/detail",
+				"pages/link/link"
+			]
+		},
+		{
+			"root": "subpages/partyElegant",
+			"name": "partyElegant",
+			"pages": [
+				"pages/partyElegant/partyElegant"
+			]
+		},
+		{
+			"root": "subpages/unionBuild",
+			"name": "unionBuild",
+			"pages": [
+				"pages/list/list",
+				"pages/detail/detail"
+			]
+		},
+		{
+			"root": "subpages/appeal",
+			"name": "appeal",
+			"pages": [
+				"pages/peopleLivelihood/peopleLivelihood",
+				"pages/development/development",
+				"pages/list/list",
+				"pages/peopleLivelihoodWork/peopleLivelihoodWork"
+			]
+		}
+	],
+	"preloadRule": {
+		"pages/index/index": {
+			"network": "all",
+			"packages": [
+				"subpages/changegrid",
+				"subpages/home"
+			]
+		},
+		"pages/discussion/discussion": {
+			"network": "all",
+			"packages": [
+				"discussion"
+			]
+		},
+		"pages/association/association": {
+			"network": "all",
+			"packages": [
+				"subpages/association"
+			]
+		},
+		"pages/mine/mine": {
+			"network": "all",
+			"packages": [
+				"mine"
+			]
+		}
+	},
+	"tabBar": {
+		"color": "#666666",
+		"selectedColor": "#FF0000",
+		"backgroundColor": "#FFFFFF",
+		"borderStyle": "white",
+		"custom": true,
+		"list": [{
+				"pagePath": "pages/home/home",
+				"text": "首页",
+				"iconPath": "images/main/icon01.png",
+				"selectedIconPath": "images/main/icon01-a.png"
+			},
+			{
+				"pagePath": "pages/message/message",
+				"text": "消息",
+				"iconPath": "images/main/icon02.png",
+				"selectedIconPath": "images/main/icon02-a.png"
+			},
+			{
+				"pagePath": "pages/my/my",
+				"text": "我的",
+				"iconPath": "images/main/icon03.png",
+				"selectedIconPath": "images/main/icon03-a.png"
+			}
+		]
+	},
+	"window": {
+		"backgroundTextStyle": "light",
+		"navigationBarBackgroundColor": "#fff",
+		"navigationBarTitleText": "WeChat",
+		"navigationBarTextStyle": "black"
+	},
+	"networkTimeout": {
+		"request": 60000
+	},
+	"permission": {
+		"scope.userLocation": {
+			"desc": "党群e家将获取您的位置信息"
+		}
+	},
+	"requiredPrivateInfos": [
+		"getLocation",
+		"chooseLocation"
+	],
+	"sitemapLocation": "sitemap.json",
+	"serviceProviderTicket": "BhBC8k6Lkgi+6uDaV2haUUUH7ZC81tEpXdNMtSxiPnrYRxkRxMu5f6gprJ5i+leAKUxHM1E5YWc3P9vtgTtu2BULafIVikYURVk="
+>>>>>>> jly/task002
 }
--- a/miniprogram/subpages/redGrider/components/demeanor/index.js
+++ b/miniprogram/subpages/redGrider/components/demeanor/index.js
@ -0,0 +1,225 @@
+// subpages/volunteer/components/demeanor/index.js
+const app = getApp()
+Page({
+
+	/**
+	 * 页面的初始数据
+	 */
+	data: {
+		statusHeight: app.globalData.deviceInfo.statusHeight, // 自定义头部状态栏高度
+		navigationHeight: app.globalData.deviceInfo.navigationHeight,
+		list: [{
+			"title": "嘉善社区“迎新年联欢”网格活动",
+			"createTime": "2023-01-04",
+			"address": "山东省青岛市市北区重庆南路6号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "宣化社区新春茶话会",
+			"createTime": "2023-01-10",
+			"address": "山东省青岛市市北区金华路22号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "建国村社区“利民惠民 修理行动”主题修理活动",
+			"createTime": "2023-01-18",
+			"address": "山东省青岛市市北区宁化路33号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "建国村社区“写福送福”网格活动",
+			"createTime": "2023-01-20",
+			"address": "山东省青岛市市北区宁化路33号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "嘉善社区“垃圾分类 从我做起”网格活动",
+			"createTime": "2023-01-29",
+			"address": "山东省青岛市市北区嘉善路82号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "四机社区学雷锋，当先锋，我与城市共提升网格活动",
+			"createTime": "2023-02-01",
+			"address": "山东省青岛市市北区鞍山一路121号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "四机社区开展家庭教育网格活动",
+			"createTime": "2023-02-01",
+			"address": "山东省青岛市市北区鞍山一路121号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "嘉兴路社区“心连心”网格活动",
+			"createTime": "2023-02-17",
+			"address": "山东省青岛市市北区嘉兴路32号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "瑞昌路社区第一网格开展党的理论政策宣讲活动",
+			"createTime": "2023-02-20",
+			"address": "山东省青岛市市北区人民路299号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "四机社区开展学雷锋网格活动",
+			"createTime": "2023-03-02",
+			"address": "山东省青岛市市北区鞍山一路121号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "四机社区第五网格开展党的二十大理论专题学习和教育宣讲",
+			"createTime": "2023-03-09",
+			"address": "山东省青岛市市北区鞍山一路121号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "上四方社区“移风易俗”网格活动",
+			"createTime": "2023-04-04",
+			"address": "山东省青岛市市北区人民路58号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "宣化路社区“宜居靓家园 健康新生活”网格活动",
+			"createTime": "2023-04-08",
+			"address": "山东省青岛市市北区金华路22号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "四机社区开展环境整治活动",
+			"createTime": "2023-04-11",
+			"address": "山东省青岛市市北区嘉善路33号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "嘉善社区免费注射狂犬疫苗网格活动",
+			"createTime": "2023-04-17",
+			"address": "山东省青岛市市北区重庆南路6号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "上四方社区“人人动手 洁净家园”网格活动",
+			"createTime": "2023-04-17",
+			"address": "山东省青岛市市北区人民路58号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "宣化路社区网格连心送温暖 组团服务进家门",
+			"createTime": "2023-05-09",
+			"address": "山东省青岛市市北区金华路22号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "宣化路社区“走清廉之路 忆初心使命”网格活动",
+			"createTime": "2023-05-11",
+			"address": "山东省威海市荣成市",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "四机社区开展“清洁我们的家园”",
+			"createTime": "2023-05-12",
+			"address": "山东省青岛市市北区鞍山一路121号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "嘉善社区金融安全知识活动",
+			"createTime": "2023-05-14",
+			"address": "山东省青岛市市北区重庆南路6号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "上四方社区第6网格开展实践科学理论宣讲活动",
+			"createTime": "2023-05-21",
+			"address": "山东省青岛市市北区人民路58号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "上四方社区“洁净家园”网格活动",
+			"createTime": "2023-05-25",
+			"address": "山东省青岛市市北区人民一路58号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "嘉善社区为学习保驾护航网格活动",
+			"createTime": "2023-06-08",
+			"address": "山东省青岛市市北区重庆南路6号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "嘉善社区开展民族宗教宣讲活动",
+			"createTime": "2023-06-13",
+			"address": "山东省青岛市市北区重庆南路6号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "上四方第一网格开展二十大理论宣讲活动",
+			"createTime": "2023-06-15",
+			"address": "山东省青岛市市北区人民路58号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "嘉善社区开展“端午粽飘香”网格活动活动 ",
+			"createTime": "2023-06-20",
+			"address": "山东省青岛市市北区重庆南路6号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "宣化路社区连心广场送服务网格活动",
+			"createTime": "2023-06-21",
+			"address": "山东省青岛市市北区金华路22号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "四机社区“垃圾分一分 环境美十分”网格活动",
+			"createTime": "2023-06-23",
+			"address": "山东省青岛市市北区嘉善路35号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "宣化社区开展七一活动",
+			"createTime": "2023-06-27",
+			"address": "山东省青岛市海岸路22号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "四机社区“庆七一光荣在党50年”网格活动",
+			"createTime": "2023-06-29",
+			"address": "山东省青岛市市北区鞍山一路121号",
+			"imgUrl": "../../images/01.png"
+		}]
+	},
+
+	/**
+	 * 生命周期函数--监听页面加载
+	 */
+	onLoad(options) {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面初次渲染完成
+	 */
+	onReady() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面显示
+	 */
+	onShow() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面隐藏
+	 */
+	onHide() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面卸载
+	 */
+	onUnload() {
+
+	},
+
+	/**
+	 * 页面相关事件处理函数--监听用户下拉动作
+	 */
+	onPullDownRefresh() {
+
+	},
+
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom() {
+
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage() {
+
+	},
+	back() {
+		//返回上一级，关闭当前页面
+		wx.navigateBack({
+			delta: 1
+		})
+	},
+})
--- a/miniprogram/subpages/redGrider/components/demeanor/index.json
+++ b/miniprogram/subpages/redGrider/components/demeanor/index.json
@ -0,0 +1,3 @@
+{
+	"navigationStyle": "custom"
+}
--- a/miniprogram/subpages/redGrider/components/demeanor/index.wxml
+++ b/miniprogram/subpages/redGrider/components/demeanor/index.wxml
@ -0,0 +1,23 @@
+<view class="header">
+     <image src="../../images/back.png" class="back" style=" top: {{statusHeight}}px;"  bindtap="back"></image>
+    <!-- <image class="header-bg" src="../../images/volunteer/redSail_bg.png" mode="widthFix" /> -->
+    <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
+        网格风采
+    </view>
+</view>
+<view class="list">
+	<view wx:for="{{list}}" wx:key="index" class="listItme">
+		<view>
+			  <image src="{{item.imgUrl}}" class="icon"></image>
+		</view>
+		<view style="display: flex;flex-direction: column;justify-content: space-between;">
+			<view style="font-size:28rpx;font-weight: 600;">{{item.title}}</view>
+			<view style="color:#ccc;font-size:20rpx;display: flex;flex-direction: row;justify-content: space-between;">
+				<view style="width: 60%;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;">{{item.address}}</view>
+				<view>
+					{{item.createTime}}
+				</view>
+			</view>
+		</view>
+	</view>
+</view>
--- a/miniprogram/subpages/redGrider/components/demeanor/index.wxss
+++ b/miniprogram/subpages/redGrider/components/demeanor/index.wxss
@ -0,0 +1,75 @@
+page {
+	width: 100%;
+	height: auto;
+	overflow-y: auto;
+	background: #f7f7f7;
+	font-family: PingFang SC;
+	background: linear-gradient(180deg, #E82C19 0%, #F7F7F9 30%);
+}
+
+.header {
+
+	width: 100%;
+	height: 250rpx;
+
+	/* position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 1000; */
+}
+
+.header .header-bg {
+	width: 100%;
+	height: 100%;
+	/* position: absolute;
+    z-index: 10;
+    left: 0;
+    top: 0; */
+	position: absolute;
+	height: 100%;
+	z-index: -999;
+}
+
+.header .navigation {
+	width: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	color: rgba(255, 255, 255, 0.9);
+	font-size: 32rpx;
+	position: relative;
+	z-index: 1;
+}
+
+
+.back {
+	width: 20rpx;
+	height: 20rpx;
+	margin-left: 20rpx;
+	position: absolute;
+	margin-top: 20rpx;
+	border-radius: 0rpx;
+	z-index: 2;
+}
+
+.list {
+	background-color: #f5f5f5;
+	margin-top: -80rpx;
+	padding: 20rpx;
+	max-height: 100vh;
+	overflow-y: auto;
+}
+
+.listItme {
+	background-color: #fff;
+	border-radius: 12rpx;
+	margin-top: 20rpx;
+	padding: 20rpx;
+	display: flex;
+	flex-direction: row;
+}
+
+.icon {
+	width: 200rpx;
+	height: 160rpx;
+}
--- a/miniprogram/subpages/redGrider/pages/redGrider/redGrider.wxml
+++ b/miniprogram/subpages/redGrider/pages/redGrider/redGrider.wxml
@ -43,7 +43,7 @@
                <image src="../../images/03r.png"  class="go"></image>
            </view>
        </view> -->
-        <view class="item color04">
+        <navigator class="item color04" url="/subpages/redGrider/components/demeanor/index">
            <image src="../../images/04.png" class="icon"></image>
            <view class="vcenter flex1">
                <view class="h1">网格风采</view>
@ -54,7 +54,7 @@
            <view class="vcenter w20">
                <image src="../../images/04r.png"  class="go"></image>
            </view>
-        </view>
+        </navigator>
       
    </view>
 </view>
--- a/miniprogram/subpages/volunteer/components/demeanor/index.js
+++ b/miniprogram/subpages/volunteer/components/demeanor/index.js
@ -0,0 +1,210 @@
+// subpages/volunteer/components/demeanor/index.js
+const app = getApp()
+Page({
+
+	/**
+	 * 页面的初始数据
+	 */
+	data: {
+		statusHeight: app.globalData.deviceInfo.statusHeight, // 自定义头部状态栏高度
+		navigationHeight: app.globalData.deviceInfo.navigationHeight,
+		list: [{
+			"title": "海嘉社区文明实践站---安全教育宣讲",
+			"createTime": "2023-01-03",
+			"address": "山东省青岛市市北区嘉善路5号-3",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "嘉兴路社区新时代文明实践站开展居民预防一氧化碳中毒宣传",
+			"createTime": "2023-01-04",
+			"address": "山东省青岛市市北区嘉兴路32号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "四机社区新时代文明实践站开展“寒冬送温暖 欢乐迎新春”活动",
+			"createTime": "2023-01-10",
+			"address": "山东省青岛市市北区鞍山一路121号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "建国村社区新时代文明实践站开展“学习强国”线下学习宣讲活动",
+			"createTime": "2023-01-12",
+			"address": "山东省青岛市市北区宁化路33号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "嘉善路社区新时代文明实践站开展衍纸制作活动",
+			"createTime": "2023-01-12",
+			"address": "山东省青岛市市北区重庆南路6号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "下四方社区垃圾分类知识讲座",
+			"createTime": "2023-01-13",
+			"address": "山东省青岛市市北区杭州路28号-49号网点",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "宣化路社区新时代文明实践站“邻里情”编织活动",
+			"createTime": "2023-01-16",
+			"address": "山东省青岛市市北区金华路22号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "嘉兴路社区新时代文明实践站开展“春风润万家 群众阅读忙”全民阅读活动--丰富群众文化供给",
+			"createTime": "2023-01-28",
+			"address": "山东省青岛市市北区嘉兴路32号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "瑞昌路社区新时代文明实践站开展弘扬社会主义核心价值观系列活动",
+			"createTime": "2023-01-29",
+			"address": "山东省青岛市市北区人民路299号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "海嘉社区文明实践站---移风易俗专题宣讲",
+			"createTime": "2023-01-31",
+			"address": "山东省青岛市市北区嘉善路5号-3",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "海嘉社区文明实践站---开工后家庭事物安全宣讲",
+			"createTime": "2023-02-01",
+			"address": "山东省青岛市市北区嘉善路5号-3",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "嘉兴路社区新时代文明实践站开展“我们的节日--全民健身进社区、邻里趣味猜灯谜”活动",
+			"createTime": "2023-02-03",
+			"address": "山东省青岛市市北区嘉兴路32号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "建国村社区新时代文明实践站开展“崇尚运动 分享健康”柔力球比赛",
+			"createTime": "2023-02-07",
+			"address": "山东省青岛市市北区宁化路33号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "四机社区新时代文明实践站开展“长寿时代如何重塑老年生活”家庭教育指导活动",
+			"createTime": "2023-02-08",
+			"address": "山东省青岛市市北区鞍山一路121号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "嘉善社区新时代文明实践站开展敬老爱亲一家人宣讲活动",
+			"createTime": "2023-02-08",
+			"address": "山东省青岛市市北区重庆南路6号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "建国村社区新时代文明实践站开展“学国学 悟国学”宣讲活动",
+			"createTime": "2023-02-11",
+			"address": "山东省青岛市市北区宁化路33号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "下四方社区珐琅彩绘画活动",
+			"createTime": "2023-02-11",
+			"address": "山东省青岛市市北区杭州路28号-49号网点",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "瑞昌路社区新时代文明实践站开展弘扬社会主义核心价值观系列活动",
+			"createTime": "2023-02-16",
+			"address": "山东省青岛市市北区人民路299号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "宣化路社区新时代文明实践站开展垃圾分类宣传活动",
+			"createTime": "2023-02-20",
+			"address": "山东省青岛市市北区金华路22号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "北岭社区携手红色合伙人开展关爱老人行动",
+			"createTime": "2023-02-24",
+			"address": "山东省青岛市市北区瑞昌路141号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "四机社区新时代文明实践站开展“学雷锋，当先锋，我与城市共提升系列—小小雏鹰暖空巢 我当楼道长”活动",
+			"createTime": "2023-02-27",
+			"address": "山东省青岛市市北区鞍山一路121号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "海嘉社区携手红色合伙人开展“学雷锋当先锋我与城市共提升”活动",
+			"createTime": "2023-03-03",
+			"address": "山东省青岛市市北区嘉善路5号-3",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "北岭社区开展“不忘初心学雷锋，爱心捐赠暖人心”的衣物捐赠活动",
+			"createTime": "2023-03-03",
+			"address": "山东省青岛市市北区瑞昌路141号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "上四方社区学雷锋日活动",
+			"createTime": "2023-03-03",
+			"address": "山东省青岛市市北区人民一路58-3",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "北岭社区携手红色合伙人庆三八妇女节主题活动",
+			"createTime": "2023-03-08",
+			"address": "山东省青岛市市北区瑞昌路141号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "四机社区携手红色合伙人开展益路同行公益活动",
+			"createTime": "2023-05-09",
+			"address": "山东省青岛市市北区鞍山一路121号",
+			"imgUrl": "../../images/01.png"
+		}, {
+			"title": "四机社区端午节活动",
+			"createTime": "2023-05-10",
+			"address": "山东省青岛市市北区鞍山一路121号",
+			"imgUrl": "../../images/01.png"
+		}]
+	},
+
+	/**
+	 * 生命周期函数--监听页面加载
+	 */
+	onLoad(options) {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面初次渲染完成
+	 */
+	onReady() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面显示
+	 */
+	onShow() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面隐藏
+	 */
+	onHide() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面卸载
+	 */
+	onUnload() {
+
+	},
+
+	/**
+	 * 页面相关事件处理函数--监听用户下拉动作
+	 */
+	onPullDownRefresh() {
+
+	},
+
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom() {
+
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage() {
+
+	},
+	back() {
+		//返回上一级，关闭当前页面
+		wx.navigateBack({
+			delta: 1
+		})
+	},
+})
--- a/miniprogram/subpages/volunteer/components/demeanor/index.json
+++ b/miniprogram/subpages/volunteer/components/demeanor/index.json
@ -0,0 +1,3 @@
+{
+	"navigationStyle": "custom"
+}
--- a/miniprogram/subpages/volunteer/components/demeanor/index.wxml
+++ b/miniprogram/subpages/volunteer/components/demeanor/index.wxml
@ -0,0 +1,23 @@
+<view class="header">
+     <image src="../../images/back.png" class="back" style=" top: {{statusHeight}}px;"  bindtap="back"></image>
+    <!-- <image class="header-bg" src="../../images/volunteer/redSail_bg.png" mode="widthFix" /> -->
+    <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
+        志愿风采
+    </view>
+</view>
+<view class="list">
+	<view wx:for="{{list}}" wx:key="index" class="listItme">
+		<view>
+			  <image src="{{item.imgUrl}}" class="icon"></image>
+		</view>
+		<view style="display: flex;flex-direction: column;justify-content: space-between;">
+			<view style="font-size:28rpx;font-weight: 600;">{{item.title}}</view>
+			<view style="color:#ccc;font-size:20rpx;display: flex;flex-direction: row;justify-content: space-between;">
+				<view style="width: 60%;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;">{{item.address}}</view>
+				<view>
+					{{item.createTime}}
+				</view>
+			</view>
+		</view>
+	</view>
+</view>
--- a/miniprogram/subpages/volunteer/components/demeanor/index.wxss
+++ b/miniprogram/subpages/volunteer/components/demeanor/index.wxss
@ -0,0 +1,75 @@
+page {
+	width: 100%;
+	height: auto;
+	overflow-y: auto;
+	background: #f7f7f7;
+	font-family: PingFang SC;
+	background: linear-gradient(180deg, #E82C19 0%, #F7F7F9 30%);
+}
+
+.header {
+
+	width: 100%;
+	height: 250rpx;
+
+	/* position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 1000; */
+}
+
+.header .header-bg {
+	width: 100%;
+	height: 100%;
+	/* position: absolute;
+    z-index: 10;
+    left: 0;
+    top: 0; */
+	position: absolute;
+	height: 100%;
+	z-index: -999;
+}
+
+.header .navigation {
+	width: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	color: rgba(255, 255, 255, 0.9);
+	font-size: 32rpx;
+	position: relative;
+	z-index: 1;
+}
+
+
+.back {
+	width: 20rpx;
+	height: 20rpx;
+	margin-left: 20rpx;
+	position: absolute;
+	margin-top: 20rpx;
+	border-radius: 0rpx;
+	z-index: 2;
+}
+
+.list {
+	background-color: #f5f5f5;
+	margin-top: -80rpx;
+	padding: 20rpx;
+	max-height: 100vh;
+	overflow-y: auto;
+}
+
+.listItme {
+	background-color: #fff;
+	border-radius: 12rpx;
+	margin-top: 20rpx;
+	padding: 20rpx;
+	display: flex;
+	flex-direction: row;
+}
+
+.icon {
+	width: 200rpx;
+	height: 160rpx;
+}
--- a/miniprogram/subpages/volunteer/components/recruitOrder/index.js
+++ b/miniprogram/subpages/volunteer/components/recruitOrder/index.js
@ -12,7 +12,7 @@ Page({
 		volunteerTypeArr: ['镇街服务队', '社区服务队'],
 		volunteerType: 0,
 		volunteerTypeOneInfo: {
-			neme: "",
+			name: "",
 			IDnumber: "",
 			phone: "",
 			street: "",
@ -93,8 +93,9 @@ Page({
 	bindPickerChange: function(e) {
 		console.log('picker发送选择改变，携带值为', e.detail)
 		this.setData({
-			volunteerType: e.detail.value
+			volunteerType: e.detail.value,
 		})
+
 	},
 	bindPickerStreet: function(e) {
 		this.setData({
@ -131,4 +132,17 @@ Page({
 			["volunteerTypeOneInfo.speciality"]: e.detail.value
 		})
 	},
+	submit() {
+		if (this.data.volunteerType == 0 && (!this.data.volunteerTypeOneInfo.name || !this.data
+				.volunteerTypeOneInfo.IDnumber || !this.data.volunteerTypeOneInfo.phone || !this.data
+				.volunteerTypeOneInfo.street)) {
+			return
+		}
+		if (this.data.volunteerType == 1 && (!this.data.volunteerTypeOneInfo.community || !this.data
+				.volunteerTypeOneInfo.name || !this.data.volunteerTypeOneInfo.IDnumber || !this.data
+				.volunteerTypeOneInfo.phone || !this.data.volunteerTypeOneInfo.street)) {
+			return
+		}
+		console.log(this.data.volunteerTypeOneInfo);
+	}
 })
--- a/miniprogram/subpages/volunteer/components/recruitOrder/index.wxml
+++ b/miniprogram/subpages/volunteer/components/recruitOrder/index.wxml
@ -13,7 +13,7 @@
 			<view class="h2_view">1.中共党员或中共预备党员;</view>
 			<view class="h2_view">2.自愿从事志愿服务工作;</view>
 			<view class="h2_view">3.承认和遵守志愿者管理有关制度和规定;</view>
-			<view class="h2_view">4.政治素质过硬,道德品行端正,能够</view>
+			<view class="h2_view">4.政治素质过硬,道德品行端正,能够模范遵守党的纪律和国家法律法规;</view>
 			<view class="h2_view">5.自觉接受志愿服务队领导,认真执行各项决定和任务;</view>
 			<view class="h2_view">6.具备从事志愿服务的身体条件、服务技能和服务资格;</view>
 			<view class="h2_view">7.具有相应的民事行为能力。</view>
@ -42,7 +42,7 @@
 			<view class="orderName">姓名</view>
 			<input style="width:25%;text-align: end;"  maxlength="10" bindinput="bindNameInput"  placeholder="请输入"/>
 		</view>
-		<view class="order" style="background-color: #fafafa;">
+		<view class="order" >
 		<view class="orderName" >身份证号</view>
 		<input style="width:25%;text-align: end;"  bindinput="bindIDnumberInput"  placeholder="请输入"/>
 		</view>
@ -51,18 +51,18 @@
 		<input style="width:25%;text-align: end;"  bindinput="bindphoneInput"  placeholder="请输入"/>
 		</view>
 		<picker bindchange="bindPickerStreet" value="{{index}}" range="{{streetArr}}">
-		    <view class="order" style="background-color: #fafafa;">
+		    <view class="order">
 				<view class="orderName">所属镇街</view>
 				<view>{{streetArr[volunteerTypeOneInfo.street]?streetArr[volunteerTypeOneInfo.street]:"请选择"}}</view>
 		    </view>
 		  </picker>
-		  <picker bindchange="bindPickerCommunity" value="{{index}}" range="{{communityArr}}" wx:if="{{volunteerType==0}}">
+		  <picker bindchange="bindPickerCommunity" value="{{index}}" range="{{communityArr}}" wx:if="{{volunteerType==1}}">
 		      <view class="order">
 		  		<view class="orderName">所属社区</view>
 		  		<view>{{communityArr[volunteerTypeOneInfo.community]?communityArr[volunteerTypeOneInfo.community]:"请选择"}}</view>
 		      </view>
 		    </picker>
-			<view class="order" style="background-color: #fafafa;">
+			<view class="order">
 			<view>现工作单位</view>
 			<input style="width:25%;text-align: end;"  bindinput="bindworkUnitInput"  placeholder="请输入"/>
 			</view>
@ -74,7 +74,7 @@
 	</view>
 		<view class="typeOneButton">
 			<view class="typeOneButtonOne" data-type="1" bindtap="change">返回</view>
-			<view class="typeOneButtonTwo">提交</view>
+			<view class="typeOneButtonTwo" bindtap="submit">提交</view>
 		</view>
 	</view>
 </view>
--- a/miniprogram/subpages/volunteer/images/text.jpg
+++ b/miniprogram/subpages/volunteer/images/text.jpg
--- a/miniprogram/subpages/volunteer/pages/volunteer/volunteer.js
+++ b/miniprogram/subpages/volunteer/pages/volunteer/volunteer.js
@ -2,92 +2,91 @@
 const app = getApp()
 Page({

-    /**
-     * 页面的初始数据
-     */
-    data: {
-        statusHeight: app.globalData.deviceInfo.statusHeight, // 自定义头部状态栏高度
-        navigationHeight: app.globalData.deviceInfo.navigationHeight,
-		list:[
-			{
-				id:0,
-				url:'/subpages/volunteer/components/recruitOrder/index',
-				firstText:"招募令",
-				secondTetx:"中共党员或中共预备党员。",
-				src:'../../images/01.png',
-				rightSrc:'../../images/right.png'
+	/**
+	 * 页面的初始数据
+	 */
+	data: {
+		statusHeight: app.globalData.deviceInfo.statusHeight, // 自定义头部状态栏高度
+		navigationHeight: app.globalData.deviceInfo.navigationHeight,
+		list: [{
+				id: 0,
+				url: '/subpages/volunteer/components/recruitOrder/index',
+				firstText: "招募令",
+				secondTetx: "中共党员或中共预备党员。",
+				src: '../../images/01.png',
+				rightSrc: '../../images/right.png'
 			},
 			{
-				id:1,
-				url:'',
-				firstText:"志愿风采",
-				secondTetx:"XXXXXXXXXXXXXXXXXXXX···",
-				src:'../../images/03.png',
-				rightSrc:'../../images/right.png'
+				id: 1,
+				url: '/subpages/volunteer/components/demeanor/index',
+				firstText: "志愿风采",
+				secondTetx: "XXXXXXXXXXXXXXXXXXXX···",
+				src: '../../images/03.png',
+				rightSrc: '../../images/right.png'
 			}
 		]
-    },
+	},

-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
+	/**
+	 * 生命周期函数--监听页面加载
+	 */
+	onLoad(options) {

-    },
+	},

-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
+	/**
+	 * 生命周期函数--监听页面初次渲染完成
+	 */
+	onReady() {

-    },
+	},

-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
+	/**
+	 * 生命周期函数--监听页面显示
+	 */
+	onShow() {

-    },
+	},

-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
+	/**
+	 * 生命周期函数--监听页面隐藏
+	 */
+	onHide() {

-    },
+	},

-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
+	/**
+	 * 生命周期函数--监听页面卸载
+	 */
+	onUnload() {

-    },
+	},

-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
+	/**
+	 * 页面相关事件处理函数--监听用户下拉动作
+	 */
+	onPullDownRefresh() {

-    },
+	},

-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom() {

-    },
+	},

-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage() {

-    },
-    back() {
-        console.log("dddddddddd")
-        //返回上一级，关闭当前页面
-        wx.navigateBack({
-            delta: 1
-        })
-    },
+	},
+	back() {
+		console.log("dddddddddd")
+		//返回上一级，关闭当前页面
+		wx.navigateBack({
+			delta: 1
+		})
+	},
 })