fix: 解决冲突
This commit is contained in:
parent
237b36a89f
commit
c707b2c8ae
@ -275,6 +275,13 @@
|
||||
},
|
||||
"needLogin": false
|
||||
},
|
||||
{
|
||||
"path": "pages/mine/mine",
|
||||
"type": "page",
|
||||
"style": {
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/notification/notification",
|
||||
"type": "page"
|
||||
@ -502,4 +509,4 @@
|
||||
}
|
||||
],
|
||||
"subPackages": []
|
||||
}
|
||||
}
|
||||
3
src/types/uni-pages.d.ts
vendored
3
src/types/uni-pages.d.ts
vendored
@ -5,7 +5,6 @@
|
||||
|
||||
interface NavigateToOptions {
|
||||
url: "/pages/home/home" |
|
||||
"/pages/application-list/application-list" |
|
||||
"/pages/approval/approval-detail" |
|
||||
"/pages/approval/approval" |
|
||||
"/pages/approval/create-application" |
|
||||
@ -32,8 +31,8 @@ interface NavigateToOptions {
|
||||
"/pages/login/code" |
|
||||
"/pages/login/get-code" |
|
||||
"/pages/login/login" |
|
||||
"/pages/mine/mine" |
|
||||
"/pages/login/reset-password" |
|
||||
"/pages/mine/mine" |
|
||||
"/pages/notification/notification" |
|
||||
"/pages/personnel-passage/traffic-correlation" |
|
||||
"/pages/select/select-access-control" |
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user