12-14

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">Songzi Red Cross Society</view>
+				<view class="english-font">Red Cross Society of China Songzi Branch</view>
 			</view>
 		</view>
 

pages/applic/toknowledge.vue

@@ -102,7 +102,7 @@
 				松滋市造血干细胞捐献咨询电话:
 			</view>
 			<view class="list-tips" style="text-align: center;">
-				0716-4163849
+				赵兵 13886623968
 			</view>
 			<!-- <view class="list01">
 				具体入库办法：

pages/category/category.vue

@@ -24,7 +24,7 @@
 				<input type="text" v-model="name" class="list-input" placeholder="请填写您的姓名" />
 			</view>
 			<view class="list">
-				<view class="list-left">手机名 <text>*</text></view>
+				<view class="list-left">手机号码 <text>*</text></view>
 				<input type="text" v-model="phone" class="list-input" placeholder="请填写您的联系方式" />
 			</view>
 			<view class="list" @click="getLocation">
@@ -32,10 +32,10 @@
 				<!-- <picker-address class="box-right" @change="onCityClick">{{ address }}</picker-address> -->
 				<input type="text" v-model="showaddress" class="list-input" placeholder="请选择定位地址" />
 			</view>
-			<view class="list" @click="Toshow">
+			<view class="list" >
 				<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="mechanism" class="list-input" placeholder="请填写您的所在机构" />
 			</view>
 
 			<view class="upload-box">

pages/form/certificatesList.vue

@@ -5,11 +5,11 @@
 		</view> -->
 		<swiper class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+				<scroll-view class="list-scroll-content" scroll-y >
 					<!-- 空白页 -->
 					<empty v-if="loadingType === true && list.length === 0"></empty>
 					<!-- 订单列表 -->
-					<view class="order-item" @click="ToDetail(item)" v-for="(item, index) in list" :key="index">
+					<view class="order-item" @click="ToDetail(item)" v-for="(item, index) in list" :key="index" v-if="item.project_area == 224">
 						<view class="list-cell">
 							<image class="image" :src="item.img"></image>
 							<view class="list-tpl">{{ item.title }}</view>

pages/form/donaSuccess.vue

@@ -168,9 +168,9 @@ export default {
 		console.log(333, option);
 		this.money = option.money;
 		this.name = decodeURI(option.name)
-		this.add_time =decodeURI(option.time)
+		this.add_time = decodeURI(option.time)
 		this.IndexShare();
-		this.ScanAudio(true);
+		this.ScanAudio(true);		
 	},
 	onHide() {
 		//在页面隐藏时也要清除定时器
@@ -194,8 +194,8 @@ export default {
 			let item = {
 				link: 'http://jz.red.igxys.com/szs/#/pages/form/donaSuccess?money=' + obj.money + '&name=' + encodeURI(obj.name) + '&time=' + encodeURI(obj.add_time), // 分享链接
 				imgUrl: 'http://jz.red.igxys.com/static/img/22.jpg',
-				desc: '感谢信',
-				title: '松滋市红十字会',
+				desc: '弘扬红十字精神，传播红十字观念，宣传红十字工作，这是一个汇聚爱心、救助之家力量的平台！',
+				title: '来自松滋市红十字会的感谢信',
 				success: console.log('分享加载成功')
 			};
 			console.log('分享加', item);

pages/index/index.vue

@@ -67,7 +67,7 @@
 			<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="jzsbmarker" :scale="scale" :latitude="latitude4"
-					:longitude="longitude4" ref="map" @markertap="markertap"></map>
+					:longitude="longitude4" ref="map" @markertap="markertap" :show-location="false"></map>
 			</view>
 			<view class="" style="padding-top: 80rpx;">
 				<view v-for="(item,index) in jzsblist" :key="item.id">
@@ -117,7 +117,8 @@
 			</view>
 			<view id="container">
 				<map class="map-box" id="map" show-location :markers="jhzmarker" :scale="scale" :latitude="latitude4"
-					:longitude="longitude4" ref="map" style="height: 450rpx" @markertap="jhzmarkertap"></map>
+					:longitude="longitude4" ref="map" style="height: 450rpx" @markertap="jhzmarkertap"
+					:show-location="false"></map>
 			</view>
 			<view class="">
 				<view class="list-tpl flex" @click="openAddress(item)" v-for="(item, index) in Mechanism"
@@ -145,7 +146,8 @@
 			</view>
 			<view id="container">
 				<map class="map-box" id="map" show-location :markers="aedmarker" :scale="scale" :latitude="latitude4"
-					:longitude="longitude4" ref="map" style="height: 450rpx" @markertap="aedmarkertap"></map>
+					:longitude="longitude4" ref="map" style="height: 450rpx" @markertap="aedmarkertap"
+					:show-location="false"></map>
 			</view>
 			<view class="">
 				<view class="list-tpl flex" @click="openAddress(item)" v-for="(item, index) in AEDList" :key="item.id">
@@ -322,6 +324,15 @@
 				// #ifdef H5
 				wxOjb.ready(() => {
 					console.log('加载完毕注册事件');
+					wxOjb.updateAppMessageShareData({
+						title: '松滋市红十字会',// 分享标题
+						desc: '弘扬红十字精神，传播红十字观念，宣传红十字工作，这是一个汇聚爱心、救助之家力量的平台！',// 分享描述
+						link: 'http://jz.red.igxys.com/szs',// 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+						imgUrl: 'http://jz.red.igxys.com/static/img/22.jpg',// 分享图标
+						success: function() {
+							console.log('分享数据',)
+						}
+					})
 					locationAddress({
 						type: 'gcj02',
 						success: function(res) {
@@ -348,7 +359,7 @@
 
 				// #ifdef MP
 				locationAddress({
-					type: 'wgs84',
+					type: 'gcj02',
 					success: function(res) {
 						console.log('获取经纬度', res);
 						obj.longitude4 = res.longitude;
@@ -421,6 +432,19 @@
 		},
 		methods: {
 			...mapMutations('user', ['setUserInfo']),
+			// IndexShare() {
+			// 	let obj = this;
+			// 	// let money = obj.money;
+			// 	let item = {
+			// 		link: 'http://jz.red.igxys.com/szs, // 分享链接
+			// 		imgUrl: 'http://jz.red.igxys.com/static/img/22.jpg',
+			// 		desc: '弘扬红十字精神，传播红十字观念，宣传红十字工作，这是一个汇聚爱心、救助之家力量的平台！',
+			// 		title: '松滋市红十字会',
+			// 		success: console.log('分享加载成功')
+			// 	};
+			// 	console.log('分享加', item);
+			// 	weixindata(item);
+			// },
 			tocontribution() {
 				uni.navigateTo({
 					// url: "/pages/applic/contribution"
@@ -575,7 +599,8 @@
 					console.log(data, 999);
 					// obj.AEDList = data
 					for (let i = 0; i < data.length; i++) {
-						data[i].space = obj.space(obj.latitude4, obj.longitude4, data[i].latitude, data[i].longitude);
+						data[i].space = obj.space(obj.latitude4, obj.longitude4, data[i].latitude, data[i]
+							.longitude);
 					}
 					obj.AEDList = data;
 					let arr = data.map(item => ({
@@ -599,7 +624,8 @@
 				}) => {
 					console.log(data, '机构+++++++++++++')
 					for (let i = 0; i < data.length; i++) {
-						data[i].space = obj.space(obj.latitude4, obj.longitude4, data[i].latitude, data[i].longitude);
+						data[i].space = obj.space(obj.latitude4, obj.longitude4, data[i].latitude, data[i]
+							.longitude);
 					}
 					let arr = data.map(item => ({
 						latitude: item.latitude,
@@ -621,7 +647,7 @@
 					limit: 2
 				}).then((res) => {
 					let data = res.data;
-					data = data.slice(0,2)
+					data = data.slice(0, 2)
 					console.log('就在身边请求数据', data);
 					console.log('data.phone333', data.phone)
 					data = data.map(d => {
@@ -631,7 +657,7 @@
 						}
 					})
 					obj.jzsblist = data;
-				
+
 					let arr = data.map(item => ({
 						latitude: item.latitude,
 						longitude: item.longitude,
@@ -1185,18 +1211,18 @@
 		// height: 393rpx;
 		padding: 30rpx 30rpx 40rpx 30rpx;
 		background-color: #fff;
-	
+
 		.red-nav {
 			padding-top: 25rpx;
 			display: flex;
 			justify-content: space-between;
-	
+
 			.nav-item {
 				width: 330rpx;
 				height: 175rpx;
 				background: #FFF4F2;
 				border-radius: 15rpx;
-	
+
 				image {
 					width: 330rpx;
 					height: 175rpx;

pages/redirect/redirect.vue

@@ -41,9 +41,9 @@
 				let obj = this;
 				let url = window.location.href;
 				let code = url.match(/code=([0-9]|[a-z]|[A-Z])*/g)[0].replace('code=', '');
-				history.replaceState({
-					name: '首页'
-				}, '首页', obj.urlFile + '/#/pages/index/index');
+				// history.replaceState({
+				// 	name: '首页'
+				// }, '首页', obj.urlFile + '/#/pages/index/index');
 				let spread = uni.getStorageSync('spread') || '';
 				wechatAuth({
 					code: code,

pages/share/card.vue

@@ -4,7 +4,7 @@
 		<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 Songzi, China</view>
+			<view class="english-font">Red Cross Society of China Songzi Branch</view>
 			<view class="fgx"></view>
 		</view>
 		<view class="buttom flex">
@@ -26,7 +26,9 @@
 				<view class="text"><text>jz_hszh@sina.com</text></view>
 			</view> -->
 			<view class="map">
-				<image class="map-box" src="../../static/icon/erweima.jpg"></image>
+				<!-- <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>
@@ -60,11 +62,20 @@ export default {
 	},
 	data() {
 		return {
-			longitude: '114.316738', //荆州市经度
-			latitude: '30.353495', //荆州市纬度
+			longitude: '111.772192', //荆州市经度,
+			latitude: '30.172221', //荆州市纬度
 			longitudeNew: '', //当前经度
 			latitudeNew: '', //当前纬度
-			addr: '江夏区红十字会'
+			addr: '松滋市红十字会',
+			markers: [{
+				id: '224',
+				title: '松滋市红十字会',
+				iconPath: '/static/img/img10.png',
+				width: '28',
+				height: '28',
+				longitude: '111.772192', //荆州市经度,
+				latitude: '30.172221',
+			}]
 		};
 	},
 	onLoad() {
@@ -110,16 +121,16 @@ export default {
 			window.location.href = `http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};addr:${address}`;
 		},
 		toBaiduMap() {
-			
+			// 111.778756,30.178041
 			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.178041,111.778756&title=松滋市红十字会&content=松滋市红十字会&output=html&src=webapp.baidu.openAPIdemo `
 		},
 		//分享
 		IndexShare() {
 			let obj = this;
 			let item = {
 				link:  'http://jz.red.igxys.com/szs/#/pages/share/card',// 分享链接
-				imgUrl: '/index/static/img/002.png',
+				imgUrl: 'http://jz.red.igxys.com/static/img/22.jpg',
 				desc: '电子名片分享',
 				title: '松滋市红十字会',
 			};
@@ -133,7 +144,7 @@ export default {
 <style lang="scss">
 	.center {
 		border: 20rpx solid #e01a1c;
-		height: 100%;
+		min-height: 100%;
 		// min-height: 600px;
 	}
 	.flex {
@@ -194,6 +205,7 @@ export default {
 		}
 		.fgx {
 			margin-top: 25rpx;
+			margin-bottom: 25rpx;
 			z-index: 0;
 			width: 625rpx;
 			border-bottom: 1rpx dashed #e01a1c;
@@ -217,15 +229,17 @@ export default {
 			}
 	
 			.text {
-				display: inline-block;
-				padding-left: 75rpx;
+				width: 405rpx;
+				// display: inline-block;
+				// padding-left: 75rpx;
 				letter-spacing: 1.2rpx;
 				font-size: 25rpx;
 				font-weight: bold;
 				text-align: center;
-				.text1 {
-					padding-left: 60rpx;
-				}
+				// background-color: red;
+				// .text1 {
+				// 	padding-left: 60rpx;
+				// }
 			}
 		}
 		.map {

pages/train/index.vue

@@ -5,11 +5,11 @@
 		</view> -->
 		<swiper class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+				<scroll-view class="list-scroll-content" scroll-y >
 					<!-- 空白页 -->
 					<empty v-if="loadingType === true && list.length === 0"></empty>
 					<!-- 订单列表 -->
-					<view class="order-item" @click="ToDetail(item)" v-for="(item, index) in list" :key="index">
+					<view class="order-item" @click="ToDetail(item)" v-for="(item, index) in list" :key="index" v-if="item.project_area == 224">
 						<view class="list-cell">
 							<image class="image" :src="item.img"></image>
 							<view class="list-tpl">{{ item.title }}</view>

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"> 报名咨询电话：高明 15586000333</view>
 			</view>
 			<view class="submit" @click="submit">立即报名</view>
 		</view>

pages/user/user.vue

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

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>松滋市红十字会</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/szs/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/szs/static/js/chunk-vendors.691ce82f.js></script><script src=/szs/static/js/index.ef568a05.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=/szs/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/szs/static/js/chunk-vendors.691ce82f.js></script><script src=/szs/static/js/index.4a789e21.js></script></body></html>