diff --git a/src/components/BasicMobileBottomNav.vue b/src/components/BasicMobileBottomNav.vue index 0bb0fef..755e0c1 100644 --- a/src/components/BasicMobileBottomNav.vue +++ b/src/components/BasicMobileBottomNav.vue @@ -29,7 +29,7 @@ import BasicMobileOverflowMenu from '@/components/BasicMobileOverflowMenu.vue' import { sortBy } from 'lodash' import { computed } from 'vue' import type { RouteRecordName, RouteRecordRaw } from 'vue-router' -import { supportChatMenuEnabledSetting } from '@/utils/config' +import { hasLandingSetting, supportChatMenuEnabledSetting } from '@/utils/config' const BOTTOM_NAV_PRIORITY: (string | symbol)[] = ['dashboard', 'customers', 'orders', 'transactions'] @@ -44,6 +44,7 @@ const allMenuItems = computed(() => if (item.name === 'support' || item.meta?.permissionsKey === 'support') { return supportChatMenuEnabledSetting.value } + if (item.name === 'websiteSettings') return hasLandingSetting.value return true }), (item) => item.meta?.order diff --git a/src/core/layouts/composnts/BasicMenu.vue b/src/core/layouts/composnts/BasicMenu.vue index 17b1430..dce08a9 100644 --- a/src/core/layouts/composnts/BasicMenu.vue +++ b/src/core/layouts/composnts/BasicMenu.vue @@ -36,7 +36,7 @@ import BaseMenuItem from '@core/layouts/composnts/BaseMenuItem.vue' import type { RouteRecordName, RouteRecordRaw } from 'vue-router' import { useRouterStore } from '@core/stores/router' import { useAdminTheme } from '@core/composable/useAdminTheme' -import { supportChatMenuEnabledSetting } from '@/utils/config' +import { hasLandingSetting, supportChatMenuEnabledSetting } from '@/utils/config' const { prefixCls } = usePrefix('basic-menu') const layoutStore = useLayoutStore() @@ -79,6 +79,7 @@ const menu: ComputedRef = computed(() => { }).filter((item) => { if (item.meta?.hideMenu) return false if (isSupportMenuRoute(item)) return supportChatMenuEnabledSetting.value + if (item.name === 'websiteSettings') return hasLandingSetting.value return true }) }) diff --git a/src/pages/menuPages/configuration/SettingValueField.vue b/src/pages/menuPages/configuration/SettingValueField.vue index 310781b..becd5b3 100644 --- a/src/pages/menuPages/configuration/SettingValueField.vue +++ b/src/pages/menuPages/configuration/SettingValueField.vue @@ -97,6 +97,7 @@ :value="priceValue" :disabled="disabled" class="w-full" + :addon-after="unitLabel || undefined" :formatter="(v: string) => `${v}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')" :parser="(v: string) => sanitizeNumericString(v, { allowDecimal: false })" @update:value="onPriceChange" @@ -109,6 +110,7 @@ inputmode="numeric" allow-clear class="w-full" + :addon-after="unitLabel || undefined" @update:value="onPlainNumberChange" @blur="emit('blur')" /> @@ -144,6 +146,7 @@ import TemplateTextField from './TemplateTextField.vue' import ZaarboxPriceKeyField from './ZaarboxPriceKeyField.vue' import { hasTemplateField } from './templateFields' import { + getSettingUnitLabel, normalizeTimeValue, parseSelectOptions, resolveSettingFieldType, @@ -182,6 +185,8 @@ const fieldType = computed(() => }) ) +const unitLabel = computed(() => getSettingUnitLabel(props.settingKey, fieldType.value)) + const isZaarboxPriceKey = computed(() => props.settingKey === 'zaarbox_price_key') const isMontzarProductId = computed(() => props.settingKey === 'montzar_product_id') const isMainWalletProducts = computed(() => props.settingKey === 'main_wallet_products') diff --git a/src/pages/menuPages/configuration/index.vue b/src/pages/menuPages/configuration/index.vue index be88cf9..47c4823 100644 --- a/src/pages/menuPages/configuration/index.vue +++ b/src/pages/menuPages/configuration/index.vue @@ -1,6 +1,6 @@