diff --git a/main.js b/main.js index 1ff7b0b..34b979d 100644 --- a/main.js +++ b/main.js @@ -27,7 +27,7 @@ export function createApp() { const systemInfo = uni.getStorageSync('systemInfo') || {} app.config.globalProperties.$system = systemInfo.platform == 'ios' ? 'iOS' : 'Android' app.config.globalProperties.$systemInfo = systemInfo - uni.setStorageSync('version', '1.0.2.sp8') + uni.setStorageSync('version', '1.0.2.sp9') app.config.globalProperties.$version = uni.getStorageSync('version') app.use(globalMethods); diff --git a/pages.json b/pages.json index da23e09..27c76c0 100644 --- a/pages.json +++ b/pages.json @@ -184,6 +184,14 @@ "navigationBarTitleText": "携程火车票", "navigationStyle": "custom" } + }, + { + "path" : "train-tickets/qunar-train-tickets/qunar-train-tickets", + "style" : + { + "navigationBarTitleText" : "去哪儿", + "navigationStyle": "custom" + } } ] }, diff --git a/pages/index/index.nvue b/pages/index/index.nvue index bcdf6f9..04befa7 100644 --- a/pages/index/index.nvue +++ b/pages/index/index.nvue @@ -136,814 +136,814 @@ \ No newline at end of file diff --git a/pages/other/tickets-app/index.vue b/pages/other/tickets-app/index.vue index 724bf85..395dda1 100644 --- a/pages/other/tickets-app/index.vue +++ b/pages/other/tickets-app/index.vue @@ -51,44 +51,51 @@ const { let type = ref('airTicket') -const appList = [{ - name: '去哪儿APP', - logo: '/static/image/other/tickets-app/qvnar-logo.png', - bgImage: '/static/image/other/tickets-app/qvnar-bg.png', - airPath: '/pages/other/air-tickets/qunar-air-tickets/qunar-air-tickets', - trainPath: "", - isHot: false -}, -{ - name: '飞猪APP', - logo: '/static/image/other/tickets-app/fliggy-logo.png', - bgImage: '/static/image/other/tickets-app/fliggy-bg.png', - airPath: '/pages/other/air-tickets/fliggy-air-tickets/fliggy-air-tickets', - trainPath: "", - isHot: true -}, -{ - name: '携程APP', - logo: '/static/image/other/tickets-app/trip-com-logo.png', - bgImage: '/static/image/other/tickets-app/trip-com-bg.png', - airPath: '/pages/other/air-tickets/ctrip-air-tickets/ctrip-air-tickets', - trainPath: "/pages/other/train-tickets/ctrip-train-tickets/ctrip-train-tickets", - isHot: false -}, -{ - name: '铁路12306', - logo: '/static/image/other/tickets-app/12306-logo.png', - bgImage: '/static/image/other/tickets-app/12306-bg.png', - airPath: '', - trainPath: "/pages/other/train-tickets/12306-tickets/12306-tickets", - isHot: false -} +const appList = [ + { + name: '携程APP', + logo: '/static/image/other/tickets-app/trip-com-logo.png', + bgImage: '/static/image/other/tickets-app/trip-com-bg.png', + airPath: '/pages/other/air-tickets/ctrip-air-tickets/ctrip-air-tickets', + trainPath: "/pages/other/train-tickets/ctrip-train-tickets/ctrip-train-tickets", + isHot: false + }, + { + name: '铁路12306', + logo: '/static/image/other/tickets-app/12306-logo.png', + bgImage: '/static/image/other/tickets-app/12306-bg.png', + airPath: '', + trainPath: "/pages/other/train-tickets/12306-tickets/12306-tickets", + isHot: false + }, { + name: '去哪儿APP', + logo: '/static/image/other/tickets-app/qvnar-logo.png', + bgImage: '/static/image/other/tickets-app/qvnar-bg.png', + airPath: '/pages/other/air-tickets/qunar-air-tickets/qunar-air-tickets', + trainPath: "开发中", + isHot: false + }, + { + name: '飞猪APP', + logo: '/static/image/other/tickets-app/fliggy-logo.png', + bgImage: '/static/image/other/tickets-app/fliggy-bg.png', + airPath: '/pages/other/air-tickets/fliggy-air-tickets/fliggy-air-tickets', + trainPath: "开发中", + isHot: true + }, ] onLoad((option) => { const appType = option.type if (appType == "trainTicket") { type.value = "trainTicket" + // 进入高铁票页面埋点 + proxy.$apiUserEvent('all', { + type: 'event', + key: 'train_ticket', + prefix: '.uni.other.', + value: "高铁票" + }) } else { type.value = "airTicket" // 进入机票页面埋点 @@ -108,7 +115,7 @@ onLoad((option) => { */ const handleItemClick = (item) => { if (type.value == 'trainTicket') { - if (item.trainPath) { + if (item.trainPath && item.trainPath != "开发中") { util.goPage(item.trainPath) } else { uni.showToast({ diff --git a/pages/other/train-tickets/12306-tickets/12306-tickets.vue b/pages/other/train-tickets/12306-tickets/12306-tickets.vue index d071a37..a059311 100644 --- a/pages/other/train-tickets/12306-tickets/12306-tickets.vue +++ b/pages/other/train-tickets/12306-tickets/12306-tickets.vue @@ -364,14 +364,6 @@ const calculateNightCount = () => { onLoad(() => { const sys = uni.getSystemInfoSync(); statusBarHeight.value = sys.statusBarHeight || 20; - - // 进入高铁票页面埋点 - proxy.$apiUserEvent('all', { - type: 'event', - key: 'train_ticket', - prefix: '.uni.other.', - value: "高铁票" - }) }); onShow(() => { diff --git a/pages/other/train-tickets/ctrip-train-tickets/ctrip-train-tickets.vue b/pages/other/train-tickets/ctrip-train-tickets/ctrip-train-tickets.vue index 5146f77..02fb2de 100644 --- a/pages/other/train-tickets/ctrip-train-tickets/ctrip-train-tickets.vue +++ b/pages/other/train-tickets/ctrip-train-tickets/ctrip-train-tickets.vue @@ -96,22 +96,26 @@ - {{ formatDateTime(ticketsInfo.ticketInfo.departureTime, + {{ formatDateTime(ticketsInfo.ticketInfo.departureTime, ticketsInfo.ticketInfo.date) }} {{ ticketsInfo.ticketInfo.duration }} - {{ formatDateTime(ticketsInfo.ticketInfo.arrivalTime, - ticketsInfo.ticketInfo.date) }} + {{ + formatDateTime(ticketsInfo.ticketInfo.arrivalTime, + ticketsInfo.ticketInfo.date) }} - {{ ticketsInfo.ticketInfo.departureTime.split(' ')[1] }} + {{ ticketsInfo.ticketInfo.departureTime.split(' ')[1] + }} - {{ ticketsInfo.ticketInfo.arrivalTime.split(' ')[1] }} + {{ + ticketsInfo.ticketInfo.arrivalTime.split(' ')[1] + }} - + {{ ticketsInfo.ticketInfo.departureStation }} @@ -123,7 +127,7 @@ - + {{ ticketsInfo.ticketInfo.arrivalStation }} @@ -413,6 +417,18 @@ const formatMMDD = (mdStr) => { @import '/common/global.css'; + \ No newline at end of file