diff --git a/pages/index/index.vue b/pages/index/index.vue index b91db4e..20fa6c0 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -89,7 +89,7 @@ {{tagItem}} - {{item.goods.low_money / 100}} + @@ -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 + }) + } } }, // 天气 diff --git a/pages/map/map.vue b/pages/map/map.vue index 02409e3..b3eb304 100644 --- a/pages/map/map.vue +++ b/pages/map/map.vue @@ -1,8 +1,76 @@ - \ No newline at end of file diff --git a/subPackages/eventCalendar/eventCalendar.vue b/subPackages/eventCalendar/eventCalendar.vue index 979b155..fddf277 100644 --- a/subPackages/eventCalendar/eventCalendar.vue +++ b/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 + }) + } }, } } diff --git a/subPackages/food/foodList.vue b/subPackages/food/foodList.vue index e3806d3..be9822b 100644 --- a/subPackages/food/foodList.vue +++ b/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() { diff --git a/subPackages/hotelHomestay/hotelHomestay.vue b/subPackages/hotelHomestay/hotelHomestay.vue index db2811d..23c61b9 100644 --- a/subPackages/hotelHomestay/hotelHomestay.vue +++ b/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() { diff --git a/subPackages/techan/techanList.vue b/subPackages/techan/techanList.vue index bb11e12..5db2bef 100644 --- a/subPackages/techan/techanList.vue +++ b/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() { diff --git a/subPackages/ticketBooking/ticketBooking.vue b/subPackages/ticketBooking/ticketBooking.vue index 4fb2750..9e45e0a 100644 --- a/subPackages/ticketBooking/ticketBooking.vue +++ b/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() { diff --git a/subPackages/travelGuide/travelGuide.vue b/subPackages/travelGuide/travelGuide.vue index 6a327d9..be872a9 100644 --- a/subPackages/travelGuide/travelGuide.vue +++ b/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() {