sky/starwork-uniapp
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fanpeng' into 'develop'

Browse Source 
Fanpeng

See merge request StarlockTeam/starwork-uniapp!8
This commit is contained in:
范鹏 2025-01-10 07:53:09 +00:00
commit 06b2b953b5
8 changed files with 177 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -96,7 +96,7 @@
"pinia-plugin-persistedstate": "3.2.1",
"qs": "6.5.3",
"vue": "3.4.21",
"wot-design-uni": "1.4.0",
"wot-design-uni": "1.5.1",
"z-paging": "^2.8.4"
},
"devDependencies": {

10
pnpm-lock.yaml generated
View File

@ -72,8 +72,8 @@ importers:
specifier: 3.4.21
version: 3.4.21(typescript@5.7.2)
wot-design-uni:
specifier: 1.4.0
version: 1.4.0(vue@3.4.21(typescript@5.7.2))
specifier: 1.5.1
version: 1.5.1(vue@3.4.21(typescript@5.7.2))
z-paging:
specifier: ^2.8.4
version: 2.8.4
@ -5462,8 +5462,8 @@ packages:
resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
engines: {node: '>=0.10.0'}
wot-design-uni@1.4.0:
resolution: {integrity: sha512-h6sjrgfg7mP0nJwGTiHn/iTLPFyRswMpQV6MKhWN3skTnXe+FAyndvtXofpXp+uLkTXefGfw5BPI0uuCMD874w==}
wot-design-uni@1.5.1:
resolution: {integrity: sha512-jiDRuF8r7+xAldc4Dp+2T1VnqDnOoMWsXu6aRpDg2QG7ZH+/bJl7W8H8hHbKFgA9lu1By/HCDmpG7JC45nYtBw==}
engines: {HBuilderX: ^3.8.7}
peerDependencies:
vue: '>=3.2.47'
@ -12246,7 +12246,7 @@ snapshots:
word-wrap@1.2.5: {}
wot-design-uni@1.4.0(vue@3.4.21(typescript@5.7.2)):
wot-design-uni@1.5.1(vue@3.4.21(typescript@5.7.2)):
dependencies:
vue: 3.4.21(typescript@5.7.2)

1
src/components/TeamDilog/TeamPopup.vue → src/components/TeamPopup/TeamPopup.vue
View File

@ -64,7 +64,6 @@
onMounted(async () => {
systemInfo.value = await $basic.getSystemInfo()
showModal()
})
const closePopup = () => {

112
src/pages.json
View File

@ -63,6 +63,78 @@
"path": "pages/application-list/application-list",
"type": "page"
},
{
"path": "pages/approval/approval",
"type": "page",
"style": {
"navigationStyle": "custom",
"disableScroll": true
}
},
{
"path": "pages/attendance/allowed-time",
"type": "page",
"layout": "default",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/attendance/attendance-rules",
"type": "page",
"layout": "default",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/attendance/attendance",
"type": "page",
"layout": "default",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/attendance/classes-add-edit",
"type": "page",
"layout": "default",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/attendance/classes-manage",
"type": "page",
"layout": "default",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/attendance/flexible-punching",
"type": "page",
"layout": "default",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/attendance/issue-record-detail",
"type": "page",
"layout": "default",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/attendance/issue-record",
"type": "page",
"layout": "default",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/code/code",
"type": "page",
@ -110,6 +182,46 @@
{
"path": "pages/workbench/workbench",
"type": "page"
},
{
"path": "pages/attendance/attendance-add-group/attendance-add-group",
"type": "page",
"layout": "default",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/attendance/attendance-add-group/attendance-staff",
"type": "page",
"layout": "default",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/attendance/attendance-add-group/attendance-time",
"type": "page",
"layout": "default",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/attendance/attendance-add-group/outside-rules",
"type": "page",
"layout": "default",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/attendance/attendance-add-group/special-date-set",
"type": "page",
"layout": "default",
"style": {
"navigationStyle": "custom"
}
}
],
"subPackages": []

41
src/pages/approval/approval.vue Normal file
View File

@ -0,0 +1,41 @@
<route lang="json5">
{
style: {
navigationStyle: 'custom',
disableScroll: true
}
}
</route>
<template>
<view>
<TopNavigation :title="index === 0 ? '发起申请' : '审批'"></TopNavigation>
<CustomTabBar :list="list" :default-index="index" @change="change"></CustomTabBar>
</view>
</template>
<script setup lang="ts">
import { TabBarItem } from '@/typings'
const index = ref<number>(0)
const list: Array<TabBarItem> = [
{
title: '新申请',
icon: 'home'
},
{
title: '审批中心',
icon: 'home'
}
]
onLoad(options => {
if (options.index) {
index.value = Number(options.index)
}
})
const change = (data: object) => {
index.value = data.value
}
</script>

31
src/pages/home/home.vue
View File

@ -31,7 +31,7 @@
</view>
<scroll-view
class="mt-2"
scroll-y="true"
:scroll-y="true"
:style="{
height: systemInfo.safeArea?.height - 104 + 'px'
}"
@ -59,7 +59,7 @@
import CustomTab from '@/pages/home/HomeTab.vue'
import { useBasicStore, useUserStore } from '@/store'
import { Result } from '@/constants/result'
import { HomeTab, TabBarItem } from '@/typings'
import { HomeTab } from '@/typings'
import HomeSwiper from '@/pages/home/HomeSwiper.vue'
import HomeBulletin from '@/pages/home/HomeBulletin.vue'
import HomeTodo from '@/pages/home/HomeTodo.vue'
@ -69,7 +69,7 @@
import HomeSetting from '@/pages/home/HomeSetting.vue'
import HomeAddDevice from '@/pages/home/HomeAddDevice.vue'
import HomeAddTeamManager from '@/pages/home/HomeAddTeamManager.vue'
import TeamPopup from '@/components/TeamDilog/TeamPopup.vue'
import TeamPopup from '@/components/TeamPopup/TeamPopup.vue'
const $user = useUserStore()
const $basic = useBasicStore()
@ -80,29 +80,6 @@
const teamPopup = ref(null)
const list = ref<Array<TabBarItem>>([
{
title: '首页',
isDot: true,
icon: 'home'
},
{
title: '我的',
value: 0,
icon: '/static/tabbar/home.png'
},
{
title: '最大值',
value: 200,
icon: '/static/tabbar/home.png'
},
{
title: '客服',
value: 3,
icon: '/static/tabbar/home.png'
}
])
const featuresList = ref<Array<HomeTab>>([
{
name: '视频',
@ -235,11 +212,13 @@
{
id: 386,
icon: 'https://file.hikmall.com/prod/image/c5a56acf8efe47d78fc0107552c98bf8.png',
url: '/pages/approval/approval?index=0',
name: '发起审批'
},
{
id: 385,
icon: 'https://file.hikmall.com/prod/image/6b946ba258234cdc8d447631b07939c3.png',
url: '/pages/approval/approval?index=1',
name: '审批记录'
}
]

13
src/types/uni-pages.d.ts vendored
View File

@ -6,7 +6,15 @@
interface NavigateToOptions {
url: "/pages/home/home" |
"/pages/application-list/application-list" |
"/pages/approval/approval" |
"/pages/attendance/allowed-time" |
"/pages/attendance/attendance-rules" |
"/pages/attendance/attendance" |
"/pages/attendance/classes-add-edit" |
"/pages/attendance/classes-manage" |
"/pages/attendance/flexible-punching" |
"/pages/attendance/issue-record-detail" |
"/pages/attendance/issue-record" |
"/pages/code/code" |
"/pages/get-code/get-code" |
"/pages/login/login" |
@ -15,7 +23,10 @@ interface NavigateToOptions {
"/pages/reset-password/reset-password" |
"/pages/workbench/workbench" |
"/pages/attendance/attendance-add-group/attendance-add-group" |
"/pages/attendance/attendance-add-group/outside-rules";
"/pages/attendance/attendance-add-group/attendance-staff" |
"/pages/attendance/attendance-add-group/attendance-time" |
"/pages/attendance/attendance-add-group/outside-rules" |
"/pages/attendance/attendance-add-group/special-date-set";
}
interface RedirectToOptions extends NavigateToOptions {}

2
src/typings.ts
View File

@ -16,7 +16,7 @@ export type TabBarItem = {
export type HomeTabItem = {
icon: string
name: string
url: string
url?: string
id: number
}