diff --git a/src/components/common/AppTitleHeader.vue b/src/components/common/AppTitleHeader.vue index 37145ae..456c045 100644 --- a/src/components/common/AppTitleHeader.vue +++ b/src/components/common/AppTitleHeader.vue @@ -1,8 +1,18 @@ @@ -16,31 +26,77 @@ const props = defineProps({ subTitle: { type: String, default: '' + }, + showSubTitle: { + type: Boolean, + default: false } }) + +const emit = defineEmits(['back']) + +function handleBack() { + emit('back') + uni.navigateBack() +} diff --git a/src/pages_function/pages/equipment/detail.vue b/src/pages_function/pages/equipment/detail.vue index ab774a0..558be42 100644 --- a/src/pages_function/pages/equipment/detail.vue +++ b/src/pages_function/pages/equipment/detail.vue @@ -197,7 +197,6 @@ - @@ -205,7 +204,6 @@ import { ref, computed } from 'vue' import { onLoad } from '@dcloudio/uni-app' import AppTitleHeader from '@/components/common/AppTitleHeader.vue' -import BottomActionBar from '@/components/common/BottomActionBar.vue' import { getEquipmentDetail, getEquipmentInspectionByDeviceId, @@ -337,10 +335,6 @@ function handleTabChange(e) { currentTab.value = Number(idx === 0 ? 0 : idx || 0) } -function goBack() { - uni.navigateBack() -} - onLoad((query) => { const rawId = query && (query.id !== undefined ? query.id : query.code) const decoded = rawId ? decodeURIComponent(String(rawId)) : '' @@ -510,7 +504,7 @@ function previewImages(list, current) { } .content-section { - padding: 0 30rpx 200rpx; + padding: 0 30rpx 30rpx; } .info-card { diff --git a/src/pages_function/pages/equipment/index.vue b/src/pages_function/pages/equipment/index.vue index 56907e1..04cc5c8 100644 --- a/src/pages_function/pages/equipment/index.vue +++ b/src/pages_function/pages/equipment/index.vue @@ -1,6 +1,6 @@