11-5

manifest.json

@@ -1,101 +1,101 @@
-{
-    "name" : "鄂州市红十字会",
-    "appid" : "__UNI__EB83ABC",
-    "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" : "ez.igxys.com",
-        "router" : {
-            "mode" : "hash",
-            "base" : "/index/"
-        },
-        "devServer" : {
-            "proxy" : {
-                "/api" : {
-                    "target" : "http://ez.igxys.com", //请求的目标域名
-                    "changeOrigin" : true,
-                    // "secure": false,
-                    "pathRewrite" : {}
-                }
-            }
-        },
-        // "^/api" : ""
-        "template" : ""
-    }
-}
+{
+    "name" : "鄂州市红十字会",
+    "appid" : "__UNI__EB83ABC",
+    "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" : "https://www.ezsredcross.org.cn",
+        "router" : {
+            "mode" : "hash",
+            "base" : "/index/"
+        },
+        "devServer" : {
+            "proxy" : {
+                "/api" : {
+                    "target" : "https://www.ezsredcross.org.cn", //请求的目标域名
+                    "changeOrigin" : true,
+                    // "secure": false,
+                    "pathRewrite" : {}
+                }
+            }
+        },
+        // "^/api" : ""
+        "template" : ""
+    }
+}

pages/applic/aed.vue

@@ -27,7 +27,7 @@
 			<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="tobaiDuMap">百度地图</view> -->
 					<view class="rows-item" @click="totengxunMap">腾讯地图</view>
 				</view>
 			</view>

pages/applic/contribution.vue

@@ -51,7 +51,7 @@
 				</view>
 
 				<view class="box-bottom">
-					个人满500，单位满2000可打印纸质证书
+					如需发票、证书请联系市红十字会027-60229386
 				</view>
 			</view>
 

pages/applic/rescuerecords.vue

@@ -54,9 +54,9 @@
 					<view class="rows-item" @click="toGaodeMap">
 						高德地图
 					</view>
-					<view class="rows-item" @click="tobaiDuMap">
+					<!-- <view class="rows-item" @click="tobaiDuMap">
 						百度地图
-					</view>
+					</view> -->
 					<view class="rows-item" @click="totengxunMap">
 						腾讯地图
 					</view>

pages/form/applicationForm.vue

@@ -50,10 +50,10 @@
 				<view class="box-left">移动电话：</view>
 				<input type="text" class="list-input" v-model="phone" placeholder="请输入移动电话"/>
 			</view>
-			<view class="box-1">
+			<!-- <view class="box-1">
 				<view class="box-left">固定电话：</view>
 				<input type="text" class="list-input" v-model="tel" placeholder="请输入固定电话"/>
-			</view>
+			</view> -->
 			<view class="box-1">
 				<view class="box-left">居住地址：</view>
 				<input type="text" class="list-input" v-model="address" placeholder="请输入居住地址"/>
@@ -69,7 +69,7 @@
 			</view>
 
 			<view class="box-2">
-						我指定：该亲属为我的遗体捐献执行人，全权负责本人的遗体捐赠事宜。
+						我指定：该亲属为我的遗体器官捐献执行人，全权负责本人的遗体器官捐赠事宜。
 				</view>
 			<view class="box-1">
 				<view class="box-left">捐献执行人：</view>
@@ -87,10 +87,10 @@
 				<view class="box-left max-line">捐献执行人移动电话：</view>
 				<input type="text" class="list-input" v-model="n_phone" placeholder="请输入执行人移动电话"/>
 			</view>
-			<view class="box-1">
+			<!-- <view class="box-1">
 				<view class="box-left max-line">捐献执行人固定电话：</view>
 				<input type="text" class="list-input" v-model="n_tel" placeholder="请输入执行人固定电话"/>
-			</view>
+			</view> -->
 
 			<view class="box-1" style="border-bottom: none;"><view>我保证填写的以上信息准确真实，如发生变更或个人意愿发生变化时，及时告知登记机构。</view></view>
 		</view>
@@ -121,6 +121,9 @@ export default {
 				},
 				{
 					value: '或只捐献眼角膜'
+				},
+				{
+					value: '器官捐献'
 				}
 			],
 			current: '',
@@ -199,10 +202,10 @@ export default {
 				obj.$api.msg('请填写正确的身份证信息');
 				return;
 			}
-			if (obj.tel == ''){
-				obj.$api.msg('请填写您的固定电话');
-				return;
-			}
+			// if (obj.tel == ''){
+			// 	obj.$api.msg('请填写您的固定电话');
+			// 	return;
+			// }
 			if (obj.occupation == '') {
 				obj.$api.msg('请填写您的职业');
 				return;
@@ -245,10 +248,10 @@ export default {
 				obj.$api.msg('请填写执行人的手机号');
 				return;
 			}
-			if (obj.n_tel == ''){
-				obj.$api.msg('请填写执行人的固定电话');
-				return;
-			}
+			// if (obj.n_tel == ''){
+			// 	obj.$api.msg('请填写执行人的固定电话');
+			// 	return;
+			// }
 			obj.loding = true;
 			joinSecc({
 				name: obj.name,

pages/index/index.vue

@@ -15,7 +15,7 @@
 				<view class="img-wrapper flex">
 					<image src="../../static/icon/icon1.png" mode=""></image>
 				</view>
-				<view class="item-title">器官捐献</view>
+				<view class="item-title">遗体/器官捐献</view>
 			</view>
 			<view class="cate-item flex" @click="toapplic">
 				<view class="img-wrapper flex">
@@ -54,7 +54,7 @@
 		<view class="system">
 			<top-title :title="'救在身边'" navurl="/pages/applic/location" :show_more="true"></top-title>
 			<view class="system-map">
-				<map class="map-box" id="map" show-location :markers="jzsbmarker" :scale="scale" :latitude="latitude4"
+				<map class="map-box" id="map" :show-location="false" :markers="jzsbmarker" :scale="scale" :latitude="latitude4"
 					:longitude="longitude4" ref="map" @markertap="markertap"></map>
 			</view>
 			<view class="" style="padding-top: 80rpx;">
@@ -106,7 +106,7 @@
 				<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="jhzmarker" :scale="scale" :latitude="latitude4"
+				<map class="map-box" id="map" :show-location="false" :markers="jhzmarker" :scale="scale" :latitude="latitude4"
 					:longitude="longitude4" ref="map" style="height: 450rpx" @markertap="jhzmarkertap"></map>
 			</view>
 			<view class="">
@@ -133,7 +133,7 @@
 				<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="aedmarker" :scale="scale" :latitude="latitude4"
+				<map class="map-box" id="map" :show-location="false" :markers="aedmarker" :scale="scale" :latitude="latitude4"
 					:longitude="longitude4" ref="map" style="height: 450rpx" @markertap="aedmarkertap"></map>
 			</view>
 			<view class="">
@@ -158,7 +158,7 @@
 			<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="tobaiDuMap">百度地图</view> -->
 					<view class="rows-item" @click="totengxunMap">腾讯地图</view>
 				</view>
 			</view>
@@ -300,14 +300,6 @@
 			}
 		},
 		onLoad() {
-			// uni.showModal({
-			// 	content: '请选择您当前位置',
-			// 	success: res => {
-			// 		if (res.confirm) {
-			// 			this.chooseAddress()
-			// 		}
-			// 	}
-			// })
 			saveUrl();
 			let obj = this;
 			try {
@@ -323,7 +315,7 @@
 				wxOjb.ready(() => {
 					console.log('加载完毕注册事件');
 					locationAddress({
-						type: 'wgs84',
+						type: 'gcj02',
 						success: function(res) {
 							console.log('获取经纬度', res);
 							obj.longitude4 = res.longitude;
@@ -340,8 +332,8 @@
 						},
 						fail(e) {
 							console.log('失败', e);
-							// window.location.reload();
-							obj.tishi()
+							window.location.reload();
+							// obj.tishi()
 						}
 					});
 				});
@@ -349,7 +341,7 @@
 
 				// #ifdef MP
 				locationAddress({
-					type: 'wgs84',
+					type: 'gcj02',
 					success: function(res) {
 						console.log('获取经纬度', res);
 						obj.longitude4 = res.longitude;
@@ -382,7 +374,7 @@
 				wxOjb.ready(() => {
 					console.log('加载完毕注册事件');
 					locationAddress({
-						type: 'wgs84',
+						type: 'gcj02',
 						success: function(res) {
 							console.log('获取经纬度', res);
 							obj.longitude4 = res.longitude;
@@ -398,7 +390,7 @@
 				// #endif
 				// #ifdef MP
 				locationAddress({
-					type: 'wgs84',
+					type: 'gcj02',
 					success: function(res) {
 						console.log('获取经纬度', res);
 						obj.longitude4 = res.longitude;
@@ -422,6 +414,9 @@
 		},
 		methods: {
 			...mapMutations('user', ['setUserInfo']),
+			close2() {
+				this.$refs.popup2.close()
+			},
 			tocontribution() {
 				uni.navigateTo({
 					// url: "/pages/applic/contribution"
@@ -642,7 +637,7 @@
 						id: item.id,
 						address: item.address
 					}))
-					obj.jzsbtmarker = obj.marker.concat(arr)
+					obj.jzsbmarker = obj.marker.concat(arr)
 				}).catch(err => {
 					console.log(err);
 				});
@@ -730,8 +725,8 @@
 						name: obj.name,
 						uid: obj.uid,
 						phone: obj.phone,
-						longitude: obj.longitude,
-						latitude: obj.latitude,
+						longitude: obj.longitude4,
+						latitude: obj.latitude4,
 						to_phone: obj.to_phone
 					}).then((data) => {
 						console.log(99988, data)
@@ -740,6 +735,7 @@
 							success: res => {
 								if (res.confirm) {
 									window.location.reload(); //重新刷新页面
+									// obj.tishi()
 								}
 							}
 						})

pages/share/card.vue

@@ -40,7 +40,7 @@
 			<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="toBaiduMap()">百度地图</view> -->
 					<view class="rows-item" @click="toTengxunMap()">腾讯地图</view>
 				</view>
 			</view>

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.d847b7ca.js></script><script src=/index/static/js/index.1e565c74.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d847b7ca.js></script><script src=/index/static/js/index.d4b5d410.js></script></body></html>