Merge branch 'master' of http://47.114.134.244:3000/chenkainan/yandu_WeChat

pages.json

@@ -293,6 +293,12 @@
 				"style": {
 					"navigationBarTitleText": "选择日期"
 				}
+			},
+			{
+				"path": "h5Web/h5Web",
+				"style": {
+					"navigationBarTitleText": ""
+				}
 			}
 		]
 	}],

pages/map/map.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<map id="map" class="map" :show-location="true" :latitude="latitude" :longitude="longitude"></map>
+		<web-view :src="src"></web-view>
 	</view>
 </template>
 
@@ -8,57 +8,22 @@
 	export default {
 		data() {
 			return {
-				latitude: 33.338538,
+				src: ''
-				longitude: 120.153567,
 			}
 		},
-		onReady() {
+		onShow() {
-			this._mapContext = uni.createMapContext("map", this);
+			// 必须登录
-
+			let userInfo = (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo'))) || this.$store.state.user.userInfo || {}
-			// 仅调用初始化，才会触发 on.("markerClusterCreate", (e) => {})
+			if(userInfo.token) {
-			this._mapContext.initMarkerCluster({
+				this.src = 'https://yandumap.sz-trip.com?token=' + userInfo.token
-				enableDefaultStyle: false,
+			}else {
-				zoomOnClick: true,
+				uni.navigateTo({
-				gridSize: 60,
+					url: '/pages/login/login'
-				complete(res) {
-					console.log('initMarkerCluster', res)
-				}
-			});
-
-			this._mapContext.on("markerClusterCreate", (e) => {
-				console.log("markerClusterCreate", e);
-			});
-
-			this.addMarkers();
-		},
-		methods: {
-			addMarkers() {
-				console.log(111,this._mapContext)
-				this._mapContext.addGroundOverlay({
-					id: 1,
-					src: 'https://static.ticket.sz-trip.com/yandu/images/maps/6/53/25.png',
-					bounds: {
-						southwest: {//左下角GPS
-							longitude: 119.700158,
-							latitude: 33.112837
-						},
-						northeast: {//右上角GPS
-							longitude: 120.25057,
-							latitude: 33.458095
-						}
-					},
-					zIndex: 1, // 图层绘制顺序
-					success: () => {
-						console.log("显示成功", southwest, northeast)
-					},
-					fail: (e) => {
-						console.log("显示失败", e)
-					},
-					complete: res => {
-						console.log(res)
-					}
 				})
 			}
+		},
+		methods: {
+			
 		}
 	}
 </script>
@@ -68,9 +33,4 @@
 		width: 100vw;
 		height: 100vh;
 	}
-
-	.map {
-		width: 100vw;
-		height: 100vh;
-	}
 </style>

pages/user/user.vue

@@ -137,7 +137,7 @@
 			}
 		},
 		onShow() {
-			this.userInfo = JSON.parse(uni.getStorageSync('userInfo')) || this.$store.state.user.userInfo || {}
+			this.userInfo = (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo'))) || this.$store.state.user.userInfo || {}
 			console.log(this.userInfo)
 			// this.dfkList = []
 			// this.nowDateTime = parseInt(new Date().getTime() / 1000)

subPackages/h5Web/h5Web.vue

@@ -0,0 +1,54 @@
+<template>
+	<view></view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		onShow() {
+			// 从第三方小程序返回后
+			const oTherMiniprogramIsBack = uni.getStorageSync('oTherMiniprogramIsBack')
+			if(oTherMiniprogramIsBack) {
+				uni.showModal({
+					title: '是否返回盐都小程序',
+					success: () => {
+						uni.removeStorageSync('oTherMiniprogramIsBack')
+						uni.navigateBack();
+					}
+				})
+			}
+		},
+		onLoad(option) {
+			let data = JSON.parse(option.data)
+			if(data && data.type == 'xcx') {
+				uni.navigateToMiniProgram({
+					shortLink: data.url,
+					success(res) {
+						uni.setStorageSync('oTherMiniprogramIsBack', 1)
+					}
+				})
+			}else {
+				uni.openLocation({
+					longitude: Number(data.lon), // 经度
+					latitude: Number(data.lat), //纬度
+					name: data.address || data.title || data.name, // 位置名称
+					address: data.address, //详细地址
+					complete: res => {
+						if(res.errMsg.indexOf("openLocation:ok") != -1) {
+							uni.switchTab({
+								url: '/pages/map/map'
+							})
+						}
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+</style>