lhl 2 år sedan
förälder
incheckning
53d44a2816

+ 1 - 1
manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "广水市红十字会",
-    "appid" : "__UNI__F405D65",
+    "appid" : "__UNI__7EA1057",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

+ 32 - 22
pages/applic/aid.vue

@@ -6,7 +6,7 @@
 		</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">
+			<view class="list-tpl flex" @click="lookmore(item)" v-for="(item, index) in AEDList" :key="item.id">
 				<template>
 					<view class="list-left">
 						<view class="info">
@@ -46,15 +46,15 @@
 				<view class="aed-address" style="padding-top: 10rpx;">
 					地址:{{showAed.address}}
 				</view>
-				<view class="aed-address" style="padding-top: 10rpx;">
+				<!-- <view class="aed-address" style="padding-top: 10rpx;">
 					联系方式:{{showAed.phone}}
-				</view>
+				</view> -->
 				<view class="aed-dh" @click="opendh">
 					导航
 				</view>
-				<view class="aed-phone" @click="makecall(showAed.phone)">
+				<!-- <view class="aed-phone" @click="makecall(showAed.phone)">
 					电话
-				</view>
+				</view> -->
 			</view>
 		</uni-popup>
 		<uni-popup ref="lookimg" type="center">
@@ -169,23 +169,33 @@
 				this.$refs.aedxq.close()
 			},
 			// 打开aed详情
-			lookmore(e) {
-				console.log(e)
+			lookmore(item) {
+				// console.log(e)
 				let obj = this
-				obj.AEDList.forEach(item => {
-					if (item.id == e.detail.markerId) {
-						obj.showAed = {
-							name: item.name,
-							address: item.address,
-							addressxq: item.install_address,
-							dis: item.range >= 1 ? (item.range + 'km') : (item.distance + 'm'),
-							lat: item.latitude,
-							lon: item.longitude,
-							imgs: item.image,
-							phone: item.phone
-						}
-					}
-				})
+				// obj.AEDList.forEach(item => {
+				// 	if (item.id == e.detail.markerId) {
+				// 		obj.showAed = {
+				// 			name: item.name,
+				// 			address: item.address,
+				// 			addressxq: item.install_address,
+				// 			dis: item.range >= 1 ? (item.range + 'km') : (item.distance + 'm'),
+				// 			lat: item.latitude,
+				// 			lon: item.longitude,
+				// 			imgs: item.image,
+				// 			phone: item.phone
+				// 		}
+				// 	}
+				// })
+				obj.showAed = {
+					name: item.name,
+					address: item.address,
+					addressxq: item.install_address,
+					dis: item.range >= 1 ? (item.range + 'km') : (item.distance + 'm'),
+					lat: item.latitude,
+					lon: item.longitude,
+					imgs: item.image,
+					phone: item.phone
+				}
 				this.$refs.aedxq.open()
 			},
 			// 获取本地坐标
@@ -269,7 +279,7 @@
 					let arr = data.map(item => ({
 						latitude: item.latitude,
 						longitude: item.longitude,
-						iconPath: '/static/img/img014.png',
+						iconPath: '/static/icon/jhz.png',
 						width: '35',
 						height: '35',
 						id: item.id,

+ 33 - 23
pages/applic/itemred.vue

@@ -5,8 +5,8 @@
 				:longitude="longitude" :markers="marker"></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">
+			<espempty v-if="loaded && AEDList.length === 0" :tit="'列表为空'"></espempty>
+			<view class="list-tpl flex" @click="lookmore(item)" v-for="(item, index) in AEDList" :key="item.id">
 				<template>
 					<view class="list-left">
 						<view class="info">
@@ -46,15 +46,15 @@
 				<view class="aed-address" style="padding-top: 10rpx;">
 					地址:{{showAed.address}}
 				</view>
-				<view class="aed-address" style="padding-top: 10rpx;">
+				<!-- <view class="aed-address" style="padding-top: 10rpx;">
 					联系方式:{{showAed.phone}}
-				</view>
+				</view> -->
 				<view class="aed-dh" @click="opendh">
 					导航
 				</view>
-				<view class="aed-phone" @click="makecall(showAed.phone)">
+				<!-- <view class="aed-phone" @click="makecall(showAed.phone)">
 					电话
-				</view>
+				</view> -->
 			</view>
 		</uni-popup>
 		<uni-popup ref="lookimg" type="center">
@@ -169,23 +169,33 @@
 				this.$refs.aedxq.close()
 			},
 			// 打开aed详情
-			lookmore(e) {
-				console.log(e)
+			lookmore(item) {
+				console.log(item)
 				let obj = this
-				obj.AEDList.forEach(item => {
-					if (item.id == e.detail.markerId) {
-						obj.showAed = {
-							name: item.name,
-							address: item.address,
-							addressxq: item.install_address,
-							dis: item.range >= 1 ? (item.range + 'km') : (item.distance + 'm'),
-							lat: item.latitude,
-							lon: item.longitude,
-							imgs: item.image,
-							phone: item.phone
-						}
-					}
-				})
+				// obj.AEDList.forEach(item => {
+				// 	if (item.id == e.detail.markerId) {
+				// 		obj.showAed = {
+				// 			name: item.name,
+				// 			address: item.address,
+				// 			addressxq: item.install_address,
+				// 			dis: item.range >= 1 ? (item.range + 'km') : (item.distance + 'm'),
+				// 			lat: item.latitude,
+				// 			lon: item.longitude,
+				// 			imgs: item.image,
+				// 			phone: item.phone
+				// 		}
+				// 	}
+				// })
+				obj.showAed = {
+					name: item.name,
+					address: item.address,
+					addressxq: item.install_address,
+					dis: item.range >= 1 ? (item.range + 'km') : (item.distance + 'm'),
+					lat: item.latitude,
+					lon: item.longitude,
+					imgs: item.image,
+					phone: item.phone
+				}
 				this.$refs.aedxq.open()
 			},
 			// 获取本地坐标
@@ -269,7 +279,7 @@
 					let arr = data.map(item => ({
 						latitude: item.latitude,
 						longitude: item.longitude,
-						iconPath: '/static/img/img014.png',
+						iconPath: '/static/icon/jzsb.png',
 						width: '35',
 						height: '35',
 						id: item.id,

+ 1 - 1
pages/index/index.vue

@@ -70,7 +70,7 @@
 				<view class="img-wrapper flex">
 					<image src="../../static/index/index_icon_9.png" mode="" class="img"></image>
 				</view>
-				<view class="item-title clamp2">救在身边</view>
+				<view class="item-title clamp2">红十字救在身边</view>
 			</view>
 			<view class="cate-item flex" @click="navTo('/pages/share/card')">
 				<view class="img-wrapper flex">

BIN
static/icon/jhz.png


BIN
static/icon/jzsb.png


BIN
static/tabBar/home-action.png


BIN
static/tabBar/home.png


BIN
static/tabBar/user-action.png


BIN
static/tabBar/user.png