diff --git a/miniprogram/src/components/VenueSwitchHeader.vue b/miniprogram/src/components/VenueSwitchHeader.vue index c58b680..07fd9e9 100644 --- a/miniprogram/src/components/VenueSwitchHeader.vue +++ b/miniprogram/src/components/VenueSwitchHeader.vue @@ -1,13 +1,7 @@ @@ -26,74 +20,30 @@ const switchVenue = () => { diff --git a/miniprogram/src/pages.json b/miniprogram/src/pages.json index 5597d63..88767fe 100644 --- a/miniprogram/src/pages.json +++ b/miniprogram/src/pages.json @@ -12,6 +12,7 @@ "path": "pages/venue-select/index", "style": { "navigationBarTitleText": "选择场馆", + "navigationStyle": "custom", "navigationBarBackgroundColor": "#FFFFFF", "navigationBarTextStyle": "black" } diff --git a/miniprogram/src/pages/venue-select/index.vue b/miniprogram/src/pages/venue-select/index.vue index b219cc3..dec278f 100644 --- a/miniprogram/src/pages/venue-select/index.vue +++ b/miniprogram/src/pages/venue-select/index.vue @@ -1,32 +1,13 @@ @@ -41,7 +22,6 @@ const venueStore = useVenueStore() const venues = VENUE_OPTIONS const isReady = ref(false) const currentVenue = computed(() => venueStore.currentVenue) -const selectedVenue = computed(() => venueStore.currentVenueOption) onLoad((options) => { const storedVenue = venueStore.init() @@ -58,122 +38,43 @@ onLoad((options) => { const selectVenue = (venueKey) => { venueStore.enterVenue(venueKey) } - -const continueCurrentVenue = () => { - if (!venueStore.currentVenue) return - venueStore.enterVenue(venueStore.currentVenue) -} diff --git a/miniprogram/src/utils/venue.js b/miniprogram/src/utils/venue.js index e0428e5..6ae8565 100644 --- a/miniprogram/src/utils/venue.js +++ b/miniprogram/src/utils/venue.js @@ -6,8 +6,8 @@ export const VENUE_KEYS = Object.freeze({ }) export const VENUE_OPTIONS = Object.freeze([ - { key: VENUE_KEYS.ICE, name: '冰场馆', description: '课程预约、会员卡与滑冰服务' }, - { key: VENUE_KEYS.COMPREHENSIVE, name: '综合场馆', description: '课程、包场、门票、订单与余额' } + { key: VENUE_KEYS.COMPREHENSIVE, name: '综合场馆' }, + { key: VENUE_KEYS.ICE, name: '冰场馆' } ]) export const isVenueKey = (value) => value === VENUE_KEYS.ICE || value === VENUE_KEYS.COMPREHENSIVE @@ -16,7 +16,7 @@ export const getVenueOption = (venueKey) => VENUE_OPTIONS.find((item) => item.ke export const getStoredVenue = () => { const venue = uni.getStorageSync(CURRENT_VENUE_KEY) - return isVenueKey(venue) ? venue : '' + return isVenueKey(venue) ? venue : VENUE_KEYS.COMPREHENSIVE } export const setStoredVenue = (venueKey) => {