diff --git a/aircraft/server/index/index.vue b/aircraft/server/index/index.vue index d7e4ed0..46e2a97 100644 --- a/aircraft/server/index/index.vue +++ b/aircraft/server/index/index.vue @@ -73,7 +73,8 @@ export default { { name: '路线', icon: 'route.png', - select: 'route-select.png' + select: 'route-select.png', + navTitle: '路线' }, { name: '我的', diff --git a/aircraft/server/order/detail.vue b/aircraft/server/order/detail.vue index f12ca76..b6cd13c 100644 --- a/aircraft/server/order/detail.vue +++ b/aircraft/server/order/detail.vue @@ -376,7 +376,7 @@ export default { else this.$refs.uToast.show({type: 'error',title: "订单详情获取失败!"}); let resp = await this.$api.allRoutesByScenicId(res.attractionId); if(resp){ - this.routes = resp || []; + this.routes = resp.filter(item=>this.orderDetail.routeIds.includes(item.key)) || []; } else { this.$refs.uToast.show({type: 'error',title: "景区路线获取失败!"}); } diff --git a/aircraft/server/route/components/search-combox.vue b/aircraft/server/route/components/search-combox.vue new file mode 100644 index 0000000..030b6e8 --- /dev/null +++ b/aircraft/server/route/components/search-combox.vue @@ -0,0 +1,352 @@ + + + + + \ No newline at end of file diff --git a/aircraft/server/route/detail.vue b/aircraft/server/route/detail.vue new file mode 100644 index 0000000..f6823c7 --- /dev/null +++ b/aircraft/server/route/detail.vue @@ -0,0 +1,142 @@ + + + + + \ No newline at end of file diff --git a/aircraft/server/route/route.vue b/aircraft/server/route/route.vue index 87221a4..bd4e697 100644 --- a/aircraft/server/route/route.vue +++ b/aircraft/server/route/route.vue @@ -1,25 +1,89 @@ \ No newline at end of file diff --git a/pages.json b/pages.json index 7e56039..2fff5bd 100644 --- a/pages.json +++ b/pages.json @@ -74,6 +74,12 @@ "navigationBarTitleText": "新增订单" } }, + { + "path": "route/detail", + "style": { + "navigationBarTitleText": "路线详情" + } + }, { "path": "my/child_pages/history", "style": {