11-13

pages/form/donaSuccess.vue

@@ -167,8 +167,8 @@ export default {
 	onLoad(option) {
 		console.log(333, option);
 		this.money = option.money;
-		this.name = option.name
-		this.add_time = option.time
+		this.name = decodeURI(option.name)
+		this.add_time =decodeURI(option.time)
 		this.IndexShare();
 		this.ScanAudio(true);
 	},
@@ -192,7 +192,7 @@ export default {
 			let obj = this;
 			// let money = obj.money;
 			let item = {
-				link: 'http://jz.red.igxys.com/jzq/#/pages/form/donaSuccess?money=' + obj.money + '&name=' + obj.name + '&time=' + obj.add_time, // 分享链接
+				link: 'http://jz.red.igxys.com/jzq/#/pages/form/donaSuccess?money=' + obj.money + '&name=' + encodeURI(obj.name) + '&time=' + encodeURI(obj.add_time), // 分享链接
 				imgUrl: 'http://jz.red.igxys.com/static/img/22.jpg',
 				desc: '感谢信',
 				title: '荆州区红十字会',

pages/index/index.vue

@@ -15,7 +15,7 @@
 				<view class="img-wrapper flex">
 					<image src="../../static/icon/icon1.png" mode="" class="img1"></image>
 				</view>
-				<view class="item-title">器官捐献</view>
+				<view class="item-title">遗体器官捐献</view>
 			</view>
 			<view class="cate-item flex" @click="toapplic">
 				<view class="img-wrapper flex">
@@ -36,9 +36,20 @@
 				<view class="item-title">志愿者登记</view>
 			</view>
 		</view>
-
 		<!-- 爱心红会 -->
 		<view class="red-box">
+			<top-title :title="'爱心红会'"></top-title>
+			<view class="red-nav">
+				<view class="nav-item" @click="navTo('/pages/applic/love')">
+					<image src="../../static/img/n1.png" mode=""></image>
+				</view>
+				<view class="nav-item" @click="navTo('/pages/applic/science')">
+					<image src="../../static/img/n2.png" mode=""></image>
+				</view>
+			</view>
+		</view>
+		<!-- 爱心红会 -->
+		<!-- <view class="red-box">
 			<top-title :title="'爱心红会'"></top-title>
 			<view class="red-nav flex">
 				<view class="left-nav" @click="navTo('/pages/donate/donate')"></view>
@@ -50,13 +61,13 @@
 					</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<!--  sos急救系统 -->
 		<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="jzsbmarker" :scale="scale" :latitude="latitude4"
-					:longitude="longitude4" ref="map" ></map>
+					:longitude="longitude4" ref="map" @markertap="markertap"></map>
 			</view>
 			<view class="" style="padding-top: 80rpx;">
 				<view v-for="(item,index) in jzsblist" :key="item.id">
@@ -297,14 +308,6 @@
 			}
 		},
 		onLoad() {
-			// uni.showModal({
-			// 	content: '请选择您当前位置',
-			// 	success: res => {
-			// 		if (res.confirm) {
-			// 			this.chooseAddress()
-			// 		}
-			// 	}
-			// })
 			saveUrl();
 			let obj = this;
 			try {
@@ -320,7 +323,7 @@
 				wxOjb.ready(() => {
 					console.log('加载完毕注册事件');
 					locationAddress({
-						type: 'wgs84',
+						type: 'gcj02',
 						success: function(res) {
 							console.log('获取经纬度', res);
 							obj.longitude4 = res.longitude;
@@ -378,7 +381,7 @@
 				wxOjb.ready(() => {
 					console.log('加载完毕注册事件');
 					locationAddress({
-						type: 'wgs84',
+						type: 'gcj02',
 						success: function(res) {
 							console.log('获取经纬度', res);
 							obj.longitude4 = res.longitude;
@@ -394,7 +397,7 @@
 				// #endif
 				// #ifdef MP
 				locationAddress({
-					type: 'wgs84',
+					type: 'gcj02',
 					success: function(res) {
 						console.log('获取经纬度', res);
 						obj.longitude4 = res.longitude;
@@ -511,16 +514,6 @@
 						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
-						// 		})
-						// 	}
-						// })
 					}
 				}
 			},
@@ -642,7 +635,7 @@
 					let arr = data.map(item => ({
 						latitude: item.latitude,
 						longitude: item.longitude,
-						iconPath: '/static/img/jzsblogo.png',
+						iconPath: '/static/img/img014.png',
 						width: '35',
 						height: '35',
 						id: item.id,
@@ -736,8 +729,8 @@
 						name: obj.name,
 						uid: obj.uid,
 						phone: obj.phone,
-						longitude: obj.longitude,
-						latitude: obj.latitude,
+						longitude: obj.longitude4,
+						latitude: obj.latitude4,
 						to_phone: obj.to_phone
 					}).then((data) => {
 						console.log(99988, data)
@@ -1129,60 +1122,84 @@
 		}
 	}
 
+	// .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%;
+	// 				}
+	// 			}
+	// 		}
+	// 	}
+	// }
 	.red-box {
 		margin: 20rpx 0;
-		height: 521rpx;
-		padding: 40rpx 23rpx 35rpx 23rpx;
+		// height: 393rpx;
+		padding: 30rpx 30rpx 40rpx 30rpx;
 		background-color: #fff;
-
+	
 		.red-nav {
+			padding-top: 25rpx;
+			display: flex;
 			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%;
-					}
+	
+			.nav-item {
+				width: 330rpx;
+				height: 175rpx;
+				background: #FFF4F2;
+				border-radius: 15rpx;
+	
+				image {
+					width: 330rpx;
+					height: 175rpx;
 				}
 			}
 		}