6-20-1

pages.json

@@ -33,6 +33,19 @@
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "捐献造血干细胞"
 			}
+		},
+		// aid
+		{
+			"path": "pages/applic/aid",
+			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "救护站"
+			}
 		},
 		{
 			"path": "pages/form/donateLove",
@@ -751,7 +764,7 @@
 			// 	"navigationBarTextStyle":"white"
 			// }
 			"style": {
-				"navigationBarTitleText": "注册",
+				"navigationBarTitleText": "",
 				"app-plus": {
 					"titleNView": {
 						"type": "transparent"

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/contribution.vue

@@ -64,13 +64,13 @@
 			</view>
 			<view class="detail">
 				<view class="detail-item">
-					负责人：田守付
+					负责人：李秀娟
 				</view>
 				<view class="detail-item">
 					咨询电话：027-83891093
 				</view>
 				<view class="detail-item">
-					地址：武汉市东西湖区五环大道55号 区卫生健康局院内
+					地址：武汉市东西湖区径河街径西三路33号
 				</view>
 				
 			<!-- 	<view class="phone">

pages/applic/know.vue

@@ -10,11 +10,11 @@
 				</view>
 			</view>	
 		</view>
-		<view class="vediobg">
+		<!-- <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> -->
 		
 		<view class="box-1">
 			伸出你我双手点燃生命希望

pages/applic/location.vue

@@ -18,7 +18,7 @@
 							<image src="../../static/img/line01.png" mode=""></image>
 						</view>
 						<view class="img02">
-							<image :src="item.info.avatar" mode=""></image>
+							<image src="../../static/img/002.png" mode=""></image>
 						</view>
 						<view class="info">
 							<view class="info-header">

pages/applic/toknowledge.vue

@@ -1,60 +1,63 @@
 <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">
+		<image src="../../static/images/zxjz1.png" mode="widthFix" style="width: 750rpx;"></image>
+		<image src="../../static/images/zxjz2.png" mode="widthFix" style="width: 750rpx;"></image>
+		<image src="../../static/images/zxjz3.png" mode="widthFix" style="width: 750rpx;"></image>
+		<!-- <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>
-			</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/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 class="list-item">
 				<view class="list-title flex_item">
@@ -95,56 +98,48 @@
 			<view class="list-tips">
 				<text style="color: #C53335;">温馨提示</text>：每个志愿者抽取一次血样即可，您的资料将储存在中国造血干细胞捐献者资料库中。
 			</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;">
+				{{$store.state.baseName}}造血干细胞捐献咨询电话:
 			</view>
-			<view class="list-info">
-				二、到余姚市桐江桥献血屋或者献血车上参加无偿献血，一并参加报名登记、留取血样；
+			<view class="list-tips" style="text-align: center;">
+				{{HSCTel}}
 			</view>
-			<view class="list-info">
-				三、每年“五·八”世界红十字日前后，市红十字会会在市中心开展包括造血干细胞捐献在内的系列活动，届时可前往报名抽样。请留意新闻媒体的报道。
-			</view> -->
-			<view class="phone">
-				武汉市东西湖区红十字会咨询电话：
-			
-			</view>
-				<view style="margin-left: 228rpx;">027-83891093</view>
-				<!-- <jyf-parser :html="description" ref="article"></jyf-parser> -->
-		</view>
+		</view> -->
 	</view>
 </template>
 <script>
-// import { get_cell } from '@/api/train.js';
-import jyfParser from "@/components/jyf-parser/jyf-parser";
-export default {
-	components: {
-	   jyfParser
+import { get_cell } from '@/api/train.js';
+import jyfParser from "@/components/jyf-parser/jyf-parser";
+import { mapState, mapMutations } from 'vuex';
+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();
+	},
+	computed: {
+		...mapState('info',['HSCTel'])
 	},
 	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;'");
+				}//小程序商品详情图超出屏幕问题
 			});
 		}
 	}
@@ -153,40 +148,43 @@ export default {
 
 <style lang="scss">
 page {
-	background: #FFFFFF;
-	width: 100%;
+	background: #FFFFFF;
+	width: 100%;
 	height: 100%;
-	.content {
+	.content {
 		height: 100%;
+		image {
+			vertical-align: bottom;
+		}
 	}
-}
-.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;
-			margin-right: 15rpx;
-		}
-	}
-	.list-tpl{
-		margin: 25rpx 0rpx;
-		padding: 25rpx 25rpx;
-		background-color: #FEF6F7;
-		border:4rpx solid #C53335;
-		color: #222222;
-		font-size: 28rpx;
-		border-radius: 25rpx;
-	}
+		display: flex;
+		image{
+			width: 56rpx;
+			height: 44rpx;
+			margin-right: 15rpx;
+		}
+	}
+	.list-tpl{
+		margin: 25rpx 0rpx;
+		padding: 25rpx 25rpx;
+		background-color: #FEF6F7;
+		border:4rpx solid #C53335;
+		color: #222222;
+		font-size: 28rpx;
+		border-radius: 25rpx;
+	}
 }
 .list-tips{
 	font-size: 32rpx;

pages/category/category.vue

@@ -10,10 +10,11 @@
 		<view class="pop-list">
 			<view class="list-box1" v-for="(item,index) in peoplelist" :key='index' v-if="index<20">
 				<view class="list-top">
-					<image :src="item.avatar" mode="" class="avatar-img"></image>
+					<image src="../../static/img/002.png" mode="" class="avatar-img"></image>
 				</view>
 				<view class="nickname">
-					{{item.name}}
+					<!-- {{item.name}} -->
+					救援者{{index+1}}
 				</view>
 			</view>
 		</view>
@@ -430,15 +431,19 @@
 			border-radius: 29rpx;
 			position: relative;
 			margin: -33rpx auto 78rpx;
-			padding: 80rpx 0rpx 30rpx 30rpx;
+			padding: 80rpx 30rpx 30rpx 30rpx;
 			display: flex;
 			flex-wrap: wrap;
 
 			.list-box1 {
+				width: 25%;
 				text-align: center;
-				margin-right: 30rpx;
-				margin-bottom: 30rpx;
-
+				// margin-right: 30rpx;
+				// margin-bottom: 30rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
 				.list-top {
 					width: 100rpx;
 					height: 100rpx;
@@ -450,7 +455,8 @@
 					}
 				}
 				.nickname{
-					margin-top: 12rpx;
+					margin-top: 12rpx;
+					padding-bottom: 10rpx;
 				}
 			}
 		}

pages/fu/fuInfo.vue

@@ -48,8 +48,8 @@
 		</view> -->
 		<view class="btn-bottom">
 			<view class="btn-left">
-				<view class="submit" v-if="starting == true && list.is == 0" @click="shenqing"><text class="">申请援助</text></view>
-				<view class="submit yijieshu"  v-if="starting == true && list.is == 1"><text class="">已申请援助</text></view>
+				<view class="submit" v-if="starting == true && list.is == 0" @click="shenqing"><text class="">我要帮助</text></view>
+				<view class="submit yijieshu"  v-if="starting == true && list.is == 1"><text class="">已申请帮助</text></view>
 				<view class="submit yijieshu"  v-if="starting == false" ><text class="">已结束</text></view>
 			</view>
 			<view class="btn-right">
@@ -64,7 +64,7 @@
 			<view class="pop-box">
 				<image class="pop-img" src="../../static/images/sqyz.png"></image>
 				<view class="pop-frame">
-					<view class="pop-text">是否确认申请援助</view>
+					<view class="pop-text">是否确认申请帮助</view>
 					<view class="pop-btnBox">
 						<view class="pop-btn" @click="close">取消</view>
 						<view class="pop-btn queren" @click="corfim()">确认</view>

pages/index/index.vue

@@ -38,7 +38,7 @@
 					<image src="../../static/icon/icon5.png" style="width: 66rpx;height: 65rpx;"></image>
 					<text>普及培训</text>
 				</view>
-			</view> 
+			</view>
 		</view>
 
 		<!-- 红会科普 -->
@@ -76,25 +76,59 @@
 				</view>
 			</view>
 			<view class="system-map">
-				<view class="map-box" @click="tolocation">
-					<image src="../../static/img/map.jpg" mode=""></image>
+				<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>
+		</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" >救护站</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 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="">
@@ -115,6 +149,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">
@@ -135,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>
 </template>
 
@@ -143,7 +197,8 @@
 		loadIndexs,
 		bannerlist,
 		getListAED,
-		getDistance
+		getDistance,
+		getdis
 	} from '@/api/index.js';
 	import {
 		saveUrl,
@@ -168,6 +223,7 @@
 		},
 		data() {
 			return {
+				jzsbList: [],
 				carouselList: [], //轮播
 				science: [], //文章列表
 				page: 1,
@@ -177,10 +233,14 @@
 				longitude2: '',
 				latitude4: '',
 				longitude4: '',
+				// longitude4: '121.15829821166992',
+				// latitude4: "30.044394499237708",
 				address: '',
 				loadingType: 'more',
 				markerList: [],
 				marker: [],
+				markerjzsb: [],
+				marker1: [],
 				longitude: '121.15829821166992',
 				latitude: "30.044394499237708",
 				longitude1: '120.553638',
@@ -189,11 +249,12 @@
 				scale1: '15',
 				showbox: false,
 				showTEXT: false,
+				to_phone: '',
 			};
 		},
-		onShow() {
+		onShow() {
 			// let token = uni.getStorageSync('token');
-			console.log(11,this);
+			console.log(11, this);
 			if (!this.hasLogin) {
 				// 登录拦截
 				// interceptor();
@@ -229,21 +290,27 @@
 				wxOjb.ready(() => {
 					console.log('加载完毕注册事件');
 					locationAddress({
-						type: 'wgs84',
+						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.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);
@@ -255,12 +322,13 @@
 
 				// #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);
@@ -287,6 +355,7 @@
 							obj.longitude4 = res.longitude
 							obj.latitude4 = res.latitude
 							obj.loadData();
+							obj.getJzsb()
 						},
 						fail(e) {
 							console.log('失败', e);
@@ -303,6 +372,7 @@
 						obj.longitude4 = res.longitude
 						obj.latitude4 = res.latitude
 						obj.loadData();
+						obj.getJzsb()
 					},
 					fail(e) {
 						console.log('失败', e);
@@ -317,11 +387,74 @@
 		},
 		// 下拉加载
 		onReachBottom() {
-			this.loadData();
+			// this.loadData();
 		},
 		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);
+						}
+					}
+				});
+			},
 			// 调用高德
 			toGaodeMap() {
 				let latitude = this.latitude2
@@ -329,9 +462,9 @@
 				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`
+				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
 			},
 			// 调用腾讯
@@ -340,7 +473,8 @@
 				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}`;
+				window.location.href =
+					`http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};addr:${address}`;
 			},
 			// 调用百度
 			tobaiDuMap() {
@@ -361,7 +495,7 @@
 				let longitude = this.longitude2
 				console.log('选择谷歌', latitude, longitude)
 			},
-			
+
 			navTo(url) {
 				if (!this.hasLogin) {
 					uni.showModal({
@@ -391,29 +525,29 @@
 				uni.navigateTo({
 					url: "/pages/applic/location"
 				})
-			},
-			// 点击图标
-			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
-						// 		})
-						// 	}
-						// })
-					}
-				}	
+			},
+			// 点击图标
+			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;
@@ -467,23 +601,24 @@
 					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)
-					console.log('obj.marker',obj.marker)
+					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)
+					console.log('obj.marker', obj.marker)
 					// uni.showModal({
 					// 	title: '提示',
 					// 	content: JSON.stringify(obj.marker)
 					// })
 				})
+				obj.getJzsb()
 			},
 			// 导航
 			openAddress(item) {
@@ -508,6 +643,39 @@
 			},
 			close() {
 				this.$refs.popup.close();
+			},
+			// 获取就在身边
+			getJzsb() {
+				let obj = this;
+				getdis({
+					lng1: obj.longitude4,
+					lat1: obj.latitude4,
+					page: 1,
+					limit: 3
+				}).then((res) => {
+					let data = res.data;
+					console.log(data, 'jzsb')
+					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)
+					// });
+				});
 			}
 		}
 	};
@@ -519,10 +687,10 @@
 		color: #5f5f5f;
 	}
 
-	
+
 	.content {
-		// line-height: 1;
-		background-color: #FFABAB;
+		// line-height: 1;
+		background-color: #FFABAB;
 		// padding-bottom: 60rpx;
 	}
 
@@ -670,19 +838,20 @@
 					// display: flex;
 					display: -webkit-box;
 
-					.science-item {
+					.science-item {
 						margin-right: 24rpx;
 						width: 198rpx;
 						display: flex;
 						flex-direction: column;
 						align-items: center;
 						text-align: center;
+
 						image {
 							width: 100%;
 							height: 145rpx;
 						}
 
-						.article-title {
+						.article-title {
 							width: 198rpx;
 							color: #333;
 							font-size: 25rpx;
@@ -691,8 +860,8 @@
 							font-weight: 900;
 						}
 
-						.article-content {
-							width: 198rpx;
+						.article-content {
+							width: 198rpx;
 							color: #999999;
 							font-size: 18rpx;
 							overflow: hidden;
@@ -785,7 +954,7 @@
 
 		// AED
 		.list-box {
-			padding: 0rpx 25rpx 24rpx;
+			// padding: 0rpx 25rpx 24rpx;
 			// margin-bottom: 84rpx;
 
 			.system-title {
@@ -837,10 +1006,13 @@
 			border-radius: 15rpx;
 			display: flex;
 			justify-content: space-between;
-
+			// &:last-of-type {
+			// 	margin-bottom: 0;
+			// }
 			.list-left {
 				display: flex;
 				width: 100%;
+
 				.number {
 					font-size: 32rpx;
 					margin-right: 14rpx;
@@ -877,4 +1049,171 @@
 			}
 		}
 	}
+
+	.location-item {
+		// width: 710rpx;
+		background-color: #fff;
+		z-index: 10;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		border-bottom: 1rpx solid #e7e8ea;
+		padding: 15rpx 30rpx;
+		// margin: auto;
+		.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;
+			}
+		}
+	}
+	.popup_rows {
+		// margin-top: 108rpx;
+		height: 440rpx;
+		border-radius: 25rpx;
+		width: 100%;
+		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;
+			}
+		}
+	}
+	.science-more {
+		background-color: #fff;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: $motif-color;
+		font-size: 30rpx;
+		padding-top: 18rpx;
+		padding-bottom: 18rpx;
+	
+		image {
+			width: 20rpx;
+			height: 27rpx;
+		}
+	}
 </style>

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!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.7de7f5b7.js></script><script src=/index/static/js/index.6dc9cc11.js></script></body></html>
+            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.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.c95a6203.js></script><script src=/index/static/js/index.18009878.js></script></body></html>