Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop

# Conflicts: # app/src/pages.json
2026-06-01 14:40:10 +08:00 · 2022-09-08 18:35:59 +08:00
parent c873f109ff 67c57a5d08
commit 89f58728cc
13 changed files with 250 additions and 97 deletions
--- a/app/src/pages.json
+++ b/app/src/pages.json
@@ -47,7 +47,13 @@
 		    "style": {
 		        "navigationBarTitleText": "个人设置"
 		    }
-		}
+		},
+        {
+            "path": "pages/collection/collection",
+            "style": {
+                "navigationBarTitleText": "我的收藏"
+            }
+        }
    ],
    "globalStyle": {
        "navigationBarTextStyle": "black",