11-5

components/espempty.vue

@@ -2,7 +2,7 @@
 	<view class="empty-content">
 		<image class="empty-content-image" :src="setSrc" mode="aspectFit"></image>
 		<view class="empty-info">
-			救援列表为空
+			{{tit}}
 		</view>
 	</view>
 </template>
@@ -14,6 +14,10 @@
 				type: String,
 				default: 'espempty'
 			},
+			tit: {
+				type: String,
+				default: '救援列表为空'
+			}
 		},
 
 		data() {

components/top-title/top-title.vue

@@ -1,40 +1,64 @@
-<template>
+<template>
 	<view class="top-title">
-		<view class="title-before">
+		<view class="" style="justify-self: flex-start;">
+			<view class="title-before"></view>
+			<view class="title">{{title}}</view>
 		</view>
-		<view class="title">{{title}}</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name:"top-title",
-		data() {
-			return {
-				
-			};
+		<view class="gd" @click="navTo" v-if="show_more">
+			更多 >
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "top-title",
+		data() {
+			return {
+
+			};
 		},
 		props: {
 			title: {
 				type: String,
 				default: ''
+			},
+			navurl: {
+				type: String,
+				default: ''
+			},
+			show_more: {
+				type: Boolean,
+				default: false
 			}
-		}
-	}
-</script>
-
-<style lang="scss">
-.top-title {
+		},
+		methods: {
+			navTo() {
+				console.log('dianji')
+				uni.navigateTo({
+					url: this.navurl
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.top-title {
+
+		width: 100%;
 		display: flex;
 		align-items: center;
+		justify-content: space-between;
 		.title-before {
 			display: inline-block;
-			background-color: $m-color;
+			background-color: #F0433C;
 			width: 10rpx;
 			height: 30rpx;
 			margin-right: 16rpx;
-			
+			border-radius: 4rpx;
 		}
+
 		.title {
 			display: inline-block;
 			font-size: 32rpx;
@@ -42,8 +66,10 @@
 			font-weight: bold;
 			color: #333333;
 		}
+
 		.title-after {
 			display: inline-block;
+
 			.a1 {
 				width: 8rpx;
 				height: 8rpx;
@@ -53,6 +79,7 @@
 				margin-top: 16rpx;
 				margin-left: 25rpx;
 			}
+
 			.a2 {
 				width: 28rpx;
 				height: 4rpx;
@@ -60,8 +87,9 @@
 				opacity: 0.1;
 				border-radius: 2rpx;
 				margin-bottom: 6rpx;
-				
+
 			}
+
 			.a3 {
 				width: 28rpx;
 				height: 4rpx;
@@ -71,5 +99,5 @@
 				margin-left: 11rpx;
 			}
 		}
-	}
+	}
 </style>

pages/donate/donate.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="donate-wrapper">
 		<view class="top-select flex" style=" position: relative; z-index: 99;">
-			<view class="">选择地区</view>
-			<picker @change="bindAreaChange" :range="areas" range-key="name">
+			<view class="">选择项目状态</view>
+			<!-- <picker @change="bindAreaChange" :range="areas" range-key="name">
 				<view class="area select" :class="{ action: area }">{{ area || '点击选择地区' }}</view>
-			</picker>
+			</picker> -->
 			<picker @change="bindStatusChange" :range="statuss" range-key="name">
 				<view class="status select" :class="{ action: status }">{{ status }}</view>
 			</picker>
@@ -242,6 +242,7 @@ export default {
 	.status {
 		width: 204rpx;
 		height: 63rpx;
+		margin: 0 10rpx 0 24rpx;
 	}
 	.action {
 		color: #000;

pages/donate/donateDetail.vue

@@ -59,12 +59,10 @@
 						<view class="">
 							{{ item.project_donation_id | type(typeList) }}：
 							<text>{{ item.project_donation_num }}</text>
-							顶
 						</view>
 						<view class="">
 							最低需求捐赠数：
 							<text>{{ item.project_donation_num }}</text>
-							顶
 						</view>
 						<!-- <view class="">
 							物资捐赠要求：
@@ -254,7 +252,7 @@ export default {
 				let arr = val.map(item => {
 					for (let i = 0; i < typeList.length; i++) {
 						if (item.project_donation_id == typeList[i].id) {
-							str = str + typeList[i].name + ' ' + item.project_donation_num + ' ' + '个 ';
+							str = str + typeList[i].name + ' ' + item.project_donation_num + ' ' + ' ';
 						}
 					}
 				});
@@ -425,7 +423,7 @@ export default {
 				item.forEach(item => {
 					for (let i = 0; i < this.typeList.length; i++) {
 						if (item.project_donation_id === this.typeList[i].project_donation_id) {
-							str = str + this.typeList[i].project_donation_name + item.project_donation_num + '个';
+							str = str + this.typeList[i].project_donation_name + item.project_donation_num + '';
 						}
 					}
 				});

pages/donate/idonate.vue

@@ -58,7 +58,13 @@
 			<view class="item">
 				<view class="item-tit">物流方式<text>*</text></view>
 				<picker @change="bindLogChange" :range="logs" range-key="name">
-					<view class="log select" :class="{'action': log }">{{ log || '请选择物流方式' }}</view>
+					<view class="log " :class="{'select': log }">{{ log || '请选择物流方式' }}</view>
+				</picker>
+			</view>
+			<view class="item" v-if="jxdz_show">
+				<view class="item-tit">捐赠地址<text>*</text></view>
+				<picker @change="bindAreaChange" :range="areas" range-key="name">
+					<view class="log " :class="{'select': area }">{{ area || '请选择捐赠地址' }}</view>
 				</picker>
 			</view>
 			<view class="item no-border-b">
@@ -83,7 +89,7 @@
 				<view class="choose-box">
 					<view class="choose-item" v-for="(item,index) in wzList" :key="index" @click="dianji(index)">
 						<picker @change="bindWzChange" :range="wzs" range-key="name">
-							<view class="wz select" :class="{'action': item.project_donation_name }">{{ item.project_donation_name || '请选择物资分类' }}</view>
+							<view class="wz select clamp" :class="{'action': item.project_donation_name }">{{ item.project_donation_name || '请选择物资分类' }}</view>
 						</picker>
 						<input type="number" v-model="item.project_donation_num" placeholder="填写数量"/>
 						<!-- <view class="dele"  v-if="index != 0">
@@ -168,10 +174,16 @@
 
 <script>
 	import { upload } from '@/api/ask.js';
-	import { getProjectInfo, createProject, getLogistics, getDonationInfo, createUser } from '../../api/money.js';
+	import { getProjectInfo, createProject, getLogistics, getDonationInfo, createUser,getAllArea } from '../../api/money.js';
 	export default {
 		data() {
 			return {
+				project_area: 226,
+				areas: [{
+					id: 0,
+					name: '市本级'
+				}],
+				area: '',
 				items: [
 					{
 						value: '个人',
@@ -213,6 +225,7 @@
 				true_wzList: [],//最终捐赠的物资列表
 				hadadd: [],//已添加分类
 				project_id: 0,//项目ID
+				jxdz_show: false,
 			}
 		},
 		filters:{
@@ -239,6 +252,8 @@
 				
 			}else {
 				this.getDonationInfo()
+				this.getAllArea()
+				this.jxdz_show = true
 			}
 			
 			this.getLogistics()
@@ -288,6 +303,11 @@
 				// this.wz = this.logs[e.detail.value].name
 				
 			},
+			// 选择捐赠地址
+			bindAreaChange(e) {
+				this.project_area = this.areas[e.detail.value].id
+				this.area = this.areas[e.detail.value].name
+			},
 			openChange(e) {
 				if(e.detail.value !== '1') {
 					this.Isopen = false
@@ -357,6 +377,13 @@
 					obj.$api.msg('请选择物流方式');
 					return;
 				}
+				if(obj.jxdz_show == true) {
+					if(obj.area == '') {
+						obj.$api.msg('请选择捐赠地址');
+						return;
+					}
+				}
+				
 				try{
 					obj.wzList.forEach( item => {
 						if(!item.project_donation_id){
@@ -391,6 +418,7 @@
 					mask: true
 				})
 				createUser({
+					project_area: obj.project_area,
 					name: obj.type === 0? obj.name: obj.unit,
 					phone: obj.phone,
 					tel: obj.tel,
@@ -405,6 +433,7 @@
 					console.log(info.name,'8888888888888')
 					
 					createProject({
+						project_area: obj.project_area,
 						name: obj.type === 0? obj.name: obj.unit,
 						project_id: obj.project_id,
 						project_user_id: +info.id,
@@ -446,7 +475,16 @@
 			},
 			dele() {
 				this.$delete(this.wzList,this.wzList.length-1)
-			}
+			},
+			// 获取捐赠地址列表
+			getAllArea() {
+				getAllArea().then(({
+					data
+				}) => {
+					console.log(data, '6666666666');
+					this.areas = this.areas.concat(data);
+				});
+			},
 			
 			
 		}
@@ -474,8 +512,8 @@
 		line-height: 75rpx;
 		padding-bottom: 54rpx;
 		// padding-top: 54rpx;
-		position: fixed;
-		bottom: 0;
+		// position: fixed;
+		// bottom: 0;
 		background-color: #fff;
 		z-index: 9;
 		.next {
@@ -634,6 +672,9 @@
 			padding-top: 39rpx;
 			line-height: 1;
 			width: 200rpx;
+			text {
+				color: #F3392C;
+			}
 		}
 		.choose-box {
 			padding-top: 24rpx;

pages/donate/progress.vue

@@ -165,7 +165,7 @@ export default {
 			let arr = val.map(item => {
 				for(let i = 0; i< typeList.length ;i++){
 					if(item.project_donation_id == typeList[i].id){
-						str = str + typeList[i].name + ' '+item.project_donation_num +' '+'个 '
+						str = str + typeList[i].name + ' '+item.project_donation_num +' '+' '
 					}
 				}
 			})

pages/donate/progresst.vue

@@ -151,7 +151,7 @@ export default {
 				let arr = val.map(item => {
 					for (let i = 0; i < typeList.length; i++) {
 						if (item.project_donation_id == typeList[i].id) {
-							str = str + typeList[i].name + item.project_donation_num  + '个、';
+							str = str + typeList[i].name + item.project_donation_num  + '、';
 						}
 					}
 				});

pages/form/applicationForm.vue

@@ -50,10 +50,10 @@
 				<view class="box-left">移动电话：</view>
 				<input type="text" class="list-input" v-model="phone" placeholder="请输入移动电话"/>
 			</view>
-			<view class="box-1">
+			<!-- <view class="box-1">
 				<view class="box-left">固定电话：</view>
 				<input type="text" class="list-input" v-model="tel" placeholder="请输入固定电话"/>
-			</view>
+			</view> -->
 			<view class="box-1">
 				<view class="box-left">居住地址：</view>
 				<input type="text" class="list-input" v-model="address" placeholder="请输入居住地址"/>
@@ -87,10 +87,10 @@
 				<view class="box-left max-line">捐献执行人移动电话：</view>
 				<input type="text" class="list-input" v-model="n_phone" placeholder="请输入执行人移动电话"/>
 			</view>
-			<view class="box-1">
+			<!-- <view class="box-1">
 				<view class="box-left max-line">捐献执行人固定电话：</view>
 				<input type="text" class="list-input" v-model="n_tel" placeholder="请输入执行人固定电话"/>
-			</view>
+			</view> -->
 
 			<view class="box-1" style="border-bottom: none;"><view>我保证填写的以上信息准确真实，如发生变更或个人意愿发生变化时，及时告知登记机构。</view></view>
 		</view>
@@ -174,10 +174,10 @@ export default {
 				obj.$api.msg('请填写正确的身份证信息');
 				return;
 			}
-			if (obj.tel == ''){
-				obj.$api.msg('请填写您的固定电话');
-				return;
-			}
+			// if (obj.tel == ''){
+			// 	obj.$api.msg('请填写您的固定电话');
+			// 	return;
+			// }
 			if (obj.occupation == '') {
 				obj.$api.msg('请填写您的职业');
 				return;
@@ -220,10 +220,10 @@ export default {
 				obj.$api.msg('请填写执行人的手机号');
 				return;
 			}
-			if (obj.n_tel == ''){
-				obj.$api.msg('请填写执行人的固定电话');
-				return;
-			}
+			// if (obj.n_tel == ''){
+			// 	obj.$api.msg('请填写执行人的固定电话');
+			// 	return;
+			// }
 			obj.loding = true;
 			joinSecc({
 				name: obj.name,

pages/form/donaSuccess.vue

@@ -193,9 +193,9 @@ export default {
 			// let money = obj.money;
 			let item = {
 				link: 'http://jz.red.igxys.com/hhs/#/pages/form/donaSuccess?money=' + obj.money + '&name=' + obj.name + '&time=' + obj.add_time, // 分享链接
-				imgUrl: 'http://jz.red.igxys.com/static/img/22.jpg',
-				desc: '感谢信',
-				title: '洪湖红十字会',
+				imgUrl: 'http://jz.red.igxys.com/index/static/img/002.png',
+				desc: '弘扬红十字精神，传播红十字观念，宣传红十字工作，这是一个汇聚爱心、救助之家力量的平台！',
+				title: '来自洪湖红十字会的感谢信',
 				success: console.log('分享加载成功')
 			};
 			console.log('分享加', item);

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>
 
@@ -50,42 +52,65 @@
 			</view>
 		</view>
 		<!--  sos急救系统 -->
-		<view class="system" @click="tolocation">
-			<top-title :title="'救在身边'" @click="tolocation"></top-title>
+		<view class="system">
+			<top-title :title="'救在身边'" navurl="/pages/applic/location" :show_more="true"></top-title>
 			<view class="system-map">
-				<map
-					class="map-box"
-					id="map"
-					show-location
-					:markers="marker"
-					:scale="scale"
-					:latitude="latitude4"
-					:longitude="longitude4"
-					ref="map"
-					@markertap="markertap"
-				></map>
-				<!-- <view class="map-box" ><image src="../../static/img/map.jpg" mode=""></image></view> -->
+				<map class="map-box" id="map" show-location :markers="jzsbmarker" :scale="scale" :latitude="latitude4"
+					:longitude="longitude4" ref="map" @markertap="markertap"></map>
+			</view>
+			<view class="" style="padding-top: 80rpx;">
+				<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" v-if="item.info !=null">
+								<image src="../../static/img/002.png" mode=""></image>
+							</view>
+							<view class="img02" v-else>
+								<image src="../../static/img/002.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>
 			</view>
 		</view>
-
 		<view class="list-box">
-			<view class="system-title"><top-title :title="'救护站'" @click="tolocation"></top-title></view>
+			<view class="system-title">
+				<top-title :title="'救护站'" :navurl="'/pages/applic/aid'" :show_more="true"></top-title>
+			</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 :markers="jhzmarker" :scale="scale" :latitude="latitude4"
+					:longitude="longitude4" ref="map" style="height: 450rpx" @markertap="jhzmarkertap"></map>
 			</view>
 			<view class="">
-				<view class="list-tpl flex" @click="openAddress(item)" v-for="(item, index) in Mechanism" :key="item.id">
+				<view class="list-tpl flex" @click="openAddress(item)" v-for="(item, index) in Mechanism"
+					:key="item.id">
 					<template>
 						<view class="list-left">
 							<view class="info">
@@ -104,24 +129,16 @@
 			</view>
 		</view>
 		<view class="list-box" style="margin-top: 20rpx;">
-			<view class="system-title"><top-title :title="'智能AED'" @click="tolocation"></top-title></view>
+			<view class="system-title">
+				<top-title :title="'智能AED'" :navurl="'/pages/applic/aed'" :show_more="true"></top-title>
+			</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 :markers="aedmarker" :scale="scale" :latitude="latitude4"
+					:longitude="longitude4" ref="map" style="height: 450rpx" @markertap="aedmarkertap"></map>
 			</view>
 			<view class="">
 				<view class="list-tpl flex" @click="openAddress(item)" v-for="(item, index) in AEDList" :key="item.id">
-					<template >
+					<template>
 						<view class="list-left">
 							<view class="info">
 								<view class="title">{{ item.introduction }}</view>
@@ -135,7 +152,6 @@
 						</view>
 					</template>
 				</view>
-				<!-- <uni-load-more :status="loadingType"></uni-load-more> -->
 			</view>
 		</view>
 		<uni-popup ref="popup" type="bottom" @click="close">
@@ -144,11 +160,29 @@
 					<view class="rows-item" @click="toGaodeMap">高德地图</view>
 					<view class="rows-item" @click="tobaiDuMap">百度地图</view>
 					<view class="rows-item" @click="totengxunMap">腾讯地图</view>
-					<!-- <view class="rows-item" @click="toGoogleMap">
-						Google地图
-					</view> -->
-					<!-- <view class="row-1"><image class="first_aid" src="../../static/img/img03.jpg"></image></view> -->
-					<!-- <view class="row-2">扫码进入急救平台</view> -->
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup ref="popup2" type="center" @click="close2">
+			<view class="popup_row2">
+				<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>
@@ -156,179 +190,201 @@
 </template>
 
 <script>
-import { loadIndexs, bannerlist, getListAED, getDistance ,getListMechanism} 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';
-import topTitle from '../../components/top-title/top-title.vue';
-export default {
-	components: {
-		uniPopup,
-		uniLoadMore,
-		topTitle
-	},
-	data() {
-		return {
-			carouselList: [], //轮播
-			science: [], //文章列表
-			page: 1,
-			limit: 10,
-			AEDList: [],
-			Mechanism: [],
-			latitude2: '',
-			longitude2: '',
-			latitude4: '',
-			longitude4: '',
-			address: '',
-			loadingType: 'more',
-			markerList: [],
-			marker: [],
-			jzsbmarker: [],
-			longitude: '121.15829821166992',
-			latitude: '30.044394499237708',
-			longitude1: '120.553638',
-			latitude1: '30.547011',
-			scale: '12', //地图缩放程度
-			scale1: '15',
-			showbox: false,
-			showTEXT: false,
-			addressData: {
+	import {
+		loadIndexs,
+		bannerlist,
+		getListAED,
+		getDistance,
+		getListMechanism,
+		getdis,
+		tocall
+	} 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';
+	import topTitle from '../../components/top-title/top-title.vue';
+	export default {
+		components: {
+			uniPopup,
+			uniLoadMore,
+			topTitle
+		},
+		data() {
+			return {
 				name: '',
-				mobile: '',
-				latitude: 0, //纬度
-				longitude: 0, //经度
-				address: {
-					province: '',
-					city: '',
-					district: '',
-					detail: ''
-				},
-				area: '',
-				default: false
-			}
-		};
-	},
-	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);
+				uid: '',
+				phone: '',
+				to_phone: '',
+				jzsbmarker: [],
+				jzsblist: [],
+				jhzmarker: [],
+				aedmarker: [],
+				carouselList: [], //轮播
+				science: [], //文章列表
+				page: 1,
+				limit: 10,
+				AEDList: [],
+				Mechanism: [],
+				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: ''
+					},
+					area: '',
+					default: false
 				}
-			});
-		} 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('加载完毕注册事件');
+			};
+		},
+		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);
+					}
+				});
+			} else {
+				this.loadData();
+			}
+		},
+		onLoad() {
+			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: '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();
+							obj.tishi()
+						}
+					});
+				});
+				// #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.jzsbmarker = [
-							{
-								longitude: res.longitude,
-								latitude: res.latitude,
-								iconPath: '/static/img/img19.png',
-								width: '45',
-								height: '45'
-							}
-						]
+						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();
 						obj.tishi()
 					}
 				});
-			});
-			// #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'
+				// #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: 'wgs84',
+						success: function(res) {
+							console.log('获取经纬度', res);
+							obj.longitude4 = res.longitude;
+							obj.latitude4 = res.latitude;
+							obj.loadData();
+						},
+						fail(e) {
+							console.log('失败', e);
+							obj.tishi()
 						}
-					];
-					obj.loadData();
-				},
-				fail(e) {
-					console.log('失败', e);
-					obj.tishi()
-				}
-			});
-			// #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
+				// #ifdef MP
 				locationAddress({
 					type: 'wgs84',
 					success: function(res) {
@@ -342,699 +398,934 @@ export default {
 						obj.tishi()
 					}
 				});
-			});
-			// #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);
-					obj.tishi()
-				}
-			});
-			// #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'
-			});
-		},
-		//提示
-		tishi(){
-			uni.showModal({
-				title: '提示',
-				content:'获取当前位置信息失败,是否刷新页面。',
-				success: function(res){
-					if (res.confirm) {
-						window.location.reload();
-						console.log('用户点击确定');
-					} else if (res.cancel) {
-						console.log('用户点击取消');
-					}
-				}
-			})
-		},
-		// 调用高德
-		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
-		},
-		// 调用腾讯
-		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'
-			});
+				// #endif
+			}
 		},
-		tohelpActi() {
-			uni.navigateTo({
-				// url: "/pages/applic/tohelpActi"
-				url: '/pages/form/tovolApply'
-			});
+		computed: {
+			...mapState('user', ['userInfo', 'baseURL', 'hasLogin'])
 		},
-		toOrgan() {
-			console.log('kepuxingbaoming');
-			uni.navigateTo({
-				url: '/pages/train/index'
-			});
+		// 下拉加载
+		onReachBottom() {
+			this.loadData();
 		},
-		// 点击图标
-		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
-					// 		})
-					// 	}
-					// })
+		methods: {
+			...mapMutations('user', ['setUserInfo']),
+			tocontribution() {
+				uni.navigateTo({
+					// url: "/pages/applic/contribution"
+					url: '/pages/form/applicationForm'
+				});
+			},
+			//提示
+			tishi() {
+				uni.showModal({
+					title: '提示',
+					content: '获取当前位置信息失败,是否刷新页面。',
+					success: function(res) {
+						if (res.confirm) {
+							window.location.reload();
+							console.log('用户点击确定');
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				})
+			},
+			// 调用高德
+			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
+			},
+			// 调用腾讯
+			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;
+					}
 				}
-			}
-		},
-		loadData() {
-			let obj = this;
-			console.log('打印当前经纬度', obj.longitude4, obj.latitude4);
-			userinfo({}).then(({ data }) => {
-				obj.setUserInfo(data);
-				loadIndexs({}).then(({ data }) => {
-					obj.carouselList = data.banner; //轮播图
-					bannerlist().then(({ data }) => {
-						console.log(data);
-						obj.science = data;
+			},
+			aedmarkertap(e) {
+				console.log(e.target.markerId);
+				let obj = this;
+				for (let i = 0; i < obj.aedmarker.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;
+					}
+				}
+				obj.$refs.popup.open();
+			},
+			jhzmarkertap(e) {
+				console.log(e.target.markerId);
+				let obj = this;
+				for (let i = 0; i < obj.jhzmarker.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;
+					}
+				}
+				obj.$refs.popup.open();
+			},
+			loadData() {
+				let obj = this;
+				console.log('打印当前经纬度', obj.longitude4, obj.latitude4);
+				userinfo({}).then(({
+					data
+				}) => {
+					obj.setUserInfo(data);
+					loadIndexs({}).then(({
+						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
-				for (let i = 0; i < data.length; i++) {
-					data[i].space = obj.space(obj.latitude4, obj.longitude4, data[i].latitude, data[i].longitude);
-				}
-				obj.AEDList = obj.AEDList.concat(data);
-				console.log(obj.AEDList, '999++++++++++++++++++++++++++');
-				obj.markerList = data;
-				obj.page++;
-				if (obj.limit == data.length) {
-					obj.loadingType = 'more';
-				} else {
-					obj.loadingType = 'noMore';
+				if (obj.loadingType === 'noMore') {
+					//防止重复加载
+					return;
 				}
-			});
-			getListMechanism({
-				page: obj.page,
-				limit: obj.limit
-			}).then(({data}) => {
-				console.log(data,'机构+++++++++++++')
-				for (let i = 0; i < data.length; i++) {
-					data[i].space = obj.space(obj.latitude4, obj.longitude4, data[i].latitude, data[i].longitude);
+				// 修改当前对象状态为加载中
+				obj.loadingType = 'loading';
+				getListAED({
+					page: 1,
+					limit: 2
+				}).then(({
+					data
+				}) => {
+					console.log(data, 999);
+					// obj.AEDList = data
+					for (let i = 0; i < data.length; i++) {
+						data[i].space = obj.space(obj.latitude4, obj.longitude4, data[i].latitude, data[i].longitude);
+					}
+					obj.AEDList = data;
+					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.aedmarker = obj.marker.concat(arr)
+					console.log(obj.AEDList, '999++++++++++++++++++++++++++');
+					obj.markerList = data;
+				});
+				getListMechanism({
+					page: 1,
+					limit: 2
+				}).then(({
+					data
+				}) => {
+					console.log(data, '机构+++++++++++++')
+					for (let i = 0; i < data.length; i++) {
+						data[i].space = obj.space(obj.latitude4, obj.longitude4, data[i].latitude, data[i].longitude);
+					}
+					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.jhzmarker = obj.marker.concat(arr)
+					obj.Mechanism = data;
+					console.log(obj.Mechanism, '888++++++++++++++++++++++++++');
+				})
+				getdis({
+					lng1: obj.longitude4,
+					lat1: obj.latitude4,
+					page: 1,
+					limit: 2
+				}).then((res) => {
+					let data = res.data;
+					data = data.slice(0,2)
+					console.log('就在身边请求数据', data);
+					console.log('data.phone333', data.phone)
+					data = data.map(d => {
+						return {
+							...d,
+							iscall: true
+						}
+					})
+					obj.jzsblist = data;
+				
+					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.jzsbmarker = obj.marker.concat(arr)
+				}).catch(err => {
+					console.log(err);
+				});
+			},
+			// 导航
+			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;
 				}
-				obj.Mechanism = obj.Mechanism.concat(data);
-				console.log(obj.Mechanism, '888++++++++++++++++++++++++++');
-				// obj.markerList = data;
-				obj.page2++;
-				if (obj.limit2 == data.length) {
-					obj.loadingType2 = 'more';
+				uni.navigateTo({
+					url: '/pages/applic/info?id=' + item.id
+				});
+			},
+			open() {
+				this.$refs.popup.open();
+			},
+			close() {
+				this.$refs.popup.close();
+			},
+			navTo(url) {
+				uni.navigateTo({
+					url
+				});
+			},
+			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; // 单位米
+			},
+			// 立即救援
+			rescue(item, index) {
+				let obj = this;
+				uni.showModal({
+					content: '是否发起求救？',
+					success: res => {
+						if (res.confirm) {
+							this.$refs.popup2.open(item, index);
+							obj.name = item.name;
+							obj.uid = item.uid;
+							obj.phone = item.phone;
+							obj.iscall = false
+							console.log('点击救援时item.phone：', obj.phone)
+						}
+					}
+				})
+			},
+			comfirm1: function() {
+				let obj = this
+				if (obj.to_phone.toString().trim() == '') {
+					// uni.showModal({
+					// 	title:'输入框为空',
+					// 	// content:JSON.stringify(obj)
+					// })
 				} else {
-					obj.loadingType2 = 'noMore';
+					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.popup2.close();
+						obj.iscall = false
+						console.log(123, obj.iscall)
+					})
 				}
-			})
-			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)
-				// })
-			});
-		},
-		// 选择当前位置
-		// 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();
-		},
-		navTo(url) {
-			uni.navigateTo({
-				url
-			});
-		},
-		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; // 单位米
+			},
 		}
-	}
-};
+	};
 </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 {
+	a {
+		text-decoration: none;
+		color: #5f5f5f;
+	}
+
+	.content {
+		// line-height: 1;
+		background-color: #ffabab;
+		// padding-bottom: 60rpx;
+	}
+
+	.popup_row {
 		width: 100%;
-		padding: 0 24rpx;
+		height: 500rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
 
-		.rows-item {
-			height: 80rpx;
-			line-height: 80rpx;
-			text-align: center;
+		.rows {
 			width: 100%;
-			font-size: 32rpx;
-			color: #303133;
-			// border-bottom: 1rpx solid #f0f0f0;
-		}
+			padding: 0 24rpx;
 
-		// .row-1 {
-		// 	margin: auto;
-		// 	.first_aid {
-		// 		width: 300rpx;
-		// 		height: 300rpx;
-		// 	}
-		// }
-		// .row-2 {
-		// 	font-size: 38rpx;
-		// 	margin-top: 20rpx;
-		// }
+			.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;
+			// }
+		}
 	}
-}
 
-.content {
-	background-color: #f8f8f8;
-	height: 100%;
+	.content {
+		background-color: #f8f8f8;
+		height: 100%;
 
-	/* 头部 轮播图 */
-	.carousel-section {
-		// padding-top: 10px;
-		overflow: hidden;
-		background-color: #fff;
-		.carousel {
-			width: 705rpx;
-			height: 375rpx;
-			margin: 0 auto;
-			border-radius: 20rpx;
+		/* 头部 轮播图 */
+		.carousel-section {
+			// padding-top: 10px;
 			overflow: hidden;
-			.carousel-item {
-				width: 100%;
-				height: 100%;
-				padding-left: 30rpx;
-				padding-right: 30rpx;
-				overflow: hidden;
-			}
+			background-color: #fff;
 
-			image {
-				width: 100%;
+			.carousel {
+				width: 705rpx;
 				height: 375rpx;
+				margin: 0 auto;
 				border-radius: 20rpx;
-			}
-		}
-	}
+				overflow: hidden;
+
+				.carousel-item {
+					width: 100%;
+					height: 100%;
+					padding-left: 30rpx;
+					padding-right: 30rpx;
+					overflow: hidden;
+				}
 
-	// 分类
-	.cate-section {
-		justify-content: space-around;
-		background-color: #fff;
-		padding: 46rpx 0 30rpx;
-		.cate-item {
-			width: 25%;
-			flex-direction: column;
-			text-align: center;
-			align-items: center;
-			justify-content: center;
-			.img-wrapper {
-				width: 100rpx;
-				height: 88rpx;
-				background: #eef4ff;
-				border-radius: 14rpx;
-				position: relative;
 				image {
-					position: absolute;
-					left: 50%;
-					top: 50%;
-					transform: translate(-50%, -50%);
+					width: 100%;
+					height: 375rpx;
+					border-radius: 20rpx;
 				}
-				.img1 {
+			}
+		}
+
+		// 分类
+		.cate-section {
+			justify-content: space-around;
+			background-color: #fff;
+			padding: 46rpx 0 30rpx;
+
+			.cate-item {
+				width: 25%;
+				flex-direction: column;
+				text-align: center;
+				align-items: center;
+				justify-content: center;
+
+				.img-wrapper {
 					width: 100rpx;
-					height: 84rpx;
+					height: 88rpx;
+					background: #eef4ff;
+					border-radius: 14rpx;
+					position: relative;
+
+					image {
+						position: absolute;
+						left: 50%;
+						top: 50%;
+						transform: translate(-50%, -50%);
+					}
+
+					.img1 {
+						width: 100rpx;
+						height: 84rpx;
+					}
+
+					.img2 {
+						width: 100rpx;
+						height: 85rpx;
+					}
+
+					.img3 {
+						width: 100rpx;
+						height: 84rpx;
+
+					}
+
+					.img4 {
+						width: 100rpx;
+						height: 88rpx;
+					}
+
 				}
-				.img2 {
-					width: 100rpx;
-					height: 85rpx;
+
+				.item-title {
+					margin-top: 15rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
 				}
-				.img3 {
-					width: 100rpx;
-					height: 84rpx;
-					
+			}
+		}
+
+		// 红会科普
+		.science-section {
+			width: 100%;
+			background-color: #ffffff;
+			margin-top: 18rpx;
+			padding-top: 30rpx;
+
+			.science-title {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding-bottom: 22rpx;
+
+				.title {
+					width: 285rpx;
+					height: 64rpx;
+					background-color: #ca121e;
+					border-radius: 32rpx;
+					color: #ffffff;
+					font-size: 32rpx;
+					line-height: 64rpx;
+					text-align: center;
 				}
-				.img4 {
-					width: 100rpx;
-					height: 88rpx;
+
+				image {
+					width: 68rpx;
+					height: 43rpx;
+					margin-left: 16rpx;
+					margin-right: 16rpx;
 				}
-				
 			}
-			.item-title {
-				margin-top: 15rpx;
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-			}
-		}
-	}
 
-	// 红会科普
-	.science-section {
-		width: 100%;
-		background-color: #ffffff;
-		margin-top: 18rpx;
-		padding-top: 30rpx;
+			.science-box {
+				padding-left: 15rpx;
+				padding-right: 15rpx;
+				padding-bottom: 20rpx;
+				border-bottom: 1rpx solid #f0f0f0;
+				white-space: nowrap;
+				display: flex;
+				width: 100%;
 
-		.science-title {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			padding-bottom: 22rpx;
-
-			.title {
-				width: 285rpx;
-				height: 64rpx;
-				background-color: #ca121e;
-				border-radius: 32rpx;
-				color: #ffffff;
-				font-size: 32rpx;
-				line-height: 64rpx;
-				text-align: center;
+				// .uni-scroll-view-content{
+				// 	display: flex;
+				// }
+				.science-content {
+					// width: 100%;
+
+					// display: flex;
+					display: -webkit-box;
+
+					.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 {
+							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;
+						}
+					}
+				}
 			}
 
-			image {
-				width: 68rpx;
-				height: 43rpx;
-				margin-left: 16rpx;
-				margin-right: 16rpx;
+			.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-box {
-			padding-left: 15rpx;
-			padding-right: 15rpx;
-			padding-bottom: 20rpx;
-			border-bottom: 1rpx solid #f0f0f0;
-			white-space: nowrap;
-			display: flex;
+		// sos急救中心
+		.system {
 			width: 100%;
+			background-color: #ffffff;
+			margin-top: 18rpx;
+			padding: 40rpx 30rpx 35rpx 30rpx;
+			margin-bottom: 20rpx;
 
-			// .uni-scroll-view-content{
-			// 	display: flex;
-			// }
-			.science-content {
-				// width: 100%;
+			.system-map {
+				margin: 30rpx auto 0;
+				width: 689rpx;
+				height: 312rpx;
+				background-color: #ffffff;
+				// padding: 0 30rpx;
+				padding-bottom: 45rpx;
+				// .map-box {
+				// 	width: 100%;
+				// 	height: 312rpx;
+				// 	// background-color: #fff;
 
-				// display: flex;
-				display: -webkit-box;
+				// }
+			}
+		}
 
-				.science-item {
-					margin-right: 24rpx;
-					width: 198rpx;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
+		// AED
+		.list-box {
+			padding: 0rpx 25rpx 24rpx;
+			// margin-bottom: 84rpx;
+			background-color: #fff;
+
+			.system-title {
+				display: flex;
+				justify-content: flex-start;
+				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: 100%;
-						height: 145rpx;
+						width: 68rpx;
+						height: 43rpx;
 					}
+				}
+			}
+		}
 
-					.article-title {
-						width: 198rpx;
-						color: #333;
-						font-size: 25rpx;
-						padding-top: 20rpx;
-						padding-bottom: 16rpx;
-						font-weight: 900;
+		.map-box {
+			width: 100%;
+			height: 366rpx;
+		}
+
+		.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;
 					}
 
-					.article-content {
-						width: 198rpx;
+					.addr {
+						width: 400rpx;
+						margin-top: 20rpx;
+						font-size: 20rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
 						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;
-			}
-		}
-	}
+			.image {
+				width: 10%;
+				text-align: center;
 
-	// sos急救中心
-	.system {
-		width: 100%;
-		background-color: #ffffff;
-		margin-top: 18rpx;
-		padding: 40rpx 30rpx 35rpx 30rpx;
-		margin-bottom: 20rpx;
-		.system-map {
-			margin: 30rpx auto 0;
-			width: 689rpx;
-			height: 312rpx;
-			background-color: #ffffff;
-			// padding: 0 30rpx;
-			padding-bottom: 45rpx;
-			// .map-box {
-			// 	width: 100%;
-			// 	height: 312rpx;
-			// 	// background-color: #fff;
-				
-			// }
+				image {
+					width: 50rpx;
+					height: 50rpx;
+				}
+
+				.tip {
+					color: #7f7f7f;
+					font-size: 21rpx;
+				}
+			}
 		}
 	}
 
-	// AED
-	.list-box {
-		padding: 0rpx 25rpx 24rpx;
-		// margin-bottom: 84rpx;
+	.red-box {
+		margin: 20rpx 0;
+		height: 521rpx;
+		padding: 40rpx 23rpx 35rpx 23rpx;
 		background-color: #fff;
 
-		.system-title {
-			display: flex;
-			justify-content: flex-start;
-			align-items: center;
-			height: 130rpx;
-			// padding-bottom: 22rpx;
-			background-color: #ffffff;
+		.red-nav {
+			justify-content: space-between;
+			margin-top: 23rpx;
 
-			.title {
-				width: 285rpx;
-				height: 64rpx;
-				background-color: #ca121e;
-				border-radius: 32rpx;
-				color: #ffffff;
-				font-size: 32rpx;
-				line-height: 64rpx;
-				text-align: center;
+			.left-nav {
+				width: 332rpx;
+				height: 392rpx;
+				background: #FFF3F5;
+				background-image: url(../../static/img/m1.png);
+				background-size: 100% 100%;
 			}
 
-			.img {
-				width: 68rpx;
-				height: 43rpx;
-				margin-left: 16rpx;
-				margin-right: 16rpx;
+			.right-nav {
+				width: 357rpx;
+				height: 392rpx;
+				flex-direction: column;
+				justify-content: space-between;
 
-				image {
-					width: 68rpx;
-					height: 43rpx;
+				// background: #F6F6FF;
+				.right-top-nav {
+					width: 357rpx;
+					height: 204rpx;
+					background: #F6F6FF;
+					background-image: url(../../static/img/m2.png);
+					background-size: 100% 100%;
+				}
+
+				.right-bottom-nav {
+					width: 357rpx;
+					height: 173rpx;
+					justify-content: space-between;
+
+					view {
+						width: 171rpx;
+						height: 173rpx;
+					}
+
+					.left-item {
+						background: #F5EFFE;
+						background-image: url(../../static/img/m3.png);
+						background-size: 100% 100%;
+					}
+
+					.right-item {
+						background: #EDFEFE;
+						background-image: url(../../static/img/m4.png);
+						background-size: 100% 100%;
+					}
 				}
 			}
 		}
 	}
 
-	.map-box {
+	.popup_row2 {
+		// margin-top: 108rpx;
+		height: 440rpx;
+		border-radius: 25rpx;
 		width: 100%;
-		height: 366rpx;
+		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;
+	.location-item {
+		z-index: 1000;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		border-bottom: 1px solid #f1f1f1;
-		.list-left {
+		border-bottom: 1rpx solid #E7E8EA;
+		padding: 15rpx 0;
+
+		.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%;
+				margin-left: 16rpx;
 
-				.title {
-					font-size: 32rpx;
-					color: #222222;
-					font-weight: 500;
+				.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 {
-					width: 400rpx;
-					margin-top: 20rpx;
-					font-size: 20rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
+				.address {
+					font-size: 26rpx;
+					color: #333333;
+					margin-top: 33rpx;
 				}
 			}
 		}
 
-		.image {
-			width: 10%;
-			text-align: center;
+		.box-right {
+			.img {
+				height: 107rpx;
 
-			image {
-				width: 50rpx;
-				height: 50rpx;
+				image {
+					width: 107rpx;
+					height: 107rpx;
+				}
 			}
 
-			.tip {
-				color: #7f7f7f;
-				font-size: 21rpx;
-			}
-		}
-	}
-}
-.red-box {
-	margin: 20rpx 0;
-	height: 521rpx;
-	padding: 40rpx 23rpx 35rpx 23rpx;
-	background-color: #fff;
-	.red-nav {
-		justify-content: space-between;
-		margin-top: 23rpx;
-		.left-nav {
-			width: 332rpx;
-			height: 392rpx;
-			background: #FFF3F5;
-			background-image: url(../../static/img/m1.png);
-			background-size: 100% 100%;
-		}
-		.right-nav {
-			width: 357rpx;
-			height: 392rpx;
-			flex-direction: column;
-			justify-content: space-between;
-			// background: #F6F6FF;
-			.right-top-nav {
-				width: 357rpx;
-				height: 204rpx;
-				background: #F6F6FF;
-				background-image: url(../../static/img/m2.png);
-				background-size: 100% 100%;
-			}
-			.right-bottom-nav {
-				width: 357rpx;
-				height: 173rpx;
-				justify-content: space-between;
-				view {
-					width: 171rpx;
-					height: 173rpx;
-				}
-				.left-item {
-					background: #F5EFFE;
-					background-image: url(../../static/img/m3.png);
-					background-size: 100% 100%;
-				}
-				.right-item {
-					background: #EDFEFE;
-					background-image: url(../../static/img/m4.png);
-					background-size: 100% 100%;
-				}
+			.called {
+				margin-right: 16rpx;
+				height: 107rpx;
+				line-height: 107rpx;
+				font-size: 28rpx;
+				color: #CB131C;
 			}
 		}
 	}
-}
 </style>

pages/share/card.vue

@@ -10,7 +10,7 @@
 		<view class="buttom flex">
 			<view class="item flex">
 				<image class="home_img" src="../../static/img/test_home.png" mode="aspectFill"></image>
-				<view class="text"><text>洪湖市新堤街道宏伟南路38号</text></view>
+				<view class="text"><text>洪湖市新堤街道<br />宏伟南路38号</text></view>
 			</view>
 			<view class="item flex">
 				<image class="home_img" src="../../static/img/test_phone.png" mode="aspectFill"></image>
@@ -133,7 +133,7 @@ export default {
 <style lang="scss">
 	.center {
 		border: 20rpx solid #e01a1c;
-		height: 100%;
+		min-height: 100%;
 		// min-height: 600px;
 	}
 	.flex {

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=/hhs/static/index.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/hhs/static/js/chunk-vendors.9ca80e02.js></script><script src=/hhs/static/js/index.80679b57.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=/hhs/static/index.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/hhs/static/js/chunk-vendors.9ca80e02.js></script><script src=/hhs/static/js/index.a213ed01.js></script></body></html>

utils/newRequest.js

@@ -122,8 +122,8 @@ let service = {
 							title: '上传中'
 						})
 						let timestamp = new Date().getTime();
-						let appSecret = '55dc12c813b6131578780dcd9cfd9d90';
-						let Appid = 'wx9e9cda4611521ed4';
+						let appSecret = 'c86fec63e23217b38f817b3e94dfdc33';
+						let Appid = 'wx7f2fc8ec64602d06';
 						let Sign = md5(sha1(Appid + timestamp + appSecret + timestamp + Appid + appSecret))
 						uni.uploadFile({
 							url: config.upload_img_url, //仅为示例，非真实的接口地址

utils/request.js

@@ -65,8 +65,8 @@ service.interceptors.request(
 	config => {
 		let token = uni.getStorageSync('token') || '';
 		let timestamp = new Date().getTime();
-		let appSecret = '55dc12c813b6131578780dcd9cfd9d90';
-		let Appid = 'wx9e9cda4611521ed4';
+		let appSecret = 'c86fec63e23217b38f817b3e94dfdc33';
+		let Appid = 'wx7f2fc8ec64602d06';
 		let Sign = md5(sha1(Appid + timestamp + appSecret + timestamp + Appid + appSecret))
 		
 		console.log(Sign,Sign.length,'md5+++++++++++')