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']),
 		},
@@ -26,9 +30,9 @@
 			let obj = this;
 			// 加载缓存中的用户信息
 			let userInfo = uni.getStorageSync('userInfo') || '';
-			console.log(userInfo,'bba');
+			console.log(userInfo, 'bba');
 			// 判断是否拥有用户信息
-			if (userInfo.uid) {
+			if (userInfo.project_area == obj.project_area) {
 				//更新登陆状态
 				uni.getStorage({
 					key: 'userInfo',
@@ -62,9 +66,9 @@
 			// obj.audioMusic.onError(function(res){
 			// 	console.log(res)
 			// })
-			
-			
-			
+
+
+
 		},
 		onShow: function() {
 			// 加载拦截
@@ -135,14 +139,15 @@
 	}
 
 	//多行字体省略
-	.word2_ellipsis{
+	.word2_ellipsis {
 		overflow: hidden;
 		text-overflow: ellipsis;
 		display: -webkit-box;
-		-webkit-line-clamp: 2;//在第几行显示...
+		-webkit-line-clamp: 2; //在第几行显示...
 		-webkit-box-orient: vertical;
 
 	}
+
 	//右外边距
 	.m-r25 {
 		margin-right: 25rpx;
@@ -355,17 +360,19 @@
 		// 设置默认字体
 		font-family: PingFang SC, STHeitiSC-Light, Helvetica-Light, arial, sans-serif, Droid Sans Fallback;
 	}
+
 	.clamp {
 		overflow: hidden;
 		text-overflow: ellipsis;
 		white-space: nowrap;
 		display: block;
 	}
-	.clamp2{
-		overflow:hidden; 
-		text-overflow:ellipsis;
-		display:-webkit-box; 
-		-webkit-box-orient:vertical;
-		-webkit-line-clamp:2;
+
+	.clamp2 {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
 	}
-</style>
+</style>

components/espempty.vue

@@ -2,7 +2,7 @@
 	<view class="empty-content">
 		<image class="empty-content-image" :src="setSrc" mode="aspectFit"></image>
 		<view class="empty-info">
-			救援列表为空
+			{{tit}}
 		</view>
 	</view>
 </template>
@@ -14,6 +14,10 @@
 				type: String,
 				default: 'espempty'
 			},
+			tit: {
+				type: String,
+				default: '救援列表为空'
+			}
 		},
 
 		data() {

components/top-title/top-title.vue

@@ -1,40 +1,64 @@
-<template>
+<template>
 	<view class="top-title">
-		<view class="title-before">
+		<view class="" style="justify-self: flex-start;">
+			<view class="title-before"></view>
+			<view class="title">{{title}}</view>
 		</view>
-		<view class="title">{{title}}</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name:"top-title",
-		data() {
-			return {
-				
-			};
+		<view class="gd" @click="navTo" v-if="show_more">
+			更多 >
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "top-title",
+		data() {
+			return {
+
+			};
 		},
 		props: {
 			title: {
 				type: String,
 				default: ''
+			},
+			navurl: {
+				type: String,
+				default: ''
+			},
+			show_more: {
+				type: Boolean,
+				default: false
 			}
-		}
-	}
-</script>
-
-<style lang="scss">
-.top-title {
+		},
+		methods: {
+			navTo() {
+				console.log('dianji')
+				uni.navigateTo({
+					url: this.navurl
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.top-title {
+
+		width: 100%;
 		display: flex;
 		align-items: center;
+		justify-content: space-between;
 		.title-before {
 			display: inline-block;
-			background-color: $m-color;
+			background-color: #F0433C;
 			width: 10rpx;
 			height: 30rpx;
 			margin-right: 16rpx;
-			
+			border-radius: 4rpx;
 		}
+
 		.title {
 			display: inline-block;
 			font-size: 32rpx;
@@ -42,8 +66,10 @@
 			font-weight: bold;
 			color: #333333;
 		}
+
 		.title-after {
 			display: inline-block;
+
 			.a1 {
 				width: 8rpx;
 				height: 8rpx;
@@ -53,6 +79,7 @@
 				margin-top: 16rpx;
 				margin-left: 25rpx;
 			}
+
 			.a2 {
 				width: 28rpx;
 				height: 4rpx;
@@ -60,8 +87,9 @@
 				opacity: 0.1;
 				border-radius: 2rpx;
 				margin-bottom: 6rpx;
-				
+
 			}
+
 			.a3 {
 				width: 28rpx;
 				height: 4rpx;
@@ -71,5 +99,5 @@
 				margin-left: 11rpx;
 			}
 		}
-	}
+	}
 </style>

manifest.json

@@ -1,104 +1,104 @@
-{
-    "name" : "荆州市红十字会",
-    "appid" : "__UNI__C8A3AAB",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {},
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {},
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "maps" : {}
-            }
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true,
-        "permission" : {}
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "h5" : {
-        "title" : "荆州市红十字会",
-        "domain" : "jz.red.igxys.com",
-        "router" : {
-            "mode" : "hash",
-            "base" : "/index/"
-        },
-        "devServer" : {
-            "proxy" : {
-                "/api" : {
-                    "target" : "http://jz.red.igxys.com", //请求的目标域名
-                    "changeOrigin" : true,
-                    // "secure": false,
-                    "pathRewrite" : {}
-                }
-            }
-        },
-        // "^/api" : ""
-        "template" : "",
-        "sdkConfigs" : {
-            "maps" : {}
-        }
-    }
-}
+{
+    "name" : "松滋市红十字会",
+    "appid" : "__UNI__C8A3AAB",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "maps" : {}
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true,
+        "permission" : {}
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "h5" : {
+        "title" : "松滋市红十字会",
+        "domain" : "jz.red.igxys.com",
+        "router" : {
+            "mode" : "hash",
+            "base" : "/szs/"
+        },
+        "devServer" : {
+            "proxy" : {
+                "/api" : {
+                    "target" : "http://jz.red.igxys.com", //请求的目标域名
+                    "changeOrigin" : true,
+                    // "secure": false,
+                    "pathRewrite" : {}
+                }
+            }
+        },
+        // "^/api" : ""
+        "template" : "",
+        "sdkConfigs" : {
+            "maps" : {}
+        }
+    }
+}

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/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

@@ -3,7 +3,7 @@
 		<view id="map" class="map">
 			<map @updated='mapChange' id="map_1" ref='map_1' style="width:750rpx; height: 600rpx" :latitude="latitude"
 			 :longitude="longitude" :markers="marker"></map>
-		</view>i
+		</view>
 			<view class="location">
 				<!-- <view class="Search-box"  @click="getLocation">
 					<view class="Search-box-size">

pages/applic/other.vue

@@ -3,7 +3,7 @@
 		<view class="top flex">
 			<image src="../../static/img/002.png" mode="aspectFill"></image>
 			<view class="font">
-				<view class="china-font">荆州市红十字会</view>
+				<view class="china-font">松滋市红十字会</view>
 				<view class="english-font">Red Cross Society of China Ying Shan Branch</view>
 			</view>
 		</view>

pages/applic/toknowledge.vue

@@ -44,7 +44,7 @@
 					<view class="name">怎样成为造血干细胞志愿捐献者？？</view>
 				</view>
 				<view class="list-tpl">
-					您可与荆州市红十字会联系，或在余姚市爱心献血屋（阳明西路桐江桥街心公园内）报名。到指定地点抽取6-8毫升血液，经HLA分型检验，把相关资料录入到中华骨髓库的数据库中，这样您就成为造血干细胞志愿捐献者了。
+					您可与松滋市红十字会联系。到指定地点抽取6-8毫升血液，经HLA分型检验，把相关资料录入到中华骨髓库的数据库中，这样您就成为造血干细胞志愿捐献者了。
 				</view>
 			</view>
 			<view class="list-item">
@@ -99,7 +99,7 @@
 				<text style="color: #C53335; text-align: center;" >江夏区造血干细胞捐献咨询电话：</text>
 			</view> -->
 			<view class="list-tips" style="color: #C53335;text-align: center;">
-				荆州市造血干细胞捐献咨询电话:
+				松滋市造血干细胞捐献咨询电话:
 			</view>
 			<view class="list-tips" style="text-align: center;">
 				0716-4163849

pages/category/category.vue

@@ -10,7 +10,7 @@
 		<view class="pop-box">公众参与</view>
 		<view class="pop-list">
 			<view class="list-box1" v-for="(item, index) in peoplelist" :key="index" v-if="index < 20">
-				<view class="list-top"><image :src="item.avatar" mode="" class="avatar-img"></image></view>
+				<view class="list-top"><image src="../../static/img/002.png" mode="" class="avatar-img"></image></view>
 				<view class="nickname">{{ item.name }}</view>
 			</view>
 		</view>

pages/donate/donate.vue

@@ -11,10 +11,12 @@
 		</view>
 		<scroll-view scroll-y="true" :style="{ height: height }" class="item-wrapper" @scrolltolower="loadDate">
 			<!-- <view class="item-wrapper"> -->
-			<empty v-if="list.length === 0  "></empty>
+			<empty v-if="loaded && list.length === 0  "></empty>
 			<template>
-				<view class="item flex" v-for="item in list"  @click="join(item.id)" :key="item.id">
-					<view class="item-left"><image :src="item.img" mode=""></image></view>
+				<view class="item flex" v-for="item in list" @click="join(item.id)" :key="item.id">
+					<view class="item-left">
+						<image :src="item.img" mode=""></image>
+					</view>
 					<view class="item-right">
 						<view class="item-title clamp">{{ item.title }}</view>
 						<view class="item-content clamp2">{{ item.info }}</view>
@@ -22,310 +24,373 @@
 							捐赠进度
 							<text>{{ item.project_progress*100 }}%</text>
 						</view>
-						<view class="item-btn" :class="{ 'btn-active': item.status == 1 }">{{ item.status == 2 ? '已结束' : item.status == 0?'未开始':'我要捐赠'}}</view>
+						<view class="item-btn" :class="{ 'btn-active': item.status == 1 }">
+							{{ item.status == 2 ? '已结束' : item.status == 0?'未开始':'我要捐赠'}}</view>
 					</view>
 				</view>
 			</template>
 			<uni-load-more :status="loadingType"></uni-load-more>
 
 			<!-- </view> -->
-			
+
 		</scroll-view>
-		
+
 	</view>
 </template>
 
 <script>
-import empty from '../../components/empty.vue';
-import { getProjectList, getProjectInfo, getAllArea } from '../../api/money.js';
-export default {
-	components: {
-		empty
-	},
-	data() {
-		return {
-			areas: [],
-			area: '',
-			select_area: null,
-			area_id: 0,
-			statuss: [{id: -2,name: '全部'},{id: 1,name: '进行中'}, {id: 2,name: '已结束'}],
-			status: '全部',
-			select_status: -2,
-			list: [],
-			height: 0,
-			loadingType: 'more',
-			page: 1,
-			loaded: false,
-			limit: 5
-			// showList: []
-		};
-	},
-	onReady(res) {
-		this.getHeight()
-	},
-	onShow() {
-		// console.log(this.list.length,'********************************************444')
-		// location.reload()
-
-	},
-	computed: {
-		
-	},
-	onLoad() {
-		console.log('****************************************')
-		this.loadDate();
-		// this.showList = this.list;
-		this.getAllArea();
-		
-	},
-	methods: {
-		bindAreaChange(e) {
-			console.log(e.target);
-			this.area = this.areas[e.target.value].name;
-			if(this.select_area !== this.areas[e.target.value].id){
-				this.page = 1
-				this.loadingType = 'more'
-				this.loaded = false
-				this.select_area = this.areas[e.target.value].id;
-			}
-			this.list = []
-			uni.showLoading({
-				title: '加载中...'
-			})
-			this.loadDate()
-			
-			
+	import empty from '../../components/empty.vue';
+	import {
+		getProjectList,
+		getProjectInfo,
+		getAllArea
+	} from '../../api/money.js';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	export default {
+		components: {
+			empty
 		},
-		bindStatusChange(e) {
-			console.log(e.target);
-			this.status = this.statuss[e.target.value].name;
-			if(this.select_status !== this.statuss[e.target.value].id){
-				this.page = 1
-				this.loadingType = 'more'
-				this.loaded = false
-				this.select_status = this.statuss[e.target.value].id;
-			}
-			this.list = []
-			uni.showLoading({
-				title: '加载中...'
-			})
-			this.loadDate()
-			// if (this.status !== this.statuss[e.target.value]) {
-			// 	this.status = this.statuss[e.target.value];
-			// 	if(this.status == '全部') {
-			// 		this.showList = this.list
-			// 	}else if(this.status == '进行中'){
-			// 		this.showList = this.list.map( item => {
-			// 			return item
-			// 		})
-			// 	}
-			// }
+		data() {
+			return {
+				areas: [{
+					id: 0,
+					name: '市本级'
+				}],
+				area: '',
+				select_area: null,
+				area_id: 0,
+				statuss: [{
+					id: -2,
+					name: '全部'
+				}, {
+					id: 1,
+					name: '进行中'
+				}, {
+					id: 2,
+					name: '已结束'
+				}],
+				status: '全部',
+				select_status: -2,
+				list: [],
+				height: 0,
+				loadingType: 'more',
+				page: 1,
+				loaded: false,
+				limit: 10,
+				// showList: []
+			};
 		},
-		join(id) {
-			console.log(id);
-			uni.navigateTo({
-				url: '/pages/donate/donateDetail?id=' + id
-			});
-			console.log('dddddddddd');
+		onReady(res) {
+			this.getHeight()
 		},
-		loadDate() {
-			if(this.loadingType === 'noMore'){
-				return
-			}
-			getProjectList({
-				project_area: this.select_area,
-				page: this.page,
-				status: this.select_status,
-				limit: this.limit
-			}).then(({ data }) => {
-				console.log(data,'+++++++++++++++++999+++++++++++++++++++')
-				// this.list.push(data.list)
-				this.page++;
-				// console.log(this.page)
-				let list = [];
-				list = data.list.map(item => {
-					getProjectInfo({
-						id: item.id
-					}).then(res => {
-						// let data = JSON.parse(res.msg);
-						let data = res.data
-						console.log(res,'9999999999999999999999999999999999999999')
-						item.project_progress = data.project_progress;
-						item.info = item.info.replace(/<img [^>]*src=['"]([^'"]+)[^>]*>/g, '').replace(/<[^>]+>/g, '');
-						console.log(item);
-						this.list.push(item);
-						console.log(this.list, '/////////////////////////////////////');
-						return item;
-					});
+		computed: {
+			...mapState('user', ['userInfo', 'baseURL', 'hasLogin']),
+			...mapState(['weichatObj']),
+		},
+		onShow() {
+			if (!this.hasLogin) {
+				uni.showModal({
+					title: '登录',
+					content: '您未登录，是否马上登陆?',
+					success: e => {
+						if (e.confirm) {
+							saveUrl()
+							interceptor();
+						}
+					},
+					fail: e => {
+						console.log(e);
+						uni.showModal({
+							title: 'cuowu',
+							content: JSON.stringify(e),
+						})
+					}
 				});
-				// this.list.push(list)
-				uni.hideLoading()
-				console.log(this.list.length, '5555555');
+			} else {
+				// this.loadData();
+			}
+
+		},
+		onLoad() {
+			console.log('****************************************')
+			this.loadDate();
+			// this.showList = this.list;
+			this.getAllArea();
+
+		},
+		methods: {
+			bindAreaChange(e) {
+				console.log(e.target);
+				this.area = this.areas[e.target.value].name;
+				if (this.select_area !== this.areas[e.target.value].id) {
+					this.page = 1
+					this.loadingType = 'more'
+					this.loaded = false
+					this.select_area = this.areas[e.target.value].id;
+					this.list = []
+					this.loadDate()
+				}else {
+					
+				}
 				
-				if(this.limit == data.list.length) {
-					this.loadingType = 'more';
-					return 
+
+
+			},
+			bindStatusChange(e) {
+				console.log(e.target);
+				this.status = this.statuss[e.target.value].name;
+				if (this.select_status !== this.statuss[e.target.value].id) {
+					this.page = 1
+					this.loadingType = 'more'
+					this.loaded = false
+					this.select_status = this.statuss[e.target.value].id;
+					this.list = []
+					
+					this.loadDate()
 				}else {
-					this.loadingType = 'noMore';
+					
 				}
-				this.$set(this, 'loaded', true);
-			});
-		},
-		getAllArea() {
-			getAllArea().then(({ data }) => {
-				console.log(data, '6666666666');
-				this.areas = data;
-			});
-		},
-		isShow() {
-			console.log()
-		},
-		getHeight() {
-			var _this = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.item-wrapper').boundingClientRect();
-					query.exec(function(res) {
-						console.log(res, 'ddddddddddddd');
-						_this.height = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', _this.height);
-					});
-				},
-				fail: res => {}
-			});
+				
+				
+			},
+			join(id) {
+				console.log(id);
+				uni.navigateTo({
+					url: '/pages/donate/donateDetail?id=' + id
+				});
+				console.log('dddddddddd');
+			},
+			loadDate() {
+				if (this.loadingType === 'noMore' || this.loadingType == 'loading') {
+					return
+				}
+				this.loadingType = 'loading'
+				getProjectList({
+					project_area: this.select_area,
+					page: this.page,
+					status: this.select_status,
+					limit: this.limit
+				}).then(({
+					data
+				}) => {
+					console.log(data, '+++++++++++++++++999+++++++++++++++++++')
+					// this.list.push(data.list)
+					this.page++;
+					// console.log(this.page)
+					let list = [];
+					if(data.list.length !=0) {
+						list = data.list.map(item => {
+							getProjectInfo({
+								id: item.id
+							}).then(res => {
+								// let data = JSON.parse(res.msg);
+								let data = res.data
+								console.log(res, '9999999999999999999999999999999999999999')
+								item.project_progress = data.project_progress;
+								item.info = item.info.replace(/<img [^>]*src=['"]([^'"]+)[^>]*>/g, '')
+									.replace(/<[^>]+>/g, '');
+								console.log(item);
+								this.list.push(item);
+								console.log(this.list, '/////////////////////////////////////');
+								return item;
+							});
+						})
+					}
+					
+					// this.list.push(list)
+					
+					console.log(this.list.length, '5555555');
+
+					if (this.limit == data.list.length) {
+						this.loadingType = 'more';
+						return
+					} else {
+						this.loadingType = 'noMore';
+					}
+					this.$set(this, 'loaded', true);
+				});
+			},
+			getAllArea() {
+				getAllArea().then(({
+					data
+				}) => {
+					console.log(data, '6666666666');
+					this.areas = this.areas.concat(data);
+				});
+			},
+			isShow() {
+				console.log()
+			},
+			getHeight() {
+				var _this = this;
+				uni.getSystemInfo({
+					success: resu => {
+						const query = uni.createSelectorQuery();
+						query.select('.item-wrapper').boundingClientRect();
+						query.exec(function(res) {
+							console.log(res, 'ddddddddddddd');
+							_this.height = resu.windowHeight - res[0].top + 'px';
+							console.log('打印页面的剩余高度', _this.height);
+						});
+					},
+					fail: res => {}
+				});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.donate-wrapper {
-	padding-top: 25rpx;
-}
-.top-select {
-	font-size: 30rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #333333;
-	height: 63rpx;
-	line-height: 63rpx;
-	padding: 0 20rpx 0 19rpx;
-	margin-bottom: 20rpx;
-	.select {
-		padding-left: 40rpx;
-		background: #ffffff;
-		border-radius: 5rpx;
-		font-size: 26rpx;
+	.donate-wrapper {
+		padding-top: 25rpx;
+	}
+
+	.top-select {
+		font-size: 30rpx;
 		font-family: PingFang SC;
 		font-weight: 500;
-		color: #999999;
+		color: #333333;
+		height: 63rpx;
 		line-height: 63rpx;
-		position: relative;
-		&::after {
-			content: '';
-			width: 0;
-			height: 0;
-			border-left: 10rpx solid transparent;
-			border-right: 10rpx solid transparent;
-			border-top: 10rpx solid #808080;
-			position: absolute;
-			right: 30rpx;
-			bottom: 26rpx;
+		padding: 0 20rpx 0 19rpx;
+		margin-bottom: 20rpx;
+
+		.select {
+			padding-left: 40rpx;
+			background: #ffffff;
+			border-radius: 5rpx;
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+			line-height: 63rpx;
+			position: relative;
+
+			&::after {
+				content: '';
+				width: 0;
+				height: 0;
+				border-left: 10rpx solid transparent;
+				border-right: 10rpx solid transparent;
+				border-top: 10rpx solid #808080;
+				position: absolute;
+				right: 30rpx;
+				bottom: 26rpx;
+			}
+		}
+
+		.area {
+			width: 355rpx;
+			height: 63rpx;
+			margin: 0 10rpx 0 24rpx;
+		}
+
+		.status {
+			width: 204rpx;
+			height: 63rpx;
+		}
+
+		.action {
+			color: #000;
 		}
 	}
-	.area {
-		width: 355rpx;
-		height: 63rpx;
-		margin: 0 10rpx 0 24rpx;
-	}
-	.status {
-		width: 204rpx;
-		height: 63rpx;
-	}
-	.action {
-		color: #000;
-	}
-}
-.item-wrapper {
-	padding: 0 20rpx;
-	.item {
-		width: 710rpx;
-		height: 280rpx;
-		background: #ffffff;
-		box-shadow: 0px 0px 20rpx 0rpx rgba(50, 50, 52, 0.06);
-		border-radius: 8rpx;
-		padding: 40rpx 20rpx;
-		margin-bottom: 20rpx;
-		.item-left {
-			width: 190rpx;
-			height: 200rpx;
-			border-radius: 10rpx;
-			image {
+
+	.item-wrapper {
+		padding: 0 20rpx;
+
+		.item {
+			width: 710rpx;
+			height: 280rpx;
+			background: #ffffff;
+			box-shadow: 0px 0px 20rpx 0rpx rgba(50, 50, 52, 0.06);
+			border-radius: 8rpx;
+			padding: 40rpx 20rpx;
+			margin-bottom: 20rpx;
+
+			.item-left {
 				width: 190rpx;
 				height: 200rpx;
 				border-radius: 10rpx;
-			}
-		}
-		.item-right {
-			padding-left: 22rpx;
-			position: relative;
-			.item-title {
-				width: 316rpx;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-				display: block;
-				line-height: 1;
-				padding-bottom: 14rpx;
-			}
-			.item-content {
-				width: 416rpx;
-				font-size: 22rpx;
-				font-family: PingFang SC;
-				font-weight: 400;
-				color: #999999;
-				line-height: 1.5;
-			}
-			.item-status {
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #666666;
-				line-height: 1.5;
-				position: absolute;
-				left: 22rpx;
-				bottom: 0;
-				text {
-					color: #e80000;
-					font-weight: bold;
+
+				image {
+					width: 190rpx;
+					height: 200rpx;
+					border-radius: 10rpx;
 				}
 			}
-			.item-btn {
-				width: 160rpx;
-				height: 60rpx;
-				background: #f2f2f2;
-				border-radius: 30px;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #999999;
-				line-height: 60rpx;
-				text-align: center;
-				position: absolute;
-				right: -42rpx;
-				bottom: -9rpx;
-			}
-			.btn-active {
-				background: #fa7e67;
-				color: #fff;
-				box-shadow: 0px 2px 20px 0px rgba(250, 126, 103, 0.5);
+
+			.item-right {
+				padding-left: 22rpx;
+				position: relative;
+
+				.item-title {
+					width: 316rpx;
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					display: block;
+					line-height: 1;
+					padding-bottom: 14rpx;
+				}
+
+				.item-content {
+					width: 416rpx;
+					font-size: 22rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #999999;
+					line-height: 1.5;
+				}
+
+				.item-status {
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+					line-height: 1.5;
+					position: absolute;
+					left: 22rpx;
+					bottom: 0;
+
+					text {
+						color: #e80000;
+						font-weight: bold;
+					}
+				}
+
+				.item-btn {
+					width: 160rpx;
+					height: 60rpx;
+					background: #f2f2f2;
+					border-radius: 30px;
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+					line-height: 60rpx;
+					text-align: center;
+					position: absolute;
+					right: -42rpx;
+					bottom: -9rpx;
+				}
+
+				.btn-active {
+					background: #fa7e67;
+					color: #fff;
+					box-shadow: 0px 2px 20px 0px rgba(250, 126, 103, 0.5);
+				}
 			}
 		}
 	}
-}
 </style>

pages/donate/donateDetail.vue

@@ -109,7 +109,7 @@
 						<view class="item-top">
 							<image src="../../static/img/002.png" mode=""></image>
 							<view class="item-name-time">
-								<view class="item-name">荆州捐赠</view>
+								<view class="item-name">松滋市捐赠</view>
 								<view class="item-time">{{ item.time | time }}</view>
 							</view>
 						</view>
@@ -124,7 +124,7 @@
 						<view class="item-top">
 							<image src="../../static/img/002.png" mode=""></image>
 							<view class="item-name-time">
-								<view class="item-name">荆州捐赠</view>
+								<view class="item-name">松滋市捐赠</view>
 								<view class="item-time">{{ item.time | time }}</view>
 							</view>
 						</view>

pages/donate/idonate.vue

@@ -58,7 +58,13 @@
 			<view class="item">
 				<view class="item-tit">物流方式<text>*</text></view>
 				<picker @change="bindLogChange" :range="logs" range-key="name">
-					<view class="log select" :class="{'action': log }">{{ log || '请选择物流方式' }}</view>
+					<view class="log " :class="{'select': log }">{{ log || '请选择物流方式' }}</view>
+				</picker>
+			</view>
+			<view class="item">
+				<view class="item-tit">捐赠地址<text>*</text></view>
+				<picker @change="bindAreaChange" :range="areas" range-key="name">
+					<view class="log " :class="{'select': area }">{{ area || '请选择捐赠地址' }}</view>
 				</picker>
 			</view>
 			<view class="item no-border-b">
@@ -168,10 +174,24 @@
 
 <script>
 	import { upload } from '@/api/ask.js';
-	import { getProjectInfo, createProject, getLogistics, getDonationInfo, createUser } from '../../api/money.js';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import { getProjectInfo, createProject, getLogistics, getDonationInfo, createUser,getAllArea } from '../../api/money.js';
 	export default {
 		data() {
 			return {
+				project_area: 0,
+				areas: [{
+					id: 0,
+					name: '市本级'
+				}],
+				area: '',
 				items: [
 					{
 						value: '个人',
@@ -239,10 +259,38 @@
 				
 			}else {
 				this.getDonationInfo()
+				this.getAllArea()
 			}
 			
 			this.getLogistics()
 		},
+		onShow() {
+			if (!this.hasLogin) {
+				uni.showModal({
+					title: '登录',
+					content: '您未登录，是否马上登陆?',
+					success: e => {
+						if (e.confirm) {
+							saveUrl()
+							interceptor();
+						}
+					},
+					fail: e => {
+						console.log(e);
+						uni.showModal({
+							title: 'cuowu',
+							content: JSON.stringify(e),
+						})
+					}
+				});
+			} else {
+				// this.loadData();
+			}
+		},
+		computed: {
+			...mapState('user', ['userInfo', 'baseURL', 'hasLogin']),
+			...mapState(['weichatObj']),
+		},
 		mounted() {
 			// this.$set(this,'wzList',[this.wz1,this.wz2])
 		},
@@ -288,6 +336,11 @@
 				// this.wz = this.logs[e.detail.value].name
 				
 			},
+			// 选择捐赠地址
+			bindAreaChange(e) {
+				this.project_area = this.areas[e.detail.value].id
+				this.area = this.areas[e.detail.value].name
+			},
 			openChange(e) {
 				if(e.detail.value !== '1') {
 					this.Isopen = false
@@ -357,6 +410,10 @@
 					obj.$api.msg('请选择物流方式');
 					return;
 				}
+				if(obj.area == '') {
+					obj.$api.msg('请选择捐赠地址');
+					return;
+				}
 				try{
 					obj.wzList.forEach( item => {
 						if(!item.project_donation_id){
@@ -391,6 +448,7 @@
 					mask: true
 				})
 				createUser({
+					project_area: obj.project_area,
 					name: obj.type === 0? obj.name: obj.unit,
 					phone: obj.phone,
 					tel: obj.tel,
@@ -405,6 +463,7 @@
 					console.log(info.name,'8888888888888')
 					
 					createProject({
+						project_area: obj.project_area,
 						name: obj.type === 0? obj.name: obj.unit,
 						project_id: obj.project_id,
 						project_user_id: +info.id,
@@ -446,7 +505,16 @@
 			},
 			dele() {
 				this.$delete(this.wzList,this.wzList.length-1)
-			}
+			},
+			// 获取捐赠地址列表
+			getAllArea() {
+				getAllArea().then(({
+					data
+				}) => {
+					console.log(data, '6666666666');
+					this.areas = this.areas.concat(data);
+				});
+			},
 			
 			
 		}
@@ -474,8 +542,8 @@
 		line-height: 75rpx;
 		padding-bottom: 54rpx;
 		// padding-top: 54rpx;
-		position: fixed;
-		bottom: 0;
+		// position: fixed;
+		// bottom: 0;
 		background-color: #fff;
 		z-index: 9;
 		.next {
@@ -634,6 +702,9 @@
 			padding-top: 39rpx;
 			line-height: 1;
 			width: 200rpx;
+			text {
+				color: #F3392C;
+			}
 		}
 		.choose-box {
 			padding-top: 24rpx;

pages/form/certificates copy.vue

@@ -1,188 +1,188 @@
-<template>
-	<view class="content">
-		<view class="bgimg"><image src="../../static/img/graduation.png"></image></view>
-		<view class="box">
-			<view class="name">
-				<view class="name-left"><input type="text" v-model="name" /></view>
-				<view class="name-right">先生/女士</view>
-			</view>
-			<view class="info">您已完成荆州市红十字会普及培训,特发此证,以资鼓励。</view>
-			<view class="signName">
-				<view class="signName-left">
-					<view class="signName-1">签发人</view>
-					<view class="signName-2">Signer</view>
-				</view>
-				<view class="signName-right"><input type="text" v-model="people" class="list-input" /></view>
-			</view>
-			<view class="signDate">
-				<view class="signName-left">
-					<view class="signName-1">签发日期</view>
-					<view class="signName-2">Signer</view>
-				</view>
-				<view class="signName-right">
-					<view class="signDate">{{ getRecTime(signDate, 'yyyy.MM.dd') }}</view>
-					<!-- <input type="text" v-model="signDate" class="list-input"/> -->
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue';
-export default {
-	data() {
-		return {
-			name: '',
-			people: '荆州市红十字会',
-			signDate: ''
-		};
-	},
-	onLoad(option) {
-		console.log(234, option);
-		this.name = option.name;
-		this.signDate = option.signDate;
-		let a = this.getRecTime(this.signDate, 'yyyy.MM.dd');
-		console.log(a, '?');
-		// console.log('时间转化',getRecTime(111))
-	},
-
-	methods: {
-		getRecTime(timestamp, fmt) {
-			let d = new Date(timestamp * 1000),
-				// f = fmt || 'yyyy/MM/dd',
-				f = fmt || 'yyyy.MM.dd hh:mm:ss',
-				o = {
-					'M+': d.getMonth() + 1, //月份
-					'd+': d.getDate(), //日
-					'h+': d.getHours(), //小时
-					'm+': d.getMinutes(), //分
-					's+': d.getSeconds(), //秒
-					'q+': Math.floor((d.getMonth() + 3) / 3), //季度
-					S: d.getMilliseconds() //毫秒
-				};
-			if (/(y+)/.test(f)) {
-				f = f.replace(RegExp.$1, (d.getFullYear() + '').substr(4 - RegExp.$1.length));
-			}
-			for (let k in o) {
-				if (new RegExp('(' + k + ')').test(f)) {
-					f = f.replace(RegExp.$1, RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length));
-				}
-			}
-			return f;
-			console.log(f);
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	height: 100%;
-}
-.qrimg {
-	position: absolute;
-	left: -9999rpx;
-	top: -9999rpx;
-}
-.content {
-	width: 100%;
-	height: 100%;
-	position: relative;
-}
-.bgimg {
-	width: 100%;
-	height: 100%;
-	image {
-		width: 100%;
-		height: 100%;
-	}
-}
-.box {
-	width: 100%;
-	height: 100%;
-	position: absolute;
-	padding: 380rpx 94rpx 200rpx 94rpx;
-	color: #333;
-	left: 0;
-	top: 0;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	// align-items: center;
-	.name {
-		display: flex;
-		font-size: 32rpx;
-		.name-left {
-			text-align: center;
-			// padding: 0 24rpx;
-			width: 150rpx;
-			border-bottom: 2rpx solid #333;
-		}
-	}
-	.info {
-		margin-top: 68rpx;
-		text-indent: 64rpx;
-		line-height: 58rpx;
-	}
-	.signName {
-		margin-top: 32rpx;
-		display: flex;
-		.signName-left {
-			line-height: 34rpx;
-			.signName-1 {
-			}
-			.signName-2 {
-				font-size: 28rpx;
-			}
-		}
-		.signName-right {
-			text-align: left;
-			// width: 100%;
-			padding: 0 12rpx;
-			margin-left: 12rpx;
-
-			// width: 288rpx;
-			border-bottom: 2rpx solid #333;
-			// margin-bottom: 12rpx;
-			.list-input {
-				width: 100%;
-				padding: 0 12rpx;
-				height: 70rpx;
-				font-size: 32rpx;
-				text-align: left;
-			}
-			.signDate {
-				display: flex;
-				align-items: center;
-			}
-		}
-	}
-	.signDate {
-		margin-top: 22rpx;
-		display: flex;
-		.signName-left {
-			line-height: 34rpx;
-			.signName-1 {
-			}
-			.signName-2 {
-				font-size: 28rpx;
-			}
-		}
-		.signName-right {
-			text-align: left;
-			padding-left: 12rpx;
-			margin-left: 12rpx;
-			width: 288rpx;
-			border-bottom: 2rpx solid #333;
-			.list-input {
-				height: 70rpx;
-				font-size: 32rpx;
-				text-align: left;
-			}
-			// margin-bottom: 12rpx;
-		}
-	}
-	// background-color: pink;
-}
-</style>
+<template>
+	<view class="content">
+		<view class="bgimg"><image src="../../static/img/graduation.png"></image></view>
+		<view class="box">
+			<view class="name">
+				<view class="name-left"><input type="text" v-model="name" /></view>
+				<view class="name-right">先生/女士</view>
+			</view>
+			<view class="info">您已完成松滋市红十字会普及培训,特发此证,以资鼓励。</view>
+			<view class="signName">
+				<view class="signName-left">
+					<view class="signName-1">签发人</view>
+					<view class="signName-2">Signer</view>
+				</view>
+				<view class="signName-right"><input type="text" v-model="people" class="list-input" /></view>
+			</view>
+			<view class="signDate">
+				<view class="signName-left">
+					<view class="signName-1">签发日期</view>
+					<view class="signName-2">Signer</view>
+				</view>
+				<view class="signName-right">
+					<view class="signDate">{{ getRecTime(signDate, 'yyyy.MM.dd') }}</view>
+					<!-- <input type="text" v-model="signDate" class="list-input"/> -->
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue';
+export default {
+	data() {
+		return {
+			name: '',
+			people: '荆州市红十字会',
+			signDate: ''
+		};
+	},
+	onLoad(option) {
+		console.log(234, option);
+		this.name = option.name;
+		this.signDate = option.signDate;
+		let a = this.getRecTime(this.signDate, 'yyyy.MM.dd');
+		console.log(a, '?');
+		// console.log('时间转化',getRecTime(111))
+	},
+
+	methods: {
+		getRecTime(timestamp, fmt) {
+			let d = new Date(timestamp * 1000),
+				// f = fmt || 'yyyy/MM/dd',
+				f = fmt || 'yyyy.MM.dd hh:mm:ss',
+				o = {
+					'M+': d.getMonth() + 1, //月份
+					'd+': d.getDate(), //日
+					'h+': d.getHours(), //小时
+					'm+': d.getMinutes(), //分
+					's+': d.getSeconds(), //秒
+					'q+': Math.floor((d.getMonth() + 3) / 3), //季度
+					S: d.getMilliseconds() //毫秒
+				};
+			if (/(y+)/.test(f)) {
+				f = f.replace(RegExp.$1, (d.getFullYear() + '').substr(4 - RegExp.$1.length));
+			}
+			for (let k in o) {
+				if (new RegExp('(' + k + ')').test(f)) {
+					f = f.replace(RegExp.$1, RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length));
+				}
+			}
+			return f;
+			console.log(f);
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	height: 100%;
+}
+.qrimg {
+	position: absolute;
+	left: -9999rpx;
+	top: -9999rpx;
+}
+.content {
+	width: 100%;
+	height: 100%;
+	position: relative;
+}
+.bgimg {
+	width: 100%;
+	height: 100%;
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+.box {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	padding: 380rpx 94rpx 200rpx 94rpx;
+	color: #333;
+	left: 0;
+	top: 0;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	// align-items: center;
+	.name {
+		display: flex;
+		font-size: 32rpx;
+		.name-left {
+			text-align: center;
+			// padding: 0 24rpx;
+			width: 150rpx;
+			border-bottom: 2rpx solid #333;
+		}
+	}
+	.info {
+		margin-top: 68rpx;
+		text-indent: 64rpx;
+		line-height: 58rpx;
+	}
+	.signName {
+		margin-top: 32rpx;
+		display: flex;
+		.signName-left {
+			line-height: 34rpx;
+			.signName-1 {
+			}
+			.signName-2 {
+				font-size: 28rpx;
+			}
+		}
+		.signName-right {
+			text-align: left;
+			// width: 100%;
+			padding: 0 12rpx;
+			margin-left: 12rpx;
+
+			// width: 288rpx;
+			border-bottom: 2rpx solid #333;
+			// margin-bottom: 12rpx;
+			.list-input {
+				width: 100%;
+				padding: 0 12rpx;
+				height: 70rpx;
+				font-size: 32rpx;
+				text-align: left;
+			}
+			.signDate {
+				display: flex;
+				align-items: center;
+			}
+		}
+	}
+	.signDate {
+		margin-top: 22rpx;
+		display: flex;
+		.signName-left {
+			line-height: 34rpx;
+			.signName-1 {
+			}
+			.signName-2 {
+				font-size: 28rpx;
+			}
+		}
+		.signName-right {
+			text-align: left;
+			padding-left: 12rpx;
+			margin-left: 12rpx;
+			width: 288rpx;
+			border-bottom: 2rpx solid #333;
+			.list-input {
+				height: 70rpx;
+				font-size: 32rpx;
+				text-align: left;
+			}
+			// margin-bottom: 12rpx;
+		}
+	}
+	// background-color: pink;
+}
+</style>

pages/form/certificates.vue

@@ -49,7 +49,7 @@ export default {
 			companyName:'',
 			companyphone:'',
 			num:'',
-			people:'荆州市红十字会',
+			people:'松滋市红十字会',
 			signDate:'',
 			loading: true, //是否载入图片中
 			size: 180,
@@ -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);
@@ -170,7 +170,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('签发人:', 300 * obj.ratio, 800 * obj.ratio)
@@ -183,7 +183,7 @@ export default {
 		context.fillText('Issuer Date:', 300 * obj.ratio, 910 * obj.ratio)
 		context.setFontSize(26 * obj.ratio)
 		context.fillText(m, 475 * obj.ratio, 908 * obj.ratio)
-		context.fillText('荆州市红十字会', 440 * obj.ratio, 820 * obj.ratio)
+		context.fillText('松滋市红十字会', 440 * obj.ratio, 820 * obj.ratio)
 		// 画横线
 		context.moveTo(430 * obj.ratio, 915 * obj.ratio)
 		context.lineTo(660 * obj.ratio, 915 * obj.ratio)
@@ -238,10 +238,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/szs/#/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/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/szs/#/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/index/biaoge.vue

@@ -1,401 +1,401 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8" />
-		<meta name="viewport" content="width=device-width,initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-		<script src="layui/layui.all.js"></script>
-		<link rel="stylesheet" href="layui/css/layui.css">
-		<title></title>
-	</head>
-	<body style="background-color: #96d1d9;width: 26cm;height: 11cm;margin: 0 auto;">
-		<div>
-      <span></span>
-      <div class="header" style="margin-top: 1cm;width: 24cm;">
-        <div class="img">
-          <img style="height: 3cm; width: 3cm;" src="{__FRAME_PATH}img/22.png" />
-        </div>
-        <div class="left">
-          <div style="font-size: 31px;letter-spacing:4px">荆州市遗体捐献志愿者</div>
-          <!-- <div style="margin-top: 5px;text-align: center;font-size: 30px;">入会申请登记表</div> -->
-        </div>
-        <div class="img1">
-          <img src="{__FRAME_PATH}img/11.png" alt="" style="height: 2cm; width: 10.5cm;">
-        </div>
-       
-      </div>
-      <!-- <div class="img"></div> -->
-      <div class="header1" style="width: 21cm;">
-        <div class="box-1">
-          制表单位：荆州市红十字会
-        </div>
-        <div class="box-2">
-          填表日期：
-        </div>
-        <div class="box-3">
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;年 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;月&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;日
-        </div>
-        <!-- <div class="box-4">
-          
-        </div> -->
-        <div class="box-5">
-          <div>编号：&nbsp;&nbsp;YSQ-0{$arr.id}</div>
-          
-          
-        </div>
-      </div>
-      
-			<div style="margin:8px auto;">
-				<table class="table table-striped table-bordered" align="center" valign="center">
-					<tr>
-						<td class="value" colspan="16" style="width: 21cm;padding: 32px 12px;text-indent: 40px; text-align: left;line-height: 38px;">
-              遗体捐献是服务医疗事业,造福人类的高尚行为,是“人道、博爱、奉献”精神的崇高体现。我已了解遗体捐献的基本常识和有关政策法规。我自愿登记成为遗体捐献志愿者,身故后请执行人和所有亲属尊重我的决定。
-            </td>
-					</tr>
-					<tr>
-            <td class="column" >姓名</td>
-             <td class="value" colspan="2">{$arr.name}</td>
-           <td class="column" style="width: 1cm;">性别</td>
-						<td class="value" colspan="2">{$arr.sex}</td>
-            <td class="column" style="width: 2cm;">出生年月</td>
-						<td class="value" colspan="5">{$arr.birthday}</td>
-          <!--   <td  class="value"></td>
-            <td class="column" >性别</td>
-            <td class="value" colspan="1"></td>
-            <td class="column">民族</td>
-            <td class="value"></td>-->
-            <!-- <td class="value" rowspan="3"><img class="portrait" src="img/img04.png" /></td>   -->
-          </tr>
-          <tr> 
-            <td class="column">身份证号码</td>
-						<td class="value" colspan="5">{$arr.card}</td>
-
-            <td class="column" style="width: 2cm;">职业</td>
-            <td class="value" colspan="2">{$arr.occupation}</td>
-            <td class="column" style="width: 1.2cm;">学历</td>
-						<td class="value" colspan="2">{$arr.education}</td>
-
-          </tr>
-          <tr>
-            <!-- <td class="column">身份证号</td> -->
-              {if strpos($arr.remark,'全部遗体') !== false}
-              <td class="value" colspan="7">
-                  <div style="display: flex;align-items: center;justify-content: center;line-height: 38px;padding: 22px 0 0 0;">
-                      我自愿捐献全部遗体（含器官组织）<div style="width: 14px;height: 14px;border: 1px solid #333333;margin-right: 5px;">√</div>；
-                  </div>
-                  <div style="display: flex;align-items: center;justify-content: center;padding-bottom: 22px;">
-                      或只捐献眼角膜<div style="width: 14px;height: 14px;border: 1px solid #333333;margin-left: 5px;margin-right: 5px;line-height: 38px;"></div>；
-                  </div>
-              </td>
-              {else /}
-              <td class="value" colspan="7">
-                  <div style="display: flex;align-items: center;justify-content: center;line-height: 38px;padding: 22px 0 0 0;">
-                      我自愿捐献全部遗体（含器官组织）<div style="width: 14px;height: 14px;border: 1px solid #333333;margin-right: 5px;"></div>；
-                  </div>
-                  <div style="display: flex;align-items: center;justify-content: center;padding-bottom: 22px;">
-                      或只捐献眼角膜<div style="width: 14px;height: 14px;border: 1px solid #333333;margin-left: 5px;margin-right: 5px;line-height: 38px;">√</div>；
-                  </div>
-              </td>
-              {/if}
-            <!-- <td class="column" >联系电话</td> -->
-						<td class="value" colspan="5">
-              <div style="display: flex;align-items: center;justify-content: center;">
-                （ 请在选项<div style="width: 14px;height: 14px;border: 1px solid #333333;margin-right: 5px;margin-left: 5px;line-height: 38px;"></div>内打√ ）
-                </div>
-            </td>
-
-          </tr>
-				</table>
-      </div>
-
-      <div style="margin:8px auto;margin-top: 6cm;">
-				<table class="table table-striped table-bordered" align="center" valign="center">
-					<tr>
-            <td class="column1" rowspan="2">联系电话</td>
-            <!-- <td class="value" >固定电话:</td> -->
-            <td class="value" colspan="1" style="width: 5.8cm;text-align: left;">固定电话:{$arr.tel}</td>
-
-            <!-- <td class="value" colspan="2" style="width: 140px;"></td> -->
-              <td class="value" rowspan="2"  colspan="14"style="width: 10cm;">
-                <div style="display: flex; justify-content:center;margin-left:1.8cm" >
-                  我指定
-                  <div style="border-bottom: 1px solid #333333; width: 3cm;display:flex;justify-content:center" >{$arr.zd_name}</div>为我的遗体捐献
-                </div>
-                <div style="text-align: left;line-height: 38px;display: flex;justify-content:center">执行人全权负责本人的遗体捐献事宜。</div>
-              </td>
-      
-						<!-- <td class="value" colspan="12"></td> -->
-						<!-- <td class="value" colspan="3">15079506035</td> -->
-          </tr>
-         
-          <tr>
-						<td class="value" colspan="1" style="width: 5.8cm;text-align: left;">移动电话:{$arr.phone}</td>
-						<!-- <td class="value" colspan="2" ></td> -->
-						<!-- <td class="value" colspan="3">15079506035</td> -->
-          </tr>
-         
-          <tr>
-						<td class="column1" >居住地址</td>
-            <td class="value" colspan="8">
-            {$arr.address}
-            </td>
-          </tr>
-          <tr>
-						<td class="column1" >捐献执行人</td>
-            <td class="value" colspan="4">{$arr.executor}</td>
-            <td class="column1" >身份证号</td>
-            <td class="value" colspan="4">{$arr.sfz}</td>
-          </tr>
-          <tr >
-            <td class="column1" rowspan="2" style="height: 3cm;">与捐献志愿者关系</td>
-            <td class="value" rowspan="2" colspan="4">{$arr.relation}</td>
-            <td class="column1" >移动电话:</td>
-             <td class="value" colspan="2">{$arr.n_phone}</td>
-          </tr>
-          <tr>
-            <!-- <td class="value" colspan="5"></td> -->
-            <td class="column1" >固定电话:</td>
-             <td class="value" colspan="2">{$arr.n_tel}</td>
-						<!-- <td class="value" colspan="3">15079506035</td> -->
-          </tr>
-          <tr>
-						<td class="column1" >市红十字会地址</td>
-            <td class="value" colspan="4">武汉市江岸区胜利路162号</td>
-            <td class="column1" >24小时捐献电话</td>
-            <td class="value" colspan="4">027-82812604</td>
-          </tr>
-				</table>
-      </div>
-      
-      <div class="footer">
-        我保证填写的以上信息准确真实，如发生变更或个人意愿发生变化时，及时告知登记机构。
-      </div>
-		</div>
-	</body>
-</html>
-<script type="text/javascript" src="./js/jquery.js"></script>
-<script>
-	//一般直接写在一个js文件中
-	layui.use(['layer', 'form'], function() {
-		var layer = layui.layer,
-			form = layui.form;
-		setTimeout(function() {
-			$("#EleId").hide();
-		}, 5000);
-	});
-</script>
-<style scoped="scoped">
-  .footer{
-    margin-top: 0.8cm;
-    width: 26cm;
-    text-align: center;
-    /* margin: 0 auto; */
-  }
-  .header{
-    width: 20cm;
-    margin: 0 auto;
-    margin-top: 2cm;
-    display: flex;
-    /* justify-content: center; */
-    align-items: center; 
-    margin-top: 25px;
-    color: #eb3223;
-    margin-bottom: 1cm;
-    letter: spacing 2;
-  }
-  .header .img{
- 
-    margin-left:1.24cm;
-    margin-right:0.3cm;
-    width: 3cm;
-    height: 3cm;
- 
-  }
-  .header .img1{
-   margin-left: 0.5cm; 
-  }
-  .header1{
-    font-size: 18px;
-    /* margin-top: 134px; */
-    width: 1080px;
-    /* height: 40px; */
-    margin: 0 auto;
-    display: flex;
-    /* justify-content: space-around; */
-  }
-  .header1 .box-2{
-    margin-left: 1.2cm;
-  }
-  .header1 .box-5{
-    display: flex;
-    margin-left: 1cm;
-    /* width: 200px; */
-    /* border-bottom: 1px solid #333; */
-  }
-  .header1 .box-5 .box-6{
-    width: 4.2cm;
-    border-bottom: 1px solid #333;
-  }
-	.table {
-		border-collapse: collapse;
-		border-spacing: 0;
-		background-color: transparent;
-		display: table;
-		max-width: 100%;
-		margin: 0 auto;
-	}
-	.table td {
-    height: 44px;
-		text-align: center;
-		vertical-align: middle;
-		font-size: 18px;
-		font-family: 'Arial Normal', 'Arial';
-		color: #333333;
-		padding: 4px 12px;
-	}
-
-	.table-bordered {
-		border: 1px solid #ddd;
-	}
-	* {
-		margin: 0px;
-		padding: 0px;
-	}
-  .info{
-    width: 800px;
-    margin: 0 auto;
-    display: flex;
-    justify-content: space-between;
-    margin-top: 12px;
-    font-size:16px;
-  }
-  .date{
-    display: flex;
-    justify-content: flex-end;
-  }
-  .gap{
-    display: block;
-    height: 4px;
-    width: 26px;
-  }
-	.column {
-		width: 2.5cm;
-		height: 30px;
-		border: 1px solid #333;
-		background: #ebc5ad;
-	}
-  .column1 {
-		width: 145px;
-		height: 25px;
-		border: 1px solid #333;
-		background: #ebc5ad;
-	}
-  .box{
-		border: 1px solid #333;
-
-  }
-  .column01{
-    width: 100px;
-		height: 15px;
-		border: 1px solid #333;
-		/* background: #f1f1f1; */
-  }
-  .checkbox{
-		width: 20px;
-		height: 15px;
-		border: 1px solid #333;
-
-
-    
-    /* justify-content: center; */
-  }
-  .box01{
-      margin-right: 3px;
-      margin-left: 3px;
-
-    }
-	.tpl{
-		width: 50px !important;
-		height: 15px;
-		border: 1px solid #333;
-		background: #f1f1f1;
-	}
-  .tpl01{
-    width: 50px !important;
-		height: 15px;
-		border: 1px solid #333;
-  }
-    .title{
-		font-size: 18px !important;
-		font-weight: bold;
-	}
-	.value {
-		width: 2cm;
-		height: 30px;
-		border: 1px solid #333;
-	}
-	.value1-tip{
-		border: 1px solid #333;
-	}
-    .value1{
-		width:110px;
-		display: inline-block;
-	}
-	.value9{
-			width:550px;
-		display: inline-block;
-		text-align: left;
-	}
-	.value2{
-		width:550px;
-		display: inline-block;
-		text-align: left;
-	}
-	.value3{
-		width:610px;
-		display: inline-block;
-		text-align: left;
-	}
-	.value4{
-		padding: 8px 0px;
-	}
-	.value5{
-		padding-right: 180px;
-		text-align: right;
-	}
-	.value6{
-		text-align: right;
-		padding: 8px 45px;
-	}
-	.value7{
-		text-align: right;
-		padding-right: 180px;
-		padding-top: 10px;
-	}
-	.value8{
-		text-align: right;
-		padding: 8px 45px;
-	}
-	.tp{
-		width: 60px;
-		display: inline-block;
-	}
-	
-	.cameraCheckBoxTop{
-		margin-right: 8px;
-		width: 15px;
-		height: 15px;
-	}
-	.portrait {
-		width: 100px;
-		height: 100px;
-	}
-	.button-dayin{
-		background-color: #FF0000;
-		color: #FFFFFF;
-		width: 200px;
-		padding: 20px 0px;
-		margin: 50px auto;
-		text-align: center;
-		font-size: 30px;
-	}
-</style>
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width,initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+		<script src="layui/layui.all.js"></script>
+		<link rel="stylesheet" href="layui/css/layui.css">
+		<title></title>
+	</head>
+	<body style="background-color: #96d1d9;width: 26cm;height: 11cm;margin: 0 auto;">
+		<div>
+      <span></span>
+      <div class="header" style="margin-top: 1cm;width: 24cm;">
+        <div class="img">
+          <img style="height: 3cm; width: 3cm;" src="{__FRAME_PATH}img/22.png" />
+        </div>
+        <div class="left">
+          <div style="font-size: 31px;letter-spacing:4px">荆州市遗体捐献志愿者</div>
+          <!-- <div style="margin-top: 5px;text-align: center;font-size: 30px;">入会申请登记表</div> -->
+        </div>
+        <div class="img1">
+          <img src="{__FRAME_PATH}img/11.png" alt="" style="height: 2cm; width: 10.5cm;">
+        </div>
+       
+      </div>
+      <!-- <div class="img"></div> -->
+      <div class="header1" style="width: 21cm;">
+        <div class="box-1">
+          制表单位：松滋市红十字会
+        </div>
+        <div class="box-2">
+          填表日期：
+        </div>
+        <div class="box-3">
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;年 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;月&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;日
+        </div>
+        <!-- <div class="box-4">
+          
+        </div> -->
+        <div class="box-5">
+          <div>编号：&nbsp;&nbsp;YSQ-0{$arr.id}</div>
+          
+          
+        </div>
+      </div>
+      
+			<div style="margin:8px auto;">
+				<table class="table table-striped table-bordered" align="center" valign="center">
+					<tr>
+						<td class="value" colspan="16" style="width: 21cm;padding: 32px 12px;text-indent: 40px; text-align: left;line-height: 38px;">
+              遗体捐献是服务医疗事业,造福人类的高尚行为,是“人道、博爱、奉献”精神的崇高体现。我已了解遗体捐献的基本常识和有关政策法规。我自愿登记成为遗体捐献志愿者,身故后请执行人和所有亲属尊重我的决定。
+            </td>
+					</tr>
+					<tr>
+            <td class="column" >姓名</td>
+             <td class="value" colspan="2">{$arr.name}</td>
+           <td class="column" style="width: 1cm;">性别</td>
+						<td class="value" colspan="2">{$arr.sex}</td>
+            <td class="column" style="width: 2cm;">出生年月</td>
+						<td class="value" colspan="5">{$arr.birthday}</td>
+          <!--   <td  class="value"></td>
+            <td class="column" >性别</td>
+            <td class="value" colspan="1"></td>
+            <td class="column">民族</td>
+            <td class="value"></td>-->
+            <!-- <td class="value" rowspan="3"><img class="portrait" src="img/img04.png" /></td>   -->
+          </tr>
+          <tr> 
+            <td class="column">身份证号码</td>
+						<td class="value" colspan="5">{$arr.card}</td>
+
+            <td class="column" style="width: 2cm;">职业</td>
+            <td class="value" colspan="2">{$arr.occupation}</td>
+            <td class="column" style="width: 1.2cm;">学历</td>
+						<td class="value" colspan="2">{$arr.education}</td>
+
+          </tr>
+          <tr>
+            <!-- <td class="column">身份证号</td> -->
+              {if strpos($arr.remark,'全部遗体') !== false}
+              <td class="value" colspan="7">
+                  <div style="display: flex;align-items: center;justify-content: center;line-height: 38px;padding: 22px 0 0 0;">
+                      我自愿捐献全部遗体（含器官组织）<div style="width: 14px;height: 14px;border: 1px solid #333333;margin-right: 5px;">√</div>；
+                  </div>
+                  <div style="display: flex;align-items: center;justify-content: center;padding-bottom: 22px;">
+                      或只捐献眼角膜<div style="width: 14px;height: 14px;border: 1px solid #333333;margin-left: 5px;margin-right: 5px;line-height: 38px;"></div>；
+                  </div>
+              </td>
+              {else /}
+              <td class="value" colspan="7">
+                  <div style="display: flex;align-items: center;justify-content: center;line-height: 38px;padding: 22px 0 0 0;">
+                      我自愿捐献全部遗体（含器官组织）<div style="width: 14px;height: 14px;border: 1px solid #333333;margin-right: 5px;"></div>；
+                  </div>
+                  <div style="display: flex;align-items: center;justify-content: center;padding-bottom: 22px;">
+                      或只捐献眼角膜<div style="width: 14px;height: 14px;border: 1px solid #333333;margin-left: 5px;margin-right: 5px;line-height: 38px;">√</div>；
+                  </div>
+              </td>
+              {/if}
+            <!-- <td class="column" >联系电话</td> -->
+						<td class="value" colspan="5">
+              <div style="display: flex;align-items: center;justify-content: center;">
+                （ 请在选项<div style="width: 14px;height: 14px;border: 1px solid #333333;margin-right: 5px;margin-left: 5px;line-height: 38px;"></div>内打√ ）
+                </div>
+            </td>
+
+          </tr>
+				</table>
+      </div>
+
+      <div style="margin:8px auto;margin-top: 6cm;">
+				<table class="table table-striped table-bordered" align="center" valign="center">
+					<tr>
+            <td class="column1" rowspan="2">联系电话</td>
+            <!-- <td class="value" >固定电话:</td> -->
+            <td class="value" colspan="1" style="width: 5.8cm;text-align: left;">固定电话:{$arr.tel}</td>
+
+            <!-- <td class="value" colspan="2" style="width: 140px;"></td> -->
+              <td class="value" rowspan="2"  colspan="14"style="width: 10cm;">
+                <div style="display: flex; justify-content:center;margin-left:1.8cm" >
+                  我指定
+                  <div style="border-bottom: 1px solid #333333; width: 3cm;display:flex;justify-content:center" >{$arr.zd_name}</div>为我的遗体捐献
+                </div>
+                <div style="text-align: left;line-height: 38px;display: flex;justify-content:center">执行人全权负责本人的遗体捐献事宜。</div>
+              </td>
+      
+						<!-- <td class="value" colspan="12"></td> -->
+						<!-- <td class="value" colspan="3">15079506035</td> -->
+          </tr>
+         
+          <tr>
+						<td class="value" colspan="1" style="width: 5.8cm;text-align: left;">移动电话:{$arr.phone}</td>
+						<!-- <td class="value" colspan="2" ></td> -->
+						<!-- <td class="value" colspan="3">15079506035</td> -->
+          </tr>
+         
+          <tr>
+						<td class="column1" >居住地址</td>
+            <td class="value" colspan="8">
+            {$arr.address}
+            </td>
+          </tr>
+          <tr>
+						<td class="column1" >捐献执行人</td>
+            <td class="value" colspan="4">{$arr.executor}</td>
+            <td class="column1" >身份证号</td>
+            <td class="value" colspan="4">{$arr.sfz}</td>
+          </tr>
+          <tr >
+            <td class="column1" rowspan="2" style="height: 3cm;">与捐献志愿者关系</td>
+            <td class="value" rowspan="2" colspan="4">{$arr.relation}</td>
+            <td class="column1" >移动电话:</td>
+             <td class="value" colspan="2">{$arr.n_phone}</td>
+          </tr>
+          <tr>
+            <!-- <td class="value" colspan="5"></td> -->
+            <td class="column1" >固定电话:</td>
+             <td class="value" colspan="2">{$arr.n_tel}</td>
+						<!-- <td class="value" colspan="3">15079506035</td> -->
+          </tr>
+          <tr>
+						<td class="column1" >市红十字会地址</td>
+            <td class="value" colspan="4">武汉市江岸区胜利路162号</td>
+            <td class="column1" >24小时捐献电话</td>
+            <td class="value" colspan="4">027-82812604</td>
+          </tr>
+				</table>
+      </div>
+      
+      <div class="footer">
+        我保证填写的以上信息准确真实，如发生变更或个人意愿发生变化时，及时告知登记机构。
+      </div>
+		</div>
+	</body>
+</html>
+<script type="text/javascript" src="./js/jquery.js"></script>
+<script>
+	//一般直接写在一个js文件中
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		setTimeout(function() {
+			$("#EleId").hide();
+		}, 5000);
+	});
+</script>
+<style scoped="scoped">
+  .footer{
+    margin-top: 0.8cm;
+    width: 26cm;
+    text-align: center;
+    /* margin: 0 auto; */
+  }
+  .header{
+    width: 20cm;
+    margin: 0 auto;
+    margin-top: 2cm;
+    display: flex;
+    /* justify-content: center; */
+    align-items: center; 
+    margin-top: 25px;
+    color: #eb3223;
+    margin-bottom: 1cm;
+    letter: spacing 2;
+  }
+  .header .img{
+ 
+    margin-left:1.24cm;
+    margin-right:0.3cm;
+    width: 3cm;
+    height: 3cm;
+ 
+  }
+  .header .img1{
+   margin-left: 0.5cm; 
+  }
+  .header1{
+    font-size: 18px;
+    /* margin-top: 134px; */
+    width: 1080px;
+    /* height: 40px; */
+    margin: 0 auto;
+    display: flex;
+    /* justify-content: space-around; */
+  }
+  .header1 .box-2{
+    margin-left: 1.2cm;
+  }
+  .header1 .box-5{
+    display: flex;
+    margin-left: 1cm;
+    /* width: 200px; */
+    /* border-bottom: 1px solid #333; */
+  }
+  .header1 .box-5 .box-6{
+    width: 4.2cm;
+    border-bottom: 1px solid #333;
+  }
+	.table {
+		border-collapse: collapse;
+		border-spacing: 0;
+		background-color: transparent;
+		display: table;
+		max-width: 100%;
+		margin: 0 auto;
+	}
+	.table td {
+    height: 44px;
+		text-align: center;
+		vertical-align: middle;
+		font-size: 18px;
+		font-family: 'Arial Normal', 'Arial';
+		color: #333333;
+		padding: 4px 12px;
+	}
+
+	.table-bordered {
+		border: 1px solid #ddd;
+	}
+	* {
+		margin: 0px;
+		padding: 0px;
+	}
+  .info{
+    width: 800px;
+    margin: 0 auto;
+    display: flex;
+    justify-content: space-between;
+    margin-top: 12px;
+    font-size:16px;
+  }
+  .date{
+    display: flex;
+    justify-content: flex-end;
+  }
+  .gap{
+    display: block;
+    height: 4px;
+    width: 26px;
+  }
+	.column {
+		width: 2.5cm;
+		height: 30px;
+		border: 1px solid #333;
+		background: #ebc5ad;
+	}
+  .column1 {
+		width: 145px;
+		height: 25px;
+		border: 1px solid #333;
+		background: #ebc5ad;
+	}
+  .box{
+		border: 1px solid #333;
+
+  }
+  .column01{
+    width: 100px;
+		height: 15px;
+		border: 1px solid #333;
+		/* background: #f1f1f1; */
+  }
+  .checkbox{
+		width: 20px;
+		height: 15px;
+		border: 1px solid #333;
+
+
+    
+    /* justify-content: center; */
+  }
+  .box01{
+      margin-right: 3px;
+      margin-left: 3px;
+
+    }
+	.tpl{
+		width: 50px !important;
+		height: 15px;
+		border: 1px solid #333;
+		background: #f1f1f1;
+	}
+  .tpl01{
+    width: 50px !important;
+		height: 15px;
+		border: 1px solid #333;
+  }
+    .title{
+		font-size: 18px !important;
+		font-weight: bold;
+	}
+	.value {
+		width: 2cm;
+		height: 30px;
+		border: 1px solid #333;
+	}
+	.value1-tip{
+		border: 1px solid #333;
+	}
+    .value1{
+		width:110px;
+		display: inline-block;
+	}
+	.value9{
+			width:550px;
+		display: inline-block;
+		text-align: left;
+	}
+	.value2{
+		width:550px;
+		display: inline-block;
+		text-align: left;
+	}
+	.value3{
+		width:610px;
+		display: inline-block;
+		text-align: left;
+	}
+	.value4{
+		padding: 8px 0px;
+	}
+	.value5{
+		padding-right: 180px;
+		text-align: right;
+	}
+	.value6{
+		text-align: right;
+		padding: 8px 45px;
+	}
+	.value7{
+		text-align: right;
+		padding-right: 180px;
+		padding-top: 10px;
+	}
+	.value8{
+		text-align: right;
+		padding: 8px 45px;
+	}
+	.tp{
+		width: 60px;
+		display: inline-block;
+	}
+	
+	.cameraCheckBoxTop{
+		margin-right: 8px;
+		width: 15px;
+		height: 15px;
+	}
+	.portrait {
+		width: 100px;
+		height: 100px;
+	}
+	.button-dayin{
+		background-color: #FF0000;
+		color: #FFFFFF;
+		width: 200px;
+		padding: 20px 0px;
+		margin: 50px auto;
+		text-align: center;
+		font-size: 30px;
+	}
+</style>

pages/index/index.vue

@@ -3,7 +3,9 @@
 		<!-- 轮播 -->
 		<view class="carousel-section">
 			<swiper class="carousel" :autoplay="true" :interval="3000" :duration="1000">
-				<swiper-item v-for="item in carouselList" :key="item.id"><image :src="item.pic"></image></swiper-item>
+				<swiper-item v-for="item in carouselList" :key="item.id">
+					<image :src="item.pic"></image>
+				</swiper-item>
 			</swiper>
 		</view>
 
@@ -50,42 +52,65 @@
 			</view>
 		</view>
 		<!--  sos急救系统 -->
-		<view class="system" @click="tolocation">
-			<top-title :title="'救在身边'" @click="tolocation"></top-title>
+		<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"
-					:longitude="longitude4"
-					ref="map"
-					@markertap="markertap"
-				></map>
-				<!-- <view class="map-box" ><image src="../../static/img/map.jpg" mode=""></image></view> -->
+				<map class="map-box" id="map" show-location :markers="marker" :scale="scale" :latitude="latitude4"
+					:longitude="longitude4" ref="map" @markertap="markertap"></map>
+			</view>
+			<view class="" style="padding-top: 80rpx;">
+				<view v-for="(item,index) in jzsblist" :key="item.id">
+					<view class="location-item">
+						<view class="box-left">
+							<view class="img01">
+								<image src="../../static/img/line01.png" mode=""></image>
+							</view>
+							<view class="img02" v-if="item.info !=null">
+								<image src="../../static/img/002.png" mode=""></image>
+							</view>
+							<view class="img02" v-else>
+								<image src="../../static/img/002.png" mode=""></image>
+							</view>
+							<view class="info">
+								<view class="info-header">
+									<view class="name">
+										救护员{{ index +1 }}
+									</view>
+									<view class="distance">
+										{{ item.num }}km
+									</view>
+									<view class="location-icon">
+										<image src="../../static/img/location-icon.png" mode=""></image>
+									</view>
+								</view>
+								<view class="address">
+									{{ item.address }}
+								</view>
+							</view>
+						</view>
+						<view class="box-right" @click="rescue(item,index)">
+							<view class="img" v-if="!item.is">
+								<image src="../../static/img/rescue.png" mode=""></image>
+							</view>
+							<view class="called" v-if="item.is">
+								已呼叫
+							</view>
+						</view>
+					</view>
+				</view>
 			</view>
 		</view>
-
 		<view class="list-box">
-			<view class="system-title"><top-title :title="'救护站'" @click="tolocation"></top-title></view>
+			<view class="system-title">
+				<top-title :title="'救护站'" :navurl="'/pages/applic/aid'" :show_more="true"></top-title>
+			</view>
 			<view id="container">
-				<map
-					class="map-box"
-					id="map"
-					show-location
-					:markers="marker"
-					:scale="scale"
-					:latitude="latitude4"
-					:longitude="longitude4"
-					ref="map"
-					style="height: 450rpx"
-					@markertap="markertap"
-				></map>
+				<map class="map-box" id="map" show-location :markers="jhzmarker" :scale="scale" :latitude="latitude4"
+					:longitude="longitude4" ref="map" style="height: 450rpx" @markertap="jhzmarkertap"></map>
 			</view>
 			<view class="">
-				<view class="list-tpl flex" @click="openAddress(item)" v-for="(item, index) in Mechanism" :key="item.id">
+				<view class="list-tpl flex" @click="openAddress(item)" v-for="(item, index) in Mechanism"
+					:key="item.id">
 					<template>
 						<view class="list-left">
 							<view class="info">
@@ -104,24 +129,16 @@
 			</view>
 		</view>
 		<view class="list-box" style="margin-top: 20rpx;">
-			<view class="system-title"><top-title :title="'智能AED'" @click="tolocation"></top-title></view>
+			<view class="system-title">
+				<top-title :title="'智能AED'" :navurl="'/pages/applic/aed'" :show_more="true"></top-title>
+			</view>
 			<view id="container">
-				<map
-					class="map-box"
-					id="map"
-					show-location
-					:markers="marker"
-					:scale="scale"
-					:latitude="latitude4"
-					:longitude="longitude4"
-					ref="map"
-					style="height: 450rpx"
-					@markertap="markertap"
-				></map>
+				<map class="map-box" id="map" show-location :markers="aedmarker" :scale="scale" :latitude="latitude4"
+					:longitude="longitude4" ref="map" style="height: 450rpx" @markertap="aedmarkertap"></map>
 			</view>
 			<view class="">
 				<view class="list-tpl flex" @click="openAddress(item)" v-for="(item, index) in AEDList" :key="item.id">
-					<template >
+					<template>
 						<view class="list-left">
 							<view class="info">
 								<view class="title">{{ item.introduction }}</view>
@@ -135,7 +152,6 @@
 						</view>
 					</template>
 				</view>
-				<!-- <uni-load-more :status="loadingType"></uni-load-more> -->
 			</view>
 		</view>
 		<uni-popup ref="popup" type="bottom" @click="close">
@@ -144,11 +160,29 @@
 					<view class="rows-item" @click="toGaodeMap">高德地图</view>
 					<view class="rows-item" @click="tobaiDuMap">百度地图</view>
 					<view class="rows-item" @click="totengxunMap">腾讯地图</view>
-					<!-- <view class="rows-item" @click="toGoogleMap">
-						Google地图
-					</view> -->
-					<!-- <view class="row-1"><image class="first_aid" src="../../static/img/img03.jpg"></image></view> -->
-					<!-- <view class="row-2">扫码进入急救平台</view> -->
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup ref="popup2" type="center" @click="close2">
+			<view class="popup_row2">
+				<view class="title">
+					<view class="title-left">
+						请输入您的手机号，等待救援!
+					</view>
+					<view class="cancel" @click="cancel">
+						<image src="../../static/img/cancel1.png" mode=""></image>
+					</view>
+				</view>
+				<view class="inpBox">
+					<input type="text" value="" placeholder="请输入您的手机号" v-model="to_phone" />
+				</view>
+				<view class="inpedit">
+					可在方框中修改您的手机号
+				</view>
+				<view class="comfirm">
+					<view class="comfirm1" @click="comfirm1()">
+						确认
+					</view>
 				</view>
 			</view>
 		</uni-popup>
@@ -156,169 +190,209 @@
 </template>
 
 <script>
-import { loadIndexs, bannerlist, getListAED, getDistance ,getListMechanism} from '@/api/index.js';
-import { saveUrl, interceptor } from '@/utils/loginUtils.js';
-import { mapState, mapMutations } from 'vuex';
-import { userinfo } from '@/api/user.js';
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import { getLoca } from '@/utils/wxAuthorized.js';
-import { getcomAddress } from '@/api/index.js';
-import topTitle from '../../components/top-title/top-title.vue';
-export default {
-	components: {
-		uniPopup,
-		uniLoadMore,
-		topTitle
-	},
-	data() {
-		return {
-			carouselList: [], //轮播
-			science: [], //文章列表
-			page: 1,
-			limit: 10,
-			AEDList: [],
-			Mechanism: [],
-			latitude2: '',
-			longitude2: '',
-			latitude4: '',
-			longitude4: '',
-			address: '',
-			loadingType: 'more',
-			markerList: [],
-			marker: [],
-			longitude: '121.15829821166992',
-			latitude: '30.044394499237708',
-			longitude1: '120.553638',
-			latitude1: '30.547011',
-			scale: '12', //地图缩放程度
-			scale1: '15',
-			showbox: false,
-			showTEXT: false,
-			addressData: {
+	import {
+		loadIndexs,
+		bannerlist,
+		getListAED,
+		getDistance,
+		getListMechanism,
+		getdis,
+		tocall
+	} from '@/api/index.js';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		userinfo
+	} from '@/api/user.js';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	import {
+		getLoca
+	} from '@/utils/wxAuthorized.js';
+	import {
+		getcomAddress
+	} from '@/api/index.js';
+	import topTitle from '../../components/top-title/top-title.vue';
+	export default {
+		components: {
+			uniPopup,
+			uniLoadMore,
+			topTitle
+		},
+		data() {
+			return {
 				name: '',
-				mobile: '',
-				latitude: 0, //纬度
-				longitude: 0, //经度
-				address: {
-					province: '',
-					city: '',
-					district: '',
-					detail: ''
-				},
-				area: '',
-				default: false
-			}
-		};
-	},
-	onShow() {
-		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);
+				uid: '',
+				phone: '',
+				to_phone: '',
+				jzsbmarker: [],
+				jzsblist: [],
+				jhzmarker: [],
+				aedmarker: [],
+				carouselList: [], //轮播
+				science: [], //文章列表
+				page: 1,
+				limit: 10,
+				AEDList: [],
+				Mechanism: [],
+				latitude2: '',
+				longitude2: '',
+				latitude4: '',
+				longitude4: '',
+				address: '',
+				loadingType: 'more',
+				markerList: [],
+				marker: [],
+				longitude: '121.15829821166992',
+				latitude: '30.044394499237708',
+				longitude1: '120.553638',
+				latitude1: '30.547011',
+				scale: '12', //地图缩放程度
+				scale1: '15',
+				showbox: false,
+				showTEXT: false,
+				addressData: {
+					name: '',
+					mobile: '',
+					latitude: 0, //纬度
+					longitude: 0, //经度
+					address: {
+						province: '',
+						city: '',
+						district: '',
+						detail: ''
+					},
+					area: '',
+					default: false
 				}
-			});
-		} else {
-			this.loadData();
-		}
-	},
-	onLoad() {
-		// uni.showModal({
-		// 	content: '请选择您当前位置',
-		// 	success: res => {
-		// 		if (res.confirm) {
-		// 			this.chooseAddress()
-		// 		}
-		// 	}
-		// })
-		saveUrl();
-		let obj = this;
-		try {
-			let locationAddress;
-			// #ifdef H5
-			let wxOjb = require('jweixin-module');
-			locationAddress = wxOjb.getLocation;
-			// #endif
-			// #ifdef MP
-			locationAddress = uni.getLocation;
-			// #endif
-			// #ifdef H5
-			wxOjb.ready(() => {
-				console.log('加载完毕注册事件');
+			};
+		},
+		onShow() {
+			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 {
+				this.loadData();
+			}
+		},
+		onLoad() {
+			// uni.showModal({
+			// 	content: '请选择您当前位置',
+			// 	success: res => {
+			// 		if (res.confirm) {
+			// 			this.chooseAddress()
+			// 		}
+			// 	}
+			// })
+			saveUrl();
+			let obj = this;
+			try {
+				let locationAddress;
+				// #ifdef H5
+				let wxOjb = require('jweixin-module');
+				locationAddress = wxOjb.getLocation;
+				// #endif
+				// #ifdef MP
+				locationAddress = uni.getLocation;
+				// #endif
+				// #ifdef H5
+				wxOjb.ready(() => {
+					console.log('加载完毕注册事件');
+					locationAddress({
+						type: 'wgs84',
+						success: function(res) {
+							console.log('获取经纬度', res);
+							obj.longitude4 = res.longitude;
+							obj.latitude4 = res.latitude;
+							obj.marker = [{
+								longitude: res.longitude,
+								latitude: res.latitude,
+								iconPath: '/static/img/img19.png',
+								width: '45',
+								height: '45'
+							}];
+							obj.loadData();
+						},
+						fail(e) {
+							console.log('失败', e);
+							// window.location.reload();
+							obj.tishi()
+						}
+					});
+				});
+				// #endif
+
+				// #ifdef MP
 				locationAddress({
 					type: 'wgs84',
 					success: function(res) {
 						console.log('获取经纬度', res);
 						obj.longitude4 = res.longitude;
 						obj.latitude4 = res.latitude;
-						obj.marker = [
-							{
-								longitude: res.longitude,
-								latitude: res.latitude,
-								iconPath: '/static/img/img19.png',
-								width: '45',
-								height: '45'
-							}
-						];
+						obj.marker = [{
+							longitude: res.longitude,
+							latitude: res.latitude,
+							iconPath: '/static/img/img19.png',
+							width: '45',
+							height: '45'
+						}];
 						obj.loadData();
 					},
 					fail(e) {
 						console.log('失败', e);
-						// window.location.reload();
 						obj.tishi()
 					}
 				});
-			});
-			// #endif
-
-			// #ifdef MP
-			locationAddress({
-				type: 'wgs84',
-				success: function(res) {
-					console.log('获取经纬度', res);
-					obj.longitude4 = res.longitude;
-					obj.latitude4 = res.latitude;
-					obj.marker = [
-						{
-							longitude: res.longitude,
-							latitude: res.latitude,
-							iconPath: '/static/img/img19.png',
-							width: '45',
-							height: '45'
+				// #endif
+			} catch (e) {
+				let locationAddress;
+				// #ifdef H5
+				let wxOjb = require('jweixin-module');
+				locationAddress = wxOjb.getLocation;
+				// #endif
+				// #ifdef MP
+				locationAddress = uni.getLocation;
+				// #endif
+				// #ifdef H5
+				wxOjb.ready(() => {
+					console.log('加载完毕注册事件');
+					locationAddress({
+						type: 'wgs84',
+						success: function(res) {
+							console.log('获取经纬度', res);
+							obj.longitude4 = res.longitude;
+							obj.latitude4 = res.latitude;
+							obj.loadData();
+						},
+						fail(e) {
+							console.log('失败', e);
+							obj.tishi()
 						}
-					];
-					obj.loadData();
-				},
-				fail(e) {
-					console.log('失败', e);
-					obj.tishi()
-				}
-			});
-			// #endif
-		} catch (e) {
-			let locationAddress;
-			// #ifdef H5
-			let wxOjb = require('jweixin-module');
-			locationAddress = wxOjb.getLocation;
-			// #endif
-			// #ifdef MP
-			locationAddress = uni.getLocation;
-			// #endif
-			// #ifdef H5
-			wxOjb.ready(() => {
-				console.log('加载完毕注册事件');
+					});
+				});
+				// #endif
+				// #ifdef MP
 				locationAddress({
 					type: 'wgs84',
 					success: function(res) {
@@ -332,699 +406,944 @@ export default {
 						obj.tishi()
 					}
 				});
-			});
-			// #endif
-			// #ifdef MP
-			locationAddress({
-				type: 'wgs84',
-				success: function(res) {
-					console.log('获取经纬度', res);
-					obj.longitude4 = res.longitude;
-					obj.latitude4 = res.latitude;
-					obj.loadData();
-				},
-				fail(e) {
-					console.log('失败', e);
-					obj.tishi()
-				}
-			});
-			// #endif
-		}
-	},
-	computed: {
-		...mapState('user', ['userInfo', 'baseURL', 'hasLogin'])
-	},
-	// 下拉加载
-	onReachBottom() {
-		this.loadData();
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo']),
-		tocontribution() {
-			uni.navigateTo({
-				// url: "/pages/applic/contribution"
-				url: '/pages/form/applicationForm'
-			});
-		},
-		//提示
-		tishi(){
-			uni.showModal({
-				title: '提示',
-				content:'获取当前位置信息失败,是否刷新页面。',
-				success: function(res){
-					if (res.confirm) {
-						window.location.reload();
-						console.log('用户点击确定');
-					} else if (res.cancel) {
-						console.log('用户点击取消');
-					}
-				}
-			})
-		},
-		// 调用高德
-		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=30.537043,120.567191&name=浙江省嘉兴市桐乡市高桥镇高桥大道51号'
-			window.location.href = `https://uri.amap.com/marker?position=${longitude},${latitude}&name=${address}`;
-
-			// window.location.href = `http://uri.amap.com/navigation?from=114.02597366,22.54605355&to=114.029243,22.609562&mode=car&src=nyx_super`
-			// http://uri.amap.com/navigation?from=" + fromLongitude + "," + fromLatitude + "&to="+ longitude + "," + latitude + "&mode=car&src=nyx_super
-		},
-		// 调用腾讯
-		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.latitude4;
-			let longitude6 = this.longitude4;
-			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 `
-		},
-		// 调用谷歌
-		toGoogleMap() {
-			let latitude = this.latitude2;
-			let longitude = this.longitude2;
-			console.log('选择谷歌', latitude, longitude);
-		},
-		tolocation() {
-			uni.navigateTo({
-				url: '/pages/applic/location'
-			});
-		},
-		toapplic() {
-			uni.navigateTo({
-				url: '/pages/applic/appliSystem'
-			});
+				// #endif
+			}
 		},
-		tohelpActi() {
-			uni.navigateTo({
-				// url: "/pages/applic/tohelpActi"
-				url: '/pages/form/tovolApply'
-			});
+		computed: {
+			...mapState('user', ['userInfo', 'baseURL', 'hasLogin'])
 		},
-		toOrgan() {
-			console.log('kepuxingbaoming');
-			uni.navigateTo({
-				url: '/pages/train/index'
-			});
+		// 下拉加载
+		onReachBottom() {
+			this.loadData();
 		},
-		// 点击图标
-		markertap(e) {
-			console.log(e.target.markerId);
-			this.$refs.popup.open();
-			let obj = this;
-			for (let i = 0; i < obj.marker.length; i++) {
-				if (e.target.markerId == obj.marker[i].id) {
-					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
-					// 		})
-					// 	}
-					// })
+		methods: {
+			...mapMutations('user', ['setUserInfo']),
+			tocontribution() {
+				uni.navigateTo({
+					// url: "/pages/applic/contribution"
+					url: '/pages/form/applicationForm'
+				});
+			},
+			//提示
+			tishi() {
+				uni.showModal({
+					title: '提示',
+					content: '获取当前位置信息失败,是否刷新页面。',
+					success: function(res) {
+						if (res.confirm) {
+							window.location.reload();
+							console.log('用户点击确定');
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				})
+			},
+			// 调用高德
+			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=30.537043,120.567191&name=浙江省嘉兴市桐乡市高桥镇高桥大道51号'
+				window.location.href = `https://uri.amap.com/marker?position=${longitude},${latitude}&name=${address}`;
+
+				// window.location.href = `http://uri.amap.com/navigation?from=114.02597366,22.54605355&to=114.029243,22.609562&mode=car&src=nyx_super`
+				// http://uri.amap.com/navigation?from=" + fromLongitude + "," + fromLatitude + "&to="+ longitude + "," + latitude + "&mode=car&src=nyx_super
+			},
+			// 调用腾讯
+			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.latitude4;
+				let longitude6 = this.longitude4;
+				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 `
+			},
+			// 调用谷歌
+			toGoogleMap() {
+				let latitude = this.latitude2;
+				let longitude = this.longitude2;
+				console.log('选择谷歌', latitude, longitude);
+			},
+			tolocation() {
+				uni.navigateTo({
+					url: '/pages/applic/location'
+				});
+			},
+			toapplic() {
+				uni.navigateTo({
+					url: '/pages/applic/appliSystem'
+				});
+			},
+			tohelpActi() {
+				uni.navigateTo({
+					// url: "/pages/applic/tohelpActi"
+					url: '/pages/form/tovolApply'
+				});
+			},
+			toOrgan() {
+				console.log('kepuxingbaoming');
+				uni.navigateTo({
+					url: '/pages/train/index'
+				});
+			},
+			// 点击图标
+			markertap(e) {
+				console.log(e.target.markerId);
+				this.$refs.popup.open();
+				let obj = this;
+				for (let i = 0; i < obj.marker.length; i++) {
+					if (e.target.markerId == obj.marker[i].id) {
+						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
+						// 		})
+						// 	}
+						// })
+					}
 				}
-			}
-		},
-		loadData() {
-			let obj = this;
-			console.log('打印当前经纬度', obj.longitude4, obj.latitude4);
-			userinfo({}).then(({ data }) => {
-				obj.setUserInfo(data);
-				loadIndexs({}).then(({ data }) => {
-					obj.carouselList = data.banner; //轮播图
-					bannerlist().then(({ data }) => {
-						console.log(data);
-						obj.science = data;
+			},
+			aedmarkertap(e) {
+				console.log(e.target.markerId);
+				let obj = this;
+				for (let i = 0; i < obj.aedmarker.length; i++) {
+					if (e.target.markerId == obj.marker[i].id) {
+						obj.latitude2 = obj.marker[i].latitude;
+						obj.longitude2 = obj.marker[i].longitude;
+						obj.address = obj.marker[i].address;
+					}
+				}
+				obj.$refs.popup.open();
+			},
+			jhzmarkertap(e) {
+				console.log(e.target.markerId);
+				let obj = this;
+				for (let i = 0; i < obj.jhzmarker.length; i++) {
+					if (e.target.markerId == obj.marker[i].id) {
+						obj.latitude2 = obj.marker[i].latitude;
+						obj.longitude2 = obj.marker[i].longitude;
+						obj.address = obj.marker[i].address;
+					}
+				}
+				obj.$refs.popup.open();
+			},
+			loadData() {
+				let obj = this;
+				console.log('打印当前经纬度', obj.longitude4, obj.latitude4);
+				userinfo({}).then(({
+					data
+				}) => {
+					obj.setUserInfo(data);
+					loadIndexs({}).then(({
+						data
+					}) => {
+						obj.carouselList = data.banner; //轮播图
+						bannerlist().then(({
+							data
+						}) => {
+							console.log(data);
+							obj.science = data;
+						});
 					});
 				});
-			});
-			if (obj.loadingType === 'noMore') {
-				//防止重复加载
-				return;
-			}
-			// 修改当前对象状态为加载中
-			obj.loadingType = 'loading';
-			getListAED({
-				page: obj.page,
-				limit: obj.limit
-			}).then(({ data }) => {
-				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);
-				}
-				obj.AEDList = obj.AEDList.concat(data);
-				console.log(obj.AEDList, '999++++++++++++++++++++++++++');
-				obj.markerList = data;
-				obj.page++;
-				if (obj.limit == data.length) {
-					obj.loadingType = 'more';
-				} else {
-					obj.loadingType = 'noMore';
+				if (obj.loadingType === 'noMore') {
+					//防止重复加载
+					return;
 				}
-			});
-			getListMechanism({
-				page: obj.page,
-				limit: obj.limit
-			}).then(({data}) => {
-				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);
+				// 修改当前对象状态为加载中
+				obj.loadingType = 'loading';
+				getListAED({
+					page: 1,
+					limit: 2
+				}).then(({
+					data
+				}) => {
+					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);
+					}
+					obj.AEDList = data;
+					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)
+					console.log(obj.AEDList, '999++++++++++++++++++++++++++');
+					obj.markerList = data;
+				});
+				getListMechanism({
+					page: 1,
+					limit: 2
+				}).then(({
+					data
+				}) => {
+					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);
+					}
+					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.Mechanism = data;
+					console.log(obj.Mechanism, '888++++++++++++++++++++++++++');
+				})
+				getdis({
+					lng1: obj.longitude4,
+					lat1: obj.latitude4,
+					page: 1,
+					limit: 2
+				}).then((res) => {
+					let data = res.data;
+					data = data.slice(0,2)
+					console.log('就在身边请求数据', data);
+					console.log('data.phone333', data.phone)
+					data = data.map(d => {
+						return {
+							...d,
+							iscall: true
+						}
+					})
+					obj.jzsblist = data;
+				
+					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.jzsbtmarker = obj.marker.concat(arr)
+				}).catch(err => {
+					console.log(err);
+				});
+			},
+			// 导航
+			openAddress(item) {
+				let obj = this;
+				obj.latitude2 = item.latitude;
+				obj.longitude2 = item.longitude;
+				obj.address = item.address;
+				this.$refs.popup.open();
+			},
+			Jump(item) {
+				// console.log(item);
+				if (item.url != '') {
+					window.open(item.url);
+					return;
 				}
-				obj.Mechanism = obj.Mechanism.concat(data);
-				console.log(obj.Mechanism, '888++++++++++++++++++++++++++');
-				// obj.markerList = data;
-				obj.page2++;
-				if (obj.limit2 == data.length) {
-					obj.loadingType2 = 'more';
+				uni.navigateTo({
+					url: '/pages/applic/info?id=' + item.id
+				});
+			},
+			open() {
+				this.$refs.popup.open();
+			},
+			close() {
+				this.$refs.popup.close();
+			},
+			navTo(url) {
+				uni.navigateTo({
+					url
+				});
+			},
+			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; // 单位米
+			},
+			// 立即救援
+			rescue(item, index) {
+				let obj = this;
+				uni.showModal({
+					content: '是否发起求救？',
+					success: res => {
+						if (res.confirm) {
+							this.$refs.popup2.open(item, index);
+							obj.name = item.name;
+							obj.uid = item.uid;
+							obj.phone = item.phone;
+							obj.iscall = false
+							console.log('点击救援时item.phone：', obj.phone)
+						}
+					}
+				})
+			},
+			comfirm1: function() {
+				let obj = this
+				if (obj.to_phone.toString().trim() == '') {
+					// uni.showModal({
+					// 	title:'输入框为空',
+					// 	// content:JSON.stringify(obj)
+					// })
 				} else {
-					obj.loadingType2 = 'noMore';
+					console.log('obj.to_phone1111', obj.to_phone)
+					const reg = /^(\+?0?86-?)?1[\d]\d{9}$/;
+					if (!reg.test(obj.to_phone)) {
+						obj.$api.msg('请填写正确的手机号码');
+						return;
+					}
+					console.log('name:', obj.name)
+					console.log('uid:', obj.uid)
+					console.log('phone', obj.phone)
+					console.log('to_phone', obj.to_phone)
+					console.log('longitude', obj.longitude)
+					console.log('latitude', obj.latitude)
+					console.log('iscall', obj.iscall)
+					tocall({
+						name: obj.name,
+						uid: obj.uid,
+						phone: obj.phone,
+						longitude: obj.longitude,
+						latitude: obj.latitude,
+						to_phone: obj.to_phone
+					}).then((data) => {
+						console.log(99988, data)
+						uni.showModal({
+							title: '请耐心等待救援',
+							success: res => {
+								if (res.confirm) {
+									window.location.reload(); //重新刷新页面
+								}
+							}
+						})
+						obj.$refs.popup2.close();
+						obj.iscall = false
+						console.log(123, obj.iscall)
+					})
 				}
-			})
-			getDistance({
-				lng1: obj.longitude4,
-				lat1: obj.latitude4
-			}).then(({ data }) => {
-				console.log(data, 980);
-				obj.AEDList = data;
-				obj.AEDList = data.slice(0, 5);
-				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.marker = obj.marker.concat(arr);
-				obj.marker = obj.marker.slice(0, 6);
-				// uni.showModal({
-				// 	title: '提示',
-				// 	content: JSON.stringify(obj.marker)
-				// })
-			});
-		},
-		// 选择当前位置
-		// chooseAddress() {
-		// 	console.log('233')
-		// 	let obj = this;
-		// 	uni.chooseLocation({
-		// 		success: function(res) {
-		// 			console.log(res)
-		// 			obj.addressData.area = res.name;
-		// 			console.log('位置名称：' + res.name);
-		// 			console.log('详细地址：' + res.address);
-		// 			console.log('经度：' + res.longitude);
-		// 			console.log('纬度：' + res.latitude);
-		// 			obj.addressData.latitude = res.latitude;
-		// 			obj.addressData.longitude = res.longitude;
-		// 			obj.addressDetail = res.address;
-		// 			console.log('common_address123',obj.addressDetail )
-		// 			console.log('latitude123',obj.addressData.latitude )
-		// 			console.log('longitude123',obj.addressData.longitude )
-		// 			getcomAddress({
-		// 				common_address: obj.addressDetail,
-		// 				longitude: obj.addressData.longitude,
-		// 				latitude: obj.addressData.latitude
-		// 			}).then(data => {
-		// 				console.log(333)
-		// 				console.log(data);
-		// 				if (data.status == 200) {
-		// 					obj.$api.msg('保存成功')
-		// 				}
-		// 			})
-		// 		}
-		// 	});
-		// },
-		// 导航
-		openAddress(item) {
-			let obj = this;
-			obj.latitude2 = item.latitude;
-			obj.longitude2 = item.longitude;
-			obj.address = item.address;
-			this.$refs.popup.open();
-		},
-		Jump(item) {
-			// console.log(item);
-			if (item.url != '') {
-				window.open(item.url);
-				return;
-			}
-			uni.navigateTo({
-				url: '/pages/applic/info?id=' + item.id
-			});
-		},
-		open() {
-			this.$refs.popup.open();
-		},
-		close() {
-			this.$refs.popup.close();
-		},
-		navTo(url) {
-			uni.navigateTo({
-				url
-			});
-		},
-		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; // 单位米
+			},
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-a {
-	text-decoration: none;
-	color: #5f5f5f;
-}
-
-.content {
-	// line-height: 1;
-	background-color: #ffabab;
-	// padding-bottom: 60rpx;
-}
-
-.popup_row {
-	width: 100%;
-	height: 500rpx;
-	background-color: #ffffff;
-	border-radius: 20rpx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-
-	.rows {
+	a {
+		text-decoration: none;
+		color: #5f5f5f;
+	}
+
+	.content {
+		// line-height: 1;
+		background-color: #ffabab;
+		// padding-bottom: 60rpx;
+	}
+
+	.popup_row {
 		width: 100%;
-		padding: 0 24rpx;
+		height: 500rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
 
-		.rows-item {
-			height: 80rpx;
-			line-height: 80rpx;
-			text-align: center;
+		.rows {
 			width: 100%;
-			font-size: 32rpx;
-			color: #303133;
-			// border-bottom: 1rpx solid #f0f0f0;
-		}
+			padding: 0 24rpx;
+
+			.rows-item {
+				height: 80rpx;
+				line-height: 80rpx;
+				text-align: center;
+				width: 100%;
+				font-size: 32rpx;
+				color: #303133;
+				// border-bottom: 1rpx solid #f0f0f0;
+			}
 
-		// .row-1 {
-		// 	margin: auto;
-		// 	.first_aid {
-		// 		width: 300rpx;
-		// 		height: 300rpx;
-		// 	}
-		// }
-		// .row-2 {
-		// 	font-size: 38rpx;
-		// 	margin-top: 20rpx;
-		// }
+			// .row-1 {
+			// 	margin: auto;
+			// 	.first_aid {
+			// 		width: 300rpx;
+			// 		height: 300rpx;
+			// 	}
+			// }
+			// .row-2 {
+			// 	font-size: 38rpx;
+			// 	margin-top: 20rpx;
+			// }
+		}
 	}
-}
 
-.content {
-	background-color: #f8f8f8;
-	height: 100%;
+	.content {
+		background-color: #f8f8f8;
+		height: 100%;
 
-	/* 头部 轮播图 */
-	.carousel-section {
-		// padding-top: 10px;
-		overflow: hidden;
-		background-color: #fff;
-		.carousel {
-			width: 705rpx;
-			height: 375rpx;
-			margin: 0 auto;
-			border-radius: 20rpx;
+		/* 头部 轮播图 */
+		.carousel-section {
+			// padding-top: 10px;
 			overflow: hidden;
-			.carousel-item {
-				width: 100%;
-				height: 100%;
-				padding-left: 30rpx;
-				padding-right: 30rpx;
-				overflow: hidden;
-			}
+			background-color: #fff;
 
-			image {
-				width: 100%;
+			.carousel {
+				width: 705rpx;
 				height: 375rpx;
+				margin: 0 auto;
 				border-radius: 20rpx;
-			}
-		}
-	}
+				overflow: hidden;
+
+				.carousel-item {
+					width: 100%;
+					height: 100%;
+					padding-left: 30rpx;
+					padding-right: 30rpx;
+					overflow: hidden;
+				}
 
-	// 分类
-	.cate-section {
-		justify-content: space-around;
-		background-color: #fff;
-		padding: 46rpx 0 30rpx;
-		.cate-item {
-			width: 25%;
-			flex-direction: column;
-			text-align: center;
-			align-items: center;
-			justify-content: center;
-			.img-wrapper {
-				width: 100rpx;
-				height: 88rpx;
-				background: #eef4ff;
-				border-radius: 14rpx;
-				position: relative;
 				image {
-					position: absolute;
-					left: 50%;
-					top: 50%;
-					transform: translate(-50%, -50%);
+					width: 100%;
+					height: 375rpx;
+					border-radius: 20rpx;
 				}
-				.img1 {
+			}
+		}
+
+		// 分类
+		.cate-section {
+			justify-content: space-around;
+			background-color: #fff;
+			padding: 46rpx 0 30rpx;
+
+			.cate-item {
+				width: 25%;
+				flex-direction: column;
+				text-align: center;
+				align-items: center;
+				justify-content: center;
+
+				.img-wrapper {
 					width: 100rpx;
-					height: 84rpx;
+					height: 88rpx;
+					background: #eef4ff;
+					border-radius: 14rpx;
+					position: relative;
+
+					image {
+						position: absolute;
+						left: 50%;
+						top: 50%;
+						transform: translate(-50%, -50%);
+					}
+
+					.img1 {
+						width: 100rpx;
+						height: 84rpx;
+					}
+
+					.img2 {
+						width: 100rpx;
+						height: 85rpx;
+					}
+
+					.img3 {
+						width: 100rpx;
+						height: 84rpx;
+
+					}
+
+					.img4 {
+						width: 100rpx;
+						height: 88rpx;
+					}
+
 				}
-				.img2 {
-					width: 100rpx;
-					height: 85rpx;
+
+				.item-title {
+					margin-top: 15rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
 				}
-				.img3 {
-					width: 100rpx;
-					height: 84rpx;
-					
+			}
+		}
+
+		// 红会科普
+		.science-section {
+			width: 100%;
+			background-color: #ffffff;
+			margin-top: 18rpx;
+			padding-top: 30rpx;
+
+			.science-title {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding-bottom: 22rpx;
+
+				.title {
+					width: 285rpx;
+					height: 64rpx;
+					background-color: #ca121e;
+					border-radius: 32rpx;
+					color: #ffffff;
+					font-size: 32rpx;
+					line-height: 64rpx;
+					text-align: center;
 				}
-				.img4 {
-					width: 100rpx;
-					height: 88rpx;
+
+				image {
+					width: 68rpx;
+					height: 43rpx;
+					margin-left: 16rpx;
+					margin-right: 16rpx;
 				}
-				
 			}
-			.item-title {
-				margin-top: 15rpx;
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-			}
-		}
-	}
 
-	// 红会科普
-	.science-section {
-		width: 100%;
-		background-color: #ffffff;
-		margin-top: 18rpx;
-		padding-top: 30rpx;
+			.science-box {
+				padding-left: 15rpx;
+				padding-right: 15rpx;
+				padding-bottom: 20rpx;
+				border-bottom: 1rpx solid #f0f0f0;
+				white-space: nowrap;
+				display: flex;
+				width: 100%;
 
-		.science-title {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			padding-bottom: 22rpx;
-
-			.title {
-				width: 285rpx;
-				height: 64rpx;
-				background-color: #ca121e;
-				border-radius: 32rpx;
-				color: #ffffff;
-				font-size: 32rpx;
-				line-height: 64rpx;
-				text-align: center;
+				// .uni-scroll-view-content{
+				// 	display: flex;
+				// }
+				.science-content {
+					// width: 100%;
+
+					// display: flex;
+					display: -webkit-box;
+
+					.science-item {
+						margin-right: 24rpx;
+						width: 198rpx;
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						text-align: center;
+
+						image {
+							width: 100%;
+							height: 145rpx;
+						}
+
+						.article-title {
+							width: 198rpx;
+							color: #333;
+							font-size: 25rpx;
+							padding-top: 20rpx;
+							padding-bottom: 16rpx;
+							font-weight: 900;
+						}
+
+						.article-content {
+							width: 198rpx;
+							color: #999999;
+							font-size: 18rpx;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							display: -webkit-box;
+							word-break: break-all;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 2;
+						}
+					}
+				}
 			}
 
-			image {
-				width: 68rpx;
-				height: 43rpx;
-				margin-left: 16rpx;
-				margin-right: 16rpx;
+			.science-more {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				color: #cb131c;
+				font-size: 30rpx;
+				padding-top: 18rpx;
+				padding-bottom: 18rpx;
+
+				image {
+					width: 20rpx;
+					height: 27rpx;
+				}
 			}
 		}
 
-		.science-box {
-			padding-left: 15rpx;
-			padding-right: 15rpx;
-			padding-bottom: 20rpx;
-			border-bottom: 1rpx solid #f0f0f0;
-			white-space: nowrap;
-			display: flex;
+		// sos急救中心
+		.system {
 			width: 100%;
+			background-color: #ffffff;
+			margin-top: 18rpx;
+			padding: 40rpx 30rpx 35rpx 30rpx;
+			margin-bottom: 20rpx;
 
-			// .uni-scroll-view-content{
-			// 	display: flex;
-			// }
-			.science-content {
-				// width: 100%;
+			.system-map {
+				margin: 30rpx auto 0;
+				width: 689rpx;
+				height: 312rpx;
+				background-color: #ffffff;
+				// padding: 0 30rpx;
+				padding-bottom: 45rpx;
+				// .map-box {
+				// 	width: 100%;
+				// 	height: 312rpx;
+				// 	// background-color: #fff;
 
-				// display: flex;
-				display: -webkit-box;
+				// }
+			}
+		}
 
-				.science-item {
-					margin-right: 24rpx;
-					width: 198rpx;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
+		// AED
+		.list-box {
+			padding: 0rpx 25rpx 24rpx;
+			// margin-bottom: 84rpx;
+			background-color: #fff;
+
+			.system-title {
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				height: 130rpx;
+				// padding-bottom: 22rpx;
+				background-color: #ffffff;
+
+				.title {
+					width: 285rpx;
+					height: 64rpx;
+					background-color: #ca121e;
+					border-radius: 32rpx;
+					color: #ffffff;
+					font-size: 32rpx;
+					line-height: 64rpx;
 					text-align: center;
+				}
+
+				.img {
+					width: 68rpx;
+					height: 43rpx;
+					margin-left: 16rpx;
+					margin-right: 16rpx;
 
 					image {
-						width: 100%;
-						height: 145rpx;
+						width: 68rpx;
+						height: 43rpx;
 					}
+				}
+			}
+		}
 
-					.article-title {
-						width: 198rpx;
-						color: #333;
-						font-size: 25rpx;
-						padding-top: 20rpx;
-						padding-bottom: 16rpx;
-						font-weight: 900;
+		.map-box {
+			width: 100%;
+			height: 366rpx;
+		}
+
+		.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;
 					}
 
-					.article-content {
-						width: 198rpx;
+					.addr {
+						width: 400rpx;
+						margin-top: 20rpx;
+						font-size: 20rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
 						color: #999999;
-						font-size: 18rpx;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						display: -webkit-box;
-						word-break: break-all;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
 					}
 				}
 			}
-		}
 
-		.science-more {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			color: #cb131c;
-			font-size: 30rpx;
-			padding-top: 18rpx;
-			padding-bottom: 18rpx;
-
-			image {
-				width: 20rpx;
-				height: 27rpx;
-			}
-		}
-	}
+			.image {
+				width: 10%;
+				text-align: center;
 
-	// sos急救中心
-	.system {
-		width: 100%;
-		background-color: #ffffff;
-		margin-top: 18rpx;
-		padding: 40rpx 30rpx 35rpx 30rpx;
-		margin-bottom: 20rpx;
-		.system-map {
-			margin: 30rpx auto 0;
-			width: 689rpx;
-			height: 312rpx;
-			background-color: #ffffff;
-			// padding: 0 30rpx;
-			padding-bottom: 45rpx;
-			// .map-box {
-			// 	width: 100%;
-			// 	height: 312rpx;
-			// 	// background-color: #fff;
-				
-			// }
+				image {
+					width: 50rpx;
+					height: 50rpx;
+				}
+
+				.tip {
+					color: #7f7f7f;
+					font-size: 21rpx;
+				}
+			}
 		}
 	}
 
-	// AED
-	.list-box {
-		padding: 0rpx 25rpx 24rpx;
-		// margin-bottom: 84rpx;
+	.red-box {
+		margin: 20rpx 0;
+		height: 521rpx;
+		padding: 40rpx 23rpx 35rpx 23rpx;
 		background-color: #fff;
 
-		.system-title {
-			display: flex;
-			justify-content: flex-start;
-			align-items: center;
-			height: 130rpx;
-			// padding-bottom: 22rpx;
-			background-color: #ffffff;
+		.red-nav {
+			justify-content: space-between;
+			margin-top: 23rpx;
 
-			.title {
-				width: 285rpx;
-				height: 64rpx;
-				background-color: #ca121e;
-				border-radius: 32rpx;
-				color: #ffffff;
-				font-size: 32rpx;
-				line-height: 64rpx;
-				text-align: center;
+			.left-nav {
+				width: 332rpx;
+				height: 392rpx;
+				background: #FFF3F5;
+				background-image: url(../../static/img/m1.png);
+				background-size: 100% 100%;
 			}
 
-			.img {
-				width: 68rpx;
-				height: 43rpx;
-				margin-left: 16rpx;
-				margin-right: 16rpx;
+			.right-nav {
+				width: 357rpx;
+				height: 392rpx;
+				flex-direction: column;
+				justify-content: space-between;
 
-				image {
-					width: 68rpx;
-					height: 43rpx;
+				// background: #F6F6FF;
+				.right-top-nav {
+					width: 357rpx;
+					height: 204rpx;
+					background: #F6F6FF;
+					background-image: url(../../static/img/m2.png);
+					background-size: 100% 100%;
+				}
+
+				.right-bottom-nav {
+					width: 357rpx;
+					height: 173rpx;
+					justify-content: space-between;
+
+					view {
+						width: 171rpx;
+						height: 173rpx;
+					}
+
+					.left-item {
+						background: #F5EFFE;
+						background-image: url(../../static/img/m3.png);
+						background-size: 100% 100%;
+					}
+
+					.right-item {
+						background: #EDFEFE;
+						background-image: url(../../static/img/m4.png);
+						background-size: 100% 100%;
+					}
 				}
 			}
 		}
 	}
 
-	.map-box {
+	.popup_row2 {
+		// margin-top: 108rpx;
+		height: 440rpx;
+		border-radius: 25rpx;
 		width: 100%;
-		height: 366rpx;
+		padding: 24rpx;
+		background-color: #f8f8f8;
+		z-index: 999;
+
+		.title {
+			border-bottom: 2rpx solid #F2F2F2;
+			color: #E63931;
+			font-size: 32rpx;
+			padding-left: 4rpx;
+			padding-bottom: 16rpx;
+			display: flex;
+			justify-content: space-between;
+
+			// align-items: center;
+			.cancel {
+				margin-left: 52rpx;
+				width: 36rpx;
+				height: 36rpx;
+
+				image {
+					width: 36rpx;
+					height: 36rpx;
+				}
+			}
+		}
+
+		.inpBox {
+			margin-top: 52rpx;
+			border: 2px solid #f2f2f2;
+			padding: 12rpx 24rpx;
+			color: #FF9797;
+			border-radius: 8rpx;
+
+			.input-placeholder {
+				// height: 70rpx;
+				font-size: 32rpx;
+				color: #FF9797;
+			}
+		}
+
+		.inpedit {
+			margin-top: 24rpx;
+			margin-left: 14rpx;
+			font-size: 28rpx;
+			color: #FF9797;
+		}
+
+		.comfirm {
+			display: flex;
+			justify-content: flex-end;
+			margin-top: 54rpx;
+
+			.comfirm1 {
+				padding: 12rpx 24rpx;
+				border-radius: 12rpx;
+				color: #FFFFFF;
+				background-color: #E63931;
+			}
+		}
 	}
 
-	.list-tpl {
-		background-color: #ffffff;
-		margin: 25rpx 0rpx;
-		padding: 25rpx 25rpx;
-		font-size: 28rpx;
-		border-radius: 15rpx;
+	.location-item {
+		z-index: 1000;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		border-bottom: 1px solid #f1f1f1;
-		.list-left {
+		border-bottom: 1rpx solid #E7E8EA;
+		padding: 15rpx 0;
+
+		.box-left {
 			display: flex;
-			width: 100%;
 
-			.number {
-				font-size: 32rpx;
-				margin-right: 14rpx;
+			.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 {
-				width: 100%;
+				margin-left: 16rpx;
 
-				.title {
-					font-size: 32rpx;
-					color: #222222;
-					font-weight: 500;
+				.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;
+						}
+					}
 				}
 
-				.addr {
-					width: 400rpx;
-					margin-top: 20rpx;
-					font-size: 20rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
+				.address {
+					font-size: 26rpx;
+					color: #333333;
+					margin-top: 33rpx;
 				}
 			}
 		}
 
-		.image {
-			width: 10%;
-			text-align: center;
+		.box-right {
+			.img {
+				height: 107rpx;
 
-			image {
-				width: 50rpx;
-				height: 50rpx;
+				image {
+					width: 107rpx;
+					height: 107rpx;
+				}
 			}
 
-			.tip {
-				color: #7f7f7f;
-				font-size: 21rpx;
-			}
-		}
-	}
-}
-.red-box {
-	margin: 20rpx 0;
-	height: 521rpx;
-	padding: 40rpx 23rpx 35rpx 23rpx;
-	background-color: #fff;
-	.red-nav {
-		justify-content: space-between;
-		margin-top: 23rpx;
-		.left-nav {
-			width: 332rpx;
-			height: 392rpx;
-			background: #FFF3F5;
-			background-image: url(../../static/img/m1.png);
-			background-size: 100% 100%;
-		}
-		.right-nav {
-			width: 357rpx;
-			height: 392rpx;
-			flex-direction: column;
-			justify-content: space-between;
-			// background: #F6F6FF;
-			.right-top-nav {
-				width: 357rpx;
-				height: 204rpx;
-				background: #F6F6FF;
-				background-image: url(../../static/img/m2.png);
-				background-size: 100% 100%;
-			}
-			.right-bottom-nav {
-				width: 357rpx;
-				height: 173rpx;
-				justify-content: space-between;
-				view {
-					width: 171rpx;
-					height: 173rpx;
-				}
-				.left-item {
-					background: #F5EFFE;
-					background-image: url(../../static/img/m3.png);
-					background-size: 100% 100%;
-				}
-				.right-item {
-					background: #EDFEFE;
-					background-image: url(../../static/img/m4.png);
-					background-size: 100% 100%;
-				}
+			.called {
+				margin-right: 16rpx;
+				height: 107rpx;
+				line-height: 107rpx;
+				font-size: 28rpx;
+				color: #CB131C;
 			}
 		}
 	}
-}
 </style>

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">荆州市红十字会</view>
-			<view class="english-font">RED CROSS SOCIETY OF JIANGXIA DISTRICT, WUHAN</view>
+			<view class="china-font">松滋市红十字会</view>
+			<view class="english-font">Red Cross Society of Songzi, China</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>
@@ -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">
@@ -118,10 +118,10 @@ export default {
 		IndexShare() {
 			let obj = this;
 			let item = {
-				link:  'http://jz.red.igxys.com/index/#/pages/share/card',// 分享链接
+				link:  'http://jz.red.igxys.com/szs/#/pages/share/card',// 分享链接
 				imgUrl: '/index/static/img/002.png',
 				desc: '电子名片分享',
-				title: '荆州市红十字会',
+				title: '松滋市红十字会',
 			};
 			console.log('分享加',item)
 			weixindata(item);
@@ -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;
@@ -230,6 +230,7 @@ export default {
 		}
 		.map {
 			margin-top: 25rpx;
+			margin-bottom: 25rpx;
 			background-color: #ffffff;
 			z-index: 0;
 			width: 517rpx;
@@ -237,7 +238,7 @@ export default {
 			line-height: 0;
 			.map-box {
 				width: 513rpx;
-				height: 286rpx;
+				height: 513rpx;
 				background: #ffffff;
 			}
 			.map-font {

pages/train/index.vue

@@ -1,186 +1,186 @@
-<template>
-	<view class="container">
-		<!-- <view class="top">
-			普及培训
-		</view> -->
-		<swiper class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<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="list-cell">
-							<image class="image" :src="item.img"></image>
-							<view class="list-tpl">{{ item.title }}</view>
-						</view>
-					</view>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-<script>
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import { training } from '@/api/index.js';
-export default {
-	components: {
-		uniLoadMore,
-		empty,
-		uniPopup
-	},
-	data() {
-		return {
-			page: 1, //当前页数
-			limit: 6, //每次信息条数
-			list: [],
-			loadingType: 'more', //加载更多状态
-		};
-	},
-	onLoad() {
-		console.log(22)
-		this.loadData();
-	},
-	methods: {
-		//获取订单列表
-		loadData(type) {
-			//这里是将订单挂载到tab列表下
-			let obj = this;
-			if (type != 'refresh') {
-				console.log(obj.loadingType, '456');
-				//没有更多数据直接跳出方法
-				if (obj.loadingType === 'nomore') {
-					return;
-				} else {
-					// 设置当前为数据载入中
-					obj.loadingType = 'loading';
-				}
-			} else {
-				//当重新加载数据时更新状态为可继续添加数据
-				obj.loadingType = 'more';
-			}
-			training({})
-				.then(data => {
-					if (type === 'refresh') {
-						obj.list = [];
-					}
-					let arr = data.data
-					obj.list = obj.list.concat(arr);
-					//判断是否还有下一页，有是more  没有是nomore
-					if (obj.limit == arr.length) {
-						obj.page++;
-						obj.loadingType = 'more';
-					} else {
-						obj.loadingType = 'nomore';
-					}
-					// 判断是否为刷新数据
-					if (type === 'refresh') {
-						console.log('refresh');
-						// 判断是否为点击搜索按钮跳转加载
-						if (obj.loading == 1) {
-							uni.hideLoading();
-						} else {
-							uni.stopPullDownRefresh();
-						}
-					}
-				})
-				.catch(e => {
-					obj.loadingType = 'nomore';
-					uni.hideLoading();
-				});
-		},
-		//跳转到详情
-		ToDetail(e) {
-			let type = e.type;
-			let id = e.id;
-			uni.navigateTo({
-				url: '/pages/train/sign?type=' + type+'&id='+id
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: #F2F2F2;
-	height: 100%;
-	padding-bottom: 25rpx;
-}
-.container {
-	height: 100%;
-	.top{
-		background-color: #FFFFFF;
-		height: 88rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 36rpx;
-		font-weight: 500;
-		color: #333333;
-	}
-	.swiper-box {
-		height:100%;
-		.list-scroll-content {
-			height:100%;
-		}
-	}
-}
-.scroll-list {
-	width: 100%;
-	overflow: hidden;
-	white-space: nowrap;
-	background-color: #ffffff;
-	font-size: 32rpx;
-	.scoll-box {
-		text-align: center;
-		display: inline-block;
-		margin: 0rpx 38rpx;
-		padding: 15rpx 0rpx;
-		.scoll-img {
-			width: 130rpx;
-			height: 85rpx;
-			border-radius: 100%;
-			image {
-				width: 85rpx;
-				height: 100%;
-				border-radius: 100%;
-			}
-		}
-		.scoll-name {
-			padding-top: 15rpx;
-		}
-		&.active {
-			color: #ef3d28;
-			border-bottom: 6rpx solid #ef3d28;
-		}
-	}
-}
-
-.order-item {
-	width: 100%;
-	padding: 0rpx 25rpx;
-	padding-top: 25rpx !important;
-	.list-cell {
-		background-color: #ffffff;
-		border-radius: 20rpx;
-		width: 100%;
-		box-shadow: 0px 0px 40px 0px rgba(0, 0, 0, 0.06);
-		.image {
-			width: 100%;
-			height: 300rpx;
-			border-top-left-radius: 25rpx;
-			border-top-right-radius: 25rpx;
-		}
-		.list-tpl {
-			padding: 25rpx 25rpx;
-			padding-bottom: 35rpx !important;
-			font-size: 34rpx;
-			color: #222222;
-			font-weight:500;
-		}
-	}
-}
-</style>
+<template>
+	<view class="container">
+		<!-- <view class="top">
+			普及培训
+		</view> -->
+		<swiper class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<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="list-cell">
+							<image class="image" :src="item.img"></image>
+							<view class="list-tpl">{{ item.title }}</view>
+						</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+<script>
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import { training } from '@/api/index.js';
+export default {
+	components: {
+		uniLoadMore,
+		empty,
+		uniPopup
+	},
+	data() {
+		return {
+			page: 1, //当前页数
+			limit: 6, //每次信息条数
+			list: [],
+			loadingType: 'more', //加载更多状态
+		};
+	},
+	onLoad() {
+		console.log(22)
+		this.loadData();
+	},
+	methods: {
+		//获取订单列表
+		loadData(type) {
+			//这里是将订单挂载到tab列表下
+			let obj = this;
+			if (type != 'refresh') {
+				console.log(obj.loadingType, '456');
+				//没有更多数据直接跳出方法
+				if (obj.loadingType === 'nomore') {
+					return;
+				} else {
+					// 设置当前为数据载入中
+					obj.loadingType = 'loading';
+				}
+			} else {
+				//当重新加载数据时更新状态为可继续添加数据
+				obj.loadingType = 'more';
+			}
+			training({})
+				.then(data => {
+					if (type === 'refresh') {
+						obj.list = [];
+					}
+					let arr = data.data
+					obj.list = obj.list.concat(arr);
+					//判断是否还有下一页，有是more  没有是nomore
+					if (obj.limit == arr.length) {
+						obj.page++;
+						obj.loadingType = 'more';
+					} else {
+						obj.loadingType = 'nomore';
+					}
+					// 判断是否为刷新数据
+					if (type === 'refresh') {
+						console.log('refresh');
+						// 判断是否为点击搜索按钮跳转加载
+						if (obj.loading == 1) {
+							uni.hideLoading();
+						} else {
+							uni.stopPullDownRefresh();
+						}
+					}
+				})
+				.catch(e => {
+					obj.loadingType = 'nomore';
+					uni.hideLoading();
+				});
+		},
+		//跳转到详情
+		ToDetail(e) {
+			let type = e.type;
+			let id = e.id;
+			uni.navigateTo({
+				url: '/pages/train/sign?type=' + type+'&id='+id
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #F2F2F2;
+	height: 100%;
+	padding-bottom: 25rpx;
+}
+.container {
+	height: 100%;
+	.top{
+		background-color: #FFFFFF;
+		height: 88rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 36rpx;
+		font-weight: 500;
+		color: #333333;
+	}
+	.swiper-box {
+		height:100%;
+		.list-scroll-content {
+			height:100%;
+		}
+	}
+}
+.scroll-list {
+	width: 100%;
+	overflow: hidden;
+	white-space: nowrap;
+	background-color: #ffffff;
+	font-size: 32rpx;
+	.scoll-box {
+		text-align: center;
+		display: inline-block;
+		margin: 0rpx 38rpx;
+		padding: 15rpx 0rpx;
+		.scoll-img {
+			width: 130rpx;
+			height: 85rpx;
+			border-radius: 100%;
+			image {
+				width: 85rpx;
+				height: 100%;
+				border-radius: 100%;
+			}
+		}
+		.scoll-name {
+			padding-top: 15rpx;
+		}
+		&.active {
+			color: #ef3d28;
+			border-bottom: 6rpx solid #ef3d28;
+		}
+	}
+}
+
+.order-item {
+	width: 100%;
+	padding: 0rpx 25rpx;
+	padding-top: 25rpx !important;
+	.list-cell {
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		width: 100%;
+		box-shadow: 0px 0px 40px 0px rgba(0, 0, 0, 0.06);
+		.image {
+			width: 100%;
+			height: 300rpx;
+			border-top-left-radius: 25rpx;
+			border-top-right-radius: 25rpx;
+		}
+		.list-tpl {
+			padding: 25rpx 25rpx;
+			padding-bottom: 35rpx !important;
+			font-size: 34rpx;
+			color: #222222;
+			font-weight:500;
+		}
+	}
+}
+</style>

pages/train/sign.vue

@@ -79,7 +79,7 @@ export default {
 			companyName:'',
 			companyphone:'',
 			num:'',
-			people:'荆州市区红十字会',
+			people:'松滋市区红十字会',
 			signDate:'',
 			loading: true, //是否载入图片中
 			size: 180,
@@ -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);
@@ -200,7 +200,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('签发人:', 300 * obj.ratio, 800 * obj.ratio)
@@ -213,7 +213,7 @@ export default {
 		context.fillText('Issuer Date:', 300 * obj.ratio, 910 * obj.ratio)
 		context.setFontSize(26 * obj.ratio)
 		context.fillText(m, 475 * obj.ratio, 908 * obj.ratio)
-		context.fillText('荆州市红十字会', 440 * obj.ratio, 820 * obj.ratio)
+		context.fillText('松滋市红十字会', 440 * obj.ratio, 820 * obj.ratio)
 		// 画横线
 		context.moveTo(430 * obj.ratio, 915 * obj.ratio)
 		context.lineTo(660 * obj.ratio, 915 * obj.ratio)
@@ -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/szs/#/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,8 +182,8 @@ 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/szs/#/pages/form/donaSuccess?money=' + obj.money, // 分享链接
+				imgUrl: 'http://jz.red.igxys.com/index/#/static/img/thinks.png',
 				desc: '感谢信',
 				title: '荆州市红十字会',
 				success: console.log('分享加载成功')

pages/user/thank.vue

@@ -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,22 +234,16 @@ 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/szs/#/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: '荆州市红十字会',
+				title: '松滋市红十字会',
 				success: console.log('分享加载成功')
 			};
 			console.log('分享加', item);

pages/user/user.vue

@@ -20,7 +20,7 @@
 			<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>
+					<view class="title">我的捐赠</view>
 				</view>
 				<view class="item-right">
 					>

static/css/cmy.css

@@ -1,443 +1,443 @@
-/*初始化类*/
-@font-face {
-	font-family: 'iconfont';
-	/* project id 1482221 */
-	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot');
-	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot?#iefix') format('embedded-opentype'),
-		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'),
-		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff') format('woff'),
-		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.ttf') format('truetype'),
-		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.svg#iconfont') format('svg');
-}
-
-.iconfont {
-	font-family: 'iconfont' !important;
-	font-size: 34rpx;
-	font-style: normal;
-	-webkit-font-smoothing: antialiased;
-	-webkit-text-stroke-width: 0rpx;
-	-moz-osx-font-smoothing: grayscale;
-}
-
-.iconedit:before {
-	content: "\e649";
-}
-
-.iconfavorfill:before {
-	content: "\e64b";
-}
-
-.iconfavor:before {
-	content: "\e64c";
-}
-
-.iconlocation:before {
-	content: "\e651";
-}
-
-.iconroundcheckfill:before {
-	content: "\e656";
-}
-
-.iconroundcheck:before {
-	content: "\e657";
-}
-
-.iconunfold:before {
-	content: "\e661";
-}
-
-.iconlikefill:before {
-	content: "\e668";
-}
-
-.iconlike:before {
-	content: "\e669";
-}
-
-.iconshop:before {
-	content: "\e676";
-}
-
-.iconcart:before {
-	content: "\e6af";
-}
-
-.icondelete:before {
-	content: "\e6b4";
-}
-
-.iconhome:before {
-	content: "\e6b8";
-}
-
-.iconcartfill:before {
-	content: "\e6b9";
-}
-
-.iconhomefill:before {
-	content: "\e6bb";
-}
-
-.iconlock:before {
-	content: "\e6c0";
-}
-
-.iconfriendadd:before {
-	content: "\e6ca";
-}
-
-.iconfold:before {
-	content: "\e6de";
-}
-
-.iconapps:before {
-	content: "\e729";
-}
-
-.iconadd:before {
-	content: "\e767";
-}
-
-.iconmove:before {
-	content: "\e768";
-}
-
-.icontriangledownfill:before {
-	content: "\e79b";
-}
-
-.icontriangleupfill:before {
-	content: "\e79c";
-}
-
-.iconshaixuan:before {
-	content: "\e74a";
-}
-
-.iconyanzhengma:before {
-	content: "\e684";
-}
-
-.iconjifen:before {
-	content: "\e60f";
-}
-
-.iconwuliuxinxi:before {
-	content: "\e62b";
-}
-
-.iconmessage:before {
-	content: "\e78a";
-}
-
-.iconsetting:before {
-	content: "\e78e";
-}
-
-.iconaddition:before {
-	content: "\e6e0";
-}
-
-.iconclose:before {
-	content: "\e6e9";
-}
-
-.iconenter:after {
-	content: "\e6f8";
-}
-
-.iconprompt:before {
-	content: "\e71b";
-}
-
-.iconreturn:before {
-	content: "\e720";
-}
-
-.iconsearch:before {
-	content: "\e741";
-}
-
-.iconpengyouquan:before {
-	content: "\e62c";
-}
-
-.iconweixin:before {
-	content: "\e60e";
-}
-
-.iconzhifubao:before {
-	content: "\e673";
-}
-
-.iconyue:before {
-	content: "\e618";
-}
-
-.iconweixin1:before {
-	content: "\e622";
-}
-
-.iconlock1:before {
-	content: "\e64d";
-}
-
-.iconuser:before {
-	content: "\e64e";
-}
-
-.iconchenggongtixianshouyi:before {
-	content: "\e64f";
-}
-
-.iconviptuiguangdingdan:before {
-	content: "\e650";
-}
-
-.icondaifukuan:before {
-	content: "\e652";
-}
-
-.icondaijiesuanshouyi:before {
-	content: "\e653";
-}
-
-.icondaidakuanshouyi:before {
-	content: "\e654";
-}
-
-.icondaifahuo:before {
-	content: "\e655";
-}
-
-.icondaishouhuoshouyi:before {
-	content: "\e658";
-}
-
-.icondaishouhuo:before {
-	content: "\e659";
-}
-
-.iconwuxiaoshouyi:before {
-	content: "\e65a";
-}
-
-.icontixianmingxi:before {
-	content: "\e65b";
-}
-
-.iconshouyi:before {
-	content: "\e65c";
-}
-
-.iconkouchutixianshouxufei:before {
-	content: "\e65d";
-}
-
-.iconyishenqingshouyi:before {
-	content: "\e65e";
-}
-
-.icontuihuanhuo:before {
-	content: "\e65f";
-}
-
-
-/*水平线*/
-.hr {
-	width: 100%;
-	position: relative;
-	border-bottom: 1px solid #dddddd;
-	/* height: 0.5rpx; */
-}
-
-/* 一行显示 */
-.clamp {
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	display: block;
-}
-/* 二行显示 */
-.ellipsis{
-	overflow:hidden; 
-	text-overflow:ellipsis;
-	display:-webkit-box; 
-	-webkit-box-orient:vertical;
-	-webkit-line-clamp:2;
-}
-.common-hover {
-	background: #f5f5f5;
-}
-
-/* 角标 */
-.corner{
-	background-color:#e51c23;
-	position: absolute;
-	right: -18rpx;
-	top: -18rpx;
-	color:#FFFFFF;
-	text-align: center;
-	border-radius: 999px;
-	font-size: 24rpx !important;
-	min-width: 35rpx;
-	min-height: 35rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	line-height: 1;
-}
-/*文字对齐*/
-.text-left {
-	text-align: left !important;
-}
-
-.text-center {
-	text-align: center !important;
-}
-
-.text-justify {
-	text-align: justify !important;
-}
-
-.text-right {
-	text-align: right !important;
-}
-
-.text-default {
-	color: #212121 !important;
-}
-
-.text-white {
-	color: #ffffff !important;
-}
-
-.text-primary {
-	color: #00bcd4 !important;
-}
-
-.text-success {
-	color: #009688 !important;
-}
-
-.text-info {
-	color: #03a9f4 !important;
-}
-
-.text-warning {
-	color: #ffc107 !important;
-}
-
-.text-danger {
-	color: #e51c23 !important;
-}
-
-.text-pink {
-	color: #e91e63 !important;
-}
-
-.text-purple {
-	color: #673ab7 !important;
-}
-
-.text-indigo {
-	color: #3f51b5 !important;
-}
-
-.text-gray {
-	color: #999999 !important;
-}
-
-.bg-default {
-	background-color: #f5f5f5 !important;
-}
-
-.bg-primary {
-	background-color: #00bcd4 !important;
-}
-
-.bg-success {
-	background-color: #009688 !important;
-}
-
-.bg-info {
-	background-color: #03a9f4 !important;
-}
-
-.bg-warning {
-	background-color: #f1c40f !important;
-}
-
-.bg-danger {
-	background-color: #e51c23 !important;
-}
-
-.bg-pink {
-	background-color: #e91e63 !important;
-}
-
-.bg-purple {
-	background-color: #673ab7 !important;
-}
-
-.bg-indigo {
-	background-color: #3f51b5 !important;
-}
-
-.bg-white {
-	background-color: white !important;
-}
-
-.bg-gray {
-	background-color: #e3e3e3 !important;
-}
-
-/* 边框 */
-.border-radius-15 {
-	border-radius: 15rpx;
-}
-
-.border-radius-10 {
-	border-radius: 10rpx;
-}
-
-.border-radius-all {
-	border-radius: 1000rpx;
-}
-
-/* 底部边线 */
-.borde-b {
-	border-bottom: 1px solid #dddddd;
-}
-
-/* 弹性盒子 */
-.flex {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-}
-.flex_item {
-	display: flex;
-	align-items: center;
-	/* justify-content: space-between; */
-}
-.items-left {
-	justify-content: flex-start;
-}
-
-.items-right {
-	justify-content: flex-end;
-}
-
-.flex-shrink-false {
-	flex-shrink: 0;
-}
-
-.flex-grow-true {
-	flex-grow: 1;
-}
-
-.position-relative {
-	position: relative;
-}
+/*初始化类*/
+@font-face {
+	font-family: 'iconfont';
+	/* project id 1482221 */
+	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot');
+	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot?#iefix') format('embedded-opentype'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff') format('woff'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.ttf') format('truetype'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.svg#iconfont') format('svg');
+}
+
+.iconfont {
+	font-family: 'iconfont' !important;
+	font-size: 34rpx;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-webkit-text-stroke-width: 0rpx;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.iconedit:before {
+	content: "\e649";
+}
+
+.iconfavorfill:before {
+	content: "\e64b";
+}
+
+.iconfavor:before {
+	content: "\e64c";
+}
+
+.iconlocation:before {
+	content: "\e651";
+}
+
+.iconroundcheckfill:before {
+	content: "\e656";
+}
+
+.iconroundcheck:before {
+	content: "\e657";
+}
+
+.iconunfold:before {
+	content: "\e661";
+}
+
+.iconlikefill:before {
+	content: "\e668";
+}
+
+.iconlike:before {
+	content: "\e669";
+}
+
+.iconshop:before {
+	content: "\e676";
+}
+
+.iconcart:before {
+	content: "\e6af";
+}
+
+.icondelete:before {
+	content: "\e6b4";
+}
+
+.iconhome:before {
+	content: "\e6b8";
+}
+
+.iconcartfill:before {
+	content: "\e6b9";
+}
+
+.iconhomefill:before {
+	content: "\e6bb";
+}
+
+.iconlock:before {
+	content: "\e6c0";
+}
+
+.iconfriendadd:before {
+	content: "\e6ca";
+}
+
+.iconfold:before {
+	content: "\e6de";
+}
+
+.iconapps:before {
+	content: "\e729";
+}
+
+.iconadd:before {
+	content: "\e767";
+}
+
+.iconmove:before {
+	content: "\e768";
+}
+
+.icontriangledownfill:before {
+	content: "\e79b";
+}
+
+.icontriangleupfill:before {
+	content: "\e79c";
+}
+
+.iconshaixuan:before {
+	content: "\e74a";
+}
+
+.iconyanzhengma:before {
+	content: "\e684";
+}
+
+.iconjifen:before {
+	content: "\e60f";
+}
+
+.iconwuliuxinxi:before {
+	content: "\e62b";
+}
+
+.iconmessage:before {
+	content: "\e78a";
+}
+
+.iconsetting:before {
+	content: "\e78e";
+}
+
+.iconaddition:before {
+	content: "\e6e0";
+}
+
+.iconclose:before {
+	content: "\e6e9";
+}
+
+.iconenter:after {
+	content: "\e6f8";
+}
+
+.iconprompt:before {
+	content: "\e71b";
+}
+
+.iconreturn:before {
+	content: "\e720";
+}
+
+.iconsearch:before {
+	content: "\e741";
+}
+
+.iconpengyouquan:before {
+	content: "\e62c";
+}
+
+.iconweixin:before {
+	content: "\e60e";
+}
+
+.iconzhifubao:before {
+	content: "\e673";
+}
+
+.iconyue:before {
+	content: "\e618";
+}
+
+.iconweixin1:before {
+	content: "\e622";
+}
+
+.iconlock1:before {
+	content: "\e64d";
+}
+
+.iconuser:before {
+	content: "\e64e";
+}
+
+.iconchenggongtixianshouyi:before {
+	content: "\e64f";
+}
+
+.iconviptuiguangdingdan:before {
+	content: "\e650";
+}
+
+.icondaifukuan:before {
+	content: "\e652";
+}
+
+.icondaijiesuanshouyi:before {
+	content: "\e653";
+}
+
+.icondaidakuanshouyi:before {
+	content: "\e654";
+}
+
+.icondaifahuo:before {
+	content: "\e655";
+}
+
+.icondaishouhuoshouyi:before {
+	content: "\e658";
+}
+
+.icondaishouhuo:before {
+	content: "\e659";
+}
+
+.iconwuxiaoshouyi:before {
+	content: "\e65a";
+}
+
+.icontixianmingxi:before {
+	content: "\e65b";
+}
+
+.iconshouyi:before {
+	content: "\e65c";
+}
+
+.iconkouchutixianshouxufei:before {
+	content: "\e65d";
+}
+
+.iconyishenqingshouyi:before {
+	content: "\e65e";
+}
+
+.icontuihuanhuo:before {
+	content: "\e65f";
+}
+
+
+/*水平线*/
+.hr {
+	width: 100%;
+	position: relative;
+	border-bottom: 1px solid #dddddd;
+	/* height: 0.5rpx; */
+}
+
+/* 一行显示 */
+.clamp {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	display: block;
+}
+/* 二行显示 */
+.ellipsis{
+	overflow:hidden; 
+	text-overflow:ellipsis;
+	display:-webkit-box; 
+	-webkit-box-orient:vertical;
+	-webkit-line-clamp:2;
+}
+.common-hover {
+	background: #f5f5f5;
+}
+
+/* 角标 */
+.corner{
+	background-color:#e51c23;
+	position: absolute;
+	right: -18rpx;
+	top: -18rpx;
+	color:#FFFFFF;
+	text-align: center;
+	border-radius: 999px;
+	font-size: 24rpx !important;
+	min-width: 35rpx;
+	min-height: 35rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	line-height: 1;
+}
+/*文字对齐*/
+.text-left {
+	text-align: left !important;
+}
+
+.text-center {
+	text-align: center !important;
+}
+
+.text-justify {
+	text-align: justify !important;
+}
+
+.text-right {
+	text-align: right !important;
+}
+
+.text-default {
+	color: #212121 !important;
+}
+
+.text-white {
+	color: #ffffff !important;
+}
+
+.text-primary {
+	color: #00bcd4 !important;
+}
+
+.text-success {
+	color: #009688 !important;
+}
+
+.text-info {
+	color: #03a9f4 !important;
+}
+
+.text-warning {
+	color: #ffc107 !important;
+}
+
+.text-danger {
+	color: #e51c23 !important;
+}
+
+.text-pink {
+	color: #e91e63 !important;
+}
+
+.text-purple {
+	color: #673ab7 !important;
+}
+
+.text-indigo {
+	color: #3f51b5 !important;
+}
+
+.text-gray {
+	color: #999999 !important;
+}
+
+.bg-default {
+	background-color: #f5f5f5 !important;
+}
+
+.bg-primary {
+	background-color: #00bcd4 !important;
+}
+
+.bg-success {
+	background-color: #009688 !important;
+}
+
+.bg-info {
+	background-color: #03a9f4 !important;
+}
+
+.bg-warning {
+	background-color: #f1c40f !important;
+}
+
+.bg-danger {
+	background-color: #e51c23 !important;
+}
+
+.bg-pink {
+	background-color: #e91e63 !important;
+}
+
+.bg-purple {
+	background-color: #673ab7 !important;
+}
+
+.bg-indigo {
+	background-color: #3f51b5 !important;
+}
+
+.bg-white {
+	background-color: white !important;
+}
+
+.bg-gray {
+	background-color: #e3e3e3 !important;
+}
+
+/* 边框 */
+.border-radius-15 {
+	border-radius: 15rpx;
+}
+
+.border-radius-10 {
+	border-radius: 10rpx;
+}
+
+.border-radius-all {
+	border-radius: 1000rpx;
+}
+
+/* 底部边线 */
+.borde-b {
+	border-bottom: 1px solid #dddddd;
+}
+
+/* 弹性盒子 */
+.flex {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+.flex_item {
+	display: flex;
+	align-items: center;
+	/* justify-content: space-between; */
+}
+.items-left {
+	justify-content: flex-start;
+}
+
+.items-right {
+	justify-content: flex-end;
+}
+
+.flex-shrink-false {
+	flex-shrink: 0;
+}
+
+.flex-grow-true {
+	flex-grow: 1;
+}
+
+.position-relative {
+	position: relative;
+}

store/index.js

@@ -11,22 +11,23 @@ const store = new Vuex.Store({
 		baseURL: 'http://jz.red.igxys.com', //请求地址配置
 		// #endif
 		// baseURL: 'http://yrh.liuniu946.com', //请求地址配置
-		urlFile: '/index', //项目部署所在文件夹
+		urlFile: '/szs', //项目部署所在文件夹
 		loginInterceptor: false, //是否打开强制登录
-		token:'',
+		token: '',
 		// #ifdef H5 
-		setWeiChatInfo:'',
-		Spread:'',
+		setWeiChatInfo: '',
+		Spread: '',
 		weichatInfo: {}, //保存微信注册信息
 		weichatObj: '', //微信对象
-		weichatBrowser: '' ,//当前是否为微信内置浏览器
+		weichatBrowser: '', //当前是否为微信内置浏览器
 		// #endif
 		// shareData:'',//分享信息
+		project_area: 224
 	},
 	mutations: {
-	
+
 		// #ifdef H5
-		tabbar(state,provider){
+		tabbar(state, provider) {
 			state.tabbarindex = provider;
 		},
 		//保存微信信息
@@ -42,7 +43,7 @@ const store = new Vuex.Store({
 		}
 		// #endif
 	},
-	modules:{
+	modules: {
 		user
 	},
 	actions: {
@@ -50,4 +51,4 @@ const store = new Vuex.Store({
 	}
 })
 
-export default store
+export default store

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>
+            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.331bfcd3.js></script><script src=/index/static/js/index.eac9b04a.js></script></body></html>

unpackage/dist/build/h5/static/js/pages-form-demo.2d7332ff.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-form-demo"],{"193d":function(t,n,e){"use strict";e.r(n);var r=e("d596"),a=e.n(r);for(var i in r)"default"!==i&&function(t){e.d(n,t,(function(){return r[t]}))}(i);n["default"]=a.a},"3dcb":function(t,n,e){"use strict";var r;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return r}));var a=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("v-uni-view",[e("v-uni-canvas",{staticStyle:{width:"750px",height:"200px"},attrs:{"canvas-id":"firstCanvas",id:"firstCanvas"}})],1)},i=[]},"8dbf":function(t,n,e){"use strict";e.r(n);var r=e("3dcb"),a=e("193d");for(var i in a)"default"!==i&&function(t){e.d(n,t,(function(){return a[t]}))}(i);var u,c=e("f0c5"),o=Object(c["a"])(a["default"],r["b"],r["c"],!1,null,null,null,!1,r["a"],u);n["default"]=o.exports},d596:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={onReady:function(t){var n=uni.createCanvasContext("firstCanvas");n.setStrokeStyle("#00ff00"),n.setLineWidth(5),n.rect(0,0,200,200),n.stroke(),n.draw()},methods:{canvasIdErrorCallback:function(t){console.error(t.detail.errMsg)}}};n.default=r}}]);