Fly 3 周之前
父節點
當前提交
e1610c8d6b
共有 3 個文件被更改,包括 29 次插入13 次删除
  1. 16 6
      components/tiandituMap/tiandituMap.vue
  2. 1 1
      config/index.js
  3. 12 6
      pages/map/index.vue

+ 16 - 6
components/tiandituMap/tiandituMap.vue

@@ -2,13 +2,15 @@
 	<view id="mapDiv" class="mapDiv" :apikey="apiKey" :prop="option" :change:prop="Trenderjs.initTMap">
 		<view class="tool-btn">
 			<view v-if="isGetLocation" class="position" @click.stop="Trenderjs.onPosition">
-				<image style="width: 100%;height: 100%;" src="@/static/images/position.png" mode="aspectFit"></image>
+				<image class="position-icon" src="@/static/images/position.png" mode="aspectFit"></image>
 			</view>
 			<view class="position" @click.stop="$emit('openHint')">
-				<image style="width: 100%;height: 100%;" src="@/static/images/hint.png" mode="aspectFit"></image>
+				<image class="position-icon" src="@/static/images/hint.png" mode="aspectFit"></image>
+				<text class="position-text">声明</text>
 			</view>
 			<view v-if="isFeedback" class="position" @click.stop="$emit('openFeedback')">
-				<image style="width: 100%;height: 100%;" src="@/static/images/feedback.png" mode="aspectFit"></image>
+				<image class="position-icon" src="@/static/images/feedback.png" mode="aspectFit"></image>
+				<text class="position-text">反馈</text>
 			</view>
 		</view>
 	</view>
@@ -679,21 +681,29 @@
 	.position {
 
 		width: 94rpx;
-		height: 99rpx;
+		// height: 99rpx;
 		background-color: #fff;
 		padding: 10rpx;
 		border-radius: 22rpx;
 		padding: 23rpx 20rpx 22rpx 20rpx;
 
 		.position-icon {
-			width: 100%;
-			height: 100%;
+			width: 54rpx;
+			height: 54rpx;
 
 			path {
 				fill: #3291F8;
 			}
 
 		}
+		.position-text{
+			display: inline-block;
+			width: 100%;
+			text-align: center;
+			font-size: 26rpx;
+			color: #3291F8;
+			line-height: 1.2;
+		}
 		&+.position{
 			margin-top: 20rpx;
 		}

+ 1 - 1
config/index.js

@@ -17,5 +17,5 @@ export default {
 	type: 'H6', // H5 / H6,  web端打包需要修改 manifest.json web配置的基础运行路径
 
 	isGetLocation: true, // 是否显示定位
-	isFeedback: true,		// 是否显示反馈
+	isFeedback: false,		// 是否显示反馈
 }

+ 12 - 6
pages/map/index.vue

@@ -10,9 +10,13 @@
 
 		<Touchbox ref="TouchboxRef" :maxHeight="0.8" v-if="showMap && siteListArr && siteListArr.length > 0"
 			:zIndex="1001" @currentHeight="e => TouchHeight = e">
-			<template #touchSlot>
-				<!-- v-if="centreText" -->
-				<view class="centre-box" v-if="centreText">
+			<template #touchSlot> 
+			<!-- 	<view class="centre-box" v-if="SearchText">
+					<text class="text">为您展示</text>
+					<text class="text-val one-row">{{SearchText}}</text>
+					<text class="text">相关的大厅</text>
+				</view> -->
+				<view class="centre-box" v-if="SearchText || centreText">
 					<svg t="1734080022350" class="position-icon" viewBox="0 0 1024 1024" version="1.1"
 						xmlns="http://www.w3.org/2000/svg" p-id="4287" xmlns:xlink="http://www.w3.org/1999/xlink">
 						<path d="M512 512m-80 0a80 80 0 1 0 160 0 80 80 0 1 0-160 0Z" p-id="4288"></path>
@@ -21,8 +25,8 @@
 							p-id="4289"></path>
 					</svg>
 					<text class="text">为您展示</text>
-					<text class="text-val one-row">{{centreText}}</text>
-					<text class="text">附近的大厅</text>
+					<text class="text-val one-row">{{SearchText || centreText}}</text>
+					<text class="text">{{ SearchText ? '相关的大厅' : '附近的大厅'}}</text>
 				</view>
 			</template>
 			<template #contentSlot>
@@ -66,7 +70,7 @@
 				searchDot: false,
 				// 是否显示地图
 				showMap: false,
-
+				SearchText:'',
 
 
 
@@ -162,6 +166,8 @@
 					latitude: this.latitude,
 					radius: 5000
 				};
+				// 记录搜索框中的内容
+				this.SearchText = parms.locationName;
 				// 判断是否通过收索
 				this.searchDot = parms.search
 				// 如果存在收索条件,则去掉 范围 和 中心点