diff --git a/wuye-manager-uniapp/App.vue b/wuye-manager-uniapp/App.vue index 43629b2..a13a99b 100644 --- a/wuye-manager-uniapp/App.vue +++ b/wuye-manager-uniapp/App.vue @@ -68,6 +68,12 @@ export default { .w-full { width: 100%; } +.overflow-hidden { + overflow: hidden; +} +.overflow-auto { + overflow: auto; +} /* 自定义导航栏专用 */ .custom-header { height: calc(var(--status-bar-height) + 88rpx); @@ -98,5 +104,18 @@ export default { padding-bottom: constant(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom); } +.page_padding { + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + + display: flex; + flex-direction: column; + + width: 100%; + min-height: 100vh; + max-height: 100vh; + overflow: hidden; + box-sizing: border-box; +} /* 1 电表 2水表 */ diff --git a/wuye-manager-uniapp/components/navbar/navbar.vue b/wuye-manager-uniapp/components/navbar/navbar.vue new file mode 100644 index 0000000..62e74a8 --- /dev/null +++ b/wuye-manager-uniapp/components/navbar/navbar.vue @@ -0,0 +1,200 @@ + + + + + diff --git a/wuye-manager-uniapp/components/tabs/tabs.vue b/wuye-manager-uniapp/components/tabs/tabs.vue index bf35e09..b444141 100644 --- a/wuye-manager-uniapp/components/tabs/tabs.vue +++ b/wuye-manager-uniapp/components/tabs/tabs.vue @@ -9,7 +9,7 @@ active: item.value === activeValue }" > - {{ item.name }} + {{ item[props.options.label] }} @@ -20,15 +20,19 @@ import { ref } from 'vue' type tabslistType = { name: string; value: number } const props = defineProps<{ tabslist: tabslistType[] + options: { + label: 'name' + value: 'value' + } }>() const emit = defineEmits<{ update: [value: number] }>() -const activeValue = ref(0) +const activeValue = ref(props.tabslist[0].value) const handleTabs = (row: tabslistType) => { - activeValue.value = row.value - emit('update', row.value) + activeValue.value = row[props.options.value] + emit('update', row[props.options.value]) } diff --git a/wuye-manager-uniapp/pageSubPack/ticket/hall.vue b/wuye-manager-uniapp/pageSubPack/ticket/hall.vue new file mode 100644 index 0000000..553b339 --- /dev/null +++ b/wuye-manager-uniapp/pageSubPack/ticket/hall.vue @@ -0,0 +1,442 @@ + + + + + diff --git a/wuye-manager-uniapp/pageSubPack/ticket/shareUser.vue b/wuye-manager-uniapp/pageSubPack/ticket/shareUser.vue new file mode 100644 index 0000000..c760903 --- /dev/null +++ b/wuye-manager-uniapp/pageSubPack/ticket/shareUser.vue @@ -0,0 +1,224 @@ + + + + + diff --git a/wuye-manager-uniapp/pages.json b/wuye-manager-uniapp/pages.json index 5ad0c11..670a6d6 100644 --- a/wuye-manager-uniapp/pages.json +++ b/wuye-manager-uniapp/pages.json @@ -138,6 +138,23 @@ } ] }, + { + "root": "pageSubPack/ticket", + "pages": [{ + "path": "hall", + "style": { + "navigationBarTitleText": "工单大厅", + "navigationStyle": "custom" + } + }, + { + "path": "shareUser", + "style": { + "navigationBarTitleText": "分配派单" + } + } +] + }, { "root": "pageSubPack/oneClickOpen", "pages": [{