11-13-1

manifest.json

@@ -93,12 +93,17 @@
                     // "secure": false,
                     "pathRewrite" : {}
                 }
-            }
+            },
+            "port" : ""
         },
         // "^/api" : ""
         "template" : "",
         "sdkConfigs" : {
-            "maps" : {}
+            "maps" : {
+                "qqmap" : {
+                    "key" : "VYZBZ-P2TRG-RMIQ3-ITAIN-2DKBK-CKFQQ"
+                }
+            }
         }
     }
 }

pages/category/category.vue

@@ -30,7 +30,7 @@
 			<view class="list" @click="getLocation">
 				<view class="list-left">地址 <text>*</text></view>
 				<!-- <picker-address class="box-right" @change="onCityClick">{{ address }}</picker-address> -->
-				<input type="text" v-model="showaddress" class="list-input" placeholder="请选择定位地址" />
+				<input type="text" v-model="showaddress" class="list-input" placeholder="请选择常用地址" />
 			</view>
 			<!-- <view class="list" @click="Toshow">
 				<view class="list-left">机构 <text>*</text></view>
@@ -79,6 +79,8 @@ export default {
 	},
 	data() {
 		return {
+			longitude4: '',
+			latitude4: '',
 			longitude: '',
 			latitude: '',
 			name: '',
@@ -111,6 +113,73 @@ export default {
 			}
 		};
 	},
+	onLoad() {
+		let obj = this;
+		console.log('开始加载事件');
+		// obj.loadBaseData();
+		// 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.longitude4 = res.longitude
+						obj.latitude4 = res.latitude
+						obj.loadData();
+					},
+					fail(e) {
+						console.log('失败', e);
+					}
+				});
+			})
+		
+		}
+	},
 	computed: {
 		...mapState('user', ['hasLogin', 'userInfo']),
 	},
@@ -160,6 +229,8 @@ export default {
 			console.log('选择当前位置');
 			let obj = this;
 			uni.chooseLocation({
+				latitude: obj.latitude4,
+				longitude: obj.longitude4,
 				success: function(res) {
 					obj.addressData.area = res.name;
 					console.log('位置名称：' + res.name);

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/hhs/#/pages/form/donaSuccess?money=' + obj.money + '&name=' + obj.name + '&time=' + obj.add_time, // 分享链接
+				link: 'http://jz.red.igxys.com/hhs/#/pages/form/donaSuccess?money=' + obj.money + '&name=' + encodeURI(obj.name) + '&time=' + encodeURI(obj.add_time), // 分享链接
 				imgUrl: 'http://jz.red.igxys.com/index/static/img/002.png',
 				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,7 +61,7 @@
 					</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<!--  sos急救系统 -->
 		<view class="system">
 			<top-title :title="'救在身边'" navurl="/pages/applic/location" :show_more="true"></top-title>
@@ -312,7 +323,7 @@
 				wxOjb.ready(() => {
 					console.log('加载完毕注册事件');
 					locationAddress({
-						type: 'wgs84',
+						type: 'gcj02',
 						success: function(res) {
 							console.log('获取经纬度', res);
 							obj.longitude4 = res.longitude;
@@ -370,7 +381,7 @@
 				wxOjb.ready(() => {
 					console.log('加载完毕注册事件');
 					locationAddress({
-						type: 'wgs84',
+						type: 'gcj02',
 						success: function(res) {
 							console.log('获取经纬度', res);
 							obj.longitude4 = res.longitude;
@@ -386,7 +397,7 @@
 				// #endif
 				// #ifdef MP
 				locationAddress({
-					type: 'wgs84',
+					type: 'gcj02',
 					success: function(res) {
 						console.log('获取经纬度', res);
 						obj.longitude4 = res.longitude;
@@ -1111,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;
 				}
 			}
 		}

pages/train/index.vue

@@ -9,7 +9,7 @@
 					<!-- 空白页 -->
 					<empty v-if="loadingType === true && list.length === 0"></empty>
 					<!-- 订单列表 -->
-					<view class="order-item" @click="ToDetail(item)" v-for="(item, index) in list" :key="index">
+					<view class="order-item" @click="ToDetail(item)" v-for="(item, index) in list" :key="index" v-if="item.project_area !=0">
 						<view class="list-cell">
 							<image class="image" :src="item.img"></image>
 							<view class="list-tpl">{{ item.title }}</view>

pages/user/user.vue

@@ -17,7 +17,7 @@
 			</view>
 		</view>
 		<view class="nav-wrapper">
-			<view class="nav-item flex" @click="navTo('/pages/user/myaid?state=-2')">
+			<!-- <view class="nav-item flex" @click="navTo('/pages/user/myaid?state=-2')">
 				<view class="item-left flex">
 					<image src="../../static/icon/i5.png" mode="" class="img1"></image>
 					<view class="title">我的捐款</view>
@@ -25,7 +25,7 @@
 				<view class="item-right">
 					>
 				</view>
-			</view>
+			</view> -->
 			<view class="nav-item flex" @click="tohelp">
 				<view class="item-left flex">
 					<image src="../../static/icon/i6.png" mode="" class="img1"></image>

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.a213ed01.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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/hhs/static/js/chunk-vendors.3b792c37.js></script><script src=/hhs/static/js/index.22501615.js></script></body></html>