1-21-1

pages/applic/aed.vue

@@ -197,9 +197,6 @@
 			// 打开aed详情
 			lookmore(e) {
 				console.log(e)
-				// if(e.markerId == 0) {
-				// 	return
-				// }
 				let obj = this
 				if(obj.befoId != 0) {
 					obj.marker[obj.befoId].iconPath = '/static/icon/aed-na.png'
@@ -370,14 +367,7 @@
 
 		//搜索框
 		.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;
 

pages/applic/aid.vue

@@ -1,17 +1,17 @@
 <template>
 	<view class="content">
-		<view id="map" class="map">
-			<map @updated='mapChange' id="map_1" ref='map_1' style="width:750rpx;" :style="{'height': height}"
-				:latitude="latitude" :longitude="longitude" :markers="marker" @markertap="lookmore"></map>
+		<view id="map" class="map">
+			<map @updated='mapChange' id="map_1" ref='map_1' style="width:750rpx; height: 600rpx" :latitude="latitude"
+				:longitude="longitude" :markers="marker"></map>
 		</view>
-		<!-- <scroll-view scroll-y="true" class="scroll-wrapper" :style="{'height': height}" @scrolltolower="loadData">
+		<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.name }}</view>
-							<view class="addr">地址：{{ item.install_address }}</view>
+							<view class="addr">地址：{{ item.address }}</view>
 						</view>
 					</view>
 					<view class="image">
@@ -21,7 +21,7 @@
 				</template>
 			</view>
 			<uni-load-more :status="loadingType"></uni-load-more>
-		</scroll-view> -->
+		</scroll-view>
 		<uni-popup ref="popup" type="bottom" @click="close">
 			<view class="popup_row">
 				<view class="rows">
@@ -122,7 +122,7 @@
 			uni.getSystemInfo({
 				success: resu => {
 					const query = uni.createSelectorQuery();
-					query.select('.map').boundingClientRect();
+					query.select('.scroll-wrapper').boundingClientRect();
 					query.exec(function(res) {
 						console.log(res, 'ddddddddddddd');
 						_this.height = resu.windowHeight - res[0].top + 'px';
@@ -184,7 +184,6 @@
 							imgs: item.image,
 							phone: item.phone
 						}
-						// break
 					}
 				})
 				this.$refs.aedxq.open()
@@ -350,7 +349,7 @@
 
 	.map {
 		width: 100%;
-		height: 100%;
+		height: 600rpx;
 	}
 
 	/* #ifdef H5 */

pages/index/index.vue

@@ -19,7 +19,7 @@
 			</view>
 			<view class="cate-item flex" @click="tocontribution">
 				<view class="img-wrapper flex">
-					<image src="../../static/index/index04.png" mode="" class="img"></image>
+					<image src="../../static/index/index04.png" mode="" class="img" style="width: 110rpx;"></image>
 				</view>
 				<view class="item-title">遗体器官捐献</view>
 			</view>