gps

起风了
2 parents 174797bb a4fe6287
Showing 18 changed files with 116 additions and 94 deletions
Civil-Affairs-Bureau-WeChar
apis/modules/ly.js
apis/modules/oauth.js
pages.json
pages/funeralculture/funeralculture.vue
pages/funeralguide/funeralguide.vue
pages/funerallaw/funerallaw.vue
pages/funeralproblem/funeralproblem.vue
pages/home/home.vue
pages/maptask/maptask.scss
pages/maptask/maptask.vue
pages/maptaskdetail/maptaskdetail.scss
pages/my/my.vue
pages/myreservationdetail/myreservationdetail.vue
pages/policy/policy.vue
pages/policy/policydetail.vue
pages/receiptRegistration/receiptRegistrationList.vue
pages/xxdetail/xxdetail.vue
-Subproject commit 265e64e9a0cbb670ab3ba7d3d113ab4863bb0058
+Subproject commit 3eb65c13bdf332339d04370e771ce91fc6e3ad6a
@@ -13,6 +13,10 @@ export default {
 	getpolicyDocument(data){
 		return request.get('/arePlaceName/policyDocument/list',data)
 	},
+	// 政策文件详情
+	getpolicyDocumentone(data){
+		return request.get('/arePlaceName/policyDocument/'+data)
+	},
 	// 行政区
 	getplie(data){
 		return request.get('/areBoundary/plie/list',data)
@@ -27,6 +27,10 @@ export default {
 	getfbgl(data){
 		return request.get("/funeral/related/list",data)
 	},
+	// 获取殡葬文化、普法、办事、详情
+	getfbgldata(data){
+		return request.get("/funeral/related/"+data)
+	},
 	// 获取殡葬服务机构列表
 	getjg(){
 		return request.get('/funeral/agencies/list?pageNum=1&pageSize=10');
@@ -155,7 +155,8 @@
 		}, {
 			"path": "pages/maptask/maptask",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "我的任务",
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/maptaskdetail/maptaskdetail",
@@ -9,7 +9,7 @@
 					<view class="name">
 						<text>{{item.title}}</text>
 					</view>
-					<view class="edit" @click="tzdetail(item)">
+					<view class="edit" @click="tzdetail(item.id)">
 						<image src="../../static/right2.png"></image>
 					</view>
 				</view>
@@ -48,7 +48,7 @@
 		computed:{
 			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
 		},
-		onShow() {
+		onLoad() {
 			this.getfbgl();
 		},
 		methods: {
@@ -9,7 +9,7 @@
 					<view class="name">
 						<text>{{item.title}}</text>
 					</view>
-					<view class="edit" @click="tzdetail(item)">
+					<view class="edit" @click="tzdetail(item.id)">
 						<image src="../../static/right2.png"></image>
 					</view>
 				</view>
@@ -48,7 +48,7 @@
 		computed:{
 			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
 		},
-		onShow() {
+		onLoad() {
 			this.getfbgl();
 		},
 		methods: {
@@ -9,7 +9,7 @@
 					<view class="name">
 						<text>{{item.title}}</text>
 					</view>
-					<view class="edit" @click="tzdetail(item)">
+					<view class="edit" @click="tzdetail(item.id)">
 						<image src="../../static/right2.png"></image>
 					</view>
 				</view>
@@ -48,7 +48,7 @@
 		computed:{
 			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
 		},
-		onShow() {
+		onLoad() {
 			this.getfbgl();
 		},
 		methods: {
@@ -71,7 +71,7 @@
 			tzdetail(item){
 				console.log("ress",item);
 				uni.navigateTo({
-					url:'/pages/xxdetail/xxdetail?info=' + JSON.stringify(item)
+					url:'/pages/xxdetail/xxdetail?info=' + item
 				})
 			}
 		},
@@ -9,7 +9,7 @@
 					<view class="name">
 						<text>{{item.title}}</text>
 					</view>
-					<view class="edit" @click="tzdetail(item)">
+					<view class="edit" @click="tzdetail(item.id)">
 						<image src="../../static/right2.png"></image>
 					</view>
 				</view>
@@ -48,7 +48,7 @@
 		computed:{
 			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
 		},
-		onShow() {
+		onLoad() {
 			this.getfbgl();
 		},
 		methods: {
@@ -128,7 +128,7 @@
 			},
 			toponym() {
 				uni.navigateTo({
-					url:"/pages/toponym/toponym"
+					url:"/pages/declaration/declaration?type=4"
 				})
 			},
 			tzyl(){
@@ -4,28 +4,20 @@
 }
 .content {
 	width: 100%;
-	padding-top: 100rpx;
+
 }
 .coupon-tab {
-	position: fixed;
-	left: 0;
-	top: 0;
-	z-index: 10;
 	display: flex;
 	align-items: center;
 	width: 100%;
-	height: 190rpx;
-	/* #ifdef MP-WEIXIN */
-	height: 220rpx;
-	/* #endif */
 	background-color: #ffffff;
+	
 	.tab {
 		position: relative;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		width: 33%;
-		height: 100%;
 		text {
 			font-size: 28rpx;
 			color: #7C7C7C;
-<template>
+<template>
 	<view class="page">
-		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
-		<view class="coupon-tab" :style="{'padding-top':(pageTop+'px')}">
+		<view class="coupon-tab" >
 			<view class="tab" :class="{'action':TabShow===0}" @click="onCouponTab(0)">
-				<text>全部</text>
+				<text style="margin-bottom: 20rpx;">全部</text>
 				<text class="line"></text>
 			</view>
 			<view class="tab" :class="{'action':TabShow===1}" @click="onCouponTab(1)">
-				<text>未处理</text>
+				<text style="margin-bottom: 20rpx;">未处理</text>
 				<text class="line"></text>
 			</view>
 			<view class="tab" :class="{'action':TabShow===2}" @click="onCouponTab(2)">
-				<text>已处理</text>
+				<text style="margin-bottom: 20rpx;">已处理</text>
 				<text class="line"></text>
 			</view>
 		</view>
-		<view class="listBox" :style="{'padding-top':(pageTop+'px')}">
-		<view class="content">
-		<!-- 列表 -->
-		<view class="user-list">
-			<view class="list" v-for="item in list" @click="maptaskdetail(item)">
-				<view class="title">
-					<view >{{item.taskName}}</view>
-					<!-- <text>{{item.taskStatus}}</text> -->
-				</view>
-				<view class="more-content">
-					<view class="more-content-img"><text class="more-content-text">{{item.taskStatus}}</text><image src="../../static/right.png"></image></view>
+		<view class="listBox" >
+			<view class="content" >
+				<!-- 列表 -->
+				<view class="user-list">
+					<view class="list" v-for="item in list" @click="maptaskdetail(item)">
+						<view class="title">
+							<view>{{item.taskName}}</view>
+							<!-- <text>{{item.taskStatus}}</text> -->
+						</view>
+						<view class="more-content">
+							<view class="more-content-img"><text class="more-content-text" :style="item.taskStatus=='已处理'?'background: #00D970;':''">{{item.taskStatus}}</text>
+								<image src="../../static/right.png"></image>
+							</view>
+						</view>
+					</view>
 				</view>
 			</view>
 		</view>
-		</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
 			return {
 				TabShow: 0,
-				nvConfig:{
-					title:"我的任务",
-					bgColor:"#ffffff",
-					color:"#000000",
-					fixedAssist:{
-						hide:true,
+				nvConfig: {
+					title: "我的任务",
+					bgColor: "#ffffff",
+					color: "#000000",
+					fixedAssist: {
+						hide: true,
 					},
 				},
-				list:[],
-				pages:{
-					pageNum:1,
-					pageSize:10,
-					taskStatus:'',
-					toUser:uni.getStorageSync('USERS_KEY').phonenumber
-				}
-			}
+				list: [],
+				pages: {
+					pageNum: 1,
+					pageSize: 10,
+					taskStatus: '',
+					toUser: uni.getStorageSync('USERS_KEY').phonenumber
+				}
+			}
+		},
+		onPageScroll(e) {
+			this.$refs.nv.pageScroll(e)
 		},
-		onPageScroll(e) {this.$refs.nv.pageScroll(e)},
-		computed:{
-			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
+		computed: {
+			pageTop() {
+				return parseInt(88 * uni.getSystemInfoSync().windowWidth / 750) + uni.getSystemInfoSync().statusBarHeight
+			}
 		},
 		onShow() {
 			this.getwdrwlist();
 		},
-		methods:{
+		methods: {
 			// 获取我的任务的列表
-			getwdrwlist(){
-				this.API.getwdrwlist(this.pages).then(res=>{
-					console.log("我的任务列表",res);
+			getwdrwlist() {
+				this.API.getwdrwlist(this.pages).then(res => {
+					console.log("我的任务列表", res);
 					this.list = res.rows
 				})
 			},
-			onCouponTab(type){
+			onCouponTab(type) {
 				this.TabShow = type;
-				if(type == 0){
+				if (type == 0) {
 					this.pages.taskStatus = ''
 				}
-				if(type == 1){
+				if (type == 1) {
 					this.pages.taskStatus = '未处理'
 				}
-				if(type == 2){
+				if (type == 2) {
 					this.pages.taskStatus = '已处理'
 				}
@@ -91,10 +96,10 @@
 					url: '/pages/maptaskdetail/maptaskdetail?info=' + info
 				})
 			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	@import 'maptask.scss';
-</style>
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'maptask.scss';
+</style>
 \ No newline at end of file
@@ -160,8 +160,8 @@
 	width: 94%;
 	position: fixed;
 	bottom: 30rpx;
-	background: rgba(255,255,255,0.63);
-	border-radius: 30rpx;
+	// background: rgba(255,255,255,0.63);
+	// border-radius: 30rpx;
 	.bottom-two {
 		display: flex;
 		justify-content: space-between;
@@ -10,7 +10,7 @@
 			<view class="my-top">
 				<view class="user-info">
 					<view class="portrait" @click="tzmy">
-						<image :src="user.avatar"></image>
+						<image :src="Baseapi + user.avatar"></image>
 					</view>
 					<view class="info">
 						<view class="nickname">
@@ -144,7 +144,7 @@
 				    width: 10,
 				    arrowLine: true,
 				    borderWidth: 2 //线的边框宽度，还有很多参数，请看文档 
-				}]
+				}]
 			};
 		},
 		onPageScroll(e) {this.$refs.nv.pageScroll(e)},
@@ -276,7 +276,7 @@
 						    width: 4,
 						    arrowLine: true,
 						    // borderWidth: 2 //线的边框宽度，还有很多参数，请看文档 
-						}]
+						}]
 					}
 				})
 <template>
 	<view>
 		<view v-if="list.length>0">
-			<view class="content" @click="xwtz('/pages/policy/policydetail?cent='+JSON.stringify(item))" v-for="(item,index) in list" :key="index">
+			<view class="content" @click="xwtz('/pages/policy/policydetail?id='+item.id)" v-for="(item,index) in list" :key="index">
 				<view class="box_item">
 					<view class="box_left">
 						<span class="f1">{{item.title}}</span>
@@ -56,14 +56,21 @@
 			}
 		},
 		onLoad(params) {
-			console.log(11111)
-
-			this.info = JSON.parse(params.cent)
-			this.nvConfig.title = this.info.title
-			console.log(this.info)
+			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.getpolicyDocumentone(e).then(res => {
+					console.log(res);
+					this.info = res.data
+					this.nvConfig.title = this.info.title
+				})
+			},
 			downfile(e) {
 				let that = this
@@ -2,7 +2,7 @@
 	<view>
 		<view>
 			<view v-for="(item, index) in list" :key="index" class="top-box" @click="gopath('/pages/receiptRegistration/receiptRegistrationDetail?item=' +JSON.stringify(item))">
-				<view>{{item.chiAdoptCaseRegistrationPo.reportTime}}<span style="margin-left: 20rpx;color: #547DFF;">{{item.chiAdoptCaseFlowExecuteNodeHistoryList[item.chiAdoptCaseFlowExecuteNodeHistoryList.length-1].approvalStatus}}</span></view>
+				<view>{{item.chiAdoptCaseRegistrationPo.reportTime}}<span style="margin-left: 20rpx;color: #547DFF;">{{item.chiAdoptCaseFlowExecuteNodeHistoryList[item.chiAdoptCaseFlowExecuteNodeHistoryList.length-1].nodeName}}</span></view>
 				<view class="top-box-img">
 					<image src="../../static/right2.png" mode="widthFix"></image>
 				</view>
@@ -49,11 +49,20 @@
 		},
 		onLoad(item) {
 			console.log("res",item);
-			this.info = JSON.parse(item.info)
-			this.nvConfig.title = this.info.title + "详情页"
+
+			this.gain(item.info)
+			// this.info = JSON.parse(item.info)
+			// this.nvConfig.title = this.info.title + "详情页"
 		},
 		methods: {
-			
+			gain(e) {
+				this.API.getfbgldata(e).then(res => {
+					console.log(res);
+					this.info = res.data
+					// this.info = JSON.parse(item.info)
+					this.nvConfig.title = this.info.title + "详情页"
+				})
+			},
 		}
 	}
 </script>