1-28-1

pages.json

@@ -507,6 +507,11 @@
 		{
 			"path": "pages/applic/cause",
 			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
 				"navigationBarBackgroundColor": "#fff",
 				"navigationBarTextStyle": "black",
 				"navigationBarTitleText": "红会事业"
@@ -921,7 +926,7 @@
 				"pagePath": "pages/category/category",
 				"iconPath": "static/tabBar/dengji.png",
 				"selectedIconPath": "static/tabBar/dengji-action.png",
-				"text": "就在身边"
+				"text": "救在身边"
 			},
 			{
 				"pagePath": "pages/user/user",

pages/applic/aed.vue

@@ -72,6 +72,8 @@
 				height: '',
 				list: [],
 				latitude: '',
+				latitude2: '',
+				longitude2: '',
 				longitude: '',
 				current: 0,
 				name: '',
@@ -182,6 +184,9 @@
 		computed: {
 			...mapState('user', ['hasLogin', 'userInfo'])
 		},
+		onHide() {
+			uni.hideLoading()
+		},
 		methods: {
 			...mapMutations('user', ['setUserInfo']),
 			// 地图渲染完毕事件
@@ -191,24 +196,27 @@
 			// 载入数据
 			async loadData() {
 				let obj = this;
-				if(obj.loadtype == 'loading' || obj.loadtype == 'noMore') {
-					return 
+				if (obj.loadtype == 'loading' || obj.loadtype == 'noMore') {
+					return
 				}
 				obj.loadtype = 'loading'
 				getListAED({
 					page: obj.page,
 					limit: obj.limit,
-				}).then(({data}) => {
+				}).then(({
+					data
+				}) => {
 					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);
+						data[i].space = obj.space(obj.latitude, obj.longitude, data[i].latitude, data[i]
+							.longitude);
 					}
 					obj.AEDList = obj.AEDList.concat(data);
 					console.log(obj.AEDList, 'obj.AEDList+++++++');
 					let arr = data.map(item => ({
 						latitude: item.latitude,
 						longitude: item.longitude,
-						iconPath: '/static/img/img014.png',
+						iconPath: '/static/icon/aed-log.png',
 						width: '35',
 						height: '35',
 						id: item.id,
@@ -220,7 +228,7 @@
 					obj.page++;
 					if (obj.limit == data.length) {
 						obj.loadtype = 'more';
-						
+
 					} else {
 						obj.loadtype = 'noMore';
 					}
@@ -232,7 +240,8 @@
 				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)));
+				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; // 单位米
@@ -246,6 +255,9 @@
 			},
 			// 调用高德
 			toGaodeMap() {
+				uni.showLoading({
+					title: '打开中..'
+				})
 				let latitude = this.latitude2;
 				let longitude = this.longitude2;
 				let address = this.address;
@@ -254,25 +266,47 @@
 			},
 			// 调用腾讯
 			totengxunMap() {
+				uni.showLoading({
+					title: '打开中..'
+				})
 				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}`;
+				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;
+				uni.showLoading({
+					title: '打开中..'
+				})
+				function bd_encrypt(gg_lng, gg_lat) {
+					var X_PI = Math.PI * 3000.0 / 180.0;
+					var x = gg_lng,
+						y = gg_lat;
+					var z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * X_PI);
+					var theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * X_PI);
+					var bd_lng = z * Math.cos(theta) + 0.0065;
+					var bd_lat = z * Math.sin(theta) + 0.006;
+					return {
+						lat: bd_lat,
+						lng: bd_lng
+					}
+				}
+				let towhere = bd_encrypt(this.longitude2, this.latitude2)
+				let formwhere = bd_encrypt(this.longitude, this.latitude)
+				let latitude6 =towhere.lat;
+				let longitude6 =  towhere.lng;
+				let latitude = formwhere.lat
+				let longitude = formwhere.lng
 				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 `
+				window.location.href =
+					`http://api.map.baidu.com/direction?origin=latlng:${latitude},${longitude}|name:我的位置&destination=${latitude6},${longitude6}&mode=driving&region=${address}&output=html&src=webapp.baidu.openAPIdemo`;
 			},
-			
+
 		}
 	}
 </script>
@@ -524,6 +558,7 @@
 			}
 		}
 	}
+
 	.popup_row {
 		width: 100%;
 		height: 500rpx;
@@ -532,11 +567,11 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-	
+
 		.rows {
 			width: 100%;
 			padding: 0 24rpx;
-	
+
 			.rows-item {
 				height: 80rpx;
 				line-height: 80rpx;

pages/applic/aid.vue

@@ -195,17 +195,20 @@
 			// 载入数据
 			async loadData() {
 				let obj = this;
-				if(obj.loadtype == 'loading' || obj.loadtype == 'noMore') {
-					return 
+				if (obj.loadtype == 'loading' || obj.loadtype == 'noMore') {
+					return
 				}
 				getListMechanism({
 					page: obj.page,
 					limit: obj.limit,
-				}).then(({data}) => {
+				}).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);
+						data[i].space = obj.space(obj.latitude, obj.longitude, data[i].latitude, data[i]
+							.longitude);
 					}
 					let arr = data.map(item => ({
 						latitude: item.latitude,
@@ -235,7 +238,8 @@
 				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)));
+				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; // 单位米
@@ -249,6 +253,9 @@
 			},
 			// 调用高德
 			toGaodeMap() {
+				uni.showLoading({
+					title: '打开中..'
+				})
 				let latitude = this.latitude2;
 				let longitude = this.longitude2;
 				let address = this.address;
@@ -257,25 +264,48 @@
 			},
 			// 调用腾讯
 			totengxunMap() {
+				uni.showLoading({
+					title: '打开中..'
+				})
 				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}`;
+				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;
+				uni.showLoading({
+					title: '打开中..'
+				})
+
+				function bd_encrypt(gg_lng, gg_lat) {
+					var X_PI = Math.PI * 3000.0 / 180.0;
+					var x = gg_lng,
+						y = gg_lat;
+					var z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * X_PI);
+					var theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * X_PI);
+					var bd_lng = z * Math.cos(theta) + 0.0065;
+					var bd_lat = z * Math.sin(theta) + 0.006;
+					return {
+						lat: bd_lat,
+						lng: bd_lng
+					}
+				}
+				let towhere = bd_encrypt(this.longitude2, this.latitude2)
+				let formwhere = bd_encrypt(this.longitude, this.latitude)
+				let latitude6 = towhere.lat;
+				let longitude6 = towhere.lng;
+				let latitude = formwhere.lat
+				let longitude = formwhere.lng
 				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 `
+				window.location.href =
+					`http://api.map.baidu.com/direction?origin=latlng:${latitude},${longitude}|name:我的位置&destination=${latitude6},${longitude6}&mode=driving&region=${address}&output=html&src=webapp.baidu.openAPIdemo`;
 			},
-			
+
 		}
 	}
 </script>
@@ -527,6 +557,7 @@
 			}
 		}
 	}
+
 	.popup_row {
 		width: 100%;
 		height: 500rpx;
@@ -535,11 +566,11 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-	
+
 		.rows {
 			width: 100%;
 			padding: 0 24rpx;
-	
+
 			.rows-item {
 				height: 80rpx;
 				line-height: 80rpx;
@@ -551,4 +582,3 @@
 		}
 	}
 </style>
-

pages/applic/cause.vue

@@ -88,7 +88,7 @@
 			height: 145rpx;
 			margin-right: 20rpx;
 			.left-img{
-				width: 230rpx;
+				width: 145rpx;
 				height: 145rpx;
 			}
 		}
@@ -124,7 +124,7 @@
 				// margin-top: 13rpx;
 				position: absolute;
 				right: 0;
-				bottom: 0;
+				bottom: -20rpx;
 			}
 		}
 	}

pages/applic/other.vue

@@ -4,7 +4,7 @@
 			<image src="../../static/img/002.png" mode="aspectFill"></image>
 			<view class="font">
 				<view class="china-font">神农架林区红十字会</view>
-				<view class="english-font">Red Cross Society of China Honghu Branch</view>
+				<view class="english-font">Red Cross Society of China Shennongjia Forestry District Branch</view>
 			</view>
 		</view>
 
@@ -40,9 +40,9 @@
 
 			<view class="title">2.现场捐款/捐物</view>
 			<view class="detail">
-				<view class="detail-item">负责人：********</view>
-				<view class="detail-item">咨询电话：********</view>
-				<view class="detail-item">地址：********</view>
+				<view class="detail-item">负责人：文仕华（捐款），陈昌盛（捐物）</view>
+				<view class="detail-item">咨询电话：0719-3319598</view>
+				<view class="detail-item">地址：神农架林区松柏镇神农大道101号</view>
 			</view>
 		</view>
 	</view>
@@ -58,8 +58,8 @@ export default {
 					id: 0,
 					spread_url: 11,
 					name: '神农架林区红十字会',
-					count: '********',
-					number: '********'
+					count: '工行十堰分行林区支行',
+					number: '1810012009200032667'
 				}
 			]
 		};

pages/applic/science.vue

@@ -26,7 +26,7 @@
 				</view>
 			</view>
 		</view>
-		<uni-load-more :status="loadingType"></uni-load-more>
+		<!-- <uni-load-more :status="loadingType"></uni-load-more> -->
 	</view>
 </template>
 
@@ -44,9 +44,9 @@
 		onLoad() {
 		this.loadData();
 		},
-		onReachBottom() {
-			this.loadData()
-		},
+		// onReachBottom() {
+		// 	this.loadData()
+		// },
 		filters: {
 			time(val) {
 				let arr = val.split(' ')

pages/applic/toknowledge.vue

@@ -102,7 +102,7 @@
 				神农架林区造血干细胞捐献咨询电话:
 			</view>
 			<view class="list-tips" style="text-align: center;">
-				********
+				0719-3319528
 			</view>
 			<!-- <view class="list01">
 				具体入库办法：

pages/form/donaSuccess.vue

@@ -106,26 +106,26 @@ export default {
 		context.fillText('感谢信', ((750 - obj.size) * obj.ratio) / 2, 260 * obj.ratio)
 		context.setFontSize(30 * obj.ratio);
 		context.fillText('尊敬的' + this.name + ':', 60 * obj.ratio, 350 * obj.ratio);
-		context.fillText('衷心感谢您对神农架林区红十字事业的信任与支', 120 * obj.ratio, 410 * obj.ratio);
-		context.fillText('持！我们已收到您的捐款', 60 * obj.ratio, 465 * obj.ratio);
+		context.fillText('衷心感谢您对神农架林区红十字事业的信任', 120 * obj.ratio, 410 * obj.ratio);
+		context.fillText('与支持！我们已收到您的捐款', 60 * obj.ratio, 465 * obj.ratio);
 		// 画横线
-		context.moveTo(380 * obj.ratio, 470 * obj.ratio);
-		context.lineTo(540 * obj.ratio, 470 * obj.ratio);
+		context.moveTo(450 * obj.ratio, 470 * obj.ratio);
+		context.lineTo(600 * obj.ratio, 470 * obj.ratio);
 		context.stroke();
 		context.setTextAlign('center')
-		context.fillText('￥' + obj.money, 460 * obj.ratio, 465 * obj.ratio);
+		context.fillText('￥' + obj.money, 525 * obj.ratio, 465 * obj.ratio);
 		context.setTextAlign('left')
-		context.fillText('元。我们承', 540 * obj.ratio, 465 * obj.ratio);
-		context.fillText('诺绝不辜负大家的信任，遵照您的意愿，将捐款', 60 * obj.ratio, 520 * obj.ratio);
-		context.fillText('全部用于相关救助项目。您的善举将给受助人带', 60 * obj.ratio, 575 * obj.ratio);
-		context.fillText('去温暖！', 60 * obj.ratio, 630 * obj.ratio);
+		context.fillText('元。我', 600 * obj.ratio, 465 * obj.ratio);
+		context.fillText('们承诺绝不辜负大家的信任，遵照您的意愿，将', 60 * obj.ratio, 520 * obj.ratio);
+		context.fillText('捐款全部用于相关救助项目。您的善举将给受助', 60 * obj.ratio, 575 * obj.ratio);
+		context.fillText('人带去温暖！', 60 * obj.ratio, 630 * obj.ratio);
 		context.fillText('爱心无界，情义无价。谨以此信表达谢意，', 120 * obj.ratio, 680 * obj.ratio);
 
 		context.fillText('我们因您更有力量，因您倍感温暖！', 60 * obj.ratio, 735 * obj.ratio);
 		// context.fillText('谨表谢意', (580 * obj.ratio), 680 * obj.ratio)
 		// context.setTextAlign('right')
-		context.fillText('神农架林区红十字会', 450 * obj.ratio, 850 * obj.ratio);
-        context.fillText(obj.add_time, 450 * obj.ratio, 910 * obj.ratio);
+		context.fillText('神农架林区红十字会', 420 * obj.ratio, 850 * obj.ratio);
+        context.fillText(obj.add_time, 420 * obj.ratio, 910 * obj.ratio);
 		// 插入二维码
 		// console.log(codeX, codeY, codeSize, 999)
 		context.drawImage(src, codeX, codeY, codeSize, codeSize);

pages/index/index.vue

@@ -18,14 +18,14 @@
 			</view>
 		</view>
 		<!-- 下半部分菜单 -->
-		<view class="bottom-box flex" @click="navTo('/pages/applic/location')">
-			<view class="btm-left">
+		<view class="bottom-box flex">
+			<view class="btm-left" @click="navTo('/pages/applic/location')">
 				<view class="tit">救在身边救护员</view>
 				<view class="left-content">实时救护，就在身边</view>
 				<image src="../../static/icon/tb-5.png" mode="" class="bglogo"></image>
 			</view>
-			<view class="btm-right" @click="navTo('/pages/applic/aid')">
-				<view class="b-l-item">
+			<view class="btm-right" >
+				<view class="b-l-item" @click="navTo('/pages/applic/aid')">
 					<view class="tit">救护站</view>
 					<view class="left-content">附近的救护站都在这里</view>
 					<image src="../../static/icon/tb-6.png" mode="" class="right-logo"></image>
@@ -125,22 +125,22 @@
 			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 {
+			if (!this.userInfo.uid) {
+				// 登录拦截
+				interceptor();
+				// uni.showModal({
+				// 	title: '登录',
+				// 	content: '您未登录，是否马上登陆?',
+				// 	success: e => {
+				// 		if (e.confirm) {
+				// 			interceptor();
+				// 		}
+				// 	},
+				// 	fail: e => {
+				// 		console.log(e);
+				// 	}
+				// });
+			}
 			this.loadData();
 		},
 		onLoad() {

pages/share/card.vue

@@ -1,39 +1,47 @@
 <template>
 	<view class="center">
-		<view class="bg"><image class="imgBox" src="../../static/img/test_bg.png" mode="scaleToFill"></image></view>
+		<view class="bg">
+			<image class="imgBox" src="../../static/img/test_bg.png" mode="scaleToFill"></image>
+		</view>
 		<view class="top flex">
 			<image src="../../static/img/top_bg.png" mode="aspectFill"></image>
-			<view class="china-font">神农架林区红十字会</view>
-			<view class="english-font">Red Cross Society of China Honghu Branch</view>
+			<view class="china-font">神农架林区<br />红十字会</view>
+			<view class="english-font">Red Cross Society of China Shennongjia Forestry District Branch</view>
 			<view class="fgx"></view>
 		</view>
 		<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>神农架林区新堤街道<br />宏伟南路38号</text></view>
+				<view class="text"><text>神农架林区松柏镇<br />神农大道101号</text></view>
 			</view>
 			<view class="item flex">
 				<image class="home_img" src="../../static/img/test_phone.png" mode="aspectFill"></image>
 				<!-- #ifdef H5 -->
-				<view class="text"><text class="text1">0716-2203655</text></view>
+				<view class="text"><text class="text1">0719-3334840</text></view>
 				<!-- #endif -->
 				<!-- #ifndef H5 -->
-				<view class="text" @click="uni.makePhoneCall({phoneNumber: '0716-2203655'})"><text>0716-2203655</text></view>
+				<view class="text" @click="uni.makePhoneCall({phoneNumber: '0719-3334840'})"><text>0719-3334840</text>
+				</view>
 				<!-- #endif -->
 			</view>
-			<view class="item flex">
+			<!-- <view class="item flex">
 				<image class="home_img" src="../../static/img/test_mail.png" mode="aspectFill"></image>
-				<view class="text"><text>hhshszh20210909@126.com</text></view>
-			</view>
+				<view class="text"><text>xgshszh@163.com</text></view>
+			</view> -->
 			<view class="map">
-				<!-- <image class="map-box" src="../../static/icon/erweima.jpg"></image> -->
+
 				<map class="map-box" id="map" :markers="markers" :scale="scale" :latitude="latitude"
 					:longitude="longitude" ref="map" :show-location="false"></map>
 				<view class="map-font flex">
 					<view class="font-left">神农架林区红十字会</view>
-					<view @click="navigation()" class="font-right"><image src="../../static/img/btn.png" mode="aspectFill"></image></view>
+					<view @click="navigation()" class="font-right">
+						<image src="../../static/img/btn.png" mode="aspectFill"></image>
+					</view>
 				</view>
 			</view>
+			<view class="map">
+				<image class="map-box" src="../../static/icon/erweima.jpg"></image>
+			</view>
 			<!-- <view class="qrcode">
 				<image src="../../static/images/qrcode.jpg" mode="aspectFill"></image>
 			</view> -->
@@ -47,118 +55,101 @@
 				</view>
 			</view>
 		</uni-popup>
-	</view>
-</template>
-
+	</view>
+</template>
+
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue'
-import {
-		weixindata,
-		weixinlocation
-	} from '@/utils/wxAuthorized.js';
-export default {
-	components: {
-		uniPopup
-	},
-	data() {
-		return {
-			scale: '12',
-			longitude: '113.465', //神农架林区经度,
-			latitude: '29.811251', //神农架林区纬度
-			longitudeNew: '', //当前经度
-			latitudeNew: '', //当前纬度
-			addr: '神农架林区红十字会',
-			markers: [{
-				id: '226',
-				title: '神农架林区红十字会',
-				iconPath: '/static/img/img10.png',
-				width: '28',
-				height: '28',
-				longitude: '113.465', //神农架林区经度,
-				latitude: '29.811251', //神农架林区纬度
-			}]
-		};
-	},
-	onLoad() {
-		let obj = this;
-		this.IndexShare();
-		uni.getLocation({
-			type: 'wgs84',
-			success: res => {
-				console.log('当前位置的经度：' + res.longitude);
-				console.log('当前位置的纬度：' + res.latitude);
-				obj.longitudeNew = res.longitude;
-				obj.latitudeNew = res.latitude;
-			},
-			fail(e) {
-				console.log('获取位置失败', e);
-			}
-		});
-	},
-	methods: {
-		navigation() {
-			this.$refs.popup2.open();
-			// uni.openLocation({
-			// 	latitude:+latitude,
-			// 	longitude:+longitude,
-			// 	address:address,
-			// 	fail(e){
-			// 		console.log(e);
-			// 	}
-			// })
-			
-		},
-		toGaodeMap() {
-			let latitude = this.latitude
-			let longitude = this.longitude
-			let address = this.addr
-			console.log(latitude,longitude,address);
-			window.location.href = `https://uri.amap.com/marker?position=${longitude},${latitude}&name=${address}`
-		},
-		toTengxunMap() {
-			let latitude = this.latitude
-			let longitude = this.longitude
-			let address = this.addr
-			window.location.href = `http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};addr:${address}`;
-		},
-		toBaiduMap() {
-			
-			window.location.href=
-			`http://api.map.baidu.com/marker?location=30.357764,112.218665&title=神农架林区红十字会&content=神农架林区红十字会&output=html&src=webapp.baidu.openAPIdemo `
+	import uniPopup from '@/components/uni-popup/uni-popup.vue'
+	import {
+		weixindata,
+		weixinlocation
+	} from '@/utils/wxAuthorized.js';
+	export default {
+		components: {
+			uniPopup
 		},
-		//分享
-		IndexShare() {
-			let obj = this;
-			let item = {
-				link:  'http://slj.igxys.com/index/#/pages/share/card',// 分享链接
-				imgUrl: '/index/static/img/002.png',
-				desc: '电子名片分享',
-				title: '神农架林区红十字会',
+		data() {
+			return {
+				scale: '12',
+				longitude: '110.682255', //神农架林区经度,,
+				latitude: '31.743072', //神农架林区纬度
+				longitudeNew: '', //当前经度
+				latitudeNew: '', //当前纬度
+				addr: '神农架林区红十字会',
+				markers: [{
+					id: '226',
+					title: '神农架林区红十字会',
+					iconPath: '/static/img/img10.png',
+					width: '28',
+					height: '28',
+					longitude: '110.682255', //神农架林区经度,
+					latitude: '31.743072', //神农架林区纬度
+				}]
 			};
-			console.log('分享加',item)
-			weixindata(item);
-		},
-	}
-};
-</script>
-
+		},
+		onLoad() {
+			let obj = this;
+			this.IndexShare();
+		},
+		methods: {
+			navigation() {
+				this.$refs.popup2.open();
+			},
+			toGaodeMap() {
+				let latitude = this.latitude
+				let longitude = this.longitude
+				let address = this.addr
+				console.log(latitude, longitude, address);
+				window.location.href = `https://uri.amap.com/marker?position=${longitude},${latitude}&name=${address}`
+			},
+			toTengxunMap() {
+				let latitude = this.latitude
+				let longitude = this.longitude
+				let address = this.addr
+				window.location.href =
+					`http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};addr:${address}`;
+			},
+			toBaiduMap() {
+
+				window.location.href =
+					`http://api.map.baidu.com/marker?location=30.357764,112.218665&title=神农架林区红十字会&content=神农架林区红十字会&output=html&src=webapp.baidu.openAPIdemo `
+			},
+			//分享
+			IndexShare() {
+				let obj = this;
+				let item = {
+					link: 'http://slj.igxys.com/index/#/pages/share/card', // 分享链接
+					imgUrl: '/index/static/img/002.png',
+					desc: '电子名片分享',
+					title: '神农架林区红十字会',
+				};
+				console.log('分享加', item)
+				weixindata(item);
+			},
+		}
+	};
+</script>
+
 <style lang="scss">
 	.center {
 		border: 20rpx solid #e01a1c;
 		min-height: 100%;
 		// min-height: 600px;
 	}
+
 	.flex {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 	}
+
 	page {
 		width: 100%;
 		height: 100%;
 		margin: 0;
 		padding: 0;
 	}
+
 	.bg {
 		width: 100%;
 		height: 100%;
@@ -166,13 +157,16 @@ export default {
 		left: 0;
 		top: 0;
 		padding: 20rpx;
+
 		.imgBox {
 			width: 100%;
 		}
 	}
+
 	.top {
 		flex-direction: column;
 		width: 100%;
+
 		image {
 			width: 312rpx;
 			height: 312rpx;
@@ -180,7 +174,7 @@ export default {
 			border-radius: 50%;
 			margin-top: 85rpx;
 		}
-	
+
 		.china-font {
 			z-index: 0;
 			width: 100%;
@@ -194,6 +188,7 @@ export default {
 			margin-top: 19rpx;
 			text-align: center;
 		}
+
 		.english-font {
 			margin-top: 14rpx;
 			z-index: 0;
@@ -204,6 +199,7 @@ export default {
 			color: #e01a1c;
 			text-align: center;
 		}
+
 		.fgx {
 			margin-top: 25rpx;
 			margin-bottom: 25rpx;
@@ -212,8 +208,10 @@ export default {
 			border-bottom: 1rpx dashed #e01a1c;
 		}
 	}
+
 	.buttom {
 		flex-direction: column;
+
 		.item {
 			z-index: 0;
 			margin: 0 auto;
@@ -222,13 +220,13 @@ export default {
 			border: 1rpx solid #e01a1c;
 			border-radius: 38rpx;
 			justify-content: flex-start;
-	
+
 			.home_img {
 				height: 58rpx;
 				width: 58rpx;
 				margin: 8rpx 13rpx;
 			}
-	
+
 			.text {
 				width: 405rpx;
 				// display: inline-block;
@@ -243,6 +241,7 @@ export default {
 				// }
 			}
 		}
+
 		.map {
 			margin-top: 25rpx;
 			margin-bottom: 25rpx;
@@ -251,15 +250,18 @@ export default {
 			width: 517rpx;
 			border: 2rpx solid #ea3638;
 			line-height: 0;
+
 			.map-box {
 				width: 513rpx;
 				height: 513rpx;
 				background: #ffffff;
 			}
+
 			.map-font {
 				height: 90rpx;
 				padding: 0 20rpx;
 				justify-content: space-between;
+
 				.font-left {
 					font-family: PingFang SC;
 					font-weight: bold;
@@ -267,10 +269,12 @@ export default {
 					color: #333333;
 					line-height: 1;
 				}
+
 				.font-right {
 					border-radius: 10rpx;
 					overflow: hidden;
 					background-color: #1593ff;
+
 					image {
 						width: 120rpx;
 						height: 45rpx;
@@ -278,14 +282,17 @@ export default {
 				}
 			}
 		}
+
 		.qrcode {
 			width: 517rpx;
+
 			image {
 				width: 517rpx;
 				margin: 20rpx 0 36rpx;
 			}
 		}
 	}
+
 	.popup_row {
 		width: 100%;
 		height: 500rpx;
@@ -294,11 +301,11 @@ export default {
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		
+
 		.rows {
 			width: 100%;
 			padding: 0 24rpx;
-			
+
 			.rows-item {
 				height: 80rpx;
 				line-height: 80rpx;
@@ -308,5 +315,5 @@ export default {
 				color: #303133;
 			}
 		}
-	}
+	}
 </style>

pages/train/sign.vue

@@ -32,7 +32,7 @@
 			<view class="top-title">免费报名</view>
 			<view class="text-box">
 				<view class="text">请参训学员在培训当天携带身份证复印件1张，一寸证件照2张。</view>
-				<view class="text"> 报名咨询电话：0716-4163849</view>
+				<view class="text"> 报名咨询电话：0719-3319598</view>
 			</view>
 			<view class="submit" @click="submit">立即报名</view>
 		</view>
@@ -165,7 +165,7 @@ export default {
 			}).exec();
 			console.log('obj.canHeight',obj.canHeight)
 			console.log('obj.canWeidth',obj.canWeidth)
-		let ctxBg = 'static/img/graduation.png'; //画布背景
+		let ctxBg = '/static/img/graduation.png'; //画布背景
 		let src = '/static/icon/erweima.jpg' // 二维码
 		let context = uni.createCanvasContext('qrShareBox');
 		// 插入背景图片
@@ -267,7 +267,7 @@ export default {
 			let obj = this;
 			let item = {
 				link:  'http://slj.igxys.com/index/#/pages/train/sign?type=' + obj.type + '&id=' + obj.id + '&uid=' + obj.userInfo.uid,// 分享链接
-				imgUrl: '/index/static/img/002.png',
+				imgUrl: 'http://slj.igxys.com/index/static/img/002.png',
 				desc: '结业证书',
 				title: '神农架林区红十字会',
 			};

store/index.js

@@ -22,7 +22,7 @@ const store = new Vuex.Store({
 		weichatBrowser: '' ,//当前是否为微信内置浏览器
 		// #endif
 		// shareData:'',//分享信息
-		project_area: 226
+		project_area: 0
 	},
 	mutations: {
 	

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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.066e376b.js></script><script src=/index/static/js/index.527f47b6.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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.08b8f328.js></script><script src=/index/static/js/index.27caaf15.js></script></body></html>