Merge branch 'master' into dev_jzp

pages/index/index.vue

@@ -89,7 +89,7 @@
 						<view style="display: flex;" v-if="item.goods.goods_new_tag">
 							<view class="line-tag" v-for="(tagItem,tagIndex) in item.goods.goods_new_tag.split(',').slice(0,2)" :key="tagIndex">{{tagItem}}</view>
 						</view>
-						<view class="line-price">{{item.goods.low_money / 100}}</view>
+						<!-- <view class="line-price">{{item.goods.low_money / 100}}</view> -->
 					</view>
 				</view>
 			</view>
@@ -159,37 +159,37 @@
 						path: '/subPackages/ticketBooking/ticketBooking'
 					},
 					{
-						img: 'https://static.ticket.sz-trip.com/yandu/images/index/jdmp.png',
+						img: 'https://static.ticket.sz-trip.com/yandu/images/index/jdms.png',
 						text: '酒店民宿',
 						path: '/subPackages/hotelHomestay/hotelHomestay'
 					},
 					{
-						img: 'https://static.ticket.sz-trip.com/yandu/images/index/jdmp.png',
+						img: 'https://static.ticket.sz-trip.com/yandu/images/index/cyms.png',
 						text: '餐饮美食',
 						path: '/subPackages/food/foodList'
 					},
 					{
-						img: 'https://static.ticket.sz-trip.com/yandu/images/index/jdmp.png',
+						img: 'https://static.ticket.sz-trip.com/yandu/images/index/wctc.png',
 						text: '文创特产',
 						path: '/subPackages/techan/techanList'
 					},
 					{
-						img: 'https://static.ticket.sz-trip.com/yandu/images/index/jdmp.png',
+						img: 'https://static.ticket.sz-trip.com/yandu/images/index/xltj.png',
 						text: '线路推荐',
 						path: '/subPackages/line/lineList'
 					},
 					{
-						img: 'https://static.ticket.sz-trip.com/yandu/images/index/jdmp.png',
+						img: 'https://static.ticket.sz-trip.com/yandu/images/index/zhdt.png',
 						text: '智慧地图',
 						path: ''
 					},
 					{
-						img: 'https://static.ticket.sz-trip.com/yandu/images/index/jdmp.png',
+						img: 'https://static.ticket.sz-trip.com/yandu/images/index/yjgl.png',
 						text: '游记攻略',
 						path: '/subPackages/travelGuide/travelGuide'
 					},
 					{
-						img: 'https://static.ticket.sz-trip.com/yandu/images/index/jdmp.png',
+						img: 'https://static.ticket.sz-trip.com/yandu/images/index/hdrl.png',
 						text: '活动日历',
 						path: '/subPackages/eventCalendar/eventCalendar'
 					}
@@ -279,33 +279,21 @@
 						break;
 				}
 			},
-			// 活动日历、线路详情
+			// 游记攻略、线路详情
 			goCalendarDetail(item,type) {
-				switch (item.link_type) {
-					case 0:
-						// 本小程序
-						if(type == 1) {
-							// 线路
-						}else {
-							uni.navigateTo({
-								url:'/subPackages/travelGuide/detail?id='+item.id
-							})
-						}
-						break;
-					case 1:
-						// 外部小程序
-						uni.navigateToMiniProgram({
-							shortLink: item.ext_link
+				this.goOtherDetail(item)
+				if(!item.link_type) {
+					if(type) {
+						// 线路
+						uni.navigateTo({
+							url:'/subPackages/line/detail?id='+item.id
 						})
-						break;
-					case 2:
-						// 外部h5
+					}else {
+						// 游记攻略
 						uni.navigateTo({
-							url: '/subPackages/webPage/webPage?url=' + item.ext_link
-						});
-						break;
-					default:
-						break;
+							url:'/subPackages/travelGuide/detail?id='+item.id
+						})
+					}
 				}
 			},
 			// 天气

pages/map/map.vue

@@ -1,8 +1,76 @@
 <template>
+	<view class="content">
+		<map id="map" class="map" :show-location="true" :latitude="latitude" :longitude="longitude"></map>
+	</view>
 </template>
 
 <script>
+	export default {
+		data() {
+			return {
+				latitude: 33.338538,
+				longitude: 120.153567,
+			}
+		},
+		onReady() {
+			this._mapContext = uni.createMapContext("map", this);
+
+			// 仅调用初始化，才会触发 on.("markerClusterCreate", (e) => {})
+			this._mapContext.initMarkerCluster({
+				enableDefaultStyle: false,
+				zoomOnClick: true,
+				gridSize: 60,
+				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)
+					}
+				})
+			}
+		}
+	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	.content {
+		width: 100vw;
+		height: 100vh;
+	}
+
+	.map {
+		width: 100vw;
+		height: 100vh;
+	}
 </style>

subPackages/eventCalendar/eventCalendar.vue

@@ -358,9 +358,11 @@
 			},
 			viewDetail (item) {
 				this.goOtherDetail(item)
-				uni.navigateTo({
-					url:'/subPackages/eventCalendar/detail?id='+item.id
-				})
+				if(!item.link_type) {
+					uni.navigateTo({
+						url:'/subPackages/eventCalendar/detail?id='+item.id
+					})
+				}
 			},
 		}
 	}

subPackages/food/foodList.vue

@@ -58,9 +58,11 @@
 
 			viewDetail (item) {
 				this.goOtherDetail(item)
-				uni.navigateTo({
-					url: '/subPackages/food/foodDetail?id=' + item.id
-				});
+				if(!item.link_type) {
+					uni.navigateTo({
+						url: '/subPackages/food/foodDetail?id=' + item.id
+					});
+				}
 			}
 		},
 		onReachBottom() {

subPackages/hotelHomestay/hotelHomestay.vue

@@ -133,9 +133,11 @@
 
 			viewDetail (item) {
 				this.goOtherDetail(item)
-				uni.navigateTo({
-					url: '/subPackages/hotelHomestay/detail?id=' + item.id
-				});
+				if(!item.link_type) {
+					uni.navigateTo({
+						url: '/subPackages/hotelHomestay/detail?id=' + item.id
+					});
+				}
 			}
 		},
 		onReachBottom() {

subPackages/techan/techanList.vue

@@ -48,9 +48,11 @@
 			},
 			viewDetail(item) {
 				this.goOtherDetail(item)
-				uni.navigateTo({
-					url: '/subPackages/techan/detail?id=' + item.id
-				})
+				if(!item.link_type) {
+					uni.navigateTo({
+						url: '/subPackages/techan/detail?id=' + item.id
+					})
+				}
 			}
 		},
 		onReachBottom() {

subPackages/ticketBooking/ticketBooking.vue

@@ -95,9 +95,11 @@
 			
 			viewDetail (item) {
 				this.goOtherDetail(item)
-				uni.navigateTo({
-					url:'/subPackages/ticketBooking/detail?id='+item.id
-				})
+				if(!item.link_type) {
+					uni.navigateTo({
+						url:'/subPackages/ticketBooking/detail?id='+item.id
+					})
+				}
 			},
 		},
 		onReachBottom() {

subPackages/travelGuide/travelGuide.vue

@@ -112,9 +112,11 @@
 			},
 			viewDetail (item) {
 				this.goOtherDetail(item)
-				uni.navigateTo({
-					url:'/subPackages/travelGuide/detail?id='+item.id
-				})
+				if(!item.link_type) {
+					uni.navigateTo({
+						url:'/subPackages/travelGuide/detail?id='+item.id
+					})
+				}
 			},
 		},
 		onReachBottom() {