lhl 3 years ago
parent
commit
77a7240358

+ 93 - 10
pages/applic/aed.vue

@@ -1,5 +1,24 @@
 <template>
 	<view class="content">
+		<view class="mzsm" @click="mzss">
+			免责声明
+		</view>
+		<uni-popup ref="popup" type="center">
+			<view class="mzsm-wrap">
+				<view class="mzsm-tit">
+					免责声明
+				</view>
+				<view class="mzsm-content">
+					本应用所提供的网点名称、地址信息,仅供查询参考,实际导航结果以用户所选用的第三方地图应用所显示的位置为准,本应用不保证其导航定位准确性。
+				</view>
+				<view class="mzsm-content">
+					在法律允许的范围内,本应用声明,不承担用户或任何人士就使用或未能使用本应用所提供的信息所导致的任何直接、间接、附带、从属、特殊、惩罚性或惩戒性的损害赔偿。
+				</view>
+				<view class="mzsm-close" @click="mzssClose()">
+					确定
+				</view>
+			</view>
+		</uni-popup>
 		<view class="map">
 			<map @updated='mapChange' ref='map_1' style="width:750rpx;" :style="{'height': height}" :latitude="latitude"
 				:longitude="longitude" :markers="marker" @markertap="lookmore" @regionchange="mapchange" show-location></map>
@@ -23,7 +42,7 @@
 				<scroll-view scroll-x="true" class="aed-img-scroll">
 					<view class="" style="display: flex;flex-wrap: nowrap;">
 						<image :src="'https://red.liuniu946.com' + item" mode="heightFix" v-for="item in showAed.imgs"
-							class="aed-img" @click="openimg(item)"></image>
+							class="aed-img" @click="openimg(item)" :key="item"></image>
 					</view>
 				</scroll-view>
 				<view class="aed-phone" @click="makecall(showAed.phone)">
@@ -66,7 +85,7 @@
 				loaded: false,
 				loadingType: 'more',
 				page: 1,
-				limit: 100,
+				limit: 1000,
 				AEDList: [],
 				height: '',
 				list: [],
@@ -107,11 +126,18 @@
 		},
 		onLoad() {
 			let obj = this;
-			this.getLocal()
+			// this.getLocal()
 			
 		},
 		onShow() {
-			
+			this.marker = []
+			this.list = []
+			this.page = 1
+			this.loadingType = 'more'
+			this.getLocal()
+			// if(this.page == 1) {
+			// 	this.getLocal()
+			// }
 		// this.getUrl()
 		},
 		computed: {
@@ -120,6 +146,17 @@
 		},
 		methods: {
 			...mapMutations('user', ['setUserInfo']),
+			mzss() {
+				this.$refs.popup.open();
+				// uni.showModal({
+				// 	title: '免责声明',
+				// 	content:'本应用所提供的网点名称、地址信息,仅供查询参考,实际导航结果以用户所选用的第三方地图应用所显示的位置为准,本应用不保证其导航定位准确性。在法律允许的范围内,本应用声明,不承担用户或任何人士就使用或未能使用本应用所提供的信息所导致的任何直接、间接、附带、从属、特殊、惩罚性或惩戒性的损害赔偿',
+				// 	showCancel:false
+				// })
+			},
+			mzssClose() {
+				this.$refs.popup.close();
+			},
 			getUrl() {
 					
 				MiniLink({
@@ -233,9 +270,9 @@
 									id: 0,
 									latitude: obj.latitude,
 									longitude: obj.longitude,
-									iconPath: '/static/img/img19.png',
-									width: '35',
-									height: '35',
+									iconPath: '/static/icon/gan.png',
+									width: '20',
+									height: '33',
 								}
 								obj.marker.push(item)
 								obj.loadData()
@@ -258,9 +295,9 @@
 								id: 0,
 								latitude: obj.latitude,
 								longitude: obj.longitude,
-								iconPath: '/static/img/img19.png',
-								width: '35',
-								height: '35',
+								iconPath: '/static/icon/gan.png',
+								width: '20',
+								height: '33',
 							}
 							obj.marker.push(item)
 							obj.loadData()
@@ -729,4 +766,50 @@
 		right: 0;
 		margin: 0 auto;
 	}
+	.mzsm {
+		position: fixed;
+		top: 10rpx;
+		right: 10rpx;
+		width: 150rpx;
+		height: 50rpx;
+		border-radius: 25rpx;
+		background-color: #000000;
+		color: #fff;
+		font-size: 28rpx;
+		line-height: 50rpx;
+		text-align: center;
+		z-index: 999;
+	}
+	.mzsm-wrap {
+		width: 500rpx;
+		background-color: #fff;
+		border-radius: 20rpx;
+		.mzsm-tit {
+			text-align: center;
+			line-height: 150rpx;
+			color: #000;
+			font-size: 36rpx;
+			font-weight: bold;
+		}
+		.mzsm-content {
+			 text-indent: 56rpx;
+			width: 450rpx;
+			margin: auto;
+			text-align: left;
+			line-height: 100rpx;
+			color: #888;
+			font-size: 28rpx;
+			font-weight: 500;
+			line-height: 1.5;
+		}
+		.mzsm-close {
+			margin-top: 20rpx;
+			border-top: 1px solid #eee;
+			text-align: center;
+			line-height: 100rpx;
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #000;
+		}
+	}
 </style>

+ 17 - 0
pages/index/index.vue

@@ -3,6 +3,23 @@
 </template>
 
 <script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		onShow() {
+			this.goto()
+		},
+		methods: {
+			goto() {
+				uni.navigateTo({
+					url: '/pages/applic/aed'
+				})
+			}
+		}
+	}
 	
 </script>
 

+ 1 - 1
pages/public/wxLogin.vue

@@ -188,7 +188,7 @@ page,
 	margin-top: 50rpx;
 	color: #FFFFFF;
 	border-radius: 99rpx;
-	background-color: #039175 !important;
+	background-color: #cb131d !important;
 }
 .nocaction {
 	background-color: #999;

BIN
static/icon/aed-a.png


BIN
static/icon/aed-na.png


BIN
static/icon/gan.png


BIN
static/icon/logo.jpg