10-18-1

App.vue

@@ -3,6 +3,7 @@
 	 * vuex管理登陆状态，具体可以参考官方登陆模板示例
 	 */
 	import {
+		mapState,
 		mapMutations
 	} from 'vuex';
 	// #ifdef H5
@@ -19,6 +20,9 @@
 				weixinObj: '' //保存微信对象
 			};
 		},
+		computed: {
+			...mapState(['project_area'])
+		},
 		methods: {
 			...mapMutations('user', ['setUserInfo', 'login', 'hasLogin']),
 		},
@@ -28,7 +32,7 @@
 			let userInfo = uni.getStorageSync('userInfo') || '';
 			console.log(userInfo,'bba');
 			// 判断是否拥有用户信息
-			if (userInfo.uid) {
+			if (userInfo.project_area == obj.project_area) {
 				//更新登陆状态
 				uni.getStorage({
 					key: 'userInfo',

pages.json

@@ -73,6 +73,32 @@
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "感谢信"
 			}
+		},
+		{
+			"path": "pages/applic/aid",
+			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
+				"navigationBarBackgroundColor": "#457DBF",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "救护站"
+			}
+		},
+		{
+			"path": "pages/applic/aed",
+			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
+				"navigationBarBackgroundColor": "#457DBF",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "智能AED"
+			}
 		},
 		{
 			"path": "pages/applic/donaSuccess",
@@ -926,6 +952,12 @@
 				"navigationBarBackgroundColor": "#FF727E",
 				"navigationBarTextStyle":"white"
 			}
+		},
+		{
+			"path": "pages/share/card",
+			"style": {
+				"navigationBarTitleText": "电子名片"
+			}
 		}
 	],
 	"globalStyle": {

pages/applic/aed.vue

@@ -0,0 +1,550 @@
+<template>
+	<view class="content">
+		<view id="map" class="map">
+			<map @updated='mapChange' id="map_1" ref='map_1' style="width:750rpx; height: 600rpx" :latitude="latitude"
+				:longitude="longitude" :markers="aedmarker"></map>
+		</view>
+		<scroll-view scroll-y="true" class="scroll-wrapper" :style="{'height': height}" @scrolltolower="loadData">
+			<espempty v-if="loaded && AEDList.length === 0" :tit="'智能AED列表为空'"></espempty>
+			<view class="list-tpl flex" @click="openAddress(item)" v-for="(item, index) in AEDList" :key="item.id">
+				<template>
+					<view class="list-left">
+						<view class="info">
+							<view class="title">{{ item.introduction }}</view>
+							<view class="addr">地址：{{ item.address }}</view>
+						</view>
+					</view>
+					<view class="image">
+						<image src="../../static/img/img10.png"></image>
+						<view class="tip" v-if="item.space > 999">>999m</view>
+						<view class="tip" v-else>{{ item.space }}m</view>
+					</view>
+				</template>
+			</view>
+			<uni-load-more :status="loadtype"></uni-load-more>
+		</scroll-view>
+		<uni-popup ref="popup" type="bottom" @click="close">
+			<view class="popup_row">
+				<view class="rows">
+					<view class="rows-item" @click="toGaodeMap">高德地图</view>
+					<view class="rows-item" @click="tobaiDuMap">百度地图</view>
+					<view class="rows-item" @click="totengxunMap">腾讯地图</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import espempty from '@/components/espempty';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	import {
+		getdis,
+		tocall,
+		getListAED
+	} from '@/api/index.js';
+	import {
+		userinfo
+	} from '@/api/user.js';
+	import {
+		getcomAddress
+	} from '@/api/index.js';
+	export default {
+		components: {
+			uniPopup,
+			espempty,
+			uniLoadMore
+		},
+		//相关配置参数
+		data() {
+			return {
+				aedmarker: [],
+				loaded: false,
+				loadtype: 'more',
+				page: 1,
+				limit: 10,
+				AEDList: [],
+				height: '',
+				list: [],
+				latitude: '',
+				longitude: '',
+				current: 0,
+				name: '',
+				uid: '',
+				name: '',
+				phone: '',
+				to_phone: '',
+				marker: [],
+				specificAdd: '',
+				addressData: {
+					name: '',
+					mobile: '',
+					latitude: 0, //纬度
+					longitude: 0, //经度
+					address: {
+						province: '',
+						city: '',
+						district: '',
+						detail: '',
+					},
+					area: '',
+					default: false
+				},
+			}
+		},
+		onReady(res) {
+			var _this = this;
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					query.select('.scroll-wrapper').boundingClientRect();
+					query.exec(function(res) {
+						console.log(res, 'ddddddddddddd');
+						_this.height = resu.windowHeight - res[0].top + 'px';
+						console.log('打印页面的剩余高度', _this.height);
+					});
+				},
+				fail: res => {}
+			});
+		},
+		onLoad() {
+			let obj = this;
+			console.log('开始加载事件');
+			// obj.loadBaseData();
+			// obj.loadData();
+			try {
+				let locationAddress
+				// #ifdef H5
+				let wxOjb = require('jweixin-module');
+				locationAddress = wxOjb.getLocation;
+				// #endif
+				// #ifdef MP
+				locationAddress = uni.getLocation;
+				// #endif
+				wxOjb.ready(() => {
+					console.log('加载完毕注册事件');
+					locationAddress({
+						type: 'gcj02',
+						success: function(res) {
+							console.log('获取经纬度', res);
+							obj.longitude = res.longitude
+							obj.latitude = res.latitude
+							obj.marker = [{
+								latitude: obj.latitude,
+								longitude: obj.longitude,
+								iconPath: '/static/img/img19.png',
+								width: '45',
+								height: '45',
+							}, ]
+							obj.loadData();
+						},
+						fail(e) {
+							console.log('失败', e);
+							window.location.reload();
+						}
+					});
+				})
+
+			} catch (e) {
+				console.log(e);
+				let locationAddress
+				// #ifdef H5
+				let wxOjb = require('jweixin-module');
+				locationAddress = wxOjb.getLocation;
+				// #endif
+				// #ifdef MP
+				locationAddress = uni.getLocation;
+				// #endif
+				wxOjb.ready(() => {
+					console.log('加载完毕注册事件');
+
+					locationAddress({
+						type: 'gcj02',
+						success: function(res) {
+							console.log('获取经纬度1', res);
+							obj.longitude = res.longitude
+							obj.latitude = res.latitude
+							obj.loadData();
+						},
+						fail(e) {
+							console.log('失败', e);
+						}
+					});
+				})
+
+			}
+		},
+		computed: {
+			...mapState('user', ['hasLogin', 'userInfo'])
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo']),
+			// 地图渲染完毕事件
+			mapChange(e) {
+				console.log(e);
+			},
+			// 载入数据
+			async loadData() {
+				let obj = this;
+				if(obj.loadtype == 'loading' || obj.loadtype == 'noMore') {
+					return 
+				}
+				obj.loadtype = 'loading'
+				getListAED({
+					page: obj.page,
+					limit: obj.limit,
+				}).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);
+					}
+					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',
+						width: '35',
+						height: '35',
+						id: item.id,
+						address: item.address
+					}));
+					obj.aedmarker = obj.marker.concat(arr)
+					// obj.markerList = data;
+					obj.loaded = true
+					obj.page++;
+					if (obj.limit == data.length) {
+						obj.loadtype = 'more';
+						
+					} else {
+						obj.loadtype = 'noMore';
+					}
+				})
+			},
+			space(lat1, lng1, lat2, lng2) {
+				console.log(lat1, lng1, lat2, lng2);
+				var radLat1 = (lat1 * Math.PI) / 180.0;
+				var radLat2 = (lat2 * Math.PI) / 180.0;
+				var a = radLat1 - radLat2;
+				var b = (lng1 * Math.PI) / 180.0 - (lng2 * Math.PI) / 180.0;
+				var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
+				s = s * 6378.137;
+				s = Math.round(s * 10000) / 10000;
+				return s * 1000; // 单位米
+			},
+			openAddress(item) {
+				let obj = this;
+				obj.latitude2 = item.latitude;
+				obj.longitude2 = item.longitude;
+				obj.address = item.address;
+				this.$refs.popup.open();
+			},
+			// 调用高德
+			toGaodeMap() {
+				let latitude = this.latitude2;
+				let longitude = this.longitude2;
+				let address = this.address;
+				console.log('选择高德', latitude, longitude, address);
+				window.location.href = `https://uri.amap.com/marker?position=${longitude},${latitude}&name=${address}`;
+			},
+			// 调用腾讯
+			totengxunMap() {
+				let latitude = this.latitude2;
+				let longitude = this.longitude2;
+				let address = this.address;
+				console.log('选择腾讯', latitude, longitude);
+				window.location.href = `http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};addr:${address}`;
+			},
+			// 调用百度
+			tobaiDuMap() {
+				let latitude = this.latitude2;
+				let longitude = this.longitude2;
+				let latitude6 = this.latitude;
+				let longitude6 = this.longitude;
+				let address = this.address;
+				console.log('选择百度', latitude, longitude);
+				console.log('获取当前经纬度', latitude6, longitude6);
+				window.location.href = `http://api.map.baidu.com/direction?origin=latlng:${latitude6},${longitude6}|name:我的位置&destination=${latitude},${longitude}&mode=driving&region=${address}&output=html&src=webapp.baidu.openAPIdemo`;
+				//`bdapp://map/navi?location=${longitude},${latitude}&coord_type=gc02&title=${address}&content=${address}&output=html&src=andr.baidu.openAPIdemo `
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	body,
+	page {
+		height: 100%;
+		width: 100%;
+		background-color: #fff;
+	}
+
+	.content {
+		height: 100%;
+		width: 100%;
+		background-color: #fff;
+	}
+
+	.map {
+		width: 100%;
+		height: 600rpx;
+	}
+
+	/* #ifdef H5 */
+	.location {
+		overflow-y: scroll; //溢出就滑动起来
+		// z-index: 990;
+		position: fixed;
+		bottom: 0;
+		height: 55%;
+		width: 100%;
+		background-color: #fff;
+		padding: 24rpx;
+
+		//搜索框
+		.Search-box {
+			// z-index: 999;
+			height: 80rpx;
+			// position: fixed;
+			// 		top: 0;
+			// 		left: 0;
+			// 		width: 100%;
+			// background: #FFFFFF;
+			// padding-top: 10rpx;
+			padding-right: 24rpx;
+			padding-left: 24rpx;
+
+			.Search-box-sort {
+				float: left;
+				margin-left: 32rpx;
+				margin-right: 19rpx;
+
+				.sort-text {
+					width: 57rpx;
+					height: 29rpx;
+					font-size: 30rpx;
+					font-weight: 500;
+					color: rgba(51, 51, 51, 1);
+					line-height: 58rpx;
+					margin-right: 19rpx;
+				}
+
+				.sort-img {
+					width: 21rpx;
+					height: 11rpx;
+					margin-bottom: 4rpx;
+				}
+			}
+
+			.Search-box-size {
+				// width:70%;
+				height: 58rpx;
+				border-radius: 32rpx;
+				background-color: #f1f1f1;
+				padding-left: 36rpx;
+				display: flex;
+				align-items: center;
+
+				.box-img {
+					height: 32rpx;
+					width: 32rpx;
+					margin-right: 16rpx;
+				}
+
+				// .box-right{
+				// 	height: 58rpx;
+				// 	// width: 100%;
+				// 	background-color: pink;
+				// }
+
+				.box-word {
+					width: 100%;
+					font-size: 26rpx;
+					font-weight: 500;
+					color: rgba(205, 203, 203, 1);
+					line-height: 55rpx;
+				}
+			}
+		}
+
+		.location-item {
+			z-index: 1000;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			border-bottom: 1rpx solid #E7E8EA;
+			padding: 15rpx 0;
+
+			.box-left {
+				display: flex;
+
+				.img01 {
+					width: 8rpx;
+					height: 28rpx;
+					margin-right: 18rpx;
+
+					image {
+						width: 8rpx;
+						height: 28rpx;
+					}
+				}
+
+				.img02 {
+					width: 117rpx;
+					height: 117rpx;
+					border-radius: 50%;
+
+					image {
+						width: 117rpx;
+						height: 117rpx;
+						border-radius: 50%;
+					}
+				}
+
+				.info {
+					margin-left: 16rpx;
+
+					.info-header {
+						display: flex;
+						align-items: center;
+
+						.name {
+							font-size: 32rpx;
+							color: #333333;
+						}
+
+						.distance {
+							margin-left: 25rpx;
+							font-size: 28rpx;
+							color: #303133;
+						}
+
+						.location-icon {
+							margin-left: 10rpx;
+							width: 20rpx;
+							height: 26rpx;
+
+							image {
+								width: 20rpx;
+								height: 26rpx;
+								display: inline;
+							}
+						}
+					}
+
+					.address {
+						font-size: 26rpx;
+						color: #333333;
+						margin-top: 33rpx;
+					}
+				}
+			}
+
+			.box-right {
+				.img {
+					height: 107rpx;
+
+					image {
+						width: 107rpx;
+						height: 107rpx;
+					}
+				}
+
+				.called {
+					margin-right: 16rpx;
+					height: 107rpx;
+					line-height: 107rpx;
+					font-size: 28rpx;
+					color: #CB131C;
+				}
+			}
+		}
+	}
+
+	/* #endif */
+
+	.list-tpl {
+		background-color: #ffffff;
+		margin: 25rpx 0rpx;
+		padding: 25rpx 25rpx;
+		font-size: 28rpx;
+		border-radius: 15rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		border-bottom: 1px solid #f1f1f1;
+
+		.list-left {
+			display: flex;
+			width: 100%;
+
+			.number {
+				font-size: 32rpx;
+				margin-right: 14rpx;
+			}
+
+			.info {
+				width: 100%;
+
+				.title {
+					font-size: 32rpx;
+					color: #222222;
+					font-weight: 500;
+				}
+
+				.addr {
+					width: 400rpx;
+					margin-top: 20rpx;
+					font-size: 20rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+			}
+		}
+
+		.image {
+			width: 10%;
+			text-align: center;
+
+			image {
+				width: 50rpx;
+				height: 50rpx;
+			}
+
+			.tip {
+				color: #7f7f7f;
+				font-size: 21rpx;
+			}
+		}
+	}
+	.popup_row {
+		width: 100%;
+		height: 500rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	
+		.rows {
+			width: 100%;
+			padding: 0 24rpx;
+	
+			.rows-item {
+				height: 80rpx;
+				line-height: 80rpx;
+				text-align: center;
+				width: 100%;
+				font-size: 32rpx;
+				color: #303133;
+			}
+		}
+	}
+</style>

pages/applic/aid.vue

@@ -0,0 +1,554 @@
+<template>
+	<view class="content">
+		<view id="map" class="map">
+			<map @updated='mapChange' id="map_1" ref='map_1' style="width:750rpx; height: 600rpx" :latitude="latitude"
+				:longitude="longitude" :markers="jhzmarker"></map>
+		</view>
+		<scroll-view scroll-y="true" class="scroll-wrapper" :style="{'height': height}" @scrolltolower="loadData">
+			<espempty v-if="loaded && AEDList.length === 0" :tit="'救护站列表为空'"></espempty>
+			<view class="list-tpl flex" @click="openAddress(item)" v-for="(item, index) in AEDList" :key="item.id">
+				<template>
+					<view class="list-left">
+						<view class="info">
+							<view class="title">{{ item.name }}</view>
+							<view class="addr">地址：{{ item.address }}</view>
+						</view>
+					</view>
+					<view class="image">
+						<image src="../../static/img/img10.png"></image>
+						<view class="tip" v-if="item.space > 999">>999m</view>
+						<view class="tip" v-else>{{ item.space }}m</view>
+					</view>
+				</template>
+			</view>
+			<uni-load-more :status="loadtype"></uni-load-more>
+		</scroll-view>
+		<uni-popup ref="popup" type="bottom" @click="close">
+			<view class="popup_row">
+				<view class="rows">
+					<view class="rows-item" @click="toGaodeMap">高德地图</view>
+					<view class="rows-item" @click="tobaiDuMap">百度地图</view>
+					<view class="rows-item" @click="totengxunMap">腾讯地图</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import espempty from '@/components/espempty';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	import {
+		getdis,
+		tocall,
+		getListMechanism
+	} from '@/api/index.js';
+	import {
+		userinfo
+	} from '@/api/user.js';
+	import {
+		getcomAddress
+	} from '@/api/index.js';
+	export default {
+		components: {
+			uniPopup,
+			espempty,
+			uniLoadMore
+		},
+		//相关配置参数
+		data() {
+			return {
+				loaded: false,
+				jhzmarker: [],
+				loadtype: 'more',
+				page: 1,
+				limit: 10,
+				AEDList: [],
+				height: '',
+				list: [],
+				latitude: '',
+				longitude: '',
+				current: 0,
+				name: '',
+				uid: '',
+				name: '',
+				phone: '',
+				to_phone: '',
+				marker: [],
+				specificAdd: '',
+				addressData: {
+					name: '',
+					mobile: '',
+					latitude: 0, //纬度
+					longitude: 0, //经度
+					address: {
+						province: '',
+						city: '',
+						district: '',
+						detail: '',
+					},
+					area: '',
+					default: false
+				},
+			}
+		},
+		onReady(res) {
+			var _this = this;
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					query.select('.scroll-wrapper').boundingClientRect();
+					query.exec(function(res) {
+						console.log(res, 'ddddddddddddd');
+						_this.height = resu.windowHeight - res[0].top + 'px';
+						console.log('打印页面的剩余高度', _this.height);
+					});
+				},
+				fail: res => {}
+			});
+		},
+		onLoad() {
+			let obj = this;
+			console.log('开始加载事件');
+			// obj.loadBaseData();
+			// uni.showLoading({
+			// 	title: '加载中',
+			// 	mask: true
+			// });
+			// obj.loadData();
+			try {
+				let locationAddress
+				// #ifdef H5
+				let wxOjb = require('jweixin-module');
+				locationAddress = wxOjb.getLocation;
+				// #endif
+				// #ifdef MP
+				locationAddress = uni.getLocation;
+				// #endif
+				wxOjb.ready(() => {
+					console.log('加载完毕注册事件');
+					locationAddress({
+						type: 'gcj02',
+						success: function(res) {
+							console.log('获取经纬度', res);
+							obj.longitude = res.longitude
+							obj.latitude = res.latitude
+							obj.marker = [{
+								latitude: obj.latitude,
+								longitude: obj.longitude,
+								iconPath: '/static/img/img19.png',
+								width: '45',
+								height: '45',
+							}, ]
+							obj.loadData();
+						},
+						fail(e) {
+							console.log('失败', e);
+							window.location.reload();
+						}
+					});
+				})
+
+			} catch (e) {
+				console.log(e);
+				let locationAddress
+				// #ifdef H5
+				let wxOjb = require('jweixin-module');
+				locationAddress = wxOjb.getLocation;
+				// #endif
+				// #ifdef MP
+				locationAddress = uni.getLocation;
+				// #endif
+				wxOjb.ready(() => {
+					console.log('加载完毕注册事件');
+
+					locationAddress({
+						type: 'gcj02',
+						success: function(res) {
+							console.log('获取经纬度1', res);
+							obj.longitude = res.longitude
+							obj.latitude = res.latitude
+							obj.loadData();
+						},
+						fail(e) {
+							console.log('失败', e);
+						}
+					});
+				})
+
+			}
+		},
+		computed: {
+			...mapState('user', ['hasLogin', 'userInfo'])
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo']),
+			// 地图渲染完毕事件
+			mapChange(e) {
+				console.log(e);
+			},
+			// 载入数据
+			async loadData() {
+				let obj = this;
+				if(obj.loadtype == 'loading' || obj.loadtype == 'noMore') {
+					return 
+				}
+				getListMechanism({
+					page: obj.page,
+					limit: obj.limit,
+				}).then(({data}) => {
+					uni.hideLoading();
+					console.log(data, 999);
+					for (let i = 0; i < data.length; i++) {
+						data[i].space = obj.space(obj.latitude, obj.longitude, data[i].latitude, data[i].longitude);
+					}
+					let arr = data.map(item => ({
+						latitude: item.latitude,
+						longitude: item.longitude,
+						iconPath: '/static/img/img014.png',
+						width: '35',
+						height: '35',
+						id: item.id,
+						address: item.address
+					}));
+					obj.jhzmarker = obj.marker.concat(arr)
+					obj.AEDList = obj.AEDList.concat(data);
+					console.log(obj.AEDList, 'obj.AEDList+++++++');
+					// obj.markerList = data;
+					obj.loaded = true
+					if (obj.limit == data.length) {
+						obj.loadtype = 'more';
+						obj.page++;
+					} else {
+						obj.loadtype = 'noMore';
+					}
+				})
+			},
+			space(lat1, lng1, lat2, lng2) {
+				console.log(lat1, lng1, lat2, lng2);
+				var radLat1 = (lat1 * Math.PI) / 180.0;
+				var radLat2 = (lat2 * Math.PI) / 180.0;
+				var a = radLat1 - radLat2;
+				var b = (lng1 * Math.PI) / 180.0 - (lng2 * Math.PI) / 180.0;
+				var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
+				s = s * 6378.137;
+				s = Math.round(s * 10000) / 10000;
+				return s * 1000; // 单位米
+			},
+			openAddress(item) {
+				let obj = this;
+				obj.latitude2 = item.latitude;
+				obj.longitude2 = item.longitude;
+				obj.address = item.address;
+				this.$refs.popup.open();
+			},
+			// 调用高德
+			toGaodeMap() {
+				let latitude = this.latitude2;
+				let longitude = this.longitude2;
+				let address = this.address;
+				console.log('选择高德', latitude, longitude, address);
+				window.location.href = `https://uri.amap.com/marker?position=${longitude},${latitude}&name=${address}`;
+			},
+			// 调用腾讯
+			totengxunMap() {
+				let latitude = this.latitude2;
+				let longitude = this.longitude2;
+				let address = this.address;
+				console.log('选择腾讯', latitude, longitude);
+				window.location.href = `http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};addr:${address}`;
+			},
+			// 调用百度
+			tobaiDuMap() {
+				let latitude = this.latitude2;
+				let longitude = this.longitude2;
+				let latitude6 = this.latitude;
+				let longitude6 = this.longitude;
+				let address = this.address;
+				console.log('选择百度', latitude, longitude);
+				console.log('获取当前经纬度', latitude6, longitude6);
+				window.location.href = `http://api.map.baidu.com/direction?origin=latlng:${latitude6},${longitude6}|name:我的位置&destination=${latitude},${longitude}&mode=driving&region=${address}&output=html&src=webapp.baidu.openAPIdemo`;
+				//`bdapp://map/navi?location=${longitude},${latitude}&coord_type=gc02&title=${address}&content=${address}&output=html&src=andr.baidu.openAPIdemo `
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	body,
+	page {
+		height: 100%;
+		width: 100%;
+		background-color: #fff;
+	}
+
+	.content {
+		height: 100%;
+		width: 100%;
+		background-color: #fff;
+	}
+
+	.map {
+		width: 100%;
+		height: 600rpx;
+	}
+
+	/* #ifdef H5 */
+	.location {
+		overflow-y: scroll; //溢出就滑动起来
+		// z-index: 990;
+		position: fixed;
+		bottom: 0;
+		height: 55%;
+		width: 100%;
+		background-color: #fff;
+		padding: 24rpx;
+
+		//搜索框
+		.Search-box {
+			// z-index: 999;
+			height: 80rpx;
+			// position: fixed;
+			// 		top: 0;
+			// 		left: 0;
+			// 		width: 100%;
+			// background: #FFFFFF;
+			// padding-top: 10rpx;
+			padding-right: 24rpx;
+			padding-left: 24rpx;
+
+			.Search-box-sort {
+				float: left;
+				margin-left: 32rpx;
+				margin-right: 19rpx;
+
+				.sort-text {
+					width: 57rpx;
+					height: 29rpx;
+					font-size: 30rpx;
+					font-weight: 500;
+					color: rgba(51, 51, 51, 1);
+					line-height: 58rpx;
+					margin-right: 19rpx;
+				}
+
+				.sort-img {
+					width: 21rpx;
+					height: 11rpx;
+					margin-bottom: 4rpx;
+				}
+			}
+
+			.Search-box-size {
+				// width:70%;
+				height: 58rpx;
+				border-radius: 32rpx;
+				background-color: #f1f1f1;
+				padding-left: 36rpx;
+				display: flex;
+				align-items: center;
+
+				.box-img {
+					height: 32rpx;
+					width: 32rpx;
+					margin-right: 16rpx;
+				}
+
+				// .box-right{
+				// 	height: 58rpx;
+				// 	// width: 100%;
+				// 	background-color: pink;
+				// }
+
+				.box-word {
+					width: 100%;
+					font-size: 26rpx;
+					font-weight: 500;
+					color: rgba(205, 203, 203, 1);
+					line-height: 55rpx;
+				}
+			}
+		}
+
+		.location-item {
+			z-index: 1000;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			border-bottom: 1rpx solid #E7E8EA;
+			padding: 15rpx 0;
+
+			.box-left {
+				display: flex;
+
+				.img01 {
+					width: 8rpx;
+					height: 28rpx;
+					margin-right: 18rpx;
+
+					image {
+						width: 8rpx;
+						height: 28rpx;
+					}
+				}
+
+				.img02 {
+					width: 117rpx;
+					height: 117rpx;
+					border-radius: 50%;
+
+					image {
+						width: 117rpx;
+						height: 117rpx;
+						border-radius: 50%;
+					}
+				}
+
+				.info {
+					margin-left: 16rpx;
+
+					.info-header {
+						display: flex;
+						align-items: center;
+
+						.name {
+							font-size: 32rpx;
+							color: #333333;
+						}
+
+						.distance {
+							margin-left: 25rpx;
+							font-size: 28rpx;
+							color: #303133;
+						}
+
+						.location-icon {
+							margin-left: 10rpx;
+							width: 20rpx;
+							height: 26rpx;
+
+							image {
+								width: 20rpx;
+								height: 26rpx;
+								display: inline;
+							}
+						}
+					}
+
+					.address {
+						font-size: 26rpx;
+						color: #333333;
+						margin-top: 33rpx;
+					}
+				}
+			}
+
+			.box-right {
+				.img {
+					height: 107rpx;
+
+					image {
+						width: 107rpx;
+						height: 107rpx;
+					}
+				}
+
+				.called {
+					margin-right: 16rpx;
+					height: 107rpx;
+					line-height: 107rpx;
+					font-size: 28rpx;
+					color: #CB131C;
+				}
+			}
+		}
+	}
+
+	/* #endif */
+
+	.list-tpl {
+		background-color: #ffffff;
+		margin: 25rpx 0rpx;
+		padding: 25rpx 25rpx;
+		font-size: 28rpx;
+		border-radius: 15rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		border-bottom: 1px solid #f1f1f1;
+
+		.list-left {
+			display: flex;
+			width: 100%;
+
+			.number {
+				font-size: 32rpx;
+				margin-right: 14rpx;
+			}
+
+			.info {
+				width: 100%;
+
+				.title {
+					font-size: 32rpx;
+					color: #222222;
+					font-weight: 500;
+				}
+
+				.addr {
+					width: 400rpx;
+					margin-top: 20rpx;
+					font-size: 20rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+			}
+		}
+
+		.image {
+			width: 10%;
+			text-align: center;
+
+			image {
+				width: 50rpx;
+				height: 50rpx;
+			}
+
+			.tip {
+				color: #7f7f7f;
+				font-size: 21rpx;
+			}
+		}
+	}
+	.popup_row {
+		width: 100%;
+		height: 500rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	
+		.rows {
+			width: 100%;
+			padding: 0 24rpx;
+	
+			.rows-item {
+				height: 80rpx;
+				line-height: 80rpx;
+				text-align: center;
+				width: 100%;
+				font-size: 32rpx;
+				color: #303133;
+			}
+		}
+	}
+</style>
+

pages/applic/contribution.vue

@@ -111,15 +111,10 @@
 					<input type="text" placeholder="请输入联系地址" v-model="address" />
 				</view>
 			</view>
-		</view>
-		
-		
-		
-
+		</view>
 		<view class="submit" @click="confirm()">
 			立即提交
 		</view>
-
 		<uni-popup ref="popup" type="bottom" @click="close">
 			<view class="popup_row">
 				<view class="title">
@@ -263,28 +258,21 @@
 			// console.log(333,options)
 		},
 		onShow() {
-			saveUrl()
-			// let token = uni.getStorageSync('token');
-			console.log(1, this);
-			// uni.showModal({
-			// 	title: '判断hasLogin',
-			// 	content: JSON.stringify(this.hasLogin),
-			// })
 			if (!this.hasLogin) {
 				// 登录拦截
-				// interceptor();
 				uni.showModal({
 					title: '登录',
 					content: '您未登录，是否马上登陆?',
 					success: e => {
 						if (e.confirm) {
+							saveUrl()
 							interceptor();
 						}
 					},
 					fail: e => {
 						console.log(e);
 						uni.showModal({
-							title: 'cuowu',
+							title: '错误',
 							content: JSON.stringify(e),
 						})
 					}
@@ -446,8 +434,12 @@
 						paySign: res.paySign,
 						success: function(res) {
 							// obj.$api.msg('支付成功')
+							let date = new Date()
+							let year = date.getFullYear()
+							let month = date.getMonth() >= 9 ? date.getMonth() + 1 : '0'+(date.getMonth() +1 )
+							let day = date.getDay() >= 10 ? date.getDay() : '0' + date.getDay()
 							uni.navigateTo({
-								url: '/pages/form/donaSuccess?money=' + obj.money
+								url: '/pages/form/donaSuccess?money=' + obj.money + '&name=' + obj.donate_er + '&time=' + year + '年' + month + '月' + day +'日'
 							})
 						},
 						fail: function(res) {

pages/form/certificates.vue

@@ -135,8 +135,8 @@ export default {
 				}
 			)
 			.exec();
-		let ctxBg = '/index/static/img/graduation.png'; //画布背景
-		let src = '/index/static/icon/erweima.jpg' // 二维码
+		let ctxBg = '/static/img/graduation.png'; //画布背景
+		let src = '/static/icon/erweima.jpg' // 二维码
 		let context = uni.createCanvasContext('qrShareBox');
 		// 插入背景图片
 		context.drawImage(ctxBg, 0, 0, obj.canWeidth, obj.canHeight);
@@ -238,7 +238,7 @@ export default {
 		IndexShare() {
 			let obj = this;
 			let item = {
-				link:  'http://jz.red.igxys.com/index/#/pages/train/sign?type=' + obj.type + '&id=' + obj.id + '&uid=' + obj.userInfo.uid,// 分享链接
+				link:  'http://jz.red.igxys.com/hhs/#/pages/train/sign?type=' + obj.type + '&id=' + obj.id + '&uid=' + obj.userInfo.uid,// 分享链接
 				imgUrl: '/index/static/img/002.png',
 				desc: '结业证书',
 				title: '洪湖市红十字会',

pages/form/donaSuccess.vue

@@ -39,7 +39,10 @@ export default {
 			},
 			ran: -1,
 			isStop: true,
-			demo: 0
+			demo: 0,
+			name: '',
+			add_time: '',
+			
 		};
 	},
 	onReady() {
@@ -74,8 +77,8 @@ export default {
 				}
 			)
 			.exec();
-		let ctxBg = '/index/static/img/thanks.png'; //画布背景
-		let src = '/index/static/icon/erweima.jpg'; // 二维码
+		let ctxBg = '/static/img/thanks1.png'; //画布背景
+		let src = '/static/icon/erweima.jpg'; // 二维码
 
 		let context = uni.createCanvasContext('qrShareBox');
 		// 插入背景图片
@@ -100,26 +103,29 @@ export default {
 		// // 插入文字
 		context.setFontSize(28);
 		context.setFillStyle('#d5493b');
-		// context.fillText('感谢信', ((750 - obj.size) * obj.ratio) / 2, 260 * obj.ratio)
+		context.fillText('感谢信', ((750 - obj.size) * obj.ratio) / 2, 260 * obj.ratio)
 		context.setFontSize(30 * obj.ratio);
-		context.fillText('尊敬的捐赠人：', 40 * obj.ratio, 400 * obj.ratio);
-		context.fillText('衷心感谢您对洪湖市红十字事业的信任与支持', 100 * obj.ratio, 460 * obj.ratio);
-		context.fillText('！我们已收到您的捐款', 40 * obj.ratio, 515 * 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.moveTo(340 * obj.ratio, 520 * obj.ratio);
-		context.lineTo(500 * obj.ratio, 520 * obj.ratio);
+		context.moveTo(380 * obj.ratio, 470 * obj.ratio);
+		context.lineTo(540 * obj.ratio, 470 * obj.ratio);
 		context.stroke();
-		context.fillText('￥' + obj.money, 355 * obj.ratio, 512 * obj.ratio);
-		context.fillText('元。我们承诺，', 500 * obj.ratio, 515 * obj.ratio);
-		context.fillText('绝不辜负大家的信任，遵照您的意愿，将捐款全部', 40 * obj.ratio, 570 * obj.ratio);
-		context.fillText('用于相关救助项目。您的善举将给受助人带去温暖', 40 * obj.ratio, 625 * obj.ratio);
-		context.fillText('！', 40 * obj.ratio, 680 * obj.ratio);
-		context.fillText('爱心无界，情义无价。谨以此信表达谢意，我', 100 * obj.ratio, 730 * obj.ratio);
+		context.setTextAlign('center')
+		context.fillText('￥' + obj.money, 460 * 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('爱心无界，情义无价。谨以此信表达谢意，', 120 * obj.ratio, 680 * obj.ratio);
 
-		context.fillText('们因您更有力量，因您倍感温暖！', 40 * obj.ratio, 785 * obj.ratio);
+		context.fillText('我们因您更有力量，因您倍感温暖！', 60 * obj.ratio, 735 * obj.ratio);
 		// context.fillText('谨表谢意', (580 * obj.ratio), 680 * obj.ratio)
-		context.fillText('洪湖市红十字会', 450 * obj.ratio, 900 * obj.ratio);
-
+		// context.setTextAlign('right')
+		context.fillText('洪湖市红十字会', 450 * obj.ratio, 850 * obj.ratio);
+        context.fillText(obj.add_time, 450 * obj.ratio, 910 * obj.ratio);
 		// 插入二维码
 		// console.log(codeX, codeY, codeSize, 999)
 		context.drawImage(src, codeX, codeY, codeSize, codeSize);
@@ -161,6 +167,8 @@ export default {
 	onLoad(option) {
 		console.log(333, option);
 		this.money = option.money;
+		this.name = option.name
+		this.add_time = option.time
 		this.IndexShare();
 		this.ScanAudio(true);
 	},
@@ -184,10 +192,10 @@ export default {
 			let obj = this;
 			// let money = obj.money;
 			let item = {
-				link: 'http://http://jz.red.igxys.com/index/#/pages/form/donaSuccess?money=' + obj.money, // 分享链接
-				imgUrl: 'http://http://jz.red.igxys.com/index/#/static/img/thinks.png',
+				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: '洪湖市红十字会',
+				title: '洪湖红十字会',
 				success: console.log('分享加载成功')
 			};
 			console.log('分享加', item);
@@ -302,8 +310,8 @@ page {
 			border-radius: 28rpx;
 			// background-color: pink;
 			position: absolute;
-			left: 12rpx;
-			top: 250rpx;
+			left: 40rpx;
+			top: 100rpx;
 			z-index: 999;
 		}
 

pages/share/card.vue

@@ -3,19 +3,19 @@
 		<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="china-font">洪湖市红十字会</view>
 			<view class="english-font">RED CROSS SOCIETY OF JIANGXIA DISTRICT, WUHAN</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>5楼江夏区红十字会</text></view>
+				<view class="text"><text>洪湖市红十字会*****</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">87012677</text></view>
+				<view class="text"><text class="text1">******</text></view>
 				<!-- #endif -->
 				<!-- #ifndef H5 -->
 				<view class="text" @click="uni.makePhoneCall({phoneNumber: '87012677'})"><text>87012677</text></view>
@@ -26,15 +26,15 @@
 				<view class="text"><text>jz_hszh@sina.com</text></view>
 			</view> -->
 			<view class="map">
-				<image class="map-box" src="../../static/img/baseaddr.jpg"></image>
+				<image class="map-box" src="../../static/icon/erweima.jpg"></image>
 				<view class="map-font flex">
-					<view class="font-left">武汉市江夏区红十字会</view>
+					<view class="font-left">洪湖市红十字会</view>
 					<view @click="navigation()" class="font-right"><image src="../../static/img/btn.png" mode="aspectFill"></image></view>
 				</view>
 			</view>
-			<view class="qrcode">
+			<!-- <view class="qrcode">
 				<image src="../../static/images/qrcode.jpg" mode="aspectFill"></image>
-			</view>
+			</view> -->
 		</view>
 		<uni-popup ref="popup2" type="bottom" @click="close">
 			<view class="popup_row">
@@ -112,13 +112,13 @@ export default {
 		toBaiduMap() {
 			
 			window.location.href=
-			`http://api.map.baidu.com/marker?location=30.357764,112.218665&title=洪湖市红十字会&content=荆州市红十字会&output=html&src=webapp.baidu.openAPIdemo `
+			`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://jz.red.igxys.com/index/#/pages/share/card',// 分享链接
+				link:  'http://jz.red.igxys.com/hhs/#/pages/share/card',// 分享链接
 				imgUrl: '/index/static/img/002.png',
 				desc: '电子名片分享',
 				title: '洪湖市红十字会',
@@ -133,8 +133,8 @@ export default {
 <style lang="scss">
 	.center {
 		border: 20rpx solid #e01a1c;
-		// height: 100vh;
-		min-height: 600px;
+		height: 100%;
+		// min-height: 600px;
 	}
 	.flex {
 		display: flex;
@@ -194,6 +194,7 @@ export default {
 		}
 		.fgx {
 			margin-top: 25rpx;
+			margin-bottom: 25rpx;
 			z-index: 0;
 			width: 625rpx;
 			border-bottom: 1rpx dashed #e01a1c;
@@ -230,6 +231,7 @@ export default {
 		}
 		.map {
 			margin-top: 25rpx;
+			margin-bottom: 25rpx;
 			background-color: #ffffff;
 			z-index: 0;
 			width: 517rpx;
@@ -237,7 +239,7 @@ export default {
 			line-height: 0;
 			.map-box {
 				width: 513rpx;
-				height: 286rpx;
+				height: 513rpx;
 				background: #ffffff;
 			}
 			.map-font {

pages/train/sign.vue

@@ -165,8 +165,8 @@ export default {
 			}).exec();
 			console.log('obj.canHeight',obj.canHeight)
 			console.log('obj.canWeidth',obj.canWeidth)
-		let ctxBg = '/index/static/img/graduation.png'; //画布背景
-		let src = '/index/static/icon/erweima.jpg' // 二维码
+		let ctxBg = 'static/img/graduation.png'; //画布背景
+		let src = '/static/icon/erweima.jpg' // 二维码
 		let context = uni.createCanvasContext('qrShareBox');
 		// 插入背景图片
 		context.drawImage(ctxBg, 0, 0, obj.canWeidth, obj.canHeight);
@@ -266,10 +266,10 @@ export default {
 		IndexShare() {
 			let obj = this;
 			let item = {
-				link:  'http://jz.red.igxys.com/index/#/pages/train/sign?type=' + obj.type + '&id=' + obj.id + '&uid=' + obj.userInfo.uid,// 分享链接
+				link:  'http://jz.red.igxys.com/hhs/#/pages/train/sign?type=' + obj.type + '&id=' + obj.id + '&uid=' + obj.userInfo.uid,// 分享链接
 				imgUrl: '/index/static/img/002.png',
 				desc: '结业证书',
-				title: '荆州市红十字会',
+				title: '洪湖市红十字会',
 			};
 			console.log('分享加',item)
 			weixindata(item);

pages/user/intent.vue

@@ -70,8 +70,8 @@ export default {
 				}
 			)
 			.exec();
-		let ctxBg = '/index/static/img/yxs.png'; //画布背景
-		let src = '/index/static/icon/erweima.jpg'; // 二维码
+		let ctxBg = '/static/img/yxs.png'; //画布背景
+		let src = '/static/icon/erweima.jpg'; // 二维码
 
 		let context = uni.createCanvasContext('qrShareBox');
 		// 插入背景图片
@@ -182,7 +182,7 @@ export default {
 			let obj = this;
 			// let money = obj.money;
 			let item = {
-				link: 'http://http://jz.red.igxys.com/index/#/pages/form/donaSuccess?money=' + obj.money, // 分享链接
+				link: 'http://http://jz.red.igxys.com/ssh/#/pages/form/donaSuccess?money=' + obj.money, // 分享链接
 				imgUrl: 'http://http://jz.red.igxys.com/index/#/static/img/thinks.png',
 				desc: '感谢信',
 				title: '洪湖市红十字会',

pages/user/thank.vue

@@ -35,7 +35,7 @@ export default {
 			ran: -1,
 			isStop: true,
 			demo: 0,
-			userName: '洪湖XXX公司',
+			userName: '荆州XXX公司',
 			time: 0,
 			itemName: '',
 			pid: 0
@@ -83,8 +83,8 @@ export default {
 				}
 			)
 			.exec();
-		let ctxBg = '/index/static/img/zszs.png'; //画布背景
-		let src = '/index/static/icon/erweima.jpg'; // 二维码
+		let ctxBg = '/static/img/zszs.png'; //画布背景
+		let src = '/static/icon/erweima.jpg'; // 二维码
 
 		let context = uni.createCanvasContext('qrShareBox');
 		// 插入背景图片
@@ -108,7 +108,7 @@ export default {
 
 		// // 插入文字
 		context.setFontSize(38* obj.ratio);
-		context.setFillStyle('#F5D0A2');
+		context.setFillStyle('#000');
 		// context.fillText('感谢信', ((750 - obj.size) * obj.ratio) / 2, 260 * obj.ratio)
 		context.setFontSize(40 * obj.ratio);
 		context.fillText('感谢 ' , 100 * obj.ratio, 460* obj.ratio)
@@ -150,7 +150,7 @@ export default {
 		}
 		
 		context.setFontSize(38 * obj.ratio);
-		context.fillText("感谢您于" + obj.showtime + "对于", 180* obj.ratio, 560* obj.ratio)
+		context.fillText("感谢您于" + obj.showtime + "对", 180* obj.ratio, 560* obj.ratio)
 		let str = '“' + obj.itemName + "”" + '的爱心捐赠。'
 		if(str.length < 15) {
 			context.fillText(str ,90* obj.ratio, 615* obj.ratio )
@@ -196,129 +196,6 @@ export default {
 			context.fillText('特发此证书，以示感谢！',(750/2)* obj.ratio,860 * obj.ratio)
 			context.setTextAlign('left')
 		}
-		
-		// if(obj.userName.length<=10){
-		// 	context.fillText('感谢 ' , 273 * obj.ratio, 500 * obj.ratio);
-		// 	context.fillText(obj.userName , 340 * obj.ratio, 500 * obj.ratio);
-		// 	context.fillText('您的爱心捐赠和善心！' , 273 * obj.ratio, 540 * obj.ratio);
-		// }else if(10< obj.userName.length && obj.userName.length <= 20){
-		// 	let center = Math.floor(obj.userName.length/2)
-		// 	let str1 = obj.userName.slice(0,center)
-		// 	let str2 = obj.userName.slice(center,)
-		// 	let des = 5*(20-obj.userName.length)
-		// 	context.fillText('感谢 ' , 260 * obj.ratio, 500 * obj.ratio);
-		// 	context.setTextAlign('center')
-		// 	context.fillText(str1 , (490 - des) * obj.ratio, 480 * obj.ratio);
-		// 	context.fillText(str2 , (490 - des) * obj.ratio, 520 * obj.ratio);
-		// 	context.setTextAlign('left')
-		// 	context.fillText('您的爱心捐赠和善心！' , 260 * obj.ratio, 560 * obj.ratio);
-		// }else if(20< obj.userName.length && obj.userName.length <= 30){
-			
-		// 	let str1 = obj.userName.slice(0,10)
-		// 	let str2 = obj.userName.slice(10,20)
-		// 	let str3 = obj.userName.slice(20,)
-		// 	context.fillText('感谢 ' , 260 * obj.ratio, 500 * obj.ratio);
-		// 	context.setFontSize(24* obj.ratio)
-		// 	context.fillText(str1 , 340 * obj.ratio, 460 * obj.ratio);
-			
-		// 	context.fillText(str2 , 340 * obj.ratio, 490 * obj.ratio);
-		// 	context.setTextAlign('center')
-		// 	context.fillText(str3 , 460 * obj.ratio, 520 * obj.ratio);
-		// 	context.setFontSize(38* obj.ratio)
-		// 	context.setTextAlign('left')
-		// 	context.fillText('您的爱心捐赠和善心！' , 260 * obj.ratio, 565 * obj.ratio);
-		// }
-		// context.setTextAlign('center')
-		// context.setFontSize(40* obj.ratio);
-		// context.setFillStyle('#F5D0A2');
-		// if(obj.userName.length <= 10){
-		// 	context.fillText(obj.userName , (750/2)* obj.ratio, 700 * obj.ratio);
-		// }else if(obj.userName.length <= 20){
-		// 	if(obj.userName.length <= 13){
-		// 		context.setFontSize(28* obj.ratio)
-		// 		context.fillText(obj.userName , (750/2)* obj.ratio, 700 * obj.ratio);
-		// 	}else {
-		// 		let center = Math.floor(obj.userName.length/2)
-		// 		console.log(center,'this.obj.userName.length.center')
-		// 		let str5 = obj.userName.slice(0,center)
-		// 		let str6 = obj.userName.slice(center,)
-		// 		context.setFontSize(28* obj.ratio)
-		// 		context.fillText(str5 , (750/2)* obj.ratio, 675 * obj.ratio);
-		// 		context.fillText(str6 , (750/2)* obj.ratio, 710 * obj.ratio);
-		// 		context.setFontSize(38* obj.ratio)
-		// 	}
-			
-		// }else if(obj.userName.length <= 30){
-		// 	let str5 = obj.userName.slice(0,15)
-		// 	let str6 = obj.userName.slice(15,)
-		// 	context.setFontSize(24* obj.ratio)
-		// 	context.fillText(str5 , (750/2)* obj.ratio, 675 * obj.ratio);
-		// 	context.fillText(str6 , (750/2)* obj.ratio, 710 * obj.ratio);
-		// 	context.setFontSize(38* obj.ratio)
-		// }
-		
-		// //感谢您于2021年1月1日对于“关爱关心留守儿童”的爱心捐赠。特发此证书，以示感谢！红会博爱送温暖 爱康关怀暖人心
-		// context.setTextAlign('left')
-		// context.setFillStyle('#F5D0A2');
-		// context.setFontSize(30* obj.ratio);
-		
-		// if(this.pid != 0){
-		// 	if(obj.itemName.length <= 6){
-		// 		context.fillText('感谢您于 ' + obj.showtime , 198* obj.ratio, 940 * obj.ratio);
-		// 		context.setTextAlign('center')
-		// 		context.fillText('对'+'"'+obj.itemName+'"'+ '的爱心捐赠。',(750/2+20)* obj.ratio,980 * obj.ratio)
-		// 		context.fillText('特发此证书，以示感谢！',(750/2)* obj.ratio,1025 * obj.ratio)
-		// 	}else if(obj.itemName.length > 6 && obj.itemName.length <= 20){
-		// 		let str1 = obj.itemName.slice(0,13)
-		// 		let str2 = obj.itemName.slice(13,)
-		// 		context.setFontSize(24* obj.ratio)
-		// 		context.setTextAlign('center')
-		// 		context.fillText('感谢您于 ' + obj.showtime + '对于', (750/2)* obj.ratio, 940 * obj.ratio);
-		// 		context.fillText('"'+str1,(750/2)* obj.ratio,970 * obj.ratio)
-		// 		context.fillText(str2+'"' + '的爱心捐赠。',(750/2)* obj.ratio,1000 * obj.ratio)
-		// 		context.fillText('特发此证书，以示感谢！',(750/2)* obj.ratio,1030 * obj.ratio)
-				
-		// 	}else if(obj.itemName.length > 20 && obj.itemName.length <= 30){
-		// 		let str1 = obj.itemName.slice(0,18)
-		// 		let str2 = obj.itemName.slice(18,)
-		// 		context.setFontSize(22* obj.ratio)
-		// 		context.setTextAlign('center')
-		// 		context.fillText('感谢您于 ' + obj.showtime + '对于', (750/2)* obj.ratio, 940 * obj.ratio);
-		// 		context.fillText('"'+str1,(750/2)* obj.ratio,970 * obj.ratio)
-		// 		context.fillText(str2+'"'+'的爱心捐赠。',(750/2)* obj.ratio,1000 * obj.ratio)
-		// 		context.fillText('特发此证书，以示感谢！',(750/2)* obj.ratio,1030 * obj.ratio)
-		// 	}
-			
-		// }else {
-		// 	context.fillText('感谢您于 ' + obj.showtime , 198* obj.ratio, 940 * obj.ratio);
-		// 	context.setTextAlign('left')
-		// 	context.fillText('的爱心捐赠。',198* obj.ratio,980 * obj.ratio)
-		// 	context.setTextAlign('center')
-		// 	context.fillText('特发此证书，以示感谢！',(750/2)* obj.ratio,1025 * obj.ratio)
-		// }
-		
-		
-		// context.fillText('衷心感谢您对荆州市红十字事业的信任与支持', 155 * obj.ratio, 460 * obj.ratio);
-		// context.fillText('！我们已收到您的捐款', 40 * obj.ratio, 515 * obj.ratio);
-		// // 画横线
-		// context.moveTo(340 * obj.ratio, 520 * obj.ratio);
-		// context.lineTo(500 * obj.ratio, 520 * obj.ratio);
-		// context.stroke();
-		// context.fillText('￥' + obj.money, 355 * obj.ratio, 512 * obj.ratio);
-		// context.fillText('元。我们承诺，', 500 * obj.ratio, 515 * obj.ratio);
-		// context.fillText('绝不辜负大家的信任，遵照您的意愿，将捐款全部', 40 * obj.ratio, 570 * obj.ratio);
-		// context.fillText('用于相关救助项目。您的善举将给受助人带去温暖', 40 * obj.ratio, 625 * obj.ratio);
-		// context.fillText('！', 40 * obj.ratio, 680 * obj.ratio);
-		// context.fillText('爱心无界，情义无价。谨以此信表达谢意，我', 100 * obj.ratio, 730 * obj.ratio);
-
-		// context.fillText('们因您更有力量，因您倍感温暖！', 40 * obj.ratio, 785 * obj.ratio);
-		// // context.fillText('谨表谢意', (580 * obj.ratio), 680 * obj.ratio)
-		// context.fillText('荆州市红十字会', 450 * obj.ratio, 900 * obj.ratio);
-		// context.fillText('识别右边二维码', 108 * obj.ratio, 1090 * obj.ratio);
-		// context.fillText('关注荆州市红十字会', 108 * obj.ratio, 1150 * obj.ratio);
-
-		// 插入二维码
-		// console.log(codeX, codeY, codeSize, 999)
 		context.drawImage(src, 490 * obj.ratio, 1140 * obj.ratio, codeSize, codeSize);
 
 		// 生成
@@ -341,29 +218,13 @@ export default {
 		});
 	},
 	onShow() {
-		// var animation = uni.createAnimation();
-		// this.animation = animation;
-		// if (this.isStop) {
-		// 	// 使用动画
-		// 	this.scaleAndScale();
-		// 	this.timer = setInterval(() => {
-		// 		//创建定时器,3秒执行异一次
-		// 		this.scaleAndScale();
-		// 		// console.log('每三秒执行一次 , 达到往复运动的效果')
-		// 	}, 1000);
-		// } else {
-		// 	this.noscaleAndScale();
-		// }
 	},
 	onLoad(option) {
-		// console.log(333, option);
-		// this.money = option.money;
-		// this.IndexShare();
-		// this.ScanAudio(true);
 		this.pid = option.project_id
 		this.userName = option.name
 		this.time = option.time
 		this.itemName = option.title
+		this.IndexShare()
 	},
 	onHide() {
 		//在页面隐藏时也要清除定时器
@@ -373,20 +234,14 @@ export default {
 		}
 	},
 	onUnload() {
-		//在页面卸载时清除定时器 避免出现多个定时器连续创建动画
-		// if (this.timer) {
-		// 	console.log('清除定时器-' + this.timer);
-		// 	clearInterval(this.timer);
-		// }
 	},
 	methods: {
 		// 分享
 		IndexShare() {
 			let obj = this;
-			// let money = obj.money;
 			let item = {
-				link: 'http://http://jz.red.igxys.com/index/#/pages/form/donaSuccess?money=' + obj.money, // 分享链接
-				imgUrl: 'http://http://jz.red.igxys.com/index/#/static/img/thinks.png',
+				link: 'http://jz.red.igxys.com/hhs/#/pages/user/thank?project_id=' + obj.pid + '&name=' + obj.userName + '&time=' + obj.time + '&title=' + obj.itemName, // 分享链接
+				imgUrl: 'http://jz.red.igxys.com/static/img/22.jpg',
 				desc: '感谢信',
 				title: '洪湖市红十字会',
 				success: console.log('分享加载成功')

store/index.js

@@ -22,6 +22,7 @@ const store = new Vuex.Store({
 		weichatBrowser: '' ,//当前是否为微信内置浏览器
 		// #endif
 		// shareData:'',//分享信息
+		project_area: 226
 	},
 	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.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.a687c92d.js></script><script src=/index/static/js/index.866c6c90.js></script></body></html>
+<!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.5e7e3b56.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.a5dc8d61.js></script><script src=/index/static/js/index.2890d0cd.js></script></body></html>