Merge branch 'f_local_dev' into 'main'

feat：新增设备详情地理位置

See merge request huang/thingskit-app!75

+const mapUrl = 'https://apis.map.qq.com'
+//你在腾讯地图控制台里申请的key值（配置你自己申请的key）文档https://lbs.qq.com/
+const mapKey = '3ETBZ-WAUED-2GU46-P7X7K-ENHGZ-3PFTM'
+
+export {
+	mapUrl,
+	mapKey
+}

+<template>
+	<view>
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<map style="width: 100%; min-height: 100vh;" :markers="markers" :scale="scale" :latitude="getPos.latitude" :longitude="getPos.longitude"></map>
+	</view>
+</template>
+
+<script>
+import { mapUrl, mapKay } from '@/config/tcMapConfig.js';
+
+export default {
+	components: {},
+	data() {
+		return {
+			getPos: {
+				longitude: 0,
+				latitude: 0
+			},
+			scale: 15,
+			markers: [
+				{
+					latitude: 0,
+					longitude: 0
+				}
+			]
+		};
+	},
+	onLoad(e) {
+		if (e.data != null) {
+			const params = JSON.parse(e.data);
+			if (params) this.getPos.longitude = params.longitude;
+			this.getPos.latitude = params.latitude;
+			this.markers[0].longitude = params.longitude;
+			this.markers[0].latitude = params.latitude;
+		}
+	},
+	methods: {}
+};
+</script>
+
+<style lang="scss" scoped></style>

@@ -12,6 +12,7 @@
 					{{ deviceDetail.deviceState === 'INACTIVE' ? '待激活' : deviceDetail.deviceState === 'ONLINE' ? '在线' : '离线' }}
 					{{ deviceDetail.deviceState === 'INACTIVE' ? '待激活' : deviceDetail.deviceState === 'ONLINE' ? '在线' : '离线' }}
 				</view>
 				</view>
 			</view>
 			</view>
+			<view style="margin-right: 20rpx;"><u-icon v-if="deviceDetail.deviceInfo.longitude !== ''" @click="handleClick" name="map-fill"></u-icon></view>
 			<view style="margin-right: 20rpx;" v-if="deviceDetail.deviceState === 'ONLINE' && deviceDetail.deviceType !== 'SENSOR'">
 			<view style="margin-right: 20rpx;" v-if="deviceDetail.deviceState === 'ONLINE' && deviceDetail.deviceType !== 'SENSOR'">
 				<u-button type="primary" shape="circle" size="mini" text="下发命令" @click="showModal" />
 				<u-button type="primary" shape="circle" size="mini" text="下发命令" @click="showModal" />
 			</view>
 			</view>
@@ -118,6 +119,15 @@ export default {
 	},
 	},
 	mounted() {},
 	mounted() {},
 	methods: {
 	methods: {
+		handleClick() {
+			const data = {
+				longitude: this.deviceDetail.deviceInfo.longitude || 0,
+				latitude: this.deviceDetail.deviceInfo.latitude || 0
+			};
+			uni.navigateTo({
+				url: '/deviceSubPage/deviceDetailPage/devicePosition?data=' + JSON.stringify(data)
+			});
+		},
 		showModal() {
 		showModal() {
 			this.showModel = true;
 			this.showModel = true;
 		},
 		},

@@ -87,6 +87,12 @@
 					"style": {
 					"style": {
 						"navigationBarTitleText": "命令详情"
 						"navigationBarTitleText": "命令详情"
 					}
 					}
+				},
+				{
+					"path": "deviceDetailPage/devicePosition",
+					"style": {
+						"navigationBarTitleText": "设备地理位置"
+					}
 				}
 				}
 			]
 			]
 		},
 		},