diff --git a/src/pages/faq/faq.vue b/src/packages/content/pages/faq.vue similarity index 100% rename from src/pages/faq/faq.vue rename to src/packages/content/pages/faq.vue diff --git a/src/pages/notice-list/notice-list.vue b/src/packages/content/pages/notice-list.vue similarity index 98% rename from src/pages/notice-list/notice-list.vue rename to src/packages/content/pages/notice-list.vue index fd96a66..cfd8312 100644 --- a/src/pages/notice-list/notice-list.vue +++ b/src/packages/content/pages/notice-list.vue @@ -34,7 +34,7 @@ diff --git a/src/pages/scenic-list/scenic-list.vue b/src/packages/content/pages/scenic-list.vue similarity index 99% rename from src/pages/scenic-list/scenic-list.vue rename to src/packages/content/pages/scenic-list.vue index ea388d1..1eb8108 100644 --- a/src/pages/scenic-list/scenic-list.vue +++ b/src/packages/content/pages/scenic-list.vue @@ -401,7 +401,7 @@ function goBack() { function onCardClick(scenic: ScenicItem) { uni.navigateTo({ - url: `/pages/scenic-detail/scenic-detail?id=${scenic.id}`, + url: `/packages/content/pages/scenic-detail?id=${scenic.id}`, }) } diff --git a/src/pages/usage-guide/usage-guide.vue b/src/packages/content/pages/usage-guide.vue similarity index 100% rename from src/pages/usage-guide/usage-guide.vue rename to src/packages/content/pages/usage-guide.vue diff --git a/src/pages/card-bind/card-bind.vue b/src/packages/user/pages/bind.vue similarity index 100% rename from src/pages/card-bind/card-bind.vue rename to src/packages/user/pages/bind.vue diff --git a/src/pages/card-buy/card-buy.vue b/src/packages/user/pages/buy.vue similarity index 100% rename from src/pages/card-buy/card-buy.vue rename to src/packages/user/pages/buy.vue diff --git a/src/pages/order/order-detail.vue b/src/packages/user/pages/order/detail.vue similarity index 99% rename from src/pages/order/order-detail.vue rename to src/packages/user/pages/order/detail.vue index 41518e7..2287711 100644 --- a/src/pages/order/order-detail.vue +++ b/src/packages/user/pages/order/detail.vue @@ -194,7 +194,7 @@ function copyCode() { function goActivate() { uni.navigateTo({ - url: `/pages/card-bind/card-bind?redeemCode=${order.value.redeemCode}` + url: `/packages/user/pages/bind?redeemCode=${order.value.redeemCode}` }) } @@ -213,7 +213,7 @@ function handleRefund() { } function goFaq() { - uni.navigateTo({ url: '/pages/faq/faq' }) + uni.navigateTo({ url: '/packages/content/pages/faq' }) } function goHome() { diff --git a/src/pages/order/order-list.vue b/src/packages/user/pages/order/list.vue similarity index 98% rename from src/pages/order/order-list.vue rename to src/packages/user/pages/order/list.vue index be59721..d764079 100644 --- a/src/pages/order/order-list.vue +++ b/src/packages/user/pages/order/list.vue @@ -176,12 +176,12 @@ function onLoadMore() { } function goDetail(orderId: string) { - uni.navigateTo({ url: `/pages/order/order-detail?orderId=${orderId}` }) + uni.navigateTo({ url: `/packages/user/pages/order/detail?orderId=${orderId}` }) } function goActivate(order: OrderItem) { uni.navigateTo({ - url: `/pages/card-bind/card-bind?redeemCode=${order.redeemCode}` + url: `/packages/user/pages/bind?redeemCode=${order.redeemCode}` }) } @@ -205,7 +205,7 @@ function submitRefund() { } function goBuy() { - uni.navigateTo({ url: '/pages/card-buy/card-buy' }) + uni.navigateTo({ url: '/packages/user/pages/buy' }) } diff --git a/src/pages/reserve/reserve-index.vue b/src/packages/user/pages/reserve/index.vue similarity index 98% rename from src/pages/reserve/reserve-index.vue rename to src/packages/user/pages/reserve/index.vue index 24b9155..724e504 100644 --- a/src/pages/reserve/reserve-index.vue +++ b/src/packages/user/pages/reserve/index.vue @@ -220,12 +220,12 @@ function handleSubmit() { const sessionTime = session ? session.time : '' const sessionParam = sessionTime ? `&session=${encodeURIComponent(sessionTime)}` : '' uni.navigateTo({ - url: `/pages/reserve/reserve-success?reserveId=${reserveId}&date=${selectedDate.value}&scenic=${encodeURIComponent(scenic.value.name)}${sessionParam}` + url: `/packages/user/pages/reserve/success?reserveId=${reserveId}&date=${selectedDate.value}&scenic=${encodeURIComponent(scenic.value.name)}${sessionParam}` }) } function goFaq() { - uni.navigateTo({ url: '/pages/faq/faq' }) + uni.navigateTo({ url: '/packages/content/pages/faq' }) } diff --git a/src/pages/reserve/reserve-list.vue b/src/packages/user/pages/reserve/list.vue similarity index 99% rename from src/pages/reserve/reserve-list.vue rename to src/packages/user/pages/reserve/list.vue index a581808..c5c0c2b 100644 --- a/src/pages/reserve/reserve-list.vue +++ b/src/packages/user/pages/reserve/list.vue @@ -298,7 +298,7 @@ function onLoadMore() { } function goReserve() { - uni.navigateTo({ url: '/pages/reserve/reserve-index' }) + uni.navigateTo({ url: '/packages/user/pages/reserve/index' }) } function previewPhoto(url: string) { diff --git a/src/pages/reserve/reserve-success.vue b/src/packages/user/pages/reserve/success.vue similarity index 98% rename from src/pages/reserve/reserve-success.vue rename to src/packages/user/pages/reserve/success.vue index 273e67d..f4644b2 100644 --- a/src/pages/reserve/reserve-success.vue +++ b/src/packages/user/pages/reserve/success.vue @@ -107,7 +107,7 @@ onLoad((query: any) => { // 拦截返回,跳转预约记录页 onBackPress(() => { - uni.redirectTo({ url: '/pages/reserve/reserve-list' }) + uni.redirectTo({ url: '/packages/user/pages/reserve/list' }) return true }) @@ -116,7 +116,7 @@ function showCode() { } function goRecord() { - uni.redirectTo({ url: '/pages/reserve/reserve-list' }) + uni.redirectTo({ url: '/packages/user/pages/reserve/list' }) } function goHome() { diff --git a/src/pages/union-buy/union-buy.vue b/src/packages/user/pages/union-buy.vue similarity index 100% rename from src/pages/union-buy/union-buy.vue rename to src/packages/user/pages/union-buy.vue diff --git a/src/pages.json b/src/pages.json index aa376c0..e1092b6 100644 --- a/src/pages.json +++ b/src/pages.json @@ -41,85 +41,6 @@ "style": { "navigationBarTitleText": "个人中心" } - }, - { - "path": "pages/scenic-list/scenic-list", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "" - } - }, - { - "path": "pages/scenic-detail/scenic-detail", - "style": { - "navigationBarTitleText": "景区详情" - } - }, - { - "path": "pages/notice-list/notice-list", - "style": { - "navigationBarTitleText": "通知公告" - } - }, - { - "path": "pages/card-bind/card-bind", - "style": { - "navigationBarTitleText": "绑卡激活" - } - }, - { - "path": "pages/card-buy/card-buy", - "style": { - "navigationBarTitleText": "超级玩家卡" - } - }, - { - "path": "pages/usage-guide/usage-guide", - "style": { - "navigationBarTitleText": "使用说明" - } - }, - { - "path": "pages/faq/faq", - "style": { - "navigationBarTitleText": "常见问题" - } - }, - { - "path": "pages/union-buy/union-buy", - "style": { - "navigationBarTitleText": "工会购买" - } - }, - { - "path": "pages/order/order-list", - "style": { - "navigationBarTitleText": "我的订单" - } - }, - { - "path": "pages/order/order-detail", - "style": { - "navigationBarTitleText": "订单详情" - } - }, - { - "path": "pages/reserve/reserve-index", - "style": { - "navigationBarTitleText": "景区预约" - } - }, - { - "path": "pages/reserve/reserve-success", - "style": { - "navigationBarTitleText": "预约成功" - } - }, - { - "path": "pages/reserve/reserve-list", - "style": { - "navigationBarTitleText": "预约/使用记录" - } } ], "subPackages": [ @@ -161,6 +82,90 @@ "style": { "navigationBarTitleText": "绑定年卡" } + }, + { + "path": "pages/bind", + "style": { + "navigationBarTitleText": "绑卡激活" + } + }, + { + "path": "pages/buy", + "style": { + "navigationBarTitleText": "超级玩家卡" + } + }, + { + "path": "pages/union-buy", + "style": { + "navigationBarTitleText": "工会购买" + } + }, + { + "path": "pages/order/list", + "style": { + "navigationBarTitleText": "我的订单" + } + }, + { + "path": "pages/order/detail", + "style": { + "navigationBarTitleText": "订单详情" + } + }, + { + "path": "pages/reserve/index", + "style": { + "navigationBarTitleText": "景区预约" + } + }, + { + "path": "pages/reserve/success", + "style": { + "navigationBarTitleText": "预约成功" + } + }, + { + "path": "pages/reserve/list", + "style": { + "navigationBarTitleText": "预约/使用记录" + } + } + ] + }, + { + "root": "packages/content", + "pages": [ + { + "path": "pages/scenic-list", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "" + } + }, + { + "path": "pages/scenic-detail", + "style": { + "navigationBarTitleText": "景区详情" + } + }, + { + "path": "pages/notice-list", + "style": { + "navigationBarTitleText": "通知公告" + } + }, + { + "path": "pages/usage-guide", + "style": { + "navigationBarTitleText": "使用说明" + } + }, + { + "path": "pages/faq", + "style": { + "navigationBarTitleText": "常见问题" + } } ] } diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index ec9f051..7e459be 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -155,11 +155,11 @@ const quickActions = [ function onQuickAction(item: { label: string }) { if (item.label === '我要绑卡') { - uni.navigateTo({ url: '/pages/card-bind/card-bind' }) + uni.navigateTo({ url: '/packages/user/pages/bind' }) return } if (item.label === '我要预约') { - uni.navigateTo({ url: '/pages/scenic-list/scenic-list' }) + uni.navigateTo({ url: '/packages/content/pages/scenic-list' }) return } if (item.label === '我要入园') { @@ -167,7 +167,7 @@ function onQuickAction(item: { label: string }) { return } if (item.label === '常见问题') { - uni.navigateTo({ url: '/pages/faq/faq' }) + uni.navigateTo({ url: '/packages/content/pages/faq' }) return } uni.showToast({ title: `${item.label}功能开发中`, icon: 'none' }) @@ -207,7 +207,7 @@ function openNotice(item: { typeLabel: string; content: string; body?: string }) } function goMoreNotice() { - uni.navigateTo({ url: '/pages/notice-list/notice-list' }) + uni.navigateTo({ url: '/packages/content/pages/notice-list' }) } /** 热门景点数据 */ @@ -221,19 +221,19 @@ const hotSpots = mockScenicList.slice(0, 6).map(s => ({ })) function goCardDetail() { - uni.navigateTo({ url: '/pages/card-buy/card-buy' }) + uni.navigateTo({ url: '/packages/user/pages/buy' }) } function goUnionBuy() { - uni.navigateTo({ url: '/pages/union-buy/union-buy' }) + uni.navigateTo({ url: '/packages/user/pages/union-buy' }) } function goSpot(spot: { id: number }) { - uni.navigateTo({ url: `/pages/scenic-detail/scenic-detail?id=${spot.id}` }) + uni.navigateTo({ url: `/packages/content/pages/scenic-detail?id=${spot.id}` }) } function goMore() { - uni.navigateTo({ url: '/pages/scenic-list/scenic-list' }) + uni.navigateTo({ url: '/packages/content/pages/scenic-list' }) } diff --git a/src/pages/profile/index.vue b/src/pages/profile/index.vue index 27c30f3..081a0c8 100644 --- a/src/pages/profile/index.vue +++ b/src/pages/profile/index.vue @@ -90,11 +90,11 @@ function handleLogout() { function showComingSoon() { uni.showToast({ title: '即将上线,敬请期待', icon: 'none' }) } -function goFaq() { uni.navigateTo({ url: '/pages/faq/faq' }) } +function goFaq() { uni.navigateTo({ url: '/packages/content/pages/faq' }) } -function goUsageGuide() { uni.navigateTo({ url: '/pages/usage-guide/usage-guide' }) } +function goUsageGuide() { uni.navigateTo({ url: '/packages/content/pages/usage-guide' }) } -function goOrders() { uni.navigateTo({ url: '/pages/order/order-list' }) } +function goOrders() { uni.navigateTo({ url: '/packages/user/pages/order/list' }) } function callService() { uni.makePhoneCall({ phoneNumber: '400-123-0101' }) } diff --git a/src/pages/qrcode/index.vue b/src/pages/qrcode/index.vue index 52403bb..b8a72c7 100644 --- a/src/pages/qrcode/index.vue +++ b/src/pages/qrcode/index.vue @@ -211,7 +211,7 @@ function copyCardNo() { } function goBindCard() { - uni.navigateTo({ url: '/pages/card-bind/card-bind' }) + uni.navigateTo({ url: '/packages/user/pages/bind' }) } const featureActions = [ @@ -223,19 +223,19 @@ const featureActions = [ function onFeatureClick(item: { label: string }) { if (item.label === '我要绑定') { - uni.navigateTo({ url: '/pages/card-bind/card-bind' }) + uni.navigateTo({ url: '/packages/user/pages/bind' }) return } if (item.label === '我要预约') { - uni.navigateTo({ url: '/pages/scenic-list/scenic-list' }) + uni.navigateTo({ url: '/packages/content/pages/scenic-list' }) return } if (item.label === '使用说明') { - uni.navigateTo({ url: '/pages/usage-guide/usage-guide' }) + uni.navigateTo({ url: '/packages/content/pages/usage-guide' }) return } if (item.label === '使用记录') { - uni.navigateTo({ url: '/pages/reserve/reserve-list' }) + uni.navigateTo({ url: '/packages/user/pages/reserve/list' }) return } uni.showToast({ title: `${item.label}功能开发中`, icon: 'none' }) diff --git a/src/static/icon/scenic.png b/src/static/icon/scenic.png index 3b2ed7d..604bf7f 100644 Binary files a/src/static/icon/scenic.png and b/src/static/icon/scenic.png differ