7-8

App.vue

@@ -21,6 +21,17 @@
 		},
 		methods: {
 			...mapMutations('user', ['setUserInfo', 'login', 'hasLogin']),
+			IndexShare() {
+				let obj = this;
+				let item = {
+					link:  'http://ez.igxys.com/index/#/pages/index/index',// 分享链接
+					imgUrl: 'http://ez.igxys.com/index/static/img/002.png',
+					desc: '',
+					title: '鄂州市红十字会',
+				};
+				console.log('分享加',item)
+				weixindata(item);
+			},
 		},
 		onLaunch: function(urlObj) {
 			let obj = this;
@@ -67,6 +78,7 @@
 			
 		},
 		onShow: function() {
+			this.IndexShare()
 			// 加载拦截
 			// console.log('App Show');
 			// console.log(this.$u.config.v);

pages.json

@@ -715,6 +715,18 @@
 			
 			}
 		}
+		// {
+		// 	"path": "pages/share/card",
+		// 	"style": {
+		// 		// #ifndef MP
+		// 		"app-plus": {
+		// 			"titleNView": false
+		// 		},
+		// 		// #endif
+		// 		"navigationBarTitleText": "分享名片"
+			
+		// 	}
+		// }
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/applic/donaSuccess.vue

@@ -22,7 +22,7 @@
 			</view>
 			<view class="main">
 				<view class="box-2">
-					感谢您积极参与井武汉市江夏区红十字会志愿服务各项活动，关爱他人、无私付出，为有需要的人送去温暖，用实际行动诠释了“人道、博爱、奉献”的红十字精神。
+					感谢您积极参与鄂州市红十字会志愿服务各项活动，关爱他人、无私付出，为有需要的人送去温暖，用实际行动诠释了“人道、博爱、奉献”的红十字精神。
 				</view>
 				<view class="box-2">
 					祝您及您的家人新年吉祥!身体健康!万事顺意!
@@ -36,7 +36,7 @@
 					谨表谢意
 				</view>
 				<view class="box-1">
-					武汉市江夏区红十字会
+					鄂州市红十字会
 				</view>
 			</view>
 		</view>

pages/applic/location.vue

@@ -307,10 +307,10 @@
 				}).catch(err => {
 					console.log(err);
 					uni.hideLoading();
-					uni.showModal({
-						title: '失败',
-						content: JSON.stringify(err)
-					});
+					// uni.showModal({
+					// 	title: '失败',
+					// 	content: JSON.stringify(err)
+					// });
 				});
 			},
 			cancel(){

pages/applic/other.vue

@@ -26,9 +26,9 @@
 					<view class="copyband" @click="copy(item.count)">复制开户行</view>
 				</view>
 			</view>
-			<view class="image">
+<!-- 			<view class="image">
 				<image src="../../static/images/money.png" mode=""></image>
-			</view>
+			</view> -->
 			<!-- <view class="image">
 				<image src="../../static/images/other.png" mode=""></image>
 			</view> -->
@@ -37,17 +37,18 @@
 			<view class="erweima"><image src="" mode=""></image></view>
 			<view class="weixin">微信扫码捐款</view>
 			<view class="erweima" style="background: #02974A;"><image src="" mode=""></image></view> -->
-
-			<view class="title">2.现场捐款/捐物</view>
+			<view class="title">2.捐赠二维码</view>
 			<view class="detail">
-				<view class="detail-item">负责人：邵思前</view>
-				<view class="detail-item">咨询电话：027-60229377</view>
-				<view class="detail-item">地址：湖北省鄂州市鄂城区滨湖南路60号7楼</view>
+				<image src="../../static/images/erweima.jpg" mode=""></image>
 			</view>
-			<view class="title">3.扫码捐款</view>
+			<view class="title">3.现场捐款/捐物</view>
 			<view class="detail">
-				<image src="../../static/images/zhifu.png" mode=""></image>
+				<view class="detail-item">单位：鄂州市红十字会</view>
+				<view class="detail-item">地点：湖北省鄂州市鄂城区滨湖南路60号7楼</view>
+				<view class="detail-item">联系方式：027-60229377</view>
+				<view class="sm">捐物说明：<text>如有意捐赠物资，请致电027-6022937咨询相关事宜。捐赠物资所需提供的资料为：捐赠单位捐赠意向书、单位证明、物资资质证明和价格证明等。</text></view>
 			</view>
+			
 		</view>
 	</view>
 </template>
@@ -164,7 +165,7 @@ page {
 			font-size: 28rpx;
 			font-family: PingFang SC;
 			font-weight: bold;
-			color: #101010;
+			color: #F0433C;
 		}
 
 		.detail {
@@ -198,8 +199,8 @@ page {
 			}
 			image {
 				display: block;
-				width: 560rpx;
-				height: 560rpx;
+				width: 444rpx;
+				height: 494rpx;
 				margin: 30rpx auto;
 			}
 
@@ -211,7 +212,10 @@ page {
 				line-height: 46rpx;
 				color: #000;
 				margin-top: 10rpx;
-
+				text {
+					display: inline-block;
+					margin-left: 150rpx;
+				}
 				.copy {
 					width: 168rpx;
 					display: flex;
@@ -262,4 +266,14 @@ page {
 		}
 	}
 }
+.sm {
+	margin-top: 10rpx;
+	position: relative;
+	line-height: 46rpx;
+	text {
+		display: inline-block;
+		position: absolute;
+		top: 0;
+	}
+}
 </style>

pages/category/category.vue

@@ -35,7 +35,7 @@
 			<view class="list" @click="Toshow">
 				<view class="list-left">机构<text>*</text></view>
 				<!-- <input type="text" v-model="mechanism" @click="tosearch" class="list-input" placeholder='请输入机构关键字'/> -->
-				<input type="text" v-model="mechanism" class="list-input" placeholder="请输入机构关键字" disabled />
+				<input type="text" v-model="searchVal" class="list-input" placeholder="请输入机构关键字" disabled />
 			</view>
 
 			<view class="upload-box">

pages/form/certificates copy.vue

@@ -13,7 +13,7 @@
 				</view>
 			</view>
 			<view class="info">
-				您已完成江夏红十字会普及培训,特发此证,以资鼓励。
+				您已完成鄂州市红十字会普及培训,特发此证,以资鼓励。
 			</view>
 			<view class="signName">
 				<view class="signName-left">
@@ -55,7 +55,7 @@
 		data(){
 			return{
 				name:'',
-				people:'武汉市江夏红十字会',
+				people:'鄂州市红十字会',
 				signDate:'',
 			}
 		},

pages/form/certificates.vue

@@ -237,8 +237,8 @@ export default {
 		IndexShare() {
 			let obj = this;
 			let item = {
-				link:  'http://ez.igxys.com/index/#/pages/train/sign?type=' + obj.type + '&id=' + obj.id + '&uid=' + obj.userInfo.uid,// 分享链接
-				imgUrl: '/index/static/img/002.png',
+				link:  'http://ez.igxys.com/index/#/pages/form/certificates?type=' + obj.type + '&id=' + obj.id + '&uid=' + obj.userInfo.uid,// 分享链接
+				imgUrl: 'http://ez.igxys.com/index/static/img/002.png',
 				desc: '结业证书',
 				title: '鄂州市红十字会',
 			};

pages/form/tovolApply.vue

@@ -519,7 +519,7 @@ export default {
 			add_volunteers({
 				name: obj.name,
 				sex: obj.sex,
-				birth: obj.birthday,
+				birth: obj.birth,
 				picture: obj.cardimg,
 				phone: obj.phone,
 				mobile: obj.mobile,

pages/share/card.vue

@@ -3,14 +3,14 @@
 		<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">武汉市江夏区<br>红十字会</view>
+			<view class="china-font">鄂州市<br>红十字会</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>湖北省鄂州市鄂城区滨湖南路<br>60号7楼鄂州市红十字会</text></view>
 			</view>
 			<view class="item flex">
 				<image class="home_img" src="../../static/img/test_phone.png" mode="aspectFill"></image>
@@ -28,7 +28,7 @@
 			<view class="map">
 				<image class="map-box" src="../../static/img/baseaddr.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>
@@ -64,7 +64,7 @@ export default {
 			latitude: '30.353495', //荆州市纬度
 			longitudeNew: '', //当前经度
 			latitudeNew: '', //当前纬度
-			addr: '江夏区红十字会'
+			addr: '鄂州市红十字会'
 		};
 	},
 	onLoad() {
@@ -112,14 +112,14 @@ 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://ez.igxys.com/index/#/pages/share/card',// 分享链接
-				imgUrl: '/index/static/img/002.png',
+				imgUrl: './static/img/002.png',
 				desc: '电子名片分享',
 				title: '鄂州市红十字会',
 			};

pages/train/sign.vue

@@ -79,7 +79,7 @@ export default {
 			companyName:'',
 			companyphone:'',
 			num:'',
-			people:'武汉市江夏区红十字会',
+			people:'鄂州市红十字会',
 			signDate:'',
 			loading: true, //是否载入图片中
 			size: 180,
@@ -166,7 +166,7 @@ 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.png' // 二维码
+		let src = '/index/static/icon/erweima.jpg' // 二维码
 		let context = uni.createCanvasContext('qrShareBox');
 		// 插入背景图片
 		context.drawImage(ctxBg, 0, 0, obj.canWeidth, obj.canHeight);
@@ -199,7 +199,7 @@ export default {
 		
 		context.setFontSize(31 * obj.ratio)
 		
-		context.fillText('您已完成武汉市江夏区红十字会普及培训', 105 * obj.ratio, 670 * obj.ratio)
+		context.fillText('您已完成鄂州市红十字会普及培训', 105 * obj.ratio, 670 * obj.ratio)
 		context.fillText('的全部课程，特发此证。', 105 * obj.ratio, 720 * obj.ratio)
 		context.setFontSize(22 * obj.ratio)
 		context.fillText('签发人:', 100 * obj.ratio, 800 * obj.ratio)
@@ -212,7 +212,7 @@ export default {
 		context.fillText('Issuer Date:', 100 * obj.ratio, 910 * obj.ratio)
 		context.setFontSize(26 * obj.ratio)
 		context.fillText(m, 275 * obj.ratio, 908 * obj.ratio)
-		context.fillText('武汉市江夏区红十字会', 200 * obj.ratio, 820 * obj.ratio)
+		context.fillText('鄂州市红十字会', 200 * obj.ratio, 820 * obj.ratio)
 		// 画横线
 		context.moveTo(230 * obj.ratio, 915 * obj.ratio)
 		context.lineTo(460 * obj.ratio, 915 * obj.ratio)
@@ -266,7 +266,7 @@ export default {
 			let obj = this;
 			let item = {
 				link:  'http://ez.igxys.com/index/#/pages/train/sign?type=' + obj.type + '&id=' + obj.id + '&uid=' + obj.userInfo.uid,// 分享链接
-				imgUrl: '/index/static/img/002.png',
+				imgUrl: 'http://ez.igxys.com/index/static/img/002.png',
 				desc: '结业证书',
 				title: '鄂州市红十字会',
 			};

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.3e73f18a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.4d93cbc5.js></script><script src=/index/static/js/index.e413f10f.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.3e73f18a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.4d93cbc5.js></script><script src=/index/static/js/index.e9d64726.js></script></body></html>