11-5

pages.json

@@ -59,6 +59,19 @@
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "荆州市红十字会安心捐赠"
 			}
+		},
+		{
+			"path": "pages/joinSuc/certificate",
+			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
+				"navigationBarBackgroundColor": "#457DBF",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "志愿登记证书"
+			}
 		},
 		// donaSuccess
 		{

pages/applic/aed.vue

@@ -67,7 +67,7 @@
 				loaded: false,
 				loadtype: 'more',
 				page: 1,
-				limit: 10,
+				limit: 20,
 				AEDList: [],
 				height: '',
 				list: [],
@@ -214,7 +214,12 @@
 						id: item.id,
 						address: item.address
 					}));
-					obj.aedmarker = obj.marker.concat(arr)
+					if(obj.page == 1) {
+						obj.aedmarker = obj.marker.concat(arr)
+					}else {
+						obj.aedmarker = obj.aedmarker.concat(arr)
+					}
+					
 					// obj.markerList = data;
 					obj.loaded = true
 					obj.page++;

pages/applic/aid.vue

@@ -216,7 +216,12 @@
 						id: item.id,
 						address: item.address
 					}));
-					obj.jhzmarker = obj.marker.concat(arr)
+					if(obj.page == 1) {
+						obj.jhzmarker = obj.marker.concat(arr)
+					}else {
+						obj.jhzmarker = obj.jhzmarker.concat(arr)
+					}
+					
 					obj.AEDList = obj.AEDList.concat(data);
 					console.log(obj.AEDList, 'obj.AEDList+++++++');
 					// obj.markerList = data;

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>

pages/form/certificates.vue

@@ -136,7 +136,8 @@ export default {
 			)
 			.exec();
 		let ctxBg = '/index/static/img/graduation.png'; //画布背景
-		let src = '/index/static/icon/erweima.jpg' // 二维码
+		let src = '/index/static/icon/erweima.jpg' // 二维码
+		let src1 = '/index/static/img/jzyz.png'
 		let context = uni.createCanvasContext('qrShareBox');
 		// 插入背景图片
 		context.drawImage(ctxBg, 0, 0, obj.canWeidth, obj.canHeight);
@@ -199,7 +200,10 @@ export default {
 		context.strokeRect(codeBoxX, codeBoxY, codeBoxEnd, codeBoxEnd);
 		context.stroke();
 		// 插入二维码
-		context.drawImage(src, codeX, codeY, codeSize, codeSize);
+		context.drawImage(src, codeX, codeY, codeSize, codeSize);
+		//插入印章
+		context.drawImage(src1, 480 * obj.ratio - codeSize/2, 810 * obj.ratio - codeSize/2, codeSize, codeSize);
+		
 		context.draw(false,(e) => {
 			uni.canvasToTempFilePath({
 			  x: 0,

pages/form/donaSuccess.vue

@@ -9,7 +9,6 @@
 			<canvas v-if="showcanvas" id="qrShareBox" canvas-id="qrShareBox" class="tki-qrcode-canvas" />
 			<image class="imgbox" v-else :src="img"></image>
 		</view>
-		<!-- <image class="image" src="../../static/img/thinks.png" mode=""></image> -->
 	</view>
 </template>
 
@@ -194,8 +193,8 @@ export default {
 			let item = {
 				link: 'http://jz.red.igxys.com/index/#/pages/form/donaSuccess?money=' + obj.money + '&name=' + obj.name + '&time=' + obj.add_time, // 分享链接
 				imgUrl: 'http://jz.red.igxys.com/index/static/img/002.png',
-				desc: '感谢信',
-				title: '荆州市红十字会',
+				desc: '弘扬红十字精神，传播红十字观念，宣传红十字工作，这是一个汇聚爱心、救助之家力量的平台！',
+				title: '来自荆州市红十字会的感谢信',
 				success: console.log('分享加载成功')
 			};
 			console.log('分享加', item);

pages/index/index.vue

@@ -55,7 +55,7 @@
 		<view class="system">
 			<top-title :title="'救在身边'" navurl="/pages/applic/location" :show_more="true"></top-title>
 			<view class="system-map">
-				<map class="map-box" id="map" show-location :markers="marker" :scale="scale" :latitude="latitude4"
+				<map class="map-box" id="map" show-location :markers="jzsbmarker" :scale="scale" :latitude="latitude4"
 					:longitude="longitude4" ref="map" @markertap="markertap"></map>
 			</view>
 			<view class="" style="padding-top: 80rpx;">
@@ -312,7 +312,7 @@
 				wxOjb.ready(() => {
 					console.log('加载完毕注册事件');
 					locationAddress({
-						type: 'wgs84',
+						type: 'gcj02',
 						success: function(res) {
 							console.log('获取经纬度', res);
 							obj.longitude4 = res.longitude;
@@ -337,7 +337,7 @@
 
 				// #ifdef MP
 				locationAddress({
-					type: 'wgs84',
+					type: 'gcj02',
 					success: function(res) {
 						console.log('获取经纬度', res);
 						obj.longitude4 = res.longitude;
@@ -370,7 +370,7 @@
 				wxOjb.ready(() => {
 					console.log('加载完毕注册事件');
 					locationAddress({
-						type: 'wgs84',
+						type: 'gcj02',
 						success: function(res) {
 							console.log('获取经纬度', res);
 							obj.longitude4 = res.longitude;
@@ -386,7 +386,7 @@
 				// #endif
 				// #ifdef MP
 				locationAddress({
-					type: 'wgs84',
+					type: 'gcj02',
 					success: function(res) {
 						console.log('获取经纬度', res);
 						obj.longitude4 = res.longitude;
@@ -503,16 +503,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
-						// 		})
-						// 	}
-						// })
 					}
 				}
 			},
@@ -640,7 +630,7 @@
 						id: item.id,
 						address: item.address
 					}))
-					obj.jzsbtmarker = obj.marker.concat(arr)
+					obj.jzsbmarker = obj.marker.concat(arr)
 				}).catch(err => {
 					console.log(err);
 				});

pages/joinSuc/certificate.vue

@@ -0,0 +1,270 @@
+<template>
+	<view class="content">
+		<view class="box">
+			<canvas v-if="showcanvas" id="qrShareBox" canvas-id="qrShareBox" class="tki-qrcode-canvas" />
+			<image class="imgbox" v-else :src="img"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		weixindata
+	} from '@/utils/wxAuthorized.js';
+	export default {
+		data() {
+			return {
+				money: '',
+				url: '',
+				img: '',
+				showcanvas: true,
+				loading: true, //是否载入图片中
+				size: 180,
+				ratio: 1, //页面比例用于计算
+				canHeight: '',
+				canWeidth: '',
+				playing: true,
+				current: {
+					src: '../../static/audio/xx.mp3'
+				},
+				rotateIndex: '',
+				animation: {},
+				animationData: {},
+				audioAction: {
+					method: 'pause'
+				},
+				ran: -1,
+				isStop: true,
+				demo: 0,
+				name: '',
+				add_time: '',
+
+			};
+		},
+		onReady() {
+			let query = uni.createSelectorQuery();
+			let obj = this;
+			console.log(999, obj.money);
+			// 获取页面比例
+			query
+				.select('.box')
+				.fields({
+						size: true
+					},
+					e => {
+						console.log('获取页面比例', e);
+						// 保存比例
+						this.ratio = e.width / 750;
+					}
+				)
+				.exec();
+			// 获取画布宽高信息
+			query
+				.select('#qrShareBox')
+				.fields({
+						size: true
+					},
+					e => {
+						console.log('获取画布宽高信息', e);
+						obj.canHeight = e.height;
+						obj.canWeidth = e.width;
+					}
+				)
+				.exec();
+			let ctxBg = '/index/static/img/zyzs1.png'; //画布背景
+			let src = '/index/static/icon/erweima.jpg'; // 二维码
+            let src1 = '/index/static/img/jzyz.png'; // 水印
+			let context = uni.createCanvasContext('qrShareBox');
+			// 插入背景图片
+			console.log('插入背景图片', ctxBg, 0, 0, obj.canWeidth, obj.canHeight);
+			context.drawImage(ctxBg, 0, 0, obj.canWeidth, obj.canHeight);
+
+			const codeSize = obj.size * obj.ratio; //计算二维码大小
+			const codeX = ((750 - obj.size) * obj.ratio) / 2; //二维码所在x轴位置
+			const codeY = 960 * obj.ratio; //二维码所在y轴位置
+
+			const codeBoxColor = '#FFFFFF'; //包裹框颜色
+			const codeBoxWidht = 0; //包裹边框宽度
+			const codeBoxSize = (codeBoxWidht / 2) * obj.ratio; //计算二维码白色包裹框大小
+			const codeBoxX = codeX - codeBoxSize; //包裹框初始X轴
+			const codeBoxY = codeY - codeBoxSize; //包裹框初始Y轴
+			const codeBoxEnd = codeSize + codeBoxWidht * obj.ratio; //计算包裹框大小
+			const fontTop = codeY + codeBoxEnd + (codeBoxWidht + 20) * obj.ratio; //文字距离上边距高度
+			const fontSize = 24 * obj.ratio; //文字大小
+			const fontText = ''; //文字内容
+			const fontLeft = (codeSize - fontSize * fontText.length) / 2 + codeX; //文字左侧距离
+
+			context.setFontSize(30 * obj.ratio);
+		
+			
+			// 画横线
+			context.moveTo(100 * obj.ratio, 475 * obj.ratio);
+			context.lineTo(300 * obj.ratio, 475 * obj.ratio);
+			context.stroke();
+			context.setTextAlign('center')
+			context.fillText(obj.name, 200 * obj.ratio, 465 * obj.ratio);
+			context.setTextAlign('left')
+			context.fillText('您好！', 310 * obj.ratio, 465 * obj.ratio);
+			context.fillText('欢迎您成为荆州市遗体器官捐献志愿登', 160 * obj.ratio, 526 * obj.ratio);
+			context.fillText('记者！逝世后捐献遗体器官，服务医疗，造', 100 * obj.ratio, 580 * obj.ratio);
+			context.fillText('福社会是大爱奉献精神的体现，是无比高尚', 100 * obj.ratio, 630 * obj.ratio);
+
+			context.fillText('的行为！衷心感谢您对荆州市遗体器官捐献', 100 * obj.ratio, 685 * obj.ratio);
+			context.fillText('事业的参与和支持!',100 * obj.ratio, 740 * obj.ratio)
+			// context.setTextAlign('right')
+			context.fillText('特颁此证。', 120 * obj.ratio, 860 * obj.ratio);
+			context.fillText('登记日期:', 350 * obj.ratio, 990 * obj.ratio)
+			context.fillText(obj.time, 490 * obj.ratio, 990 * obj.ratio)
+			// context.fillText('登记编号:', 350 * obj.ratio, 1030 * obj.ratio)
+			context.setFontSize(24 * obj.ratio);
+			context.fillText('荆州市红十字会制         咨询电话:   0716-8466465', 120 * obj.ratio, 1210 * obj.ratio);
+			// context.fillText(obj.add_time, 450 * obj.ratio, 910 * obj.ratio);
+			// 插入二维码
+			// console.log(codeX, codeY, codeSize, 999)
+			context.drawImage(src, 95 * obj.ratio, 910 * obj.ratio, codeSize, codeSize);
+			context.drawImage(src1, 500 * obj.ratio, 910 * obj.ratio, codeSize, codeSize);
+			// 生成
+			context.draw(false, e => {
+				uni.canvasToTempFilePath({
+					x: 0,
+					y: 0,
+					width: obj.canWeidth,
+					height: obj.canHeight,
+					destWidth: obj.canWeidth,
+					destHeight: obj.canHeight,
+					canvasId: 'qrShareBox',
+					success: function(res) {
+						console.log(333, res);
+						// 在H5平台下，tempFilePath 为 base64
+						obj.showcanvas = false;
+						obj.img = res.tempFilePath;
+					}
+				});
+			});
+		},
+		onShow() {
+			var animation = uni.createAnimation();
+			this.animation = animation;
+			
+		},
+		onLoad(option) {
+			this.name = option.name
+			this.time = option.time
+			this.IndexShare()
+		},
+		onHide() {
+			//在页面隐藏时也要清除定时器
+			
+		},
+		onUnload() {
+			//在页面卸载时清除定时器 避免出现多个定时器连续创建动画
+			
+		},
+		methods: {
+			// 分享
+			IndexShare() {
+				let obj = this;
+				// let money = obj.money;
+				let item = {
+					link: 'http://jz.red.igxys.com/index/#/pages/joinSuc/certificate?name=' + obj.name + '&time=' + obj.time, // 分享链接
+					imgUrl: 'http://jz.red.igxys.com/index/static/img/002.png',
+					desc: '弘扬红十字精神，传播红十字观念，宣传红十字工作，这是一个汇聚爱心、救助之家力量的平台！',
+					title: '来自荆州市红十字会的遗体器官志愿登记证书',
+					success: console.log('分享加载成功')
+				};
+				console.log('分享加', item);
+				weixindata(item);
+			},
+			musicClick() {},
+			play() {
+				this.playing = !this.playing;
+				this.ScanAudio(this.playing);
+				if (this.playing == true) {
+					this.timer = setInterval(() => {
+						//创建定时器,3秒执行异一次
+						this.scaleAndScale();
+						console.log('每1秒执行一次');
+					}, 1000);
+				} else {
+					clearInterval(this.timer);
+				}
+			},
+			// 定义动画内容
+			scaleAndScale() {
+				// 定义动画内容
+				// this.animation.scale(1.2, 1.2).step() //先放大1,2倍
+				// this.animation.scale(1, 1).step() //缩小至原来的大小
+				// 导出动画数据传递给data层
+				// this.animationData = this.animation.export(); //每次执行导出动画时 会覆盖之前的动画
+				this.animation.rotate(this.demo).step({
+					duration: 1000
+				});
+				this.animationData = this.animation.export();
+				this.demo += 360;
+			},
+			noscaleAndScale() {
+				this.animation.rotate(0).step({
+					duration: 1000
+				});
+				this.animationData = this.animation.export();
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+	}
+
+	.content {
+		width: 100%;
+		height: 100%;
+		position: relative;
+
+		.bgimg {
+			width: 100%;
+			height: 100%;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.tki-qrcode-canvas {
+			width: 750rpx;
+			height: 1350rpx;
+			margin: 0 auto;
+		}
+
+		.box {
+			color: #ffffff;
+			width: 100%;
+			height: 100vh;
+
+			.music {
+				border-radius: 28rpx;
+				position: absolute;
+				left: 40rpx;
+				top: 100rpx;
+				z-index: 999;
+			}
+
+			.keepgo {
+				animation-play-state: paused;
+			}
+
+			.imgbox {
+				height: 1350rpx;
+				width: 750rpx;
+			}
+		}
+
+		.image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+</style>

pages/train/sign.vue

@@ -166,7 +166,8 @@ export default {
 			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 src = '/index/static/icon/erweima.jpg' // 二维码
+		let src1 = '/index/static/img/jzyz.png'
 		let context = uni.createCanvasContext('qrShareBox');
 		// 插入背景图片
 		context.drawImage(ctxBg, 0, 0, obj.canWeidth, obj.canHeight);
@@ -230,7 +231,8 @@ export default {
 		context.stroke();
 		// 插入二维码
 		console.log('插入二维码src',src)
-		context.drawImage(src, codeX, codeY, codeSize, codeSize);
+		context.drawImage(src, codeX, codeY, codeSize, codeSize);
+		context.drawImage(src1, 480 * obj.ratio - codeSize/2, 810 * obj.ratio - codeSize/2, codeSize, codeSize);
 		context.draw(false,(e) => {
 			uni.canvasToTempFilePath({
 			  x: 0,

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.274db71c.js></script><script src=/index/static/js/index.a59f6383.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.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.274db71c.js></script><script src=/index/static/js/index.09ffb9d1.js></script></body></html>

utils/loginUtils.js

@@ -53,6 +53,9 @@ export function interceptor() {
 			title: '提示',
 			content: '请使用微信扫码！',
 		})
+		// uni.navigateTo({
+		// 	url
+		// })
 	}