lhl 4 years ago
parent
commit
48b3c01d77
100 changed files with 2440 additions and 1004 deletions
  1. 105 104
      manifest.json
  2. 39 1
      pages.json
  3. 550 0
      pages/applic/aed.vue
  4. 554 0
      pages/applic/aid.vue
  5. 8 8
      pages/applic/contribution.vue
  6. 1 1
      pages/applic/donaSuccess.vue
  7. 9 15
      pages/applic/other.vue
  8. 3 22
      pages/applic/toknowledge.vue
  9. 4 3
      pages/donate/donate.vue
  10. 29 21
      pages/form/donaSuccess.vue
  11. 1115 806
      pages/index/index.vue
  12. 19 19
      pages/share/card.vue
  13. 1 1
      pages/train/sign.vue
  14. BIN
      static/images/sharecode.jpg
  15. BIN
      static/img/btn.png
  16. BIN
      static/img/test_bg.png
  17. BIN
      static/img/test_home.png
  18. BIN
      static/img/test_mail.png
  19. BIN
      static/img/test_phone.png
  20. BIN
      static/img/thanks1.png
  21. BIN
      static/img/top_bg.png
  22. BIN
      static/img/zszs.png
  23. 1 1
      store/index.js
  24. 2 2
      unpackage/dist/build/h5/index.html
  25. BIN
      unpackage/dist/build/h5/ssq-10-15-1.rar
  26. BIN
      unpackage/dist/build/h5/static/images/sharecode.jpg
  27. BIN
      unpackage/dist/build/h5/static/img/btn.png
  28. BIN
      unpackage/dist/build/h5/static/img/jzsblogo.png
  29. BIN
      unpackage/dist/build/h5/static/img/sharecode.e6e72648.jpg
  30. BIN
      unpackage/dist/build/h5/static/img/smjk.e0f94c23.png
  31. BIN
      unpackage/dist/build/h5/static/img/test_bg.8ff239f6.png
  32. BIN
      unpackage/dist/build/h5/static/img/test_bg.png
  33. BIN
      unpackage/dist/build/h5/static/img/test_home.png
  34. BIN
      unpackage/dist/build/h5/static/img/test_mail.png
  35. BIN
      unpackage/dist/build/h5/static/img/test_phone.png
  36. BIN
      unpackage/dist/build/h5/static/img/thanks1.png
  37. BIN
      unpackage/dist/build/h5/static/img/top_bg.1bfdf6da.png
  38. BIN
      unpackage/dist/build/h5/static/img/top_bg.png
  39. BIN
      unpackage/dist/build/h5/static/img/zszs.png
  40. 0 0
      unpackage/dist/build/h5/static/js/chunk-vendors.d4a1bf80.js
  41. 0 0
      unpackage/dist/build/h5/static/js/index.55c9ab4c.js
  42. 0 0
      unpackage/dist/build/h5/static/js/index.866c6c90.js
  43. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-aed.c150cb13.js
  44. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-aed~pages-applic-aid~pages-applic-contribution~pages-applic-helprecords~pages-applic-lo~b99ab4a1.51cec2ce.js
  45. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-aed~pages-applic-aid~pages-applic-location.aa4f3568.js
  46. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-aed~pages-applic-aid~pages-applic-rescuerecords~pages-index-index.c9e481f2.js
  47. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-aid.91852a38.js
  48. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-appliSystem.5dafc753.js
  49. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-appliSystem.838c4b9f.js
  50. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-applic.a8bde3cb.js
  51. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-applic.fe82f352.js
  52. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-chooseAddress.af8cc00e.js
  53. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-chooseAddress.fd63da64.js
  54. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-commonaddress.3b2ed130.js
  55. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-commonaddress.cf4ff460.js
  56. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-contribution.20dd6b89.js
  57. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-contribution.6ec78e6c.js
  58. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-contribution~pages-applic-helprecords~pages-applic-location~pages-applic-rescuerecords~~81883202.28903b39.js
  59. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-donaSuccess.93fdbf40.js
  60. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-donaSuccess.bf2e07ba.js
  61. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-helprecords.2aa84591.js
  62. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-helprecords.5cf000f2.js
  63. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-helprecords~pages-applic-rescuerecords.72ea804c.js
  64. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-helprecords~pages-applic-rescuerecords.cac15ad8.js
  65. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-helprecords~pages-applic-rescuerecords~pages-cart-cart~pages-category-search~pages-dona~a298aa41.b925de3a.js
  66. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-helprecords~pages-applic-rescuerecords~pages-cart-cart~pages-category-search~pages-dona~a298aa41.d3280a2d.js
  67. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-info.32fc394f.js
  68. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-info.977fdce0.js
  69. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-item.0a829514.js
  70. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-item.4007a32d.js
  71. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-know.75a810b8.js
  72. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-know.eb32c262.js
  73. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-location.54762101.js
  74. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-location.7d8a629f.js
  75. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-love.3440b183.js
  76. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-love.7a14daab.js
  77. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-other.64d93cc7.js
  78. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-other.7024b4d6.js
  79. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-perSign.01cbb4f1.js
  80. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-perSign.5af6ba2a.js
  81. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-register.14ad15c0.js
  82. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-register.fbd80058.js
  83. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-rescuerecords.4caefdcb.js
  84. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-rescuerecords.b46eea36.js
  85. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-science.45b36986.js
  86. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-science.655d12e5.js
  87. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-teamSign.34a3be01.js
  88. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-teamSign.b8f1c382.js
  89. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-toOrgan.27332fe5.js
  90. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-toOrgan.cf276bc1.js
  91. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-tocontrilist.fb211950.js
  92. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-tocontrilist.fdddc1bd.js
  93. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-tohelpActi.9a3bbdcb.js
  94. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-tohelpActi.b690524c.js
  95. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-toknowledge.0b16de10.js
  96. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-toknowledge.46bff663.js
  97. 0 0
      unpackage/dist/build/h5/static/js/pages-cart-cart.4fd9aa3c.js
  98. 0 0
      unpackage/dist/build/h5/static/js/pages-cart-cart.d61d92c4.js
  99. 0 0
      unpackage/dist/build/h5/static/js/pages-cart-group.052edca4.js
  100. 0 0
      unpackage/dist/build/h5/static/js/pages-cart-group.29e6b4ec.js

+ 105 - 104
manifest.json

@@ -1,104 +1,105 @@
-{
-    "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" : "/ssq/"
+        },
+        "devServer" : {
+            "proxy" : {
+                "/api" : {
+                    // "target" : "http://www.jzrc.org.cn", //请求的目标域名
+                    "target" : "http://jz.red.igxys.com",
+                    "changeOrigin" : true,
+                    // "secure": false,
+                    "pathRewrite" : {}
+                }
+            }
+        },
+        // "^/api" : ""
+        "template" : "",
+        "sdkConfigs" : {
+            "maps" : {}
+        }
+    }
+}

+ 39 - 1
pages.json

@@ -844,7 +844,45 @@
 				"navigationBarTitleText": "详情进展"
 			
 			}
-		}
+		},
+		{
+			"path": "pages/applic/aid",
+			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
+				"navigationBarBackgroundColor": "#457DBF",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "救护站"
+			}
+		},
+		{
+			"path": "pages/applic/aed",
+			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
+				"navigationBarBackgroundColor": "#457DBF",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "智能AED"
+			}
+		},
+		{
+			"path": "pages/share/card",
+			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
+				"navigationBarBackgroundColor": "#457DBF",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "电子名片"
+		}}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

+ 550 - 0
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>

+ 554 - 0
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>
+

+ 8 - 8
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,7 +258,7 @@
 			// console.log(333,options)
 		},
 		onShow() {
-			saveUrl()
+			// saveUrl()
 			// let token = uni.getStorageSync('token');
 			console.log(1, this);
 			// uni.showModal({
@@ -278,6 +273,7 @@
 					content: '您未登录,是否马上登陆?',
 					success: e => {
 						if (e.confirm) {
+							saveUrl()
 							interceptor();
 						}
 					},
@@ -446,8 +442,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) {

+ 1 - 1
pages/applic/donaSuccess.vue

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

+ 9 - 15
pages/applic/other.vue

@@ -29,20 +29,14 @@
 			<view class="image">
 				<image src="../../static/images/oother.png" mode=""></image>
 			</view>
-			<!-- <view class="image">
-				<image src="../../static/images/other.png" mode=""></image>
-			</view> -->
-			<view class="title">2.扫码捐款</view>
-		<!-- 	<view class="zfb">支付宝扫码捐款</view> -->
-			<view class="erweima"><image src="../../static/images/smjk.png" mode=""></image></view>
-			<!-- <view class="weixin">微信扫码捐款</view>
-			<view class="erweima" style="background: #02974A;"><image src="" mode=""></image></view> -->
-
-			<view class="title">3.现场捐款/捐物</view>
+			<!-- <view class="title">2.扫码捐款</view>
+			<view class="erweima"><image src="../../static/images/smjk.png" mode=""></image></view> -->
+
+			<view class="title">2.物资捐赠</view>
 			<view class="detail">
-				<view class="detail-item">负责人:**********</view>
-				<view class="detail-item">咨询电话:**********</view>
-				<view class="detail-item">地址:********</view>
+				<view class="detail-item">负责人:周子惠</view>
+				<view class="detail-item">咨询电话:0716-4154299</view>
+				<view class="detail-item">地址:江陵县江陵大道33号江陵县红十字会307室</view>
 			</view>
 		</view>
 	</view>
@@ -58,8 +52,8 @@ export default {
 					id: 0,
 					spread_url: 11,
 					name: '江陵县红十字会',
-					count: '*********',
-					number: '**********'
+					count: '中国银行江陵支行',
+					number: '561257531213'
 				}
 			]
 		};

+ 3 - 22
pages/applic/toknowledge.vue

@@ -95,31 +95,12 @@
 			<view class="list-tips">
 				<text style="color: #C53335;">温馨提示</text>:每个志愿者抽取一次血样即可,您的资料将储存在中国造血干细胞捐献者资料库中。
 			</view>
-			<!-- <view class="list-tips">
-				<text style="color: #C53335; text-align: center;" >江夏区造血干细胞捐献咨询电话:</text>
-			</view> -->
-			<view class="list-tips" style="color: #C53335;text-align: center;">
+			<!-- <view class="list-tips" style="color: #C53335;text-align: center;">
 				荆州市造血干细胞捐献咨询电话:
-			</view>
-			<view class="list-tips" style="text-align: center;">
-				0716-4163849
-			</view>
-			<!-- <view class="list01">
-				具体入库办法:
 			</view> -->
-		<!-- 	<view class="list-info">
-				一、直接到余姚市红十字会(余姚市兰江街道新西门路219-1号)报名登记、抽取血样,每个工作日均可(8:30-16:00);
-			</view>
-			<view class="list-info">
-				二、到余姚市桐江桥献血屋或者献血车上参加无偿献血,一并参加报名登记、留取血样;
-			</view>
-			<view class="list-info">
-				三、每年“五·八”世界红十字日前后,市红十字会会在市中心开展包括造血干细胞捐献在内的系列活动,届时可前往报名抽样。请留意新闻媒体的报道。
-			</view>
-			<view class="phone">
-				余姚市红十字会报名咨询电话:62619095
+			<!-- <view class="list-tips" style="text-align: center;">
+				0716-4163849
 			</view> -->
-				<!-- <jyf-parser :html="description" ref="article"></jyf-parser> -->
 		</view>
 	</view>
 </template>

+ 4 - 3
pages/donate/donate.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="donate-wrapper">
 		<view class="top-select flex" style=" position: relative; z-index: 99;">
-			<view class="">选择地区</view>
-			<picker @change="bindAreaChange" :range="areas" range-key="name">
+			<view class="">选择项目状态</view>
+			<!-- <picker @change="bindAreaChange" :range="areas" range-key="name">
 				<view class="area select" :class="{ action: area }">{{ area || '点击选择地区' }}</view>
-			</picker>
+			</picker> -->
 			<picker @change="bindStatusChange" :range="statuss" range-key="name">
 				<view class="status select" :class="{ action: status }">{{ status }}</view>
 			</picker>
@@ -242,6 +242,7 @@ export default {
 	.status {
 		width: 204rpx;
 		height: 63rpx;
+		margin: 0 10rpx 0 24rpx;
 	}
 	.action {
 		color: #000;

+ 29 - 21
pages/form/donaSuccess.vue

@@ -39,7 +39,10 @@ export default {
 			},
 			ran: -1,
 			isStop: true,
-			demo: 0
+			demo: 0,
+			name: '',
+			add_time: '',
+			
 		};
 	},
 	onReady() {
@@ -74,7 +77,7 @@ export default {
 				}
 			)
 			.exec();
-		let ctxBg = '/index/static/img/thanks.png'; //画布背景
+		let ctxBg = '/index/static/img/thanks1.png'; //画布背景
 		let src = '/index/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,8 +192,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/index/#/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: '江陵县红十字会',
 				success: console.log('分享加载成功')
@@ -302,8 +310,8 @@ page {
 			border-radius: 28rpx;
 			// background-color: pink;
 			position: absolute;
-			left: 12rpx;
-			top: 250rpx;
+			left: 40rpx;
+			top: 100rpx;
 			z-index: 999;
 		}
 

+ 1115 - 806
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="jzsbmarker"
-					: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,179 +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: [],
-			jzsbmarker: [],
-			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.jzsbmarker = [
-							{
-								longitude: res.longitude,
-								latitude: res.latitude,
-								iconPath: '/static/img/jzsblogo.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) {
@@ -342,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);
+				if (obj.loadingType === 'noMore') {
+					//防止重复加载
+					return;
 				}
-				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';
-				}
-			});
-			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>

+ 19 - 19
pages/share/card.vue

@@ -4,37 +4,37 @@
 		<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="english-font">Jiangling County Red Cross Society</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>江陵县江陵大道33号</text></view>
 			</view>
-			<view class="item flex">
-				<image class="home_img" src="../../static/img/test_phone.png" mode="aspectFill"></image>
+			<!-- <view class="item flex"> -->
+				<!-- <image class="home_img" src="../../static/img/test_phone.png" mode="aspectFill"></image> -->
 				<!-- #ifdef H5 -->
-				<view class="text"><text class="text1">87012677</text></view>
+				<!-- <view class="text"><text class="text1">87012677</text></view> -->
 				<!-- #endif -->
 				<!-- #ifndef H5 -->
-				<view class="text" @click="uni.makePhoneCall({phoneNumber: '87012677'})"><text>87012677</text></view>
+				<!-- <view class="text" @click="uni.makePhoneCall({phoneNumber: '87012677'})"><text>87012677</text></view> -->
 				<!-- #endif -->
-			</view>
+			<!-- </view> -->
 <!-- 			<view class="item flex">
 				<image class="home_img" src="../../static/img/test_mail.png" mode="aspectFill"></image>
 				<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/images/sharecode.jpg"></image>
 				<view class="map-font flex">
 					<view class="font-left">武汉市江夏区红十字会</view>
 					<view @click="navigation()" class="font-right"><image src="../../static/img/btn.png" mode="aspectFill"></image></view>
 				</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">
@@ -60,11 +60,11 @@ export default {
 	},
 	data() {
 		return {
-			longitude: '114.316738', //荆州市经度
-			latitude: '30.353495', //荆州市纬度
+			longitude: '112.420067', //荆州市经度
+			latitude: '30.041772', //荆州市纬度
 			longitudeNew: '', //当前经度
 			latitudeNew: '', //当前纬度
-			addr: '江夏区红十字会'
+			addr: '江陵县红十字会'
 		};
 	},
 	onLoad() {
@@ -110,16 +110,15 @@ export default {
 			window.location.href = `http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};addr:${address}`;
 		},
 		toBaiduMap() {
-			
 			window.location.href=
-			`http://api.map.baidu.com/marker?location=30.357764,112.218665&title=江陵县红十字会&content=江陵县红十字会&output=html&src=webapp.baidu.openAPIdemo `
+			`http://api.map.baidu.com/marker?location=30.04796,112.426626&title=江陵县红十字会&content=江陵县红十字会&output=html&src=webapp.baidu.openAPIdemo`
 		},
 		//分享
 		IndexShare() {
 			let obj = this;
 			let item = {
 				link:  'http://jz.red.igxys.com/index/#/pages/share/card',// 分享链接
-				imgUrl: '/index/static/img/002.png',
+				imgUrl: 'http://jz.red.igxys.com/static/img/002.png',
 				desc: '电子名片分享',
 				title: '江陵县红十字会',
 			};
@@ -133,8 +132,8 @@ export default {
 <style lang="scss">
 	.center {
 		border: 20rpx solid #e01a1c;
-		// height: 100vh;
-		min-height: 600px;
+		height: 100vh;
+		// min-height: 600px;
 	}
 	.flex {
 		display: flex;
@@ -229,6 +228,7 @@ export default {
 			}
 		}
 		.map {
+			margin-bottom: 25rpx;
 			margin-top: 25rpx;
 			background-color: #ffffff;
 			z-index: 0;
@@ -237,7 +237,7 @@ export default {
 			line-height: 0;
 			.map-box {
 				width: 513rpx;
-				height: 286rpx;
+				height: 513rpx;
 				background: #ffffff;
 			}
 			.map-font {

+ 1 - 1
pages/train/sign.vue

@@ -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)

BIN
static/images/sharecode.jpg


BIN
static/img/btn.png


BIN
static/img/test_bg.png


BIN
static/img/test_home.png


BIN
static/img/test_mail.png


BIN
static/img/test_phone.png


BIN
static/img/thanks1.png


BIN
static/img/top_bg.png


BIN
static/img/zszs.png


+ 1 - 1
store/index.js

@@ -11,7 +11,7 @@ const store = new Vuex.Store({
 		baseURL: 'http://jz.red.igxys.com', //请求地址配置
 		// #endif
 		// baseURL: 'http://yrh.liuniu946.com', //请求地址配置
-		urlFile: '/index', //项目部署所在文件夹
+		urlFile: '/jlx', //项目部署所在文件夹
 		loginInterceptor: false, //是否打开强制登录
 		token:'',
 		// #ifdef H5 

+ 2 - 2
unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
-<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>荆州市红十字会</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.a687c92d.js></script><script src=/index/static/js/index.866c6c90.js></script></body></html>
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>江陵县红十字会</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/ssq/static/index.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/ssq/static/js/chunk-vendors.d4a1bf80.js></script><script src=/ssq/static/js/index.55c9ab4c.js></script></body></html>

BIN
unpackage/dist/build/h5/jz-9-29-1.rar → unpackage/dist/build/h5/ssq-10-15-1.rar


BIN
unpackage/dist/build/h5/static/images/sharecode.jpg


BIN
unpackage/dist/build/h5/static/img/btn.png


BIN
unpackage/dist/build/h5/static/img/jzsblogo.png


BIN
unpackage/dist/build/h5/static/img/sharecode.e6e72648.jpg


BIN
unpackage/dist/build/h5/static/img/smjk.e0f94c23.png


BIN
unpackage/dist/build/h5/static/img/test_bg.8ff239f6.png


BIN
unpackage/dist/build/h5/static/img/test_bg.png


BIN
unpackage/dist/build/h5/static/img/test_home.png


BIN
unpackage/dist/build/h5/static/img/test_mail.png


BIN
unpackage/dist/build/h5/static/img/test_phone.png


BIN
unpackage/dist/build/h5/static/img/thanks1.png


BIN
unpackage/dist/build/h5/static/img/top_bg.1bfdf6da.png


BIN
unpackage/dist/build/h5/static/img/top_bg.png


BIN
unpackage/dist/build/h5/static/img/zszs.png


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/chunk-vendors.d4a1bf80.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/index.55c9ab4c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/index.866c6c90.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-aed.c150cb13.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-aed~pages-applic-aid~pages-applic-contribution~pages-applic-helprecords~pages-applic-lo~b99ab4a1.51cec2ce.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-aed~pages-applic-aid~pages-applic-location.aa4f3568.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-aed~pages-applic-aid~pages-applic-rescuerecords~pages-index-index.c9e481f2.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-aid.91852a38.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-appliSystem.5dafc753.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-appliSystem.838c4b9f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-applic.a8bde3cb.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-applic.fe82f352.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-chooseAddress.af8cc00e.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-chooseAddress.fd63da64.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-commonaddress.3b2ed130.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-commonaddress.cf4ff460.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-contribution.20dd6b89.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-contribution.6ec78e6c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-contribution~pages-applic-helprecords~pages-applic-location~pages-applic-rescuerecords~~81883202.28903b39.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-donaSuccess.93fdbf40.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-donaSuccess.bf2e07ba.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-helprecords.2aa84591.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-helprecords.5cf000f2.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-helprecords~pages-applic-rescuerecords.72ea804c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-helprecords~pages-applic-rescuerecords.cac15ad8.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-helprecords~pages-applic-rescuerecords~pages-cart-cart~pages-category-search~pages-dona~a298aa41.b925de3a.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-helprecords~pages-applic-rescuerecords~pages-cart-cart~pages-category-search~pages-dona~a298aa41.d3280a2d.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-info.32fc394f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-info.977fdce0.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-item.0a829514.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-item.4007a32d.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-know.75a810b8.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-know.eb32c262.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-location.54762101.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-location.7d8a629f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-love.3440b183.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-love.7a14daab.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-other.64d93cc7.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-other.7024b4d6.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-perSign.01cbb4f1.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-perSign.5af6ba2a.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-register.14ad15c0.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-register.fbd80058.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-rescuerecords.4caefdcb.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-rescuerecords.b46eea36.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-science.45b36986.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-science.655d12e5.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-teamSign.34a3be01.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-teamSign.b8f1c382.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-toOrgan.27332fe5.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-toOrgan.cf276bc1.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-tocontrilist.fb211950.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-tocontrilist.fdddc1bd.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-tohelpActi.9a3bbdcb.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-tohelpActi.b690524c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-toknowledge.0b16de10.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-toknowledge.46bff663.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-cart-cart.4fd9aa3c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-cart-cart.d61d92c4.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-cart-group.052edca4.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-cart-group.29e6b4ec.js


Some files were not shown because too many files changed in this diff