feat：新增设备地理位置

+function AMapWX(a){this.key=a.key,this.requestConfig={key:a.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"}}AMapWX.prototype.getWxLocation=function(a,b){wx.getLocation({type:"gcj02",success:function(a){var c=a.longitude+","+a.latitude;wx.setStorage({key:"userLocation",data:c}),b(c)},fail:function(c){wx.getStorage({key:"userLocation",success:function(a){a.data&&b(a.data)}}),a.fail({errCode:"0",errMsg:c.errMsg||""})}})},AMapWX.prototype.getRegeo=function(a){function c(c){var d=b.requestConfig;wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:b.key,location:c,extensions:"all",s:d.s,platform:d.platform,appname:b.key,sdkversion:d.sdkversion,logversion:d.logversion},method:"GET",header:{"content-type":"application/json"},success:function(b){var d,e,f,g,h,i,j,k,l;b.data.status&&"1"==b.data.status?(d=b.data.regeocode,e=d.addressComponent,f=[],g="",d&&d.roads[0]&&d.roads[0].name&&(g=d.roads[0].name+"附近"),h=c.split(",")[0],i=c.split(",")[1],d.pois&&d.pois[0]&&(g=d.pois[0].name+"附近",j=d.pois[0].location,j&&(h=parseFloat(j.split(",")[0]),i=parseFloat(j.split(",")[1]))),e.provice&&f.push(e.provice),e.city&&f.push(e.city),e.district&&f.push(e.district),e.streetNumber&&e.streetNumber.street&&e.streetNumber.number?(f.push(e.streetNumber.street),f.push(e.streetNumber.number)):(k="",d&&d.roads[0]&&d.roads[0].name&&(k=d.roads[0].name),f.push(k)),f=f.join(""),l=[{iconPath:a.iconPath,width:a.iconWidth,height:a.iconHeight,name:f,desc:g,longitude:h,latitude:i,id:0,regeocodeData:d}],a.success(l)):a.fail({errCode:b.data.infocode,errMsg:b.data.info})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})}var b=this;a.location?c(a.location):b.getWxLocation(a,function(a){c(a)})},AMapWX.prototype.getWeather=function(a){function d(d){var e="base";a.type&&"forecast"==a.type&&(e="all"),wx.request({url:"https://restapi.amap.com/v3/weather/weatherInfo",data:{key:b.key,city:d,extensions:e,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion},method:"GET",header:{"content-type":"application/json"},success:function(b){function c(a){var b={city:{text:"城市",data:a.city},weather:{text:"天气",data:a.weather},temperature:{text:"温度",data:a.temperature},winddirection:{text:"风向",data:a.winddirection+"风"},windpower:{text:"风力",data:a.windpower+"级"},humidity:{text:"湿度",data:a.humidity+"%"}};return b}var d,e;b.data.status&&"1"==b.data.status?b.data.lives?(d=b.data.lives,d&&d.length>0&&(d=d[0],e=c(d),e["liveData"]=d,a.success(e))):b.data.forecasts&&b.data.forecasts[0]&&a.success({forecast:b.data.forecasts[0]}):a.fail({errCode:b.data.infocode,errMsg:b.data.info})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})}function e(e){wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:b.key,location:e,extensions:"all",s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion},method:"GET",header:{"content-type":"application/json"},success:function(b){var c,e;b.data.status&&"1"==b.data.status?(e=b.data.regeocode,e.addressComponent?c=e.addressComponent.adcode:e.aois&&e.aois.length>0&&(c=e.aois[0].adcode),d(c)):a.fail({errCode:b.data.infocode,errMsg:b.data.info})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})}var b=this,c=b.requestConfig;a.city?d(a.city):b.getWxLocation(a,function(a){e(a)})},AMapWX.prototype.getPoiAround=function(a){function d(d){var e={key:b.key,location:d,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.querytypes&&(e["types"]=a.querytypes),a.querykeywords&&(e["keywords"]=a.querykeywords),wx.request({url:"https://restapi.amap.com/v3/place/around",data:e,method:"GET",header:{"content-type":"application/json"},success:function(b){var c,d,e,f;if(b.data.status&&"1"==b.data.status){if(b=b.data,b&&b.pois){for(c=[],d=0;d<b.pois.length;d++)e=0==d?a.iconPathSelected:a.iconPath,c.push({latitude:parseFloat(b.pois[d].location.split(",")[1]),longitude:parseFloat(b.pois[d].location.split(",")[0]),iconPath:e,width:22,height:32,id:d,name:b.pois[d].name,address:b.pois[d].address});f={markers:c,poisData:b.pois},a.success(f)}}else a.fail({errCode:b.data.infocode,errMsg:b.data.info})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})}var b=this,c=b.requestConfig;a.location?d(a.location):b.getWxLocation(a,function(a){d(a)})},AMapWX.prototype.getStaticmap=function(a){function f(b){c.push("location="+b),a.zoom&&c.push("zoom="+a.zoom),a.size&&c.push("size="+a.size),a.scale&&c.push("scale="+a.scale),a.markers&&c.push("markers="+a.markers),a.labels&&c.push("labels="+a.labels),a.paths&&c.push("paths="+a.paths),a.traffic&&c.push("traffic="+a.traffic);var e=d+c.join("&");a.success({url:e})}var e,b=this,c=[],d="https://restapi.amap.com/v3/staticmap?";c.push("key="+b.key),e=b.requestConfig,c.push("s="+e.s),c.push("platform="+e.platform),c.push("appname="+e.appname),c.push("sdkversion="+e.sdkversion),c.push("logversion="+e.logversion),a.location?f(a.location):b.getWxLocation(a,function(a){f(a)})},AMapWX.prototype.getInputtips=function(a){var b=this,c=b.requestConfig,d={key:b.key,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.location&&(d["location"]=a.location),a.keywords&&(d["keywords"]=a.keywords),a.type&&(d["type"]=a.type),a.city&&(d["city"]=a.city),a.citylimit&&(d["citylimit"]=a.citylimit),wx.request({url:"https://restapi.amap.com/v3/assistant/inputtips",data:d,method:"GET",header:{"content-type":"application/json"},success:function(b){b&&b.data&&b.data.tips&&a.success({tips:b.data.tips})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})},AMapWX.prototype.getDrivingRoute=function(a){var b=this,c=b.requestConfig,d={key:b.key,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.origin&&(d["origin"]=a.origin),a.destination&&(d["destination"]=a.destination),a.strategy&&(d["strategy"]=a.strategy),a.waypoints&&(d["waypoints"]=a.waypoints),a.avoidpolygons&&(d["avoidpolygons"]=a.avoidpolygons),a.avoidroad&&(d["avoidroad"]=a.avoidroad),wx.request({url:"https://restapi.amap.com/v3/direction/driving",data:d,method:"GET",header:{"content-type":"application/json"},success:function(b){b&&b.data&&b.data.route&&a.success({paths:b.data.route.paths,taxi_cost:b.data.route.taxi_cost||""})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})},AMapWX.prototype.getWalkingRoute=function(a){var b=this,c=b.requestConfig,d={key:b.key,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.origin&&(d["origin"]=a.origin),a.destination&&(d["destination"]=a.destination),wx.request({url:"https://restapi.amap.com/v3/direction/walking",data:d,method:"GET",header:{"content-type":"application/json"},success:function(b){b&&b.data&&b.data.route&&a.success({paths:b.data.route.paths})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})},AMapWX.prototype.getTransitRoute=function(a){var b=this,c=b.requestConfig,d={key:b.key,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.origin&&(d["origin"]=a.origin),a.destination&&(d["destination"]=a.destination),a.strategy&&(d["strategy"]=a.strategy),a.city&&(d["city"]=a.city),a.cityd&&(d["cityd"]=a.cityd),wx.request({url:"https://restapi.amap.com/v3/direction/transit/integrated",data:d,method:"GET",header:{"content-type":"application/json"},success:function(b){if(b&&b.data&&b.data.route){var c=b.data.route;a.success({distance:c.distance||"",taxi_cost:c.taxi_cost||"",transits:c.transits})}},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})},AMapWX.prototype.getRidingRoute=function(a){var b=this,c=b.requestConfig,d={key:b.key,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.origin&&(d["origin"]=a.origin),a.destination&&(d["destination"]=a.destination),wx.request({url:"https://restapi.amap.com/v4/direction/bicycling",data:d,method:"GET",header:{"content-type":"application/json"},success:function(b){b&&b.data&&b.data.data&&a.success({paths:b.data.data.paths})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})},module.exports.AMapWX=AMapWX;
\ No newline at end of file

+///高德地图配置项
+///你在高德地图控制台里申请的key值（配置你自己申请的key或者使用我的key都行）请自行参考官方文档https://console.amap.com/dev/key/app
+
+const gdMapRequiredKey = '5221d1373233c782efac82fb176f7f7d'
+
+export {
+	gdMapRequiredKey
+}

-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 class="map">
+		<map
+			id="my-map"
+			ref="my-map"
+			class="my-map"
+			:style="{ height: allScreen - 44 + 'px' }"
+			:latitude="myLatitude"
+			:longitude="myLongitude"
+			:markers="makers"
+			enable-3D="true"
+			show-compass="true"
+			show-location="true"
+		></map>
 	</view>
 </template>
 
 <script>
-import { mapUrl, mapKay } from '@/config/tcMapConfig.js';
+const amapFile = require('@/config/amap-wx.js');
+import { gdMapRequiredKey } from '@/config/gdMapConfig.js';
 
 export default {
-	components: {},
 	data() {
 		return {
-			getPos: {
-				longitude: 0,
-				latitude: 0
-			},
-			scale: 15,
-			markers: [
+			mapContext: null,
+			allScreen: '',
+			myLatitude: 0, //纬度
+			myLongitude: 0, //经度
+			makers: [
 				{
+					id: 1,
 					latitude: 0,
-					longitude: 0
+					longitude: 0,
+					iconPath: '../../static/location.png',
+					width: '50px',
+					height: '50px'
 				}
 			]
 		};
 	},
 	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;
+		let params = null;
+		if (e.data !== null) {
+			params = JSON.parse(e.data);
 		}
+		let that = this;
+		var myAmapFun = new amapFile.AMapWX({ key: gdMapRequiredKey });
+		that.getMyLocation(params.longitude, params.latitude);
+		uni.getSystemInfo({
+			success: function(e) {
+				that.allScreen = e.screenHeight;
+			}
+		});
 	},
-	methods: {}
+	onReady: function(res) {
+		this.mapContext = uni.createMapContext('my-map', this);
+	},
+	methods: {
+		getMyLocation(eLong, eLat) {
+			let that = this;
+			const newPos = this.bd_decrypt(eLong, eLat);
+			that.myLatitude = newPos.lat;
+			that.myLongitude = newPos.lng;
+			that.makers[0].longitude = newPos.lng;
+			that.makers[0].latitude = newPos.lat;
+			if (newPos.lng == undefined || newPos.lat == undefined) {
+				//如果没有位置信息则使用当前定位
+				getLocationFunc();
+			}
+			const getLocationFunc = () =>
+				uni.getLocation({
+					type: 'gcj02',
+					success: function(res) {
+						that.myLatitude = res.latitude;
+						that.myLongitude = res.longitude;
+					}
+				});
+		},
+		//服务端返回的是百度地图坐标系,百度地图坐标系转换为高德地图坐标系（重要，不然会造成位置误差）
+		bd_decrypt(bd_lng, bd_lat) {
+			var X_PI = (Math.PI * 3000.0) / 180.0;
+			var x = bd_lng - 0.0065;
+			var y = bd_lat - 0.006;
+			var z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * X_PI);
+			var theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * X_PI);
+			var gg_lng = z * Math.cos(theta);
+			var gg_lat = z * Math.sin(theta);
+			return { lng: gg_lng, lat: gg_lat };
+		}
+	}
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style scoped>
+.my-map {
+	width: 750rpx;
+}
+</style>

@@ -88,9 +88,12 @@
 		"usingComponents": true,
 		"permission": {
 			"scope.userLocation": {
-				"desc": "你的位置信息将用于小程序位置接口的效果展示"
+				"desc": "如果没有位置信息则使用当前定位"
 			}
 		},
+		"requiredPrivateInfos": [
+			"getLocation"
+		],
 		"lazyCodeLoading": "requiredComponents",
 		//开启分包优化
 		"optimization": {

@@ -92,7 +92,15 @@
 					"path": "deviceDetailPage/devicePosition",
 					"style": {
 						"navigationBarTitleText": "设备地理位置"
-					}
+					},
+					"permission": {
+						"scope.userLocation": {
+							"desc": "如果没有位置信息则使用当前定位"
+						}
+					},
+					"requiredPrivateInfos": [
+						"getLocation"
+					]
 				}
 			]
 		},

@@ -131,14 +131,14 @@ export default {
 		getDeviceTotalData() {
 			uni.$u.http.get('/yt/homepage/app').then(res => {
 				if (res) {
-					this.deviceData.onLine = res.totalDevice.onLine;
-					this.deviceData.unLine = res.totalDevice.offLine;
-					this.deviceData.noActive = res.totalDevice.inActive;
-					this.alertData.noHandle = res.totalAlarm.activedAlarm;
-					this.alertData.doneHandle = res.totalAlarm.clearedAck;
-					this.alertData.errorReport = res.totalAlarm.clearedUnack;
+					this.deviceData.onLine = res.totalDevice?.onLine;
+					this.deviceData.unLine = res.totalDevice?.offLine;
+					this.deviceData.noActive = res.totalDevice?.inActive;
+					this.alertData.noHandle = res.totalAlarm?.activedAlarm;
+					this.alertData.doneHandle = res.totalAlarm?.clearedAck;
+					this.alertData.errorReport = res.totalAlarm?.clearedUnack;
 					//异步实时更新告警徽标数
-					this.updateBadgeTotal(res.totalAlarm.activedAlarm);
+					this.updateBadgeTotal(res.totalAlarm?.activedAlarm);
 				}
 			});
 		},

@@ -8,7 +8,7 @@
 			<view class="u-flex u-p-l-30 u-p-r-20 u-p-t-75 u-p-b-30">
 				<block v-if="userInfo.isToken || userInfo.isThirdLogin">
 					<view @click.top="openPersonalInfo" class="u-m-r-20">
-						<image class="avatar" mode="aspectFill" :src="!userInfo.avatar ? '../../static/logo.png' : userInfo.avatar || thirdObj.avatarUrl"></image>
+						<image class="avatar" mode="aspectFill" :src="plateInfo.logo || userInfo.avatar || thirdObj.avatarUrl||'../../static/logo.png'"></image>
 					</view>
 					<view class="u-flex-1" @click.top="openPersonalInfo">
 						<view class="nickName u-flex">
@@ -17,14 +17,14 @@
 							</view>
 							<view v-if="userInfo.isThirdLogin" @click.stop="clickAccountFunc" class="detail"><text class="text">绑定账号</text></view>
 						</view>
-						<view style="color:#FFFFFF;font-size: 14px;" v-if="userInfo.phoneNumber">{{ handlePhoneFunc(userInfo.phoneNumber || '') }}</view>
+						<view style="color: #ffffff; font-size: 14px" v-if="userInfo.phoneNumber">{{ handlePhoneFunc(userInfo.phoneNumber || '') }}</view>
 					</view>
 				</block>
 				<block v-else>
 					<view class="u-m-r-20" @click="openLoginFunc">
 						<view class="avatar u-flex"><image class="avatar" mode="aspectFill" src="../../static/logo.png"></image></view>
 					</view>
-					<view class="u-flex-1"><view @click="openLoginFunc" class="u-font-lg click-login login-btn ">请点击登录</view></view>
+					<view class="u-flex-1"><view @click="openLoginFunc" class="u-font-lg click-login login-btn">请点击登录</view></view>
 				</block>
 				<view v-if="userInfo.isToken" @click="openPersonalInfo"><u-icon name="arrow-right" color="white" size="13"></u-icon></view>
 			</view>
@@ -168,7 +168,7 @@ export default {
 		this.getOpenId = getApp().globalData.openId;
 	},
 	computed: {
-		...mapState(['userInfo'])
+		...mapState(['userInfo', 'plateInfo'])
 	},
 	methods: {
 		handlePhoneFunc(e) {
@@ -177,7 +177,7 @@ export default {
 			const y = e.toString().replace(result, '$1****$2');
 			return y;
 		},
-		...mapMutations(['emptyUserInfo', 'setUserInfo']),
+		...mapMutations(['emptyUserInfo', 'setUserInfo', 'setPlateInfo']),
 		// 跳转前判断登录
 		onTokenJump(url) {
 			this.judgeLogin(() => {
@@ -342,6 +342,12 @@ export default {
 					this.setUserInfo(res);
 				}
 			});
+			//储存平台信息
+			uni.$u.http.get('/yt/platform/get').then(res => {
+				if (res) {
+					this.setPlateInfo(res);
+				}
+			});
 		},
 		bindPhoneFunc() {
 			this.bindPhone = true;
@@ -428,4 +434,4 @@ export default {
 
 <style lang="scss" scoped>
 @import './static/personal.scss';
-</style>
+</style>

@@ -5,8 +5,8 @@
 		<view class="u-flex login-main">
 			<view class="content">
 				<view class="hello login-text-muted">您好,</view>
-
-				<view class="hello-welcome login-text-muted">欢迎来到ThingsKit!</view>
+				<!-- <view class="hello-welcome login-text-muted">欢迎来到ThingsKit!</view> -->
+				<view style="width:587rpx" class="text-clip  hello-welcome login-text-muted">欢迎来到{{ plateInfo.name !== undefined ? plateInfo.name : 'ThingsKit' }}!</view>
 			</view>
 		</view>
 
@@ -17,7 +17,7 @@
 				<view class="form-row u-flex">
 					<u-input v-model="loginForm.password" :password="showPassword" placeholder="请输入登录密码" border="bottom">
 						<template slot="suffix">
-							<view @click="showPasswordMode" style="padding:10rpx">
+							<view @click="showPasswordMode" style="padding: 10rpx">
 								<u-icon width="18" height="14" :name="showPassword ? '/static/eye-hide.png' : '/static/eye.png'"></u-icon>
 							</view>
 						</template>
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { mapMutations, mapActions } from 'vuex';
+import { mapMutations, mapActions, mapState } from 'vuex';
 import { loginApp } from '@/config/login';
 import baseUrl from '@/config/baseUrl.js';
 import WXBizDataCrypt from '@/config/WXBizDataCrypt.js';
@@ -75,9 +75,11 @@ export default {
 			}
 		});
 	},
-
+	computed: {
+		...mapState(['plateInfo'])
+	},
 	methods: {
-		...mapMutations(['setUserInfo']),
+		...mapMutations(['setUserInfo', 'setPlateInfo']),
 		...mapActions(['updateBadgeTotal']),
 		//微信授权登录
 		//#ifdef MP-WEIXIN
@@ -157,18 +159,23 @@ export default {
 
 		saveUserInfo() {
 			//储存个人信息
-
 			uni.$u.http.get('/yt/user/me/info').then(res => {
 				if (res) {
 					this.setUserInfo(res);
 				}
 			});
+			//储存平台信息
+			uni.$u.http.get('/yt/platform/get').then(res => {
+				if (res) {
+					this.setPlateInfo(res);
+				}
+			});
 		},
 		async getAlarmTotalData() {
 			const res = await uni.$u.http.get('/yt/homepage/app');
 			if (res) {
 				//异步实时更新告警徽标数
-				this.updateBadgeTotal(res.totalAlarm.activedAlarm);
+				this.updateBadgeTotal(res.totalAlarm?.activedAlarm);
 			}
 		},
 		onSubmitFunc() {

@@ -2,7 +2,9 @@ export const state = {
 	//用户数据
 	userInfo: {},
 	//存储告警徽标数据
-	badgeInfo: 0
+	badgeInfo: 0,
+	//平台信息
+	plateInfo:{}
 };
 export const mutations = {
 	//储存用户信息
@@ -18,16 +20,32 @@ export const mutations = {
 			// #endif
 		}
 	},
+	//储存平台信息
+	setPlateInfo(state, data) {
+		if (data) {
+			state.plateInfo = Object.assign({}, state.plateInfo, data);
+			// #ifdef H5
+			window.sessionStorage.setItem('plateInfo', JSON.stringify(state.plateInfo));
+			// #endif
+			// #ifndef H5
+			uni.setStorageSync('plateInfo', state.plateInfo);
+			wx.setStorageSync('plateInfo', state.plateInfo);
+			// #endif
+		}
+	},
 	// 退出APP
 	emptyUserInfo(state) {
 		state.userInfo = {};
+		state.plateInfo = {};
 		state.badgeInfo = 0;
 		// #ifdef H5
 		window.sessionStorage.removeItem("userInfo");
+		window.sessionStorage.removeItem("plateInfo");
 		// #endif
 		// #ifndef H5
 		uni.removeStorageSync("userInfo");
 		uni.removeStorageSync('storagePre');
+		uni.removeStorageSync('plateInfo');
 		// #endif
 	},
 	setBadgeInfo(state, payload) {