Merge remote-tracking branch 'origin/feature/uni-app' into feature/uni-app

# Conflicts:
#	gym-manage-uniapp/pages.json
This commit is contained in:
2026-06-11 14:33:39 +08:00
-18
View File
@@ -270,24 +270,6 @@
"style": { "style": {
"navigationBarTitleText": "" "navigationBarTitleText": ""
} }
},
{
"path": "pages/groupCourse/list",
"style": {
"navigationBarTitleText": "团课列表"
}
},
{
"path": "pages/checkIn/checkIn",
"style": {
"navigationBarTitleText": "会员签到"
}
},
{
"path": "pages/groupCourse/list",
"style": {
"navigationBarTitleText": "团课列表"
}
} }
], ],
"globalStyle": { "globalStyle": {