Merge branch 'master' of http://39.98.150.180/frontend-uniapp/Civil-Affairs-Bureau-WeChar

起风了
2 parents 6e668ba7 284e4841
Showing 18 changed files with 642 additions and 112 deletions
App.vue
apis/modules/ly.js
pages.json
pages/activity/activity.vue
pages/activitylist/activitylist.vue
pages/declaration/declarationListdetail.vue
pages/declaration/list.vue
pages/home/home.vue
pages/policy/policy.vue
pages/policy/policydetail.vue
pages/receiptRegistration/receiptRegistration.vue
pages/webviewyl/webviewyl.vue
pages/whisper/index.vue
static/yl/image-2.png
static/yl/image-3.png
static/yl/image-4.png
static/yl/image-5.png
static/yl/image.png
@@ -13,9 +13,9 @@
 			gain() {
 				// const token = uni.getStorageSync("token");
 				// if (!token) return
-				this.API.getplie({
+				this.API.getplie1({
 					pageNum: 1,
-					pageSize: 8000
+					pageSize: 80000
 				}).then(response => {
 					console.log(response, '界桩')
 					let box1 = []
 import request from '../../service/request.js'
 import utils from '../../service/utils.js'
 export default {	
+	// 活动列表查询
+	getactivityInfoSheet(pages){
+		return request.get('/boundary/activityInfoSheet/list',pages);
+	},
+	// 详情活动列表查询
+	getactivityInfoSheetdetail(pages){
+		return request.get('/boundary/activityInfoSheet/'+pages);
+	},
 	// 获取详情界桩
 	getariesInfo(data){
 		return request.get('/areBoundary/ariesInfo/'+data)
@@ -45,10 +53,14 @@ export default {
 	getpolicyDocumentone(data){
 		return request.get('/arePlaceName/policyDocument/'+data)
 	},
-	// 行政区
+	// 界桩
 	getplie(data){
 		return request.get('/areBoundary/ariesInfo/list',data)
 	},
+	// 行政区
+	getplie1(data){
+		return request.get('/areBoundary/plie/list',data)
+	},
 	// 申报小区门牌
 	adddoorplate(data){
 		return request.post('/arePlaceName/doorplate',data)
@@ -317,7 +317,7 @@
 		}, {
 			"path": "pages/declaration/list",
 			"style": {
-				"navigationBarTitleText": "区域服务",
+				"navigationBarTitleText": "区划地名",
 				"enablePullDownRefresh": false
 			}
@@ -462,6 +462,29 @@
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path" : "pages/activity/activity",
+			"style" : 
+			{
+				"navigationBarTitleText" : "活动详情",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/activitylist/activitylist",
+			"style" : 
+			{
+				"navigationBarTitleText" : "活动列表",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/webviewyl/webviewyl",
+			"style" : 
+			{
+				"navigationStyle": "custom"
+			}
 		}
 	],
 	"globalStyle": {
+<template>
+	<view class="page">
+		<!-- <pyh-nv ref="nv" :config="nvConfig"></pyh-nv> -->
+		<view class="listBox" >
+			<view class="content"
+				style="padding: 20rpx 40rpx;display: flex;flex-direction: column;align-items: center;background-color: #fff;">
+				<view class="" style="margin-bottom: 30rpx;margin-top: 20rpx;font-weight: 600;font-size: 38rpx;">
+					{{info.activityName}}
+				</view>
+				<view class=""
+					style="font-size: 20rpx;text-align: left;width: 100%;">
+					<view style="margin-bottom: 10rpx;">活动人数：{{info.activityNumber}}</view>
+					<view style="margin-bottom: 10rpx;">活动开始日期：{{info.eventStartDate}}</view>
+					<view style="margin-bottom: 10rpx;">活动结束日期：{{info.eventEndDate}}</view>
+				</view>
+				<swiper v-if="info.activeImage" style="height: 500rpx;width: 100%;" circular :indicator-dots="true" :autoplay="true">
+					<swiper-item  v-for="(item,index) in info.activeImage">
+						<view style="display: block;">
+							<image :src="BASE_URL+item" ></image>
+						</view>
+					</swiper-item>
+				
+				</swiper>
+				<!-- <image v-if="info.coverImage" :src="BASE_URL+info.coverImage" style="width: 100%;" mode="widthFix"></image> -->
+				<view class="" style="margin-top: 20rpx;margin-bottom: 20rpx;width: 100%;">
+					<view style="width: 100%;word-break:break-all;word-wrap:break-word;" v-html="info.eventContent">
+					</view>
+					<!-- <u-parse :content="info.content"></u-parse> -->
+				</view>
+
+
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import BASE_URL from "@/common/config.js"
+	export default {
+		data() {
+			return {
+				BASE_URL,
+				OrderType: 0,
+				info: {},
+				nvConfig: {
+					title: "详情",
+					bgColor: "#ffffff",
+					color: "#000000",
+					fixedAssist: {
+						hide: true,
+					},
+				},
+			};
+		},
+		onPageScroll(e) {
+			this.$refs.nv.pageScroll(e)
+		},
+		computed: {
+			pageTop() {
+				return parseInt(88 * uni.getSystemInfoSync().windowWidth / 750) + uni.getSystemInfoSync().statusBarHeight
+			}
+		},
+		onLoad(params) {
+			console.log(params.id)
+			this.gain(params.id)
+			// this.info = JSON.parse(params.cent)
+			// this.nvConfig.title = this.info.title
+			// console.log(this.info)
+			// this.OrderType = params.type;
+		},
+		methods: {
+			gain(e) {
+				this.API.getactivityInfoSheetdetail(e).then(res => {
+					console.log(res);
+					this.info = res.data
+					if(this.info.activeImage) {
+						this.info.activeImage = this.info.activeImage.split(',')
+					}
+					
+					// this.nvConfig.title = this.info.title
+				})
+			},
+			downfile(e) {
+
+				let that = this
+				console.log(that.BASE_URL + e)
+				let c1 = e.split('.')
+				console.log(c1)
+				uni.downloadFile({
+					url: that.BASE_URL + e,
+					header: {
+						'content-type': "application/json",
+					},
+					// filePath: wx.env.USER_DATA_PATH + e,
+					success: (res) => {
+						console.log(res)
+						if (res.statusCode === 200) {
+							const savedFilePath = res.tempFilePath
+							uni.openDocument({
+								filePath: savedFilePath,
+								fileType: c1[1], //注意：文件为pdf，类型为pdf
+								showMenu: true,
+								success: (response) => {
+									console.log(response)
+								},
+								fail: (err) => {
+									console.log(err)
+									wx.hideLoading()
+								}
+							})
+						} else {
+							wx.hideLoading()
+						}
+					},
+					fail: (err) => {
+						console.log(err)
+						wx.hideLoading()
+
+					},
+					complete: () => {
+						wx.hideLoading()
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.skip-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 100rpx;
+		margin-top: 70rpx;
+		position: fixed;
+		bottom: 30rpx;
+
+		.cart-add {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 38%;
+
+			image {
+				width: 253rpx;
+				height: 80rpx;
+				box-shadow: 5rpx 10rpx 20rpx 0 #efefef;
+				border-radius: 100rpx;
+			}
+
+			text {
+				font-size: 30rpx;
+				font-weight: bold;
+				color: #262626;
+				position: absolute;
+				z-index: 1;
+			}
+		}
+
+		.buy-at {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 58%;
+
+			image {
+				width: 415rpx;
+				height: 80rpx;
+				box-shadow: 5rpx 10rpx 20rpx 0 #b7c8ff;
+				border-radius: 100rpx;
+			}
+
+			text {
+				font-size: 30rpx;
+				font-weight: bold;
+				color: #FFFFFF;
+				position: absolute;
+				z-index: 1;
+			}
+		}
+	}
+
+	.listBox {
+		position: relative;
+		z-index: 1;
+	}
+
+	.content {
+		width: 100%;
+	}
+
+	/* 订单列表 */
+	.order-list {
+		width: 100%;
+		padding-bottom: 10rpx;
+
+		.list {
+			padding: 30rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			margin: 25rpx;
+
+			.title-status {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				width: 100%;
+				height: 100rpx;
+
+				.title {
+					display: flex;
+					align-items: center;
+
+					text {
+						font-size: 26rpx;
+						color: #A7A7A7;
+					}
+
+					image {
+						width: 18rpx;
+						height: 18rpx;
+						margin-left: 10rpx;
+					}
+				}
+
+				.status {
+					display: flex;
+					align-items: center;
+
+					text {
+						font-size: 26rpx;
+						color: #EE8952;
+					}
+				}
+			}
+
+			.goods-list {
+				width: 100%;
+
+				.goods {
+					display: flex;
+					justify-content: space-between;
+					width: 100%;
+					position: relative;
+
+					.goods-name {
+						width: 65%;
+						font-size: 26rpx;
+						color: #A7A7A7;
+
+						.goods-name-title {
+							font-size: 30rpx;
+							color: #3d3d3d;
+							font-weight: bold;
+							margin-bottom: 20rpx;
+						}
+					}
+
+					.btn {
+						width: 200rpx;
+						height: 58rpx;
+						position: absolute;
+						bottom: 0;
+						right: 0;
+
+						text {
+							font-size: 28rpx;
+							color: #fff;
+							position: absolute;
+							width: 200rpx;
+							line-height: 58rpx;
+							text-align: center;
+							z-index: 1;
+						}
+
+						image {
+							width: 200rpx;
+							height: 58rpx;
+							position: absolute;
+							z-index: 0;
+							box-shadow: 5rpx 10rpx 20rpx 0 #b7c8ff;
+							border-radius: 100rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
 \ No newline at end of file
+<template>
+	<view>
+		<view v-if="list.length>0">
+			<view class="content" @click="xwtz('/pages/activity/activity?id='+item.id)" v-for="(item,index) in list" :key="index">
+				<view class="box_item">
+					<view class="box_left">
+						<span class="f1">{{item.activityName}}</span>
+						<span class="f2">{{item.eventStartDate?item.eventStartDate:'-'}}{{item.eventEndDate?'至'+item.eventEndDate:'-'}}</span>
+					</view>
+					<view class="box_right" v-if="item.activeImage">
+						<view class="images">
+							<image :src="BASE_URL + item.activeImage[0]" style="width: 100%;height: 100%;border-radius: 20rpx;" mode="aspectFill"></image>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view v-else style="width: 100%;text-align: center;margin-top: 100rpx;font-size: 30rpx;">
+			暂无数据
+		</view>
+	</view>
+</template>
+
+<script>
+	import BASE_URL from "@/common/config.js"
+	export default {
+		data() {
+			return {
+				BASE_URL,
+				list: [],
+				from:{
+					activeStatus:'展示',
+					activeType:''
+				}
+			}
+		},
+		onLoad(e) {
+			if(e.activeType){
+				this.from.activeType = e.activeType
+			}
+			this.getlist()
+		},
+		methods: {
+			getlist() {
+				this.API.getactivityInfoSheet(this.from).then(res => {
+					console.log(res);
+					for (let i = 0; i < res.rows.length; i++) {
+						if(res.rows[i].activeImage) {
+							res.rows[i].activeImage = res.rows[i].activeImage.split(',')
+						}
+						
+					}
+					this.list = res.rows
+					
+				})
+			},
+			xwtz(e) {
+				uni.navigateTo({
+					url: e
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		padding: 20rpx;
+
+		.box_item {
+			background-color: #fff;
+			display: flex;
+			padding: 20rpx;
+			border-radius: 20rpx;
+			height: 200rpx;
+
+			.box_left {
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				width: 100%;
+				// margin-right: 2%;
+
+				.f1 {
+					font-size: 35rpx;
+					font-weight: 600;
+					display: block;
+					margin-bottom: 20rpx;
+				}
+
+				.f2 {
+					color: #ababab;
+				}
+			}
+
+			.box_right {
+				width: 40%;
+
+				.images {
+					// background-color: #ababab;
+					height: 160rpx;
+					width: 100%;
+					// background-image: url("http://antis14.sherkxuan.cn/assets/images/a1.png");
+					// background-size: 100% 100%;
+				}
+			}
+		}
+	}
+</style>
 \ No newline at end of file
@@ -6,7 +6,7 @@
 				<view class="message-list">
 					<view class="titleall-box">
 						<view class="titleall-left">
-							<view class="titleall-left-line"></view>基本信息  
+							<view class="titleall-left-line"></view>基本信息    
 						</view> 
 					</view>
 					<view class="info-box">
@@ -2,21 +2,29 @@
 	<view>
 		<view class="bg"><image src="../../static/bg.jpg" mode="widthFix"></image></view>
 		<view style="display: flex;padding: 30rpx;width: 100%;box-sizing: border-box;flex-wrap: wrap;justify-content: space-between;">
-			<view @click="gopath('/pages/declaration/declaration?type=5')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;">
+			<view @click="gopath('/pages/declaration/newDeclaration')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
 				<view style="width: 50%;margin: 0 auto;">
-					<image style="height: 120rpx;width: 100%;" src="../../static/ly/image11.png" mode="aspectFit"></image>
+					<image style="height: 120rpx;width: 100%;" src="../../static/ly/image6.png" mode="aspectFit"></image>
 				</view>
 				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
-					<!-- 地名标志牌需求申报 -->
-					门楼牌申报
+					地名申报
 				</view>
 			</view>
+			<view @click="gopath('/pages/map1/map')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
+				<view style="width: 50%;margin: 0 auto;">
+					<image style="height: 120rpx;width: 100%;" src="/static/new/image 2.png"  mode="aspectFit"></image>
+				</view>
+				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
+					地名查询
+				</view>
+			</view>
+
 			<view @click="gopath('/pages/mapdoorplate/mapdoorplate')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;">
 				<view style="width: 50%;margin: 0 auto;">
 					<image style="height: 120rpx;width: 100%;" src="../../static/ly/image8.png" mode="aspectFit"></image>
 				</view>
 				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
-					地名标志牌申报
+					地名标志备案
 				</view>
 			</view>
 			<view @click="gopath('/pages/declaration/declaration?type=3')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
@@ -27,12 +35,13 @@
 					建筑物名称备案
 				</view>
 			</view>
-			<view @click="gopath('/pages/declaration/newDeclaration')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
+			<view @click="gopath('/pages/declaration/declaration?type=5')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;">
 				<view style="width: 50%;margin: 0 auto;">
-					<image style="height: 120rpx;width: 100%;" src="../../static/ly/image6.png" mode="aspectFit"></image>
+					<image style="height: 120rpx;width: 100%;" src="../../static/ly/image11.png" mode="aspectFit"></image>
 				</view>
 				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
-					地名申报
+					<!-- 地名标志牌需求申报 -->
+					门楼牌备案
 				</view>
 			</view>
@@ -41,17 +50,10 @@
 					<image style="height: 120rpx;width: 100%;" src="/static/new/3.png" mode="aspectFit"></image>
 				</view>
 				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
-					界桩管护
-				</view>
-			</view>
-			<view @click="gopath('/pages/map1/map')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
-				<view style="width: 50%;margin: 0 auto;">
-					<image style="height: 120rpx;width: 100%;" src="/static/new/image 2.png"  mode="aspectFit"></image>
-				</view>
-				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
-					地名查询服务
+					界桩维护
 				</view>
 			</view>
+
 			<view @click="gopath('/pages/maptask/maptask')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
 				<view style="width: 50%;margin: 0 auto;">
 					<image style="height: 120rpx;width: 100%;" src="/static/new/image 1.png" mode="aspectFit"></image>
@@ -60,7 +62,22 @@
 					巡检任务
 				</view>
 			</view>
-			
+			<view @click="gopath('/pages/policy/policy')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
+				<view style="width: 50%;margin: 0 auto;">
+					<image style="height: 120rpx;width: 100%;" src="/static/new/image 3.png" mode="aspectFit"></image>
+				</view>
+				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
+					政策文件
+				</view>
+			</view>
+			<view @click="gopath('/pages/activitylist/activitylist?activeType=区划')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
+				<view style="width: 50%;margin: 0 auto;">
+					<image style="height: 120rpx;width: 100%;" src="/static/new/image 4.png" mode="aspectFit"></image>
+				</view>
+				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
+					区划活动
+				</view>
+			</view>
 		</view>
 <!-- 		<view style="padding: 30rpx;width: 100%;box-sizing: border-box;">
 			<view @click="gopath('/pages/declaration/declaration?type=5')" style="width: 100%;background: rgba(255,255,255,0.63);border-radius: 30rpx;padding: 20rpx 0;">
@@ -27,13 +27,13 @@
 							<view>
 								<image src="/static/new/2.png" mode="heightFix"></image>
 							</view>
-							<view class="text">个案登记</view>
+							<view class="text">未成年</view>
 						</view>
 						<view class="list" @click="map">
 							<view>
 								<image src="/static/new/3.png" mode="heightFix"></image>
 							</view>
-							<view class="text">区域申报</view>
+							<view class="text">地名</view>
 						</view>
 						<view class="list" @click="funeral">
 							<view>
@@ -60,96 +60,54 @@
 					</view>
 				</view>
 			</view>
-			<!-- 服务 -->
-			<view class="xw" style="padding-top: 20rpx;padding-left: 20rpx;">
-				<view class="title">
-					<view class="box1">
-						<image src="../../static/new/矩形 331.png" mode=""></image>
-						<span>殡葬服务</span>
-					</view>
-				</view>
-				<view class="content">
-					<view class="box_item" @click="funeralculture">
-						<view>
-							<image src="/static/nav/nav_ico5.png" style="width: 90%;" mode="widthFix"></image>
-						</view>
-						<view class="text">线上报丧</view>
-					</view>
-					<view class="box_item" @click="funerallaw">
-						<view>
-							<image src="/static/nav/nav_ico6.png" style="width: 90%;" mode="widthFix"></image>
-						</view>
-						<view class="text">线上预约</view>
-					</view>
-					<view class="box_item" @click="funeralguide">
-						<view>
-							<image src="/static/nav/nav_ico9.png" style="width: 90%;" mode="widthFix"></image>
-						</view>
-						<view class="text">办事指南</view>
-					</view>
-					<view class="box_item" @click="funeralproblem">
-						<view>
-							<image src="/static/nav/nav_ico10.png" style="width: 90%;" mode="widthFix"></image>
-						</view>
-						<view class="text">常见问题</view>
-					</view>
-				</view>
-			</view>
-
-			<view class="xw" style="padding-top: 20rpx;padding-left: 20rpx;">
+			<view class="xw" style="">
 				<view class="title">
 					<view class="box1">
 						<image src="../../static/new/矩形 331.png" mode=""></image>
-						<span>区域服务</span>
+						<span>养老服务</span>
 					</view>
 				</view>
-				<view class="content" style="margin-bottom:40rpx;">
-					<view class="box_item" @click="gopath('/pages/declaration/declaration?type=5')">
+				<view class="content" style="padding-bottom: 0;">
+					<view class="box_item" @click="goyl('http://icare.rsxmzj.91xxt.com:81/admin/resources/wsShop/html/index/oIndex_index.html')">
 						<view style="margin-bottom: 20rpx;">
-							<image src="/static/ly/image11.png" style="width: 60%;height: 90rpx;" mode=""></image>
+							<image src="../../static/yl/image-2.png" style="height: 100rpx;" mode="heightFix"></image>
 						</view>
-						<view class="text">门楼牌申报</view>
+						<view class="text">服务预约</view>
 					</view>
-					<view class="box_item" @click="gopath('/pages/mapdoorplate/mapdoorplate')">
+					<view class="box_item" @click="goyl('http://icare.rsxmzj.91xxt.com:81/admin/resources/H5_YLZS/html/login.html')">
 						<view style="margin-bottom: 20rpx;">
-							<image src="/static/ly/image8.png" style="width: 60%;height: 90rpx;" mode=""></image>
+							<image src="../../static/yl/image.png" style="height: 100rpx;" mode="heightFix"></image>
 						</view>
-						<view class="text">地名标志牌申报</view>
+						<view class="text">高龄津贴认证</view>
 					</view>
-					<view class="box_item" @click="gopath('/pages/declaration/declaration?type=3')">
+					<view class="box_item" @click="goyl('http://show.rsxmzj.91xxt.com:81/2020/orgMap/html/map/list.html')">
 						<view style="margin-bottom: 20rpx;">
-							<image src="/static/ly/image5.png" style="width: 60%;height: 90rpx;" mode=""></image>
+							<image src="../../static/yl/image-4.png" style="height: 100rpx;" mode="heightFix"></image>
 						</view>
-						<view class="text">建筑物备案</view>
+						<view class="text">关爱地图</view>
 					</view>
-					<view class="box_item" @click="gopath('/pages/declaration/newDeclaration')">
+	
+					<view class="box_item" @click="goyl('http://icare.rsxmzj.91xxt.com:81/admin/mobile/meal_aid_copy/html/login.html')">
 						<view style="margin-bottom: 20rpx;">
-							<image src="/static/ly/image6.png" style="width: 60%;height: 90rpx;" mode=""></image>
+							<image src="../../static/yl/image-5.png" style="height: 100rpx;" mode="heightFix"></image>
 						</view>
-						<view class="text">地名备案</view>
+						<view class="text">养老助餐</view>
 					</view>
 				</view>
-				<view class="content" style="margin-top: -70rpx;z-index: 10000;padding: 0 20rpx;">
-					<view class="box_item" @click="lmpsb">
+				<view class="content" style="padding-top: 0;">
+					<view class="box_item" @click="goyl('http://cwservice.rsxmzj.91xxt.com:81/icare-admin/resources/cwbt/html/login.html')">
 						<view style="margin-bottom: 20rpx;">
-							<image src="/static/new/image 2.png" style="width: 60%;height: 90rpx;" mode=""></image>
+							<image src="../../static/yl/image-3.png" style="height: 100rpx;" mode="heightFix"></image>
 						</view>
-						<view class="text">地名查询服务</view>
-					</view>
-					<view class="box_item" @click="gopath('/pages/maptask/maptask')">
-						<view style="margin-bottom: 20rpx;">
-							<image src="/static/new/image 1.png" style="width: 60%;height: 90rpx;" mode=""></image>
-						</view>
-						<view class="text">巡检任务</view>
+						<view class="text">床位补贴机构资质申请</view>
 					</view>
 				</view>
 			</view>
-
 			<view class="xw" style="">
 				<view class="title">
 					<view class="box1">
 						<image src="../../static/new/矩形 331.png" mode=""></image>
-						<span>未保服务</span>
+						<span>未成年服务</span>
 					</view>
 				</view>
 				<view class="content">
@@ -165,58 +123,127 @@
 						</view>
 						<view class="text">悄悄话</view>
 					</view>
+			<!-- 		<view class="box_item" @click="gopath('/pages/activitylist/activitylist?activeType=未成年')">
+						<view style="margin-bottom: 20rpx;">
+							<image src="/static/new/image 4.png" style="height: 100rpx;" mode="heightFix"></image>
+						</view>
+						<view class="text">未成年活动</view>
+					</view> -->
 				</view>
 			</view>
-			
+
 			<view class="xw" style="padding-top: 20rpx;padding-left: 20rpx;">
 				<view class="title">
 					<view class="box1">
 						<image src="../../static/new/矩形 331.png" mode=""></image>
-						<span>区域划分</span>
+						<span>区划地名服务</span>
 					</view>
 				</view>
 				<view class="content" style="margin-bottom:40rpx;">
-					<view class="box_item" @click="gopath('/pages/declaration/declaration?type=5')">
+					<view class="box_item" @click="gopath('/pages/declaration/newDeclaration')">
 						<view style="margin-bottom: 20rpx;">
-							<image src="/static/ly/image11.png" style="width: 60%;height: 90rpx;" mode=""></image>
+							<image src="/static/ly/image6.png" style="width: 60%;height: 90rpx;" mode=""></image>
 						</view>
-						<view class="text">门楼牌申报</view>
+						<view class="text">地名申报</view>
+					</view>
+					<view class="box_item" @click="lmpsb">
+						<view style="margin-bottom: 20rpx;">
+							<image src="/static/new/image 2.png" style="width: 60%;height: 90rpx;" mode=""></image>
+						</view>
+						<view class="text">地名查询</view>
 					</view>
 					<view class="box_item" @click="gopath('/pages/mapdoorplate/mapdoorplate')">
 						<view style="margin-bottom: 20rpx;">
 							<image src="/static/ly/image8.png" style="width: 60%;height: 90rpx;" mode=""></image>
 						</view>
-						<view class="text">地名标志牌申报</view>
+						<view class="text">地名标志备案</view>
 					</view>
+
+
 					<view class="box_item" @click="gopath('/pages/declaration/declaration?type=3')">
 						<view style="margin-bottom: 20rpx;">
 							<image src="/static/ly/image5.png" style="width: 60%;height: 90rpx;" mode=""></image>
 						</view>
-						<view class="text">建筑物备案</view>
-					</view>
-					<view class="box_item" @click="gopath('/pages/declaration/newDeclaration')">
-						<view style="margin-bottom: 20rpx;">
-							<image src="/static/ly/image6.png" style="width: 60%;height: 90rpx;" mode=""></image>
-						</view>
-						<view class="text">地名备案</view>
+						<view class="text">建筑物名称备案</view>
 					</view>
+
 				</view>
 				<view class="content" style="margin-top: -70rpx;z-index: 10000;padding: 0 20rpx;">
-					<view class="box_item" @click="lmpsb">
+					<view class="box_item" @click="gopath('/pages/declaration/declaration?type=5')">
 						<view style="margin-bottom: 20rpx;">
-							<image src="/static/new/image 2.png" style="width: 60%;height: 90rpx;" mode=""></image>
+							<image src="/static/ly/image11.png" style="width: 60%;height: 90rpx;" mode=""></image>
 						</view>
-						<view class="text">地名查询服务</view>
+						<view class="text">门楼牌备案</view>
 					</view>
-					<view class="box_item" @click="gopath('/pages/maptask/maptask')">
+		<!-- 			<view class="box_item" @click="gopath('/pages/maptask/maptask')">
 						<view style="margin-bottom: 20rpx;">
 							<image src="/static/new/image 1.png" style="width: 60%;height: 90rpx;" mode=""></image>
 						</view>
 						<view class="text">巡检任务</view>
+					</view> -->
+					<view class="box_item" @click="gopath('/pages/policy/policy')">
+						<view style="margin-bottom: 20rpx;">
+							<image src="/static/new/image 3.png" style="width: 60%;height: 90rpx;" mode=""></image>
+						</view>
+						<view class="text">政策文件</view>
 					</view>
+			
 				</view>
 			</view>
+
+			<!-- 服务 -->
+			<view class="xw" style="padding-top: 20rpx;padding-left: 20rpx;">
+				<view class="title">
+					<view class="box1">
+						<image src="../../static/new/矩形 331.png" mode=""></image>
+						<span>殡葬服务</span>
+					</view>
+				</view>
+				<view class="content">
+					<view class="box_item" @click="funeralculture">
+						<view>
+							<image src="/static/nav/nav_ico5.png" style="width: 90%;" mode="widthFix"></image>
+						</view>
+						<view class="text">线上报丧</view>
+					</view>
+					<view class="box_item" @click="funerallaw">
+						<view>
+							<image src="/static/nav/nav_ico6.png" style="width: 90%;" mode="widthFix"></image>
+						</view>
+						<view class="text">线上预约</view>
+					</view>
+					<view class="box_item" @click="funeralguide">
+						<view>
+							<image src="/static/nav/nav_ico9.png" style="width: 90%;" mode="widthFix"></image>
+						</view>
+						<view class="text">办事指南</view>
+					</view>
+					<view class="box_item" @click="funeralproblem">
+						<view>
+							<image src="/static/nav/nav_ico10.png" style="width: 90%;" mode="widthFix"></image>
+						</view>
+						<view class="text">常见问题</view>
+					</view>
+				</view>
+			</view>
+			<view class="xw" style="padding-top: 20rpx;padding-left: 20rpx;">
+					<view class="title">
+						<view class="box1">
+							<image src="../../static/new/矩形 331.png" mode=""></image>
+							<span>活动服务</span>
+						</view>
+					</view>
+					<view class="content" >
+						<view class="box_item" @click="gopath('/pages/activitylist/activitylist')">
+							<view style="margin-bottom: 20rpx;">
+								<image src="/static/new/image 4.png" style="width: 60%;height: 90rpx;" mode=""></image>
+							</view>
+							<view class="text">活动</view>
+						</view>
+					</view>
+				</view>
+
 		</view>
 	</view>
@@ -266,6 +293,12 @@
 			uni.hideTabBar();
 		},
 		methods: {
+			goyl(e) {
+				console.log(e)
+				uni.navigateTo({
+					url: '/pages/webviewyl/webviewyl?url='+e
+				})
+			},
 			// 
 			funeralculture() {
 				uni.setStorageSync('dh', 1)
@@ -7,7 +7,7 @@
 						<span class="f1">{{item.title}}</span>
 						<span class="f2">{{item.readCount}}人阅读</span>
 					</view>
-					<view class="box_right">
+					<view class="box_right" v-if="item.coverImage">
 						<view class="images">
 							<image :src="BASE_URL + item.coverImage" style="width: 100%;height: 100%;border-radius: 20rpx;" mode="aspectFill"></image>
 						</view>
@@ -68,8 +68,8 @@
 				display: flex;
 				flex-direction: column;
 				justify-content: space-between;
-				width: 58%;
-				margin-right: 2%;
+				width: 100%;
+				// margin-right: 2%;
 				.f1 {
 					font-size: 35rpx;
@@ -7,7 +7,7 @@
 				<view class="" style="margin-bottom: 30rpx;margin-top: 20rpx;font-weight: 600;font-size: 38rpx;">
 					{{info.absrtact}}
 				</view>
-				<image :src="BASE_URL+info.coverImage" style="width: 100%;" mode="widthFix"></image>
+				<image v-if="info.coverImage" :src="BASE_URL+info.coverImage" style="width: 100%;" mode="widthFix"></image>
 				<view class="" style="margin-top: 20rpx;margin-bottom: 20rpx;width: 100%;">
 					<view style="width: 100%;word-break:break-all;word-wrap:break-word;" v-html="info.content"></view>
 					<!-- <u-parse :content="info.content"></u-parse> -->
@@ -38,7 +38,7 @@
 				OrderType: 0,
 				info: {},
 				nvConfig: {
-					title: "",
+					title: "详情",
 					bgColor: "#ffffff",
 					color: "#000000",
 					fixedAssist: {
@@ -68,7 +68,7 @@
 				this.API.getpolicyDocumentone(e).then(res => {
 					console.log(res);
 					this.info = res.data
-					this.nvConfig.title = this.info.title
+					// this.nvConfig.title = this.info.title
 				})
 			},
 			downfile(e) {
@@ -18,6 +18,14 @@
 					乡镇上报
 				</view>
 			</view>
+			<view @click="gopath('/pages/activitylist/activitylist?activeType=未成年')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top: 30rpx;">
+				<view style="width: 50%;margin: 0 auto;">
+					<image style="height: 120rpx;width: 100%;" mode="aspectFit" src="../../static/new/image 4.png"></image>
+				</view>
+				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
+					未成年活动
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
+<template>
+	<view>
+		<!-- <web-view :webview-styles="webviewStyles" src="https://show.91xxt.com/2023/renshou/index.html"></web-view> -->
+		<web-view :webview-styles="webviewStyles" :src="url"></web-view>
+	</view>
+</template>
+
+<script>
+	import md5 from "../../common/md5.js";
+	export default {
+		data() {
+			return {
+				url:"",
+				t:0,
+				time:0,
+				url:null
+			}
+		},
+		onLoad(e) {
+			console.log(e)
+			this.url = e.url
+			// console.log(uni.getStorageSync("USERS_KEY"));
+			// this.t = uni.getStorageSync("USERS_KEY").phonenumber
+			// this.time = new Date().getTime();
+			// // Let encryptedstr CryptoJs.MD5(t + time).tostring（）;
+			// var encryptedstr = md5.hex_md5(this.t + this.time + "rszhmz@2023");
+			// console.log("1",this.t,this.time);
+			// console.log("2",encryptedstr);
+			// this.url = encryptedstr
+		}
+	}
+</script>
+
+<style>
+
+</style>
@@ -58,7 +58,7 @@
 							<view class="serve-title">就读学校</view>
 							<view>
 								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
-									v-model="form.attend_school" placeholder="请输入" style="text-align: right;" />
+									v-model="form.attendSchool" placeholder="请输入" style="text-align: right;" />
 							</view>
 						</view>
 					</view>