6-19-1

.gitignore

@@ -0,0 +1,6 @@
+.DS_Store
+unpackage/dist
+unpackage/release
+unpackage/debug
+unpackage/cache
+.hbuilderx

pages.json

@@ -177,7 +177,20 @@
 				// #endif
 				"navigationBarBackgroundColor": "#457DBF",
 				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "定位"
+				"navigationBarTitleText": "AED"
+			}
+		},
+		{
+			"path": "pages/applic/aid",
+			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
+				"navigationBarBackgroundColor": "#457DBF",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "救护站"
 			}
 		},
 		{

pages/applic/aid.vue

@@ -0,0 +1,554 @@
+<template>
+	<view class="content">
+		<view id="map" class="map">
+			<map @updated='mapChange' id="map_1" ref='map_1' style="width:750rpx; height: 600rpx" :latitude="latitude"
+				:longitude="longitude" :markers="jhzmarker"></map>
+		</view>
+		<scroll-view scroll-y="true" class="scroll-wrapper" :style="{'height': height}" @scrolltolower="loadData">
+			<espempty v-if="loaded && AEDList.length === 0" :tit="'救护站列表为空'"></espempty>
+			<view class="list-tpl flex" @click="openAddress(item)" v-for="(item, index) in AEDList" :key="item.id">
+				<template>
+					<view class="list-left">
+						<view class="info">
+							<view class="title">{{ item.name }}</view>
+							<view class="addr">地址：{{ item.address }}</view>
+						</view>
+					</view>
+					<view class="image">
+						<image src="../../static/img/img10.png"></image>
+						<view class="tip" v-if="item.space > 999">>999m</view>
+						<view class="tip" v-else>{{ item.space }}m</view>
+					</view>
+				</template>
+			</view>
+			<uni-load-more :status="loadtype"></uni-load-more>
+		</scroll-view>
+		<uni-popup ref="popup" type="bottom" @click="close">
+			<view class="popup_row">
+				<view class="rows">
+					<view class="rows-item" @click="toGaodeMap">高德地图</view>
+					<view class="rows-item" @click="tobaiDuMap">百度地图</view>
+					<view class="rows-item" @click="totengxunMap">腾讯地图</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import espempty from '@/components/espempty';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	import {
+		getdis,
+		tocall,
+		getDistance
+	} from '@/api/index.js';
+	import {
+		userinfo
+	} from '@/api/user.js';
+	import {
+		getcomAddress
+	} from '@/api/index.js';
+	export default {
+		components: {
+			uniPopup,
+			espempty,
+			uniLoadMore
+		},
+		//相关配置参数
+		data() {
+			return {
+				loaded: false,
+				jhzmarker: [],
+				loadtype: 'more',
+				page: 1,
+				limit: 10,
+				AEDList: [],
+				height: '',
+				list: [],
+				latitude: '',
+				longitude: '',
+				current: 0,
+				name: '',
+				uid: '',
+				name: '',
+				phone: '',
+				to_phone: '',
+				marker: [],
+				specificAdd: '',
+				addressData: {
+					name: '',
+					mobile: '',
+					latitude: 0, //纬度
+					longitude: 0, //经度
+					address: {
+						province: '',
+						city: '',
+						district: '',
+						detail: '',
+					},
+					area: '',
+					default: false
+				},
+			}
+		},
+		onReady(res) {
+			var _this = this;
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					query.select('.scroll-wrapper').boundingClientRect();
+					query.exec(function(res) {
+						console.log(res, 'ddddddddddddd');
+						_this.height = resu.windowHeight - res[0].top + 'px';
+						console.log('打印页面的剩余高度', _this.height);
+					});
+				},
+				fail: res => {}
+			});
+		},
+		onLoad() {
+			let obj = this;
+			console.log('开始加载事件');
+			// obj.loadBaseData();
+			uni.showLoading({
+				title: '加载中',
+				mask: true
+			});
+			// obj.loadData();
+			try {
+				let locationAddress
+				// #ifdef H5
+				let wxOjb = require('jweixin-module');
+				locationAddress = wxOjb.getLocation;
+				// #endif
+				// #ifdef MP
+				locationAddress = uni.getLocation;
+				// #endif
+				wxOjb.ready(() => {
+					console.log('加载完毕注册事件');
+					locationAddress({
+						type: 'gcj02',
+						success: function(res) {
+							console.log('获取经纬度', res);
+							obj.longitude = res.longitude
+							obj.latitude = res.latitude
+							obj.marker = [{
+								latitude: obj.latitude,
+								longitude: obj.longitude,
+								iconPath: '/static/img/img19.png',
+								width: '45',
+								height: '45',
+							}, ]
+							obj.loadData();
+						},
+						fail(e) {
+							console.log('失败', e);
+							// window.location.reload();
+						}
+					});
+				})
+
+			} catch (e) {
+				console.log(e);
+				let locationAddress
+				// #ifdef H5
+				let wxOjb = require('jweixin-module');
+				locationAddress = wxOjb.getLocation;
+				// #endif
+				// #ifdef MP
+				locationAddress = uni.getLocation;
+				// #endif
+				wxOjb.ready(() => {
+					console.log('加载完毕注册事件');
+
+					locationAddress({
+						type: 'gcj02',
+						success: function(res) {
+							console.log('获取经纬度1', res);
+							obj.longitude = res.longitude
+							obj.latitude = res.latitude
+							obj.loadData();
+						},
+						fail(e) {
+							console.log('失败', e);
+						}
+					});
+				})
+
+			}
+		},
+		computed: {
+			...mapState('user', ['hasLogin', 'userInfo'])
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo']),
+			// 地图渲染完毕事件
+			mapChange(e) {
+				console.log(e);
+			},
+			// 载入数据
+			async loadData() {
+				let obj = this;
+				if(obj.loadtype == 'loading' || obj.loadtype == 'noMore') {
+					return 
+				}
+				getDistance({
+					lng1: obj.longitude,
+					lat1: obj.latitude
+				}).then(({data}) => {
+					uni.hideLoading();
+					console.log(data, 999);
+					for (let i = 0; i < data.length; i++) {
+						data[i].space = obj.space(obj.latitude, obj.longitude, data[i].latitude, data[i].longitude);
+					}
+					let arr = data.map(item => ({
+						latitude: item.latitude,
+						longitude: item.longitude,
+						iconPath: '/static/icon/jhz.png',
+						width: '35',
+						height: '35',
+						id: item.id,
+						address: item.address
+					}));
+					obj.jhzmarker = obj.marker.concat(arr)
+					obj.AEDList = obj.AEDList.concat(data);
+					console.log(obj.AEDList, 'obj.AEDList+++++++');
+					// obj.markerList = data;
+					obj.loaded = true
+					if (obj.limit == data.length) {
+						obj.loadtype = 'more';
+						obj.page++;
+					} else {
+						obj.loadtype = 'noMore';
+					}
+				})
+			},
+			space(lat1, lng1, lat2, lng2) {
+				console.log(lat1, lng1, lat2, lng2);
+				var radLat1 = (lat1 * Math.PI) / 180.0;
+				var radLat2 = (lat2 * Math.PI) / 180.0;
+				var a = radLat1 - radLat2;
+				var b = (lng1 * Math.PI) / 180.0 - (lng2 * Math.PI) / 180.0;
+				var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
+				s = s * 6378.137;
+				s = Math.round(s * 10000) / 10000;
+				return s * 1000; // 单位米
+			},
+			openAddress(item) {
+				let obj = this;
+				obj.latitude2 = item.latitude;
+				obj.longitude2 = item.longitude;
+				obj.address = item.address;
+				this.$refs.popup.open();
+			},
+			// 调用高德
+			toGaodeMap() {
+				let latitude = this.latitude2;
+				let longitude = this.longitude2;
+				let address = this.address;
+				console.log('选择高德', latitude, longitude, address);
+				window.location.href = `https://uri.amap.com/marker?position=${longitude},${latitude}&name=${address}`;
+			},
+			// 调用腾讯
+			totengxunMap() {
+				let latitude = this.latitude2;
+				let longitude = this.longitude2;
+				let address = this.address;
+				console.log('选择腾讯', latitude, longitude);
+				window.location.href = `http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};addr:${address}`;
+			},
+			// 调用百度
+			tobaiDuMap() {
+				let latitude = this.latitude2;
+				let longitude = this.longitude2;
+				let latitude6 = this.latitude;
+				let longitude6 = this.longitude;
+				let address = this.address;
+				console.log('选择百度', latitude, longitude);
+				console.log('获取当前经纬度', latitude6, longitude6);
+				window.location.href = `http://api.map.baidu.com/direction?origin=latlng:${latitude6},${longitude6}|name:我的位置&destination=${latitude},${longitude}&mode=driving&region=${address}&output=html&src=webapp.baidu.openAPIdemo`;
+				//`bdapp://map/navi?location=${longitude},${latitude}&coord_type=gc02&title=${address}&content=${address}&output=html&src=andr.baidu.openAPIdemo `
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	body,
+	page {
+		height: 100%;
+		width: 100%;
+		background-color: #fff;
+	}
+
+	.content {
+		height: 100%;
+		width: 100%;
+		background-color: #fff;
+	}
+
+	.map {
+		width: 100%;
+		height: 600rpx;
+	}
+
+	/* #ifdef H5 */
+	.location {
+		overflow-y: scroll; //溢出就滑动起来
+		// z-index: 990;
+		position: fixed;
+		bottom: 0;
+		height: 55%;
+		width: 100%;
+		background-color: #fff;
+		padding: 24rpx;
+
+		//搜索框
+		.Search-box {
+			// z-index: 999;
+			height: 80rpx;
+			// position: fixed;
+			// 		top: 0;
+			// 		left: 0;
+			// 		width: 100%;
+			// background: #FFFFFF;
+			// padding-top: 10rpx;
+			padding-right: 24rpx;
+			padding-left: 24rpx;
+
+			.Search-box-sort {
+				float: left;
+				margin-left: 32rpx;
+				margin-right: 19rpx;
+
+				.sort-text {
+					width: 57rpx;
+					height: 29rpx;
+					font-size: 30rpx;
+					font-weight: 500;
+					color: rgba(51, 51, 51, 1);
+					line-height: 58rpx;
+					margin-right: 19rpx;
+				}
+
+				.sort-img {
+					width: 21rpx;
+					height: 11rpx;
+					margin-bottom: 4rpx;
+				}
+			}
+
+			.Search-box-size {
+				// width:70%;
+				height: 58rpx;
+				border-radius: 32rpx;
+				background-color: #f1f1f1;
+				padding-left: 36rpx;
+				display: flex;
+				align-items: center;
+
+				.box-img {
+					height: 32rpx;
+					width: 32rpx;
+					margin-right: 16rpx;
+				}
+
+				// .box-right{
+				// 	height: 58rpx;
+				// 	// width: 100%;
+				// 	background-color: pink;
+				// }
+
+				.box-word {
+					width: 100%;
+					font-size: 26rpx;
+					font-weight: 500;
+					color: rgba(205, 203, 203, 1);
+					line-height: 55rpx;
+				}
+			}
+		}
+
+		.location-item {
+			z-index: 1000;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			border-bottom: 1rpx solid #E7E8EA;
+			padding: 15rpx 0;
+
+			.box-left {
+				display: flex;
+
+				.img01 {
+					width: 8rpx;
+					height: 28rpx;
+					margin-right: 18rpx;
+
+					image {
+						width: 8rpx;
+						height: 28rpx;
+					}
+				}
+
+				.img02 {
+					width: 117rpx;
+					height: 117rpx;
+					border-radius: 50%;
+
+					image {
+						width: 117rpx;
+						height: 117rpx;
+						border-radius: 50%;
+					}
+				}
+
+				.info {
+					margin-left: 16rpx;
+
+					.info-header {
+						display: flex;
+						align-items: center;
+
+						.name {
+							font-size: 32rpx;
+							color: #333333;
+						}
+
+						.distance {
+							margin-left: 25rpx;
+							font-size: 28rpx;
+							color: #303133;
+						}
+
+						.location-icon {
+							margin-left: 10rpx;
+							width: 20rpx;
+							height: 26rpx;
+
+							image {
+								width: 20rpx;
+								height: 26rpx;
+								display: inline;
+							}
+						}
+					}
+
+					.address {
+						font-size: 26rpx;
+						color: #333333;
+						margin-top: 33rpx;
+					}
+				}
+			}
+
+			.box-right {
+				.img {
+					height: 107rpx;
+
+					image {
+						width: 107rpx;
+						height: 107rpx;
+					}
+				}
+
+				.called {
+					margin-right: 16rpx;
+					height: 107rpx;
+					line-height: 107rpx;
+					font-size: 28rpx;
+					color: #CB131C;
+				}
+			}
+		}
+	}
+
+	/* #endif */
+
+	.list-tpl {
+		background-color: #ffffff;
+		margin: 25rpx 0rpx;
+		padding: 25rpx 25rpx;
+		font-size: 28rpx;
+		border-radius: 15rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		border-bottom: 1px solid #f1f1f1;
+
+		.list-left {
+			display: flex;
+			width: 100%;
+
+			.number {
+				font-size: 32rpx;
+				margin-right: 14rpx;
+			}
+
+			.info {
+				width: 100%;
+
+				.title {
+					font-size: 32rpx;
+					color: #222222;
+					font-weight: 500;
+				}
+
+				.addr {
+					width: 400rpx;
+					margin-top: 20rpx;
+					font-size: 20rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+			}
+		}
+
+		.image {
+			width: 10%;
+			text-align: center;
+
+			image {
+				width: 50rpx;
+				height: 50rpx;
+			}
+
+			.tip {
+				color: #7f7f7f;
+				font-size: 21rpx;
+			}
+		}
+	}
+	.popup_row {
+		width: 100%;
+		height: 500rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	
+		.rows {
+			width: 100%;
+			padding: 0 24rpx;
+	
+			.rows-item {
+				height: 80rpx;
+				line-height: 80rpx;
+				text-align: center;
+				width: 100%;
+				font-size: 32rpx;
+				color: #303133;
+			}
+		}
+	}
+</style>
+

pages/applic/know.vue

@@ -5,17 +5,11 @@
 		</view>
 		<view class="list-box">
 			<view class="list-item">
-				<view class="list-tpl">
+				<view class="list-tpl paragraph">
 					很多有爱心的小伙伴在后台问小编：什么是造血干细胞造血干细胞能治疗什么病、联系哪进行登记捐献造血干细胞等等。本期细胞日志为大家普及一下，捐献造血干细胞的流程。让爱生根，让爱发芽。
 				</view>
 			</view>	
 		</view>
-		<view class="vediobg">
-			<video id="myVideo" src="http://xuebang.oss-cn-beijing.aliyuncs.com/edf7pyxpng4ns63sr1w3l443619vpvlh.mp4"
-			      @error="videoErrorCallback"  controls autoplay show-mute-btn>
-			</video>
-		</view>
-		
 		<view class="box-1">
 			伸出你我双手点燃生命希望
 		</view>
@@ -42,7 +36,7 @@
 			
 			<view class="list-box">
 				<view class="list-item">
-					<view class="list-tpl">
+					<view class="list-tpl paragraph">
 						入库年龄在18-45周岁,捐献年龄在18~55周岁,身体健康,符合无偿献血条件,可与所在地省级管理中心或红十字会联系。
 					</view>
 				</view>	
@@ -67,7 +61,7 @@
 			
 			<view class="list-box">
 				<view class="list-item">
-					<view class="list-tpl">
+					<view class="list-tpl paragraph">
 						可以直接到献血车上抽取约8毫升血液，进行HLA分型检验。
 					</view>
 				</view>	
@@ -83,7 +77,9 @@
 						<view class="title-1">
 							HLA低分辨分型
 						</view>
-						反映了HLA抗原水平的等位基因类型，用于骨髓、器官移植组织配型的初筛。
+						<view class="paragraph">
+							反映了HLA抗原水平的等位基因类型，用于骨髓、器官移植组织配型的初筛。
+						</view>
 					</view>
 				</view>	
 			</view>
@@ -103,7 +99,7 @@
 			
 			<view class="list-box">
 				<view class="list-item">
-					<view class="list-tpl">
+					<view class="list-tpl paragraph">
 						数据资料将在"静思期"过后,被录入中国造血干细胞捐献者资料库等待患者查询。
 					</view>
 				</view>	
@@ -125,7 +121,9 @@
 						<view class="title-1">
 							静思期？
 						</view>
-						抽取血样后,我们留给您一周时间。一周内如果您改变主意，请立即通知所在地省级管理中心或当地红十字会，终止HLA分型检测及数据录入,从而避免资源浪费及未来可能对患者造成的伤害。
+						<view class="paragraph">
+							抽取血样后,我们留给您一周时间。一周内如果您改变主意，请立即通知所在地省级管理中心或当地红十字会，终止HLA分型检测及数据录入,从而避免资源浪费及未来可能对患者造成的伤害。
+						</view>
 					</view>
 				</view>	
 			</view>
@@ -145,7 +143,7 @@
 			
 			<view class="list-box">
 				<view class="list-item">
-					<view class="list-tpl">
+					<view class="list-tpl paragraph">
 						如果一旦检索配型成功,在征得捐献者的同意后,将会对捐献者和患者的血样进行<text style="font-weight: 700;">HLA高分辨检测</text>。
 					</view>
 				</view>	
@@ -186,7 +184,7 @@
 			
 			<view class="list-box">
 				<view class="list-item">
-					<view class="list-tpl">
+					<view class="list-tpl paragraph">
 						完成体检并完成注射动员剂,每天打两针动员剂,上午一针,下午一针,一共打四天,第五天进行采集。
 					</view>
 				</view>	
@@ -231,7 +229,9 @@
 						<view class="title-1">
 							为什么要注射动员剂？
 						</view>
-							进行外周造血干细胞采集。在采集时，从一处静脉引出血，通过仪器把<text style="font-weight: 700;">造血干细胞提取出来</text>用于移植，不需要的成分再<text style="font-weight: 700;">"送"</text>回供者的体内。		
+						<view class="paragraph">
+							进行外周造血干细胞采集。在采集时，从一处静脉引出血，通过仪器把<text style="font-weight: 700;">造血干细胞提取出来</text>用于移植，不需要的成分再<text style="font-weight: 700;">"送"</text>回供者的体内。
+						</view>
 					</view>
 				</view>	
 			</view>
@@ -242,7 +242,7 @@
 			
 			<view class="list-box">
 				<view class="list-item">
-					<view class="list-tpl">
+					<view class="list-tpl paragraph">
 						注:移植前,尤其是签署捐献同意书后就不能改变捐献的决定，因为在这个时候,患者为准备移植已经进行了大剂量的放疗和化疗，丧失了造血能力，此期间若终止捐献，再临时寻找配型相合者已来不及，患者将有生命危险。
 					</view>
 				</view>	
@@ -263,7 +263,7 @@
 			
 			<view class="list-box">
 				<view class="list-item">
-					<view class="list-tpl">
+					<view class="list-tpl paragraph">
 						医护人员将造血干细胞输注患者体内完成移植手术。
 					</view>
 				</view>	
@@ -288,7 +288,7 @@
 			
 			<view class="list-box">
 				<view class="list-item">
-					<view class="list-tpl">
+					<view class="list-tpl paragraph">
 						在捐献后30天到半年之内,将会对捐献者的健康状况进行<text style="font-weight: 700;">跟踪随访</text>，还会为捐献者提供一年的相关保险。
 					</view>
 				</view>	
@@ -403,15 +403,13 @@
 				color: #222222;
 				font-size: 28rpx;
 				border-radius: 25rpx;
+				text-align: justify;
 				.title-1{
 					font-size: 32rpx;
 					text-align: center;
 					margin-bottom: 15rpx;
 				}
-				.paragraph{
-					margin-top: 2rpx;
-					text-indent:52rpx;
-				}
+				
 			}
 		}
 		video{
@@ -555,4 +553,8 @@
 			}
 		}
 	}
+	.paragraph{
+		margin-top: 2rpx;
+		// text-indent:52rpx;
+	}
 </style>

pages/applic/location.vue

@@ -3,7 +3,7 @@
 		<view id="map" class="map">
 			<map @updated='mapChange' id="map_1" ref='map_1' style="width:750rpx; height: 600rpx" :latitude="latitude"
 			 :longitude="longitude" :markers="marker"></map>
-		</view>i
+		</view>
 			<view class="location">
 				<!-- <view class="Search-box"  @click="getLocation">
 					<view class="Search-box-size">

pages/applic/toknowledge.vue

@@ -1,64 +1,64 @@
 <template>
-	<view class="content">
-		<image class="top-image" src="../../static/img/ack.png"></image>
-		<view class="list-box">
-			<view class="list-item">
-				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
-					<view class="name">捐献造血干细胞的意义</view>
-				</view>
-				<view class="list-tpl">
-					血液病对人类健康造成极大的威胁，造血干细胞移植不仅可以根治白血病，还可以治疗许多重症血液病。我国现在正等待造血干细胞移植的患者有数百万，其中少年儿童占50%以上，患者数量的增长速度从过去每年约4万人提高到每年约8万人。造血干细胞移植成败的关键是HLA（人类白细胞抗原）配型问题。由于现在大多数青少年是独生子女，如需移植很难在亲缘关系的兄弟姐妹中找到供者，只能依靠社会上的非亲缘的捐献者为他们提供HLA配型相同的造血干细胞。非血缘关系造血干细胞高分辨配型成功的机率仅为十万分之一，这并不是说10万份血样中必然会有一份能配型成功。只要有足够数量的捐献志愿者，患者找到HLA配型相同志愿者的机会就越多，生存的希望就越大。我们期盼更多的志愿者能加入到捐献造血干细胞志愿捐献者的行列中来。
-				</view>
-			</view>
-			<view class="list-item">
-				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
-					<view class="name">从外周血中采集造血干细胞</view>
-				</view>
-				<view class="list-tpl">
+	<view class="content">
+		<image class="top-image" src="../../static/img/ack.png"></image>
+		<view class="list-box">
+			<view class="list-item">
+				<view class="list-title flex_item">
+					<image src="../../static/icon/zxkp1.png"></image>
+					<view class="name">捐献造血干细胞的意义</view>
+				</view>
+				<view class="list-tpl">
+					血液病对人类健康造成极大的威胁，造血干细胞移植不仅可以根治白血病，还可以治疗许多重症血液病。我国现在正等待造血干细胞移植的患者有数百万，其中少年儿童占50%以上，患者数量的增长速度从过去每年约4万人提高到每年约8万人。造血干细胞移植成败的关键是HLA（人类白细胞抗原）配型问题。由于现在大多数青少年是独生子女，如需移植很难在亲缘关系的兄弟姐妹中找到供者，只能依靠社会上的非亲缘的捐献者为他们提供HLA配型相同的造血干细胞。非血缘关系造血干细胞高分辨配型成功的机率仅为十万分之一，这并不是说10万份血样中必然会有一份能配型成功。只要有足够数量的捐献志愿者，患者找到HLA配型相同志愿者的机会就越多，生存的希望就越大。我们期盼更多的志愿者能加入到捐献造血干细胞志愿捐献者的行列中来。
+				</view>
+			</view>
+			<view class="list-item">
+				<view class="list-title flex_item">
+					<image src="../../static/icon/zxkp1.png"></image>
+					<view class="name">从外周血中采集造血干细胞</view>
+				</view>
+				<view class="list-tpl">
 					 造血干细胞是从外周血中采集。采用肌肉注射动员剂的方法将骨髓血中的造血干细胞动员到外周血中，从捐献者手臂静脉处采集全血，通过血细胞分离机提取造血干细胞，同时将其它血液成分回输捐献者体内。
-				</view>
-			</view>
-			<view class="list-item">
-				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
-					<view class="name">采集造血干细胞有没有危险？</view>
-				</view>
-				<view class="list-tpl">
-				采集外周血干细胞很安全，至今没有引起对捐献者伤害的先例。部分捐献者可能有“感冒”样症状。在采集完成后，一些轻微疼痛感和不适将会很快消失。所用的器材都经严格消毒，并一次性使用，确保了捐献者的安全。捐献者大约需要采集50~200毫升造血干细胞混悬液。
-				</view>
-			</view>
-			<view class="list-item">
-				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
-					<view class="name">捐献造血干细胞影响身体健康吗？</view>
-				</view>
-				<view class="list-tpl">
-					 人体内的造血干细胞具有很强的再生能力，正常情况下，人体各种细胞每天都在不断新陈代谢，进行着生成、衰老、死亡的循环往复，捐献造血干细胞血1-2周内，血液的各种血细胞恢复到原来水平，因此，捐献造血干细胞不影响健康。
-				</view>
-			</view>
-			<view class="list-item">
-				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
-					<view class="name">怎样成为造血干细胞志愿捐献者？？</view>
-				</view>
-				<view class="list-tpl">
-					您可与武汉市江夏区红十字会联系报名。到指定地点抽取6-8毫升血液，经HLA分型检验，把相关资料录入到中华骨髓库的数据库中，这样您就成为造血干细胞志愿捐献者了。
-				</view>
-			</view>
-			<view class="list-item">
-				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
-					<view class="name">报名前有哪些特别需要注意的事项？ </view>
-				</view>
-				<view class="list-tpl">
-					 报名入库前最好先征得家人的同意，以避免配型成功后，家人的阻扰，甚至引起家庭矛盾。当然家人的同意不是必须的。如果志愿者意志坚决，则不会影响捐献，但是会影响自身的家庭关系。所以之前最好还是应征求好家人的意见，做好知识宣传。
-				</view>
+				</view>
+			</view>
+			<view class="list-item">
+				<view class="list-title flex_item">
+					<image src="../../static/icon/zxkp1.png"></image>
+					<view class="name">采集造血干细胞有没有危险？</view>
+				</view>
+				<view class="list-tpl">
+				采集外周血干细胞很安全，至今没有引起对捐献者伤害的先例。部分捐献者可能有“感冒”样症状。在采集完成后，一些轻微疼痛感和不适将会很快消失。所用的器材都经严格消毒，并一次性使用，确保了捐献者的安全。捐献者大约需要采集50~200毫升造血干细胞混悬液。
+				</view>
+			</view>
+			<view class="list-item">
+				<view class="list-title flex_item">
+					<image src="../../static/icon/zxkp1.png"></image>
+					<view class="name">捐献造血干细胞影响身体健康吗？</view>
+				</view>
+				<view class="list-tpl">
+					 人体内的造血干细胞具有很强的再生能力，正常情况下，人体各种细胞每天都在不断新陈代谢，进行着生成、衰老、死亡的循环往复，捐献造血干细胞血1-2周内，血液的各种血细胞恢复到原来水平，因此，捐献造血干细胞不影响健康。
+				</view>
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
+					<view class="name">怎样成为造血干细胞志愿捐献者？？</view>
+				</view>
+				<view class="list-tpl">
+					您可与{{$store.state.baseName}}联系报名。到指定地点抽取6-8毫升血液，经HLA分型检验，把相关资料录入到中华骨髓库的数据库中，这样您就成为造血干细胞志愿捐献者了。
+				</view>
+			</view>
+			<view class="list-item">
+				<view class="list-title flex_item">
+					<image src="../../static/icon/zxkp1.png"></image>
+					<view class="name">报名前有哪些特别需要注意的事项？ </view>
+				</view>
+				<view class="list-tpl">
+					 报名入库前最好先征得家人的同意，以避免配型成功后，家人的阻扰，甚至引起家庭矛盾。当然家人的同意不是必须的。如果志愿者意志坚决，则不会影响捐献，但是会影响自身的家庭关系。所以之前最好还是应征求好家人的意见，做好知识宣传。
+				</view>
+			</view>
+			<view class="list-item">
+				<view class="list-title flex_item">
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">填写“造血干细胞志愿捐献者同意书”注意什么？ </view>
 				</view>
 				<view class="list-tpl">
@@ -67,7 +67,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">健康者在多大年龄适合捐献造血干细胞？ </view>
 				</view>
 				<view class="list-tpl">
@@ -76,7 +76,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">什么时候能够捐献？ </view>
 				</view>
 				<view class="list-tpl">
@@ -85,7 +85,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">捐献者需要承担费用吗?有报酬吗？ </view>
 				</view>
 				<view class="list-tpl">
@@ -95,63 +95,44 @@
 			<view class="list-tips">
 				<text style="color: #C53335;">温馨提示</text>：每个志愿者抽取一次血样即可，您的资料将储存在中国造血干细胞捐献者资料库中。
 			</view>
-			<!-- <view class="list-tips">
-				<text style="color: #C53335; text-align: center;" >江夏区造血干细胞捐献咨询电话：</text>
-			</view> -->
-			<view class="list-tips" style="color: #C53335;text-align: center;">
-				江夏区造血干细胞捐献咨询电话:
-			</view>
-			<view class="list-tips" style="text-align: center;">
-				027-87012677
-			</view>
-			<!-- <view class="list01">
-				具体入库办法：
-			</view> -->
-		<!-- 	<view class="list-info">
-				一、直接到余姚市红十字会（余姚市兰江街道新西门路219-1号）报名登记、抽取血样，每个工作日均可（8：30-16：00）；
+			<view class="list-tips" style="color: #C53335;text-align: center;text-indent: 0;">
+				{{$store.state.baseName}}造血干细胞捐献咨询电话:
 			</view>
-			<view class="list-info">
-				二、到余姚市桐江桥献血屋或者献血车上参加无偿献血，一并参加报名登记、留取血样；
+			<view class="list-tips" style="text-align: center;text-indent: 0;">
+				{{$store.state.zxphone}}
 			</view>
-			<view class="list-info">
-				三、每年“五·八”世界红十字日前后，市红十字会会在市中心开展包括造血干细胞捐献在内的系列活动，届时可前往报名抽样。请留意新闻媒体的报道。
-			</view>
-			<view class="phone">
-				余姚市红十字会报名咨询电话：62619095
-			</view> -->
-				<!-- <jyf-parser :html="description" ref="article"></jyf-parser> -->
-		</view>
+		</view>
 	</view>
 </template>
 <script>
-// import { get_cell } from '@/api/train.js';
+import { get_cell } from '@/api/train.js';
 import jyfParser from "@/components/jyf-parser/jyf-parser";
-export default {
-	components: {
-	   jyfParser
+export default {
+	components: {
+	   jyfParser
 	 },
 	data() {
-		return {
-			id:'',
-			list:'',
-			description:'',
+		return {
+			id:'',
+			list:'',
+			description:'',
 		};
 	},
-	onLoad(option) {
-		this.id = option.id;
-		this.loadData();
+	onLoad(option) {
+		this.id = option.id;
+		this.loadData();
 	},
 	onShow() {},
 	methods: {
 		async loadData() {
 			let obj = this;
-			get_cell({
-				id:obj.id
-			}).then((e) => {
-				obj.list = e.data;
-				if(obj.list.content != null){
-					obj.description = obj.list.content.replace(/<img/g,"<img style='max-width:100%;height:auto;'");
-				}//小程序商品详情图超出屏幕问题
+			get_cell({
+				id:obj.id
+			}).then((e) => {
+				obj.list = e.data;
+				if(obj.list.content != null){
+					obj.description = obj.list.content.replace(/<img/g,"<img style='max-width:100%;height:auto;'");
+				}//小程序商品详情图超出屏幕问题
 			});
 		}
 	}
@@ -160,40 +141,43 @@ export default {
 
 <style lang="scss">
 page {
-	background: #FFFFFF;
-	width: 100%;
+	background: #FFFFFF;
+	width: 100%;
 	height: 100%;
-	.content {
-		height: 100%;
+	.content {
+		height: 100%;
 	}
-}
-.top-image{
-	width: 100%;
-	height: 300rpx;
-}
-.list-box{
-	padding:25rpx 25rpx;
-}
-.list-item{
-	padding-bottom: 15rpx;
-	.list-title{
+}
+.top-image{
+	width: 100%;
+	height: 300rpx;
+}
+.list-box{
+	padding:25rpx 25rpx;
+}
+.list-item{
+	padding-bottom: 15rpx;
+	.list-title{
 		font-size: 34rpx;
-		display: flex;
-		image{
-			width: 56rpx;
-			height: 44rpx;
+		display: flex;
+		image{
+			width: 60rpx;
+			height: 60rpx;
 			margin-right: 15rpx;
-		}
-	}
-	.list-tpl{
-		margin: 25rpx 0rpx;
-		padding: 25rpx 25rpx;
-		background-color: #FEF6F7;
-		border:4rpx solid #C53335;
-		color: #222222;
-		font-size: 28rpx;
+			flex-shrink: 0;
+		}
+	}
+	.list-tpl{
+		margin: 25rpx 0rpx;
+		padding: 25rpx 25rpx;
+		background-color: #FEF6F7;
+		border:4rpx solid #C53335;
+		color: #222222;
+		font-size: 28rpx;
 		border-radius: 25rpx;
-	}
+		text-align: justify;
+		// text-indent:2em;
+	}
 }
 .list-tips{
 	font-size: 32rpx;

pages/index/index.vue

@@ -3,7 +3,9 @@
 		<!-- 轮播 -->
 		<view class="carousel-section">
 			<swiper class="carousel" :autoplay="true" :interval="3000" :duration="1000">
-				<swiper-item v-for="item in carouselList" :key="item.id"><image :src="item.pic"></image></swiper-item>
+				<swiper-item v-for="item in carouselList" :key="item.id">
+					<image :src="item.pic"></image>
+				</swiper-item>
 			</swiper>
 		</view>
 
@@ -71,37 +73,72 @@
 		<!--  sos急救系统 -->
 		<view class="system">
 			<view class="system-title">
-				<view class="img"><image src="../../static/img/wings-left.png"></image></view>
+				<view class="img">
+					<image src="../../static/img/wings-left.png"></image>
+				</view>
 				<view class="title" @click="tolocation">救在身边</view>
-				<view class="img"><image src="../../static/img/wings-right.png"></image></view>
+				<view class="img">
+					<image src="../../static/img/wings-right.png"></image>
+				</view>
 			</view>
 			<view class="system-map">
-				<view class="map-box" @click="tolocation"><image src="../../static/img/map.jpg" mode=""></image></view>
+				<map @click="tolocation" :show-location="false" class="map-box" id="mapjzsb" :markers="markerjzsb"
+					:scale="scale" :latitude="latitude4" :longitude="longitude4" ref="mapjzsb" style="height: 450rpx"></map>
+				<!-- <view class="map-box" @click="tolocation"><image src="../../static/img/map.jpg" mode=""></image></view> -->
 			</view>
 		</view>
-
+		<view v-for="(item, index) in jzsbList" :key="item.id">
+			<view class="location-item">
+				<view class="box-left">
+					<view class="img01">
+						<image src="../../static/img/line01.png" mode=""></image>
+					</view>
+					<view class="img02">
+						<image src="../../static/img/002.png" mode=""></image>
+					</view>
+					<!-- <view class="img02" v-else><image src="../../static/img/missing-face.png" mode=""></image></view> -->
+					<view class="info">
+						<view class="info-header">
+							<view class="name">救护员{{ index + 1 }}</view>
+							<view class="distance">{{ item.num }}km</view>
+							<view class="location-icon">
+								<image src="../../static/img/location-icon.png" mode=""></image>
+							</view>
+						</view>
+						<view class="address">{{ item.address }}</view>
+					</view>
+				</view>
+				<view class="box-right" @click="rescue(item, index)">
+					<view class="img" v-if="!item.is">
+						<image src="../../static/img/rescue.png" mode=""></image>
+					</view>
+					<view class="called" v-if="item.is">已呼叫</view>
+				</view>
+			</view>
+		</view>
+		<navigator class="science-more" url="/pages/applic/location">
+			查看更多
+			<image src="../../static/icon/moreRight.png" mode=""></image>
+			<image src="../../static/icon/moreRight.png" mode=""></image>
+		</navigator>
 		<view class="list-box">
 			<view class="system-title">
-				<view class="img"><image src="../../static/img/wings-left.png"></image></view>
-				<view class="title" @click="tolocation">救护站</view>
-				<view class="img"><image src="../../static/img/wings-right.png"></image></view>
+				<view class="img">
+					<image src="../../static/img/wings-left.png"></image>
+				</view>
+				<view class="title">救护站</view>
+				<view class="img">
+					<image src="../../static/img/wings-right.png"></image>
+				</view>
 			</view>
 			<view id="container">
-				<map
-					class="map-box"
-					id="map"
-					show-location
-					:markers="marker"
-					:scale="scale"
-					:latitude="latitude4"
-					:longitude="longitude4"
-					ref="map"
-					style="height: 450rpx"
-					@markertap="markertap"
-				></map>
+				<map class="map-box" id="map" :show-location="false" :markers="marker" :scale='scale'
+					:latitude="latitude4" :longitude="longitude4" ref="map" style="height: 450rpx"
+					@markertap='markertap'>
+				</map>
 			</view>
 			<view class="">
-				<view class="list-tpl flex" @click="openAddress(item)" v-for="(item, index) in AEDList" :key="item.id">
+				<view class="list-tpl flex" @click="openAddress(item)" v-for="(item,index) in AEDList" :key="item.id">
 					<view class="list-left">
 						<view class="number">{{ index + 1 }}</view>
 						<view class="info">
@@ -109,7 +146,7 @@
 							<view class="addr">地址：{{ item.address }}</view>
 						</view>
 					</view>
-
+		
 					<view class="image">
 						<image src="../../static/img/img10.png"></image>
 						<view class="tip">导航</view>
@@ -118,6 +155,11 @@
 				<!-- <uni-load-more :status="loadingType"></uni-load-more> -->
 			</view>
 		</view>
+		<navigator class="science-more" url="/pages/applic/aid">
+			查看更多
+			<image src="../../static/icon/moreRight.png" mode=""></image>
+			<image src="../../static/icon/moreRight.png" mode=""></image>
+		</navigator>
 		<uni-popup ref="popup" type="bottom" @click="close">
 			<view class="popup_row">
 				<view class="rows">
@@ -132,6 +174,21 @@
 				</view>
 			</view>
 		</uni-popup>
+		<uni-popup ref="popups" type="center">
+			<view class="popup_rows">
+				<view class="title">
+					<view class="title-left">请输入您的手机号，等待救援!</view>
+					<view class="cancel" @click="cancel">
+						<image src="../../static/img/cancel1.png" mode=""></image>
+					</view>
+				</view>
+				<view class="inpBox"><input type="text" value="" placeholder="请输入您的手机号" v-model="to_phone" /></view>
+				<view class="inpedit">可在方框中修改您的手机号</view>
+				<view class="comfirm">
+					<view class="comfirm1" @click="comfirm1()">确认</view>
+				</view>
+			</view>
+		</uni-popup>
 		<!-- <view class="base-map">
 			<view class="system-title">
 				<view class="img">
@@ -148,127 +205,170 @@
 </template>
 
 <script>
-import {
-	loadIndexs,
-	bannerlist,
-	getListAED,
-	getDistance
-} from '@/api/index.js';
-import {
-	saveUrl,
-	interceptor
-} from '@/utils/loginUtils.js';
-import {
-	mapState,
-	mapMutations
-} from 'vuex';
-import {
-	userinfo
-} from '@/api/user.js';
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import {
-	getLoca
-} from '@/utils/wxAuthorized.js';
-import {
-	getcomAddress
-} from '@/api/index.js';
-export default {
-	components: {
-		uniPopup,
-		uniLoadMore
-	},
-	data() {
-		return {
-			carouselList: [], //轮播
-			science: [], //文章列表
-			page: 1,
-			limit: 10,
-			AEDList: [],
-			latitude2: '',
-			longitude2: '',
-			latitude4: '',
-			longitude4: '',
-			address: '',
-			loadingType: 'more',
-			markerList: [],
-			marker: [],
-			longitude: '121.15829821166992',
-			latitude: "30.044394499237708",
-			longitude1: '120.553638',
-			latitude1: "30.547011",
-			scale: '12', //地图缩放程度
-			scale1: '15',
-			showbox: false,
-			showTEXT: false,
-			addressData: {
-				name: '',
-				mobile: '',
-				latitude: 0, //纬度
-				longitude: 0, //经度
-				address: {
-					province: '',
-					city: '',
-					district: '',
-					detail: '',
+	import {
+		loadIndexs,
+		bannerlist,
+		getListAED,
+		getDistance,
+		getdis
+	} from '@/api/index.js';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		userinfo
+	} from '@/api/user.js';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	import {
+		getLoca
+	} from '@/utils/wxAuthorized.js';
+	import {
+		getcomAddress
+	} from '@/api/index.js';
+	export default {
+		components: {
+			uniPopup,
+			uniLoadMore
+		},
+		data() {
+			return {
+				to_phone: '',
+				jzsbList: [],
+				carouselList: [], //轮播
+				science: [], //文章列表
+				page: 1,
+				limit: 10,
+				AEDList: [],
+				latitude2: '',
+				longitude2: '',
+				latitude4: '',
+				longitude4: '',
+				address: '',
+				loadingType: 'more',
+				markerList: [],
+				marker: [],
+				marker1: [],
+				markerjzsb: [],
+				longitude: '121.44297',
+				latitude: "28.67307",
+				longitude1: '120.553638',
+				latitude1: "30.547011",
+				scale: '12', //地图缩放程度
+				scale1: '15',
+				showbox: false,
+				showTEXT: false,
+				addressData: {
+					name: '',
+					mobile: '',
+					latitude: 0, //纬度
+					longitude: 0, //经度
+					address: {
+						province: '',
+						city: '',
+						district: '',
+						detail: '',
+					},
+					area: '',
+					default: false
 				},
-				area: '',
-				default: false
-			},
-			baseLongitude: 114.316738,
-			baseLatitude: 30.353495,
-			baseMarker: [{ id: 'baseAddr',latitude: 30.353495, longitude: 114.316738, iconPath: '../../static/img/location-icon.png' }]
-
-		};
-	},
-	onShow() {
-		saveUrl()
-		// let token = uni.getStorageSync('token');
-		console.log(11, this);
-		if (!this.hasLogin) {
-			// 登录拦截
-			// interceptor();
-			uni.showModal({
-				title: '登录',
-				content: '您未登录，是否马上登陆?',
-				success: e => {
-					if (e.confirm) {
-						interceptor();
+				baseLongitude: 114.316738,
+				baseLatitude: 30.353495,
+				baseMarker: [{
+					id: 'baseAddr',
+					latitude: 30.353495,
+					longitude: 114.316738,
+					iconPath: '../../static/img/location-icon.png'
+				}]
+
+			};
+		},
+		onShow() {
+			saveUrl()
+			// let token = uni.getStorageSync('token');
+			console.log(11, this);
+			if (!this.hasLogin) {
+				// 登录拦截
+				// interceptor();
+				uni.showModal({
+					title: '登录',
+					content: '您未登录，是否马上登陆?',
+					success: e => {
+						if (e.confirm) {
+							interceptor();
+						}
+					},
+					fail: e => {
+						console.log(e);
 					}
-				},
-				fail: e => {
-					console.log(e);
-				}
-			});
-		} else {
-			this.loadData();
-		}
-	},
-	onLoad() {
-		// uni.showModal({
-		// 	content: '请选择您当前位置',
-		// 	success: res => {
-		// 		if (res.confirm) {
-		// 			this.chooseAddress()
-		// 		}
-		// 	}
-		// })
-		saveUrl()
-		let obj = this;
-		try {
-			let locationAddress
-			// #ifdef H5
-			let wxOjb = require('jweixin-module');
-			locationAddress = wxOjb.getLocation;
-			// #endif
-			// #ifdef MP
-			locationAddress = uni.getLocation;
-			// #endif
-			// #ifdef H5
-			wxOjb.ready(() => {
-				console.log('加载完毕注册事件');
+				});
+			} else {
+				this.loadData();
+			}
+		},
+		onLoad() {
+			// this.getJzsb()
+			// uni.showModal({
+			// 	content: '请选择您当前位置',
+			// 	success: res => {
+			// 		if (res.confirm) {
+			// 			this.chooseAddress()
+			// 		}
+			// 	}
+			// })
+			saveUrl()
+			let obj = this;
+			try {
+				let locationAddress
+				// #ifdef H5
+				let wxOjb = require('jweixin-module');
+				locationAddress = wxOjb.getLocation;
+				// #endif
+				// #ifdef MP
+				locationAddress = uni.getLocation;
+				// #endif
+				// #ifdef H5
+				wxOjb.ready(() => {
+					console.log('加载完毕注册事件');
+					locationAddress({
+						type: 'gcj02',
+						success: function(res) {
+							console.log('获取经纬度', res);
+							obj.longitude4 = res.longitude
+							obj.latitude4 = res.latitude
+							obj.marker = [{
+								longitude: res.longitude,
+								latitude: res.latitude,
+								iconPath: '/static/img/img19.png',
+								width: '45',
+								height: '45',
+							}, ]
+							obj.marker1 = [{
+								longitude: res.longitude,
+								latitude: res.latitude,
+								iconPath: '/static/img/img19.png',
+								width: '45',
+								height: '45',
+							}]
+							obj.loadData();
+							obj.getJzsb()
+						},
+						fail(e) {
+							console.log('失败', e);
+							window.location.reload();
+						}
+					});
+				})
+				// #endif
+
+				// #ifdef MP
 				locationAddress({
-					type: 'wgs84',
+					type: 'gcj02',
 					success: function(res) {
 						console.log('获取经纬度', res);
 						obj.longitude4 = res.longitude
@@ -279,673 +379,918 @@ export default {
 							iconPath: '/static/img/img19.png',
 							width: '45',
 							height: '45',
-						}, ]
+						}]
+						obj.marker1 = [{
+							longitude: res.longitude,
+							latitude: res.latitude,
+							iconPath: '/static/img/img19.png',
+							width: '45',
+							height: '45',
+						}]
 						obj.loadData();
+						obj.getJzsb()
 					},
 					fail(e) {
 						console.log('失败', e);
 						window.location.reload();
 					}
 				});
-			})
-			// #endif
-
-			// #ifdef MP
-			locationAddress({
-				type: 'wgs84',
-				success: function(res) {
-					console.log('获取经纬度', res);
-					obj.longitude4 = res.longitude
-					obj.latitude4 = res.latitude
-					obj.marker = [{
-						longitude: res.longitude,
-						latitude: res.latitude,
-						iconPath: '/static/img/img19.png',
-						width: '45',
-						height: '45',
-					}]
-					obj.loadData();
-				},
-				fail(e) {
-					console.log('失败', e);
-					window.location.reload();
-				}
-			});
-			// #endif
-		} catch (e) {
-			let locationAddress
-			// #ifdef H5
-			let wxOjb = require('jweixin-module');
-			locationAddress = wxOjb.getLocation;
-			// #endif
-			// #ifdef MP
-			locationAddress = uni.getLocation;
-			// #endif
-			// #ifdef H5
-			wxOjb.ready(() => {
-				console.log('加载完毕注册事件');
+				// #endif
+			} catch (e) {
+				let locationAddress
+				// #ifdef H5
+				let wxOjb = require('jweixin-module');
+				locationAddress = wxOjb.getLocation;
+				// #endif
+				// #ifdef MP
+				locationAddress = uni.getLocation;
+				// #endif
+				// #ifdef H5
+				wxOjb.ready(() => {
+					console.log('加载完毕注册事件');
+					locationAddress({
+						type: 'gcj02',
+						success: function(res) {
+							console.log('获取经纬度', res);
+							obj.longitude4 = res.longitude
+							obj.latitude4 = res.latitude
+							obj.loadData();
+							obj.getJzsb()
+						},
+						fail(e) {
+							console.log('失败', e);
+							window.location.reload();
+						}
+					});
+				})
+				// #endif
+				// #ifdef MP
 				locationAddress({
-					type: 'wgs84',
+					type: 'gcj02',
 					success: function(res) {
 						console.log('获取经纬度', res);
 						obj.longitude4 = res.longitude
 						obj.latitude4 = res.latitude
 						obj.loadData();
+						obj.getJzsb()
 					},
 					fail(e) {
 						console.log('失败', e);
 						window.location.reload();
 					}
 				});
-			})
-			// #endif
-			// #ifdef MP
-			locationAddress({
-				type: 'wgs84',
-				success: function(res) {
-					console.log('获取经纬度', res);
-					obj.longitude4 = res.longitude
-					obj.latitude4 = res.latitude
-					obj.loadData();
-				},
-				fail(e) {
-					console.log('失败', e);
-					window.location.reload();
-				}
-			});
-			// #endif
-		}
-	},
-	computed: {
-		...mapState('user', ['userInfo', 'baseURL', 'hasLogin'])
-	},
-	// 下拉加载
-	onReachBottom() {
-		this.loadData();
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo']),
-		tocontribution() {
-			uni.navigateTo({
-				// url: "/pages/applic/contribution"
-				url: "/pages/form/applicationForm"
-			})
-		},
-		// 调用高德
-		toGaodeMap() {
-			let latitude = this.latitude2
-			let longitude = this.longitude2
-			let address = this.address
-			console.log('选择高德', latitude, longitude, address)
-			// window.location.href =  'https://uri.amap.com/marker?position=30.537043,120.567191&name=浙江省嘉兴市桐乡市高桥镇高桥大道51号'
-			window.location.href = `https://uri.amap.com/marker?position=${longitude},${latitude}&name=${address}`
-
-			// window.location.href = `http://uri.amap.com/navigation?from=114.02597366,22.54605355&to=114.029243,22.609562&mode=car&src=nyx_super`
-			// http://uri.amap.com/navigation?from=" + fromLongitude + "," + fromLatitude + "&to="+ longitude + "," + latitude + "&mode=car&src=nyx_super
+				// #endif
+			}
 		},
-		// 调用腾讯
-		totengxunMap() {
-			let latitude = this.latitude2
-			let longitude = this.longitude2
-			let address = this.address
-			console.log('选择腾讯', latitude, longitude)
-			window.location.href = `http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};addr:${address}`;
+		computed: {
+			...mapState('user', ['userInfo', 'baseURL', 'hasLogin'])
 		},
-		// 调用百度
-		tobaiDuMap() {
-			let latitude = this.latitude2
-			let longitude = this.longitude2
-			let latitude6 = this.latitude4
-			let longitude6 = this.longitude4
-			let address = this.address
-			console.log('选择百度', latitude, longitude)
-			console.log('获取当前经纬度', latitude6, longitude6)
-			window.location.href =
-				`http://api.map.baidu.com/direction?origin=latlng:${latitude6},${longitude6}|name:我的位置&destination=${latitude},${longitude}&mode=driving&region=${ address }&output=html&src=webapp.baidu.openAPIdemo`
-			//`bdapp://map/navi?location=${longitude},${latitude}&coord_type=gc02&title=${address}&content=${address}&output=html&src=andr.baidu.openAPIdemo `
+		// 下拉加载
+		onReachBottom() {
+			this.loadData();
 		},
-		// 调用谷歌
-		toGoogleMap() {
-			let latitude = this.latitude2
-			let longitude = this.longitude2
-			console.log('选择谷歌', latitude, longitude)
+		methods: {
+			...mapMutations('user', ['setUserInfo']),
+			cancel() {
+				this.$refs.popups.close();
+			},
+			comfirm1: function() {
+						let obj = this;
+						if (obj.to_phone.toString().trim() == '') {
+							// uni.showModal({
+							// 	title:'输入框为空',
+							// 	// content:JSON.stringify(obj)
+							// })
+						} else {
+							console.log('obj.to_phone1111', obj.to_phone);
+							const reg = /^(\+?0?86-?)?1[\d]\d{9}$/;
+							if (!reg.test(obj.to_phone)) {
+								obj.$api.msg('请填写正确的手机号码');
+								return;
+							}
+							console.log('name:', obj.name);
+							console.log('uid:', obj.uid);
+							console.log('phone', obj.phone);
+							console.log('to_phone', obj.to_phone);
+							console.log('longitude', obj.longitude);
+							console.log('latitude', obj.latitude);
+							console.log('iscall', obj.iscall);
+							tocall({
+								name: obj.name,
+								uid: obj.uid,
+								phone: obj.phone,
+								longitude: obj.longitude4,
+								latitude: obj.latitude4,
+								to_phone: obj.to_phone
+							}).then(data => {
+								console.log(99988, data);
+								uni.showModal({
+									title: '请耐心等待救援',
+									success: res => {
+										if (res.confirm) {
+											window.location.reload(); //重新刷新页面
+										}
+									}
+								});
+								obj.$refs.popups.close();
+								obj.iscall = false;
+								console.log(123, obj.iscall);
+							});
+						}
+					},
+			// 立即救援
+			rescue(item, index) {
+				let obj = this;
+				uni.showModal({
+					content: '是否发起求救？',
+					success: res => {
+						if (res.confirm) {
+							this.$refs.popups.open(item, index);
+							obj.name = item.name;
+							obj.uid = item.uid;
+							obj.phone = item.phone;
+							obj.iscall = false;
+							console.log('点击救援时item.phone：', obj.phone);
+						}
+					}
+				});
+			},
+			tocontribution() {
+				uni.navigateTo({
+					// url: "/pages/applic/contribution"
+					url: "/pages/form/applicationForm"
+				})
+			},
+			// 调用高德
+			toGaodeMap() {
+				let latitude = this.latitude2
+				let longitude = this.longitude2
+				let address = this.address
+				console.log('选择高德', latitude, longitude, address)
+				// window.location.href =  'https://uri.amap.com/marker?position=30.537043,120.567191&name=浙江省嘉兴市桐乡市高桥镇高桥大道51号'
+				window.location.href = `https://uri.amap.com/marker?position=${longitude},${latitude}&name=${address}`
 
-		},
-		tolocation() {
-			uni.navigateTo({
-				url: "/pages/applic/location"
-			})
-		},
-		toapplic() {
-			uni.navigateTo({
-				url: "/pages/applic/appliSystem"
-			})
-		},
-		tohelpActi() {
-			uni.navigateTo({
-				// url: "/pages/applic/tohelpActi"
-				url: "/pages/form/tovolApply"
-			})
-		},
-		toOrgan() {
-			console.log('kepuxingbaoming')
-			uni.navigateTo({
-				url: "/pages/train/index"
-			})
-		},
-		// 点击图标
-		markertap(e) {
-			console.log(e.target.markerId);
-			this.$refs.popup.open();
-			let obj = this;
-			for (let i = 0; i < obj.marker.length; i++) {
-				if (e.target.markerId == obj.marker[i].id) {
-					obj.latitude2 = obj.marker[i].latitude;
-					obj.longitude2 = obj.marker[i].longitude;
-					obj.address = obj.marker[i].address;
-					// uni.showModal({
-					// 	title: '坐标',
-					// 	content: JSON.stringify(obj.marker[i]),
-					// 	success() {
-					// 		uni.showModal({
-					// 			title: '成功',
-					// 			content: obj.marker[i].latitude
-					// 		})
-					// 	}
-					// })
+				// window.location.href = `http://uri.amap.com/navigation?from=114.02597366,22.54605355&to=114.029243,22.609562&mode=car&src=nyx_super`
+				// http://uri.amap.com/navigation?from=" + fromLongitude + "," + fromLatitude + "&to="+ longitude + "," + latitude + "&mode=car&src=nyx_super
+			},
+			// 调用腾讯
+			totengxunMap() {
+				let latitude = this.latitude2
+				let longitude = this.longitude2
+				let address = this.address
+				console.log('选择腾讯', latitude, longitude)
+				window.location.href =
+					`http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};addr:${address}`;
+			},
+			// 调用百度
+			tobaiDuMap() {
+				let latitude = this.latitude2
+				let longitude = this.longitude2
+				let latitude6 = this.latitude4
+				let longitude6 = this.longitude4
+				let address = this.address
+				console.log('选择百度', latitude, longitude)
+				console.log('获取当前经纬度', latitude6, longitude6)
+				window.location.href =
+					`http://api.map.baidu.com/direction?origin=latlng:${latitude6},${longitude6}|name:我的位置&destination=${latitude},${longitude}&mode=driving&region=${ address }&output=html&src=webapp.baidu.openAPIdemo`
+				//`bdapp://map/navi?location=${longitude},${latitude}&coord_type=gc02&title=${address}&content=${address}&output=html&src=andr.baidu.openAPIdemo `
+			},
+			// 调用谷歌
+			toGoogleMap() {
+				let latitude = this.latitude2
+				let longitude = this.longitude2
+				console.log('选择谷歌', latitude, longitude)
+
+			},
+			tolocation() {
+				uni.navigateTo({
+					url: "/pages/applic/location"
+				})
+			},
+			toapplic() {
+				uni.navigateTo({
+					url: "/pages/applic/appliSystem"
+				})
+			},
+			tohelpActi() {
+				uni.navigateTo({
+					// url: "/pages/applic/tohelpActi"
+					url: "/pages/form/tovolApply"
+				})
+			},
+			toOrgan() {
+				console.log('kepuxingbaoming')
+				uni.navigateTo({
+					url: "/pages/train/index"
+				})
+			},
+			// 点击图标
+			markertap(e) {
+				console.log(e.target.markerId);
+				this.$refs.popup.open();
+				let obj = this;
+				for (let i = 0; i < obj.marker.length; i++) {
+					if (e.target.markerId == obj.marker[i].id) {
+						obj.latitude2 = obj.marker[i].latitude;
+						obj.longitude2 = obj.marker[i].longitude;
+						obj.address = obj.marker[i].address;
+						// uni.showModal({
+						// 	title: '坐标',
+						// 	content: JSON.stringify(obj.marker[i]),
+						// 	success() {
+						// 		uni.showModal({
+						// 			title: '成功',
+						// 			content: obj.marker[i].latitude
+						// 		})
+						// 	}
+						// })
+					}
 				}
-			}
-		},
-		loadData() {
-			let obj = this;
-			console.log('打印当前经纬度', obj.longitude4, obj.latitude4)
-			userinfo({}).then(({
-				data
-			}) => {
-				obj.setUserInfo(data);
-				loadIndexs({}).then(({
+			},
+			loadData() {
+				let obj = this;
+				console.log('打印当前经纬度', obj.longitude4, obj.latitude4)
+				userinfo({}).then(({
 					data
 				}) => {
-					obj.carouselList = data.banner; //轮播图
-					bannerlist().then(({
+					obj.setUserInfo(data);
+					loadIndexs({}).then(({
 						data
 					}) => {
-						console.log(data);
-						obj.science = data;
+						obj.carouselList = data.banner; //轮播图
+						bannerlist().then(({
+							data
+						}) => {
+							console.log(data);
+							obj.science = data;
+						});
 					});
-				});
 
-			});
-			if (obj.loadingType === 'noMore') {
-				//防止重复加载
-				return;
-			}
-			// 修改当前对象状态为加载中
-			obj.loadingType = 'loading';
-			// getListAED({
-			// 	page: obj.page,
-			// 	limit: obj.limit
-			// }).then(({
-			// 	data
-			// }) => {
-			// 	console.log(data, 999)
-			// 	// obj.AEDList = data
-			// 	obj.AEDList = obj.AEDList.concat(data);
-			// 	obj.markerList = data
-			// 	obj.page++;
-			// 	if (obj.limit == data.length) {
-			// 		obj.loadingType = 'more';
-			// 	} else {
-			// 		obj.loadingType = 'noMore';
-			// 	}
-			// })
-			getDistance({
-				lng1: obj.longitude4,
-				lat1: obj.latitude4
-			}).then(({
-				data
-			}) => {
-				console.log(data, 980)
-				obj.AEDList = data
-				obj.AEDList = data.slice(0, 5)
-				let arr = data.map(item => ({
-					latitude: item.latitude,
-					longitude: item.longitude,
-					iconPath: '/static/img/img014.png',
-					width: '35',
-					height: '35',
-					id: item.id,
-					address: item.address
-				}))
-				obj.marker = obj.marker.concat(arr)
-				obj.marker = obj.marker.slice(0, 6)
-				// uni.showModal({
-				// 	title: '提示',
-				// 	content: JSON.stringify(obj.marker)
+				});
+				if (obj.loadingType === 'noMore') {
+					//防止重复加载
+					return;
+				}
+				// 修改当前对象状态为加载中
+				obj.loadingType = 'loading';
+				// getListAED({
+				// 	page: obj.page,
+				// 	limit: obj.limit
+				// }).then(({
+				// 	data
+				// }) => {
+				// 	console.log(data, 999)
+				// 	// obj.AEDList = data
+				// 	obj.AEDList = obj.AEDList.concat(data);
+				// 	obj.markerList = data
+				// 	obj.page++;
+				// 	if (obj.limit == data.length) {
+				// 		obj.loadingType = 'more';
+				// 	} else {
+				// 		obj.loadingType = 'noMore';
+				// 	}
 				// })
-			})
-		},
-		// 选择当前位置
-		// chooseAddress() {
-		// 	console.log('233')
-		// 	let obj = this;
-		// 	uni.chooseLocation({
-		// 		success: function(res) {
-		// 			console.log(res)
-		// 			obj.addressData.area = res.name;
-		// 			console.log('位置名称：' + res.name);
-		// 			console.log('详细地址：' + res.address);
-		// 			console.log('经度：' + res.longitude);
-		// 			console.log('纬度：' + res.latitude);
-		// 			obj.addressData.latitude = res.latitude;
-		// 			obj.addressData.longitude = res.longitude;
-		// 			obj.addressDetail = res.address;
-		// 			console.log('common_address123',obj.addressDetail )
-		// 			console.log('latitude123',obj.addressData.latitude )
-		// 			console.log('longitude123',obj.addressData.longitude )
-		// 			getcomAddress({
-		// 				common_address: obj.addressDetail,
-		// 				longitude: obj.addressData.longitude,
-		// 				latitude: obj.addressData.latitude
-		// 			}).then(data => {
-		// 				console.log(333)
-		// 				console.log(data);
-		// 				if (data.status == 200) {
-		// 					obj.$api.msg('保存成功')
-		// 				}
-		// 			})
-		// 		}
-		// 	});
-		// },
-		// 导航
-		openAddress(item) {
-			let obj = this
-			obj.latitude2 = item.latitude
-			obj.longitude2 = item.longitude
-			obj.address = item.address
-			this.$refs.popup.open();
-		},
-		Jump(item) {
-			// console.log(item);
-			if (item.url != '') {
-				window.open(item.url);
-				return
+				getDistance({
+					lng1: obj.longitude4,
+					lat1: obj.latitude4
+				}).then(({
+					data
+				}) => {
+					console.log(data, 980)
+					obj.AEDList = data
+					obj.AEDList = data.slice(0, 5)
+					let arr = data.map(item => ({
+						latitude: item.latitude,
+						longitude: item.longitude,
+						iconPath: '/static/icon/jzsb.png',
+						width: '35',
+						height: '35',
+						id: item.id,
+						address: item.address
+					}))
+					obj.marker = obj.marker.concat(arr)
+					obj.marker = obj.marker.slice(0, 6)
+					// uni.showModal({
+					// 	title: '提示',
+					// 	content: JSON.stringify(obj.marker)
+					// })
+				})
+			},
+			// 选择当前位置
+			// chooseAddress() {
+			// 	console.log('233')
+			// 	let obj = this;
+			// 	uni.chooseLocation({
+			// 		success: function(res) {
+			// 			console.log(res)
+			// 			obj.addressData.area = res.name;
+			// 			console.log('位置名称：' + res.name);
+			// 			console.log('详细地址：' + res.address);
+			// 			console.log('经度：' + res.longitude);
+			// 			console.log('纬度：' + res.latitude);
+			// 			obj.addressData.latitude = res.latitude;
+			// 			obj.addressData.longitude = res.longitude;
+			// 			obj.addressDetail = res.address;
+			// 			console.log('common_address123',obj.addressDetail )
+			// 			console.log('latitude123',obj.addressData.latitude )
+			// 			console.log('longitude123',obj.addressData.longitude )
+			// 			getcomAddress({
+			// 				common_address: obj.addressDetail,
+			// 				longitude: obj.addressData.longitude,
+			// 				latitude: obj.addressData.latitude
+			// 			}).then(data => {
+			// 				console.log(333)
+			// 				console.log(data);
+			// 				if (data.status == 200) {
+			// 					obj.$api.msg('保存成功')
+			// 				}
+			// 			})
+			// 		}
+			// 	});
+			// },
+			// 导航
+			openAddress(item) {
+				let obj = this
+				obj.latitude2 = item.latitude
+				obj.longitude2 = item.longitude
+				obj.address = item.address
+				this.$refs.popup.open();
+			},
+			Jump(item) {
+				// console.log(item);
+				if (item.url != '') {
+					window.open(item.url);
+					return
+				}
+				uni.navigateTo({
+					url: "/pages/applic/info?id=" + item.id
+				})
+			},
+			open() {
+				this.$refs.popup.open();
+			},
+			close() {
+				this.$refs.popup.close();
+			},
+			// 获取就在身边
+			getJzsb() {
+				let obj = this;
+				getdis({
+					lng1: obj.longitude4,
+					lat1: obj.latitude4
+				}).then((res) => {
+					let data = res.data;
+					this.jzsbList = res.data.slice(0, 3)
+					let arr = data.map(item => ({
+						latitude: item.latitude,
+						longitude: item.longitude,
+						iconPath: '/static/img/img014.png',
+						width: '35',
+						height: '35',
+						id: item.id,
+						address: item.address
+					}))
+					obj.markerjzsb = obj.marker1.concat(arr)
+					console.log(obj.markerjzsb, 'obj.markerjzsb')
+				}).catch(err => {
+					console.log(err);
+					uni.hideLoading();
+					uni.showModal({
+						title: '失败',
+						content: JSON.stringify(err)
+					});
+				});
 			}
-			uni.navigateTo({
-				url: "/pages/applic/info?id=" + item.id
-			})
-		},
-		open() {
-			this.$refs.popup.open();
-		},
-		close() {
-			this.$refs.popup.close();
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-a {
-	text-decoration: none;
-	color: #5f5f5f;
-}
-
-.content {
-	// line-height: 1;
-	background-color: #ffabab;
-	// padding-bottom: 60rpx;
-}
-
-.popup_row {
-	width: 100%;
-	height: 500rpx;
-	background-color: #ffffff;
-	border-radius: 20rpx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-
-	.rows {
-		width: 100%;
-		padding: 0 24rpx;
-
-		.rows-item {
-			height: 80rpx;
-			line-height: 80rpx;
-			text-align: center;
-			width: 100%;
-			font-size: 32rpx;
-			color: #303133;
-			// border-bottom: 1rpx solid #f0f0f0;
-		}
-
-		// .row-1 {
-		// 	margin: auto;
-		// 	.first_aid {
-		// 		width: 300rpx;
-		// 		height: 300rpx;
-		// 	}
-		// }
-		// .row-2 {
-		// 	font-size: 38rpx;
-		// 	margin-top: 20rpx;
-		// }
+	a {
+		text-decoration: none;
+		color: #5f5f5f;
 	}
-}
 
-.content {
-	background-color: #f8f8f8;
-	height: 100%;
+	.content {
+		// line-height: 1;
+		background-color: #ffabab;
+		// padding-bottom: 60rpx;
+	}
 
-	/* 头部 轮播图 */
-	.carousel-section {
-		// padding-top: 10px;
-		overflow: hidden;
+	.popup_row {
+		width: 100%;
+		height: 500rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
 
-		.carousel {
+		.rows {
 			width: 100%;
-			height: 398rpx;
+			padding: 0 24rpx;
 
-			.carousel-item {
+			.rows-item {
+				height: 80rpx;
+				line-height: 80rpx;
+				text-align: center;
 				width: 100%;
-				height: 100%;
-				padding-left: 30rpx;
-				padding-right: 30rpx;
-				overflow: hidden;
+				font-size: 32rpx;
+				color: #303133;
+				// border-bottom: 1rpx solid #f0f0f0;
 			}
 
-			image {
-				width: 100%;
-				height: 398rpx;
-			}
+			// .row-1 {
+			// 	margin: auto;
+			// 	.first_aid {
+			// 		width: 300rpx;
+			// 		height: 300rpx;
+			// 	}
+			// }
+			// .row-2 {
+			// 	font-size: 38rpx;
+			// 	margin-top: 20rpx;
+			// }
 		}
 	}
 
-	// 分类
-	.cate-section {
-		display: flex;
-		justify-items: center;
-		align-items: center;
-		justify-content: space-around;
-		height: 214rpx;
-		width: 750rpx;
-		background-color: #ffffff;
+	.content {
+		background-color: #f8f8f8;
+		height: 100%;
 
-		.cate-item {
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			color: #5f5f5f;
-			font-size: 26rpx;
+		/* 头部 轮播图 */
+		.carousel-section {
+			// padding-top: 10px;
+			overflow: hidden;
 
-			image {
-				height: 88rpx;
-				width: 88rpx;
-				margin-bottom: 14rpx;
-				border-radius: 50%;
-				opacity: 0.7;
+			.carousel {
+				width: 100%;
+				height: 398rpx;
+
+				.carousel-item {
+					width: 100%;
+					height: 100%;
+					padding-left: 30rpx;
+					padding-right: 30rpx;
+					overflow: hidden;
+				}
+
+				image {
+					width: 100%;
+					height: 398rpx;
+				}
 			}
 		}
-	}
 
-	// 红会科普
-	.science-section {
-		width: 100%;
-		background-color: #ffffff;
-		margin-top: 18rpx;
-		padding-top: 30rpx;
-
-		.science-title {
+		// 分类
+		.cate-section {
 			display: flex;
-			justify-content: center;
+			justify-items: center;
 			align-items: center;
-			padding-bottom: 22rpx;
+			justify-content: space-around;
+			height: 214rpx;
+			width: 750rpx;
+			background-color: #ffffff;
 
-			.title {
-				width: 285rpx;
-				height: 64rpx;
-				background-color: #ca121e;
-				border-radius: 32rpx;
-				color: #ffffff;
-				font-size: 32rpx;
-				line-height: 64rpx;
-				text-align: center;
-			}
+			.cate-item {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				color: #5f5f5f;
+				font-size: 26rpx;
 
-			image {
-				width: 68rpx;
-				height: 43rpx;
-				margin-left: 16rpx;
-				margin-right: 16rpx;
+				image {
+					height: 88rpx;
+					width: 88rpx;
+					margin-bottom: 14rpx;
+					border-radius: 50%;
+					opacity: 0.7;
+				}
 			}
 		}
 
-		.science-box {
-			padding-left: 15rpx;
-			padding-right: 15rpx;
-			padding-bottom: 20rpx;
-			border-bottom: 1rpx solid #f0f0f0;
-			white-space: nowrap;
-			display: flex;
+		// 红会科普
+		.science-section {
 			width: 100%;
+			background-color: #ffffff;
+			margin-top: 18rpx;
+			padding-top: 30rpx;
 
-			// .uni-scroll-view-content{
-			// 	display: flex;
-			// }
-			.science-content {
-				// width: 100%;
-
-				// display: flex;
-				display: -webkit-box;
+			.science-title {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding-bottom: 22rpx;
 
-				.science-item {
-					margin-right: 24rpx;
-					width: 198rpx;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
+				.title {
+					width: 285rpx;
+					height: 64rpx;
+					background-color: #ca121e;
+					border-radius: 32rpx;
+					color: #ffffff;
+					font-size: 32rpx;
+					line-height: 64rpx;
 					text-align: center;
+				}
 
-					image {
-						width: 100%;
-						height: 145rpx;
-					}
+				image {
+					width: 68rpx;
+					height: 43rpx;
+					margin-left: 16rpx;
+					margin-right: 16rpx;
+				}
+			}
 
-					.article-title {
-						width: 198rpx;
-						color: #333;
-						font-size: 25rpx;
-						padding-top: 20rpx;
-						padding-bottom: 16rpx;
-						font-weight: 900;
-					}
+			.science-box {
+				padding-left: 15rpx;
+				padding-right: 15rpx;
+				padding-bottom: 20rpx;
+				border-bottom: 1rpx solid #f0f0f0;
+				white-space: nowrap;
+				display: flex;
+				width: 100%;
+
+				// .uni-scroll-view-content{
+				// 	display: flex;
+				// }
+				.science-content {
+					// width: 100%;
 
-					.article-content {
+					// display: flex;
+					display: -webkit-box;
+
+					.science-item {
+						margin-right: 24rpx;
 						width: 198rpx;
-						color: #999999;
-						font-size: 18rpx;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						display: -webkit-box;
-						word-break: break-all;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						text-align: center;
+
+						image {
+							width: 100%;
+							height: 145rpx;
+						}
+
+						.article-title {
+							width: 198rpx;
+							color: #333;
+							font-size: 25rpx;
+							padding-top: 20rpx;
+							padding-bottom: 16rpx;
+							font-weight: 900;
+						}
+
+						.article-content {
+							width: 198rpx;
+							color: #999999;
+							font-size: 18rpx;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							display: -webkit-box;
+							word-break: break-all;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 2;
+						}
 					}
 				}
 			}
-		}
 
-		.science-more {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			color: #cb131c;
-			font-size: 30rpx;
-			padding-top: 18rpx;
-			padding-bottom: 18rpx;
-
-			image {
-				width: 20rpx;
-				height: 27rpx;
+			.science-more {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				color: #cb131c;
+				font-size: 30rpx;
+				padding-top: 18rpx;
+				padding-bottom: 18rpx;
+
+				image {
+					width: 20rpx;
+					height: 27rpx;
+				}
 			}
 		}
-	}
 
-	// sos急救中心
-	.system {
-		width: 100%;
-		background-color: #ffffff;
-		margin-top: 18rpx;
-		padding-top: 40rpx;
-		// padding-bottom: 45rpx;
-		// margin-bottom: 43rpx;
-
-		.system-title {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			padding-bottom: 22rpx;
+		// sos急救中心
+		.system {
+			width: 100%;
+			background-color: #ffffff;
+			margin-top: 18rpx;
+			padding-top: 40rpx;
+			// padding-bottom: 45rpx;
+			// margin-bottom: 43rpx;
 
-			.title {
-				width: 285rpx;
-				height: 64rpx;
-				background-color: #ca121e;
-				border-radius: 32rpx;
-				color: #ffffff;
-				font-size: 32rpx;
-				line-height: 64rpx;
-				text-align: center;
-			}
+			.system-title {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding-bottom: 22rpx;
 
-			.img {
-				width: 68rpx;
-				height: 43rpx;
-				margin-left: 16rpx;
-				margin-right: 16rpx;
+				.title {
+					width: 285rpx;
+					height: 64rpx;
+					background-color: #ca121e;
+					border-radius: 32rpx;
+					color: #ffffff;
+					font-size: 32rpx;
+					line-height: 64rpx;
+					text-align: center;
+				}
 
-				image {
+				.img {
 					width: 68rpx;
 					height: 43rpx;
+					margin-left: 16rpx;
+					margin-right: 16rpx;
+
+					image {
+						width: 68rpx;
+						height: 43rpx;
+					}
 				}
 			}
-		}
-
-		.system-map {
-			width: 750rpx;
-			height: 500rpx;
-			background-color: #ffffff;
-			padding: 0 24rpx;
-			padding-bottom: 45rpx;
 
-			.map-box {
-				width: 100%;
+			.system-map {
+				width: 750rpx;
 				height: 500rpx;
-				background-color: #f8f8f8;
+				background-color: #ffffff;
+				padding: 0 24rpx;
+				padding-bottom: 45rpx;
 
-				image {
+				.map-box {
 					width: 100%;
 					height: 500rpx;
+					background-color: #f8f8f8;
+
+					image {
+						width: 100%;
+						height: 500rpx;
+					}
 				}
 			}
 		}
-	}
 
-	// AED
-	.list-box {
-		padding: 0rpx 25rpx 24rpx;
-		// margin-bottom: 84rpx;
+		// AED
+		.list-box {
+			padding: 0rpx 25rpx 24rpx;
+			// margin-bottom: 84rpx;
 
-		.system-title {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 130rpx;
-			// padding-bottom: 22rpx;
+			.system-title {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				height: 130rpx;
+				// padding-bottom: 22rpx;
+				background-color: #ffffff;
+
+				.title {
+					width: 285rpx;
+					height: 64rpx;
+					background-color: #ca121e;
+					border-radius: 32rpx;
+					color: #ffffff;
+					font-size: 32rpx;
+					line-height: 64rpx;
+					text-align: center;
+				}
+
+				.img {
+					width: 68rpx;
+					height: 43rpx;
+					margin-left: 16rpx;
+					margin-right: 16rpx;
+
+					image {
+						width: 68rpx;
+						height: 43rpx;
+					}
+				}
+			}
+		}
+
+		.map-box {
+			// background-color: #FFFFFF;
+			width: 100%;
+			height: 366rpx;
+			// border: 2rpx solid #F2F2F2;
+			box-shadow: 5px 15px 15px 5px #f2f2f2;
+		}
+
+		.list-tpl {
 			background-color: #ffffff;
+			margin: 25rpx 0rpx;
+			padding: 25rpx 25rpx;
+			font-size: 28rpx;
+			border-radius: 15rpx;
+			display: flex;
+			justify-content: space-between;
 
-			.title {
-				width: 285rpx;
-				height: 64rpx;
-				background-color: #ca121e;
-				border-radius: 32rpx;
-				color: #ffffff;
-				font-size: 32rpx;
-				line-height: 64rpx;
-				text-align: center;
+			.list-left {
+				display: flex;
+				width: 100%;
+
+				.number {
+					font-size: 32rpx;
+					margin-right: 14rpx;
+				}
+
+				.info {
+					width: 100%;
+
+					.title {
+						font-size: 32rpx;
+						color: #222222;
+						font-weight: 500;
+					}
+
+					.addr {
+						margin-top: 20rpx;
+					}
+				}
 			}
 
-			.img {
-				width: 68rpx;
-				height: 43rpx;
-				margin-left: 16rpx;
-				margin-right: 16rpx;
+			.image {
+				width: 10%;
+				text-align: center;
 
 				image {
-					width: 68rpx;
-					height: 43rpx;
+					width: 50rpx;
+					height: 50rpx;
+				}
+
+				.tip {
+					color: #7f7f7f;
+					font-size: 21rpx;
 				}
 			}
 		}
 	}
-
-	.map-box {
-		// background-color: #FFFFFF;
+	.popup_rows {
+		// margin-top: 108rpx;
+		height: 440rpx;
+		border-radius: 25rpx;
 		width: 100%;
-		height: 366rpx;
-		// border: 2rpx solid #F2F2F2;
-		box-shadow: 5px 15px 15px 5px #f2f2f2;
+		padding: 24rpx;
+		background-color: #f8f8f8;
+		z-index: 999;
+		.title {
+			border-bottom: 2rpx solid #f2f2f2;
+			color: #e63931;
+			font-size: 32rpx;
+			padding-left: 4rpx;
+			padding-bottom: 16rpx;
+			display: flex;
+			justify-content: space-between;
+			// align-items: center;
+			.cancel {
+				margin-left: 52rpx;
+				width: 36rpx;
+				height: 36rpx;
+				image {
+					width: 36rpx;
+					height: 36rpx;
+				}
+			}
+		}
+		.inpBox {
+			margin-top: 52rpx;
+			border: 2px solid #f2f2f2;
+			padding: 12rpx 24rpx;
+			color: #ff9797;
+			border-radius: 8rpx;
+			.input-placeholder {
+				// height: 70rpx;
+				font-size: 32rpx;
+				color: #ff9797;
+			}
+		}
+		.inpedit {
+			margin-top: 24rpx;
+			margin-left: 14rpx;
+			font-size: 28rpx;
+			color: #ff9797;
+		}
+		.comfirm {
+			display: flex;
+			justify-content: flex-end;
+			margin-top: 54rpx;
+			.comfirm1 {
+				padding: 12rpx 24rpx;
+				border-radius: 12rpx;
+				color: #ffffff;
+				background-color: #e63931;
+			}
+		}
 	}
-
-	.list-tpl {
-		background-color: #ffffff;
-		margin: 25rpx 0rpx;
-		padding: 25rpx 25rpx;
-		font-size: 28rpx;
-		border-radius: 15rpx;
+	.science-more {
+		background-color: #fff;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #e63931;
+		font-size: 30rpx;
+		padding-top: 18rpx;
+		padding-bottom: 18rpx;
+	
+		image {
+			width: 20rpx;
+			height: 27rpx;
+		}
+	}
+	.location-item {
+		// width: 710rpx;
+		background-color: #fff;
+		z-index: 10;
 		display: flex;
 		justify-content: space-between;
-
-		.list-left {
+		align-items: center;
+		border-bottom: 1rpx solid #e7e8ea;
+		padding: 15rpx 30rpx;
+		// margin: auto;
+		.box-left {
 			display: flex;
-			width: 100%;
-
-			.number {
-				font-size: 32rpx;
-				margin-right: 14rpx;
+	
+			.img01 {
+				width: 8rpx;
+				height: 28rpx;
+				margin-right: 18rpx;
+	
+				image {
+					width: 8rpx;
+					height: 28rpx;
+				}
 			}
-
+	
+			.img02 {
+				width: 117rpx;
+				height: 117rpx;
+				border-radius: 50%;
+	
+				image {
+					width: 117rpx;
+					height: 117rpx;
+					border-radius: 50%;
+				}
+			}
+	
 			.info {
-				width: 100%;
-
-				.title {
-					font-size: 32rpx;
-					color: #222222;
-					font-weight: 500;
+				margin-left: 16rpx;
+	
+				.info-header {
+					display: flex;
+					align-items: center;
+	
+					.name {
+						font-size: 32rpx;
+						color: #333333;
+					}
+	
+					.distance {
+						margin-left: 25rpx;
+						font-size: 28rpx;
+						color: #303133;
+					}
+	
+					.location-icon {
+						margin-left: 10rpx;
+						width: 20rpx;
+						height: 26rpx;
+	
+						image {
+							width: 20rpx;
+							height: 26rpx;
+							display: inline;
+						}
+					}
 				}
-
-				.addr {
-					margin-top: 20rpx;
+	
+				.address {
+					font-size: 26rpx;
+					color: #333333;
+					margin-top: 33rpx;
 				}
 			}
 		}
-
-		.image {
-			width: 10%;
-			text-align: center;
-
-			image {
-				width: 50rpx;
-				height: 50rpx;
+	
+		.box-right {
+			.img {
+				height: 107rpx;
+	
+				image {
+					width: 107rpx;
+					height: 107rpx;
+				}
 			}
-
-			.tip {
-				color: #7f7f7f;
-				font-size: 21rpx;
+	
+			.called {
+				margin-right: 16rpx;
+				height: 107rpx;
+				line-height: 107rpx;
+				font-size: 28rpx;
+				color: #cb131c;
 			}
 		}
 	}
-}
-
 </style>

store/index.js

@@ -22,6 +22,8 @@ const store = new Vuex.Store({
 		weichatBrowser: '' ,//当前是否为微信内置浏览器
 		// #endif
 		// shareData:'',//分享信息
+		zxphone: '027-87012677',
+		baseName: '武汉市江夏区红十字会'
 	},
 	mutations: {
 	

unpackage/dist/build/h5/index.html

@@ -1,2 +0,0 @@
-<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>武汉市江夏区红十字会</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.344b246c.js></script><script src=/index/static/js/index.af9351ec.js></script></body></html>

unpackage/dist/build/h5/static/css/cmy.css

@@ -1,443 +0,0 @@
-/*初始化类*/
-@font-face {
-	font-family: 'iconfont';
-	/* project id 1482221 */
-	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot');
-	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot?#iefix') format('embedded-opentype'),
-		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'),
-		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff') format('woff'),
-		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.ttf') format('truetype'),
-		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.svg#iconfont') format('svg');
-}
-
-.iconfont {
-	font-family: "iconfont" !important;
-	font-size: 34rpx;
-	font-style: normal;
-	-webkit-font-smoothing: antialiased;
-	-webkit-text-stroke-width: 0rpx;
-	-moz-osx-font-smoothing: grayscale;
-}
-
-.iconedit:before {
-	content: "\e649";
-}
-
-.iconfavorfill:before {
-	content: "\e64b";
-}
-
-.iconfavor:before {
-	content: "\e64c";
-}
-
-.iconlocation:before {
-	content: "\e651";
-}
-
-.iconroundcheckfill:before {
-	content: "\e656";
-}
-
-.iconroundcheck:before {
-	content: "\e657";
-}
-
-.iconunfold:before {
-	content: "\e661";
-}
-
-.iconlikefill:before {
-	content: "\e668";
-}
-
-.iconlike:before {
-	content: "\e669";
-}
-
-.iconshop:before {
-	content: "\e676";
-}
-
-.iconcart:before {
-	content: "\e6af";
-}
-
-.icondelete:before {
-	content: "\e6b4";
-}
-
-.iconhome:before {
-	content: "\e6b8";
-}
-
-.iconcartfill:before {
-	content: "\e6b9";
-}
-
-.iconhomefill:before {
-	content: "\e6bb";
-}
-
-.iconlock:before {
-	content: "\e6c0";
-}
-
-.iconfriendadd:before {
-	content: "\e6ca";
-}
-
-.iconfold:before {
-	content: "\e6de";
-}
-
-.iconapps:before {
-	content: "\e729";
-}
-
-.iconadd:before {
-	content: "\e767";
-}
-
-.iconmove:before {
-	content: "\e768";
-}
-
-.icontriangledownfill:before {
-	content: "\e79b";
-}
-
-.icontriangleupfill:before {
-	content: "\e79c";
-}
-
-.iconshaixuan:before {
-	content: "\e74a";
-}
-
-.iconyanzhengma:before {
-	content: "\e684";
-}
-
-.iconjifen:before {
-	content: "\e60f";
-}
-
-.iconwuliuxinxi:before {
-	content: "\e62b";
-}
-
-.iconmessage:before {
-	content: "\e78a";
-}
-
-.iconsetting:before {
-	content: "\e78e";
-}
-
-.iconaddition:before {
-	content: "\e6e0";
-}
-
-.iconclose:before {
-	content: "\e6e9";
-}
-
-.iconenter:after {
-	content: "\e6f8";
-}
-
-.iconprompt:before {
-	content: "\e71b";
-}
-
-.iconreturn:before {
-	content: "\e720";
-}
-
-.iconsearch:before {
-	content: "\e741";
-}
-
-.iconpengyouquan:before {
-	content: "\e62c";
-}
-
-.iconweixin:before {
-	content: "\e60e";
-}
-
-.iconzhifubao:before {
-	content: "\e673";
-}
-
-.iconyue:before {
-	content: "\e618";
-}
-
-.iconweixin1:before {
-	content: "\e622";
-}
-
-.iconlock1:before {
-	content: "\e64d";
-}
-
-.iconuser:before {
-	content: "\e64e";
-}
-
-.iconchenggongtixianshouyi:before {
-	content: "\e64f";
-}
-
-.iconviptuiguangdingdan:before {
-	content: "\e650";
-}
-
-.icondaifukuan:before {
-	content: "\e652";
-}
-
-.icondaijiesuanshouyi:before {
-	content: "\e653";
-}
-
-.icondaidakuanshouyi:before {
-	content: "\e654";
-}
-
-.icondaifahuo:before {
-	content: "\e655";
-}
-
-.icondaishouhuoshouyi:before {
-	content: "\e658";
-}
-
-.icondaishouhuo:before {
-	content: "\e659";
-}
-
-.iconwuxiaoshouyi:before {
-	content: "\e65a";
-}
-
-.icontixianmingxi:before {
-	content: "\e65b";
-}
-
-.iconshouyi:before {
-	content: "\e65c";
-}
-
-.iconkouchutixianshouxufei:before {
-	content: "\e65d";
-}
-
-.iconyishenqingshouyi:before {
-	content: "\e65e";
-}
-
-.icontuihuanhuo:before {
-	content: "\e65f";
-}
-
-
-/*水平线*/
-.hr {
-	width: 100%;
-	position: relative;
-	border-bottom: 1px solid #dddddd;
-	/* height: 0.5rpx; */
-}
-
-/* 一行显示 */
-.clamp {
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	display: block;
-}
-/* 二行显示 */
-.ellipsis{
-	overflow:hidden; 
-	text-overflow:ellipsis;
-	display:-webkit-box; 
-	-webkit-box-orient:vertical;
-	-webkit-line-clamp:2;
-}
-.common-hover {
-	background: #f5f5f5;
-}
-
-/* 角标 */
-.corner{
-	background-color:#e51c23;
-	position: absolute;
-	right: -18rpx;
-	top: -18rpx;
-	color:#FFFFFF;
-	text-align: center;
-	border-radius: 999px;
-	font-size: 24rpx !important;
-	min-width: 35rpx;
-	min-height: 35rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	line-height: 1;
-}
-/*文字对齐*/
-.text-left {
-	text-align: left !important;
-}
-
-.text-center {
-	text-align: center !important;
-}
-
-.text-justify {
-	text-align: justify !important;
-}
-
-.text-right {
-	text-align: right !important;
-}
-
-.text-default {
-	color: #212121 !important;
-}
-
-.text-white {
-	color: #ffffff !important;
-}
-
-.text-primary {
-	color: #00bcd4 !important;
-}
-
-.text-success {
-	color: #009688 !important;
-}
-
-.text-info {
-	color: #03a9f4 !important;
-}
-
-.text-warning {
-	color: #ffc107 !important;
-}
-
-.text-danger {
-	color: #e51c23 !important;
-}
-
-.text-pink {
-	color: #e91e63 !important;
-}
-
-.text-purple {
-	color: #673ab7 !important;
-}
-
-.text-indigo {
-	color: #3f51b5 !important;
-}
-
-.text-gray {
-	color: #999999 !important;
-}
-
-.bg-default {
-	background-color: #f5f5f5 !important;
-}
-
-.bg-primary {
-	background-color: #00bcd4 !important;
-}
-
-.bg-success {
-	background-color: #009688 !important;
-}
-
-.bg-info {
-	background-color: #03a9f4 !important;
-}
-
-.bg-warning {
-	background-color: #f1c40f !important;
-}
-
-.bg-danger {
-	background-color: #e51c23 !important;
-}
-
-.bg-pink {
-	background-color: #e91e63 !important;
-}
-
-.bg-purple {
-	background-color: #673ab7 !important;
-}
-
-.bg-indigo {
-	background-color: #3f51b5 !important;
-}
-
-.bg-white {
-	background-color: white !important;
-}
-
-.bg-gray {
-	background-color: #e3e3e3 !important;
-}
-
-/* 边框 */
-.border-radius-15 {
-	border-radius: 15rpx;
-}
-
-.border-radius-10 {
-	border-radius: 10rpx;
-}
-
-.border-radius-all {
-	border-radius: 1000rpx;
-}
-
-/* 底部边线 */
-.borde-b {
-	border-bottom: 1px solid #dddddd;
-}
-
-/* 弹性盒子 */
-.flex {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-}
-.flex_item {
-	display: flex;
-	align-items: center;
-	/* justify-content: space-between; */
-}
-.items-left {
-	justify-content: flex-start;
-}
-
-.items-right {
-	justify-content: flex-end;
-}
-
-.flex-shrink-false {
-	flex-shrink: 0;
-}
-
-.flex-grow-true {
-	flex-grow: 1;
-}
-
-.position-relative {
-	position: relative;
-}