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

# Conflicts: # app/src/pages.json
2022-09-09 10:14:29 +08:00 · 2022-09-09 10:14:29 +08:00 · ee86e5dbf1
parent 59f508d70f c9bf4ed561
commit ee86e5dbf1
1 changed files with 7 additions and 1 deletions
--- a/app/src/pages.json
+++ b/app/src/pages.json
@ -83,7 +83,13 @@
 		    "style": {
 		        "navigationBarTitleText": "个人资料"
 		    }
-		}
+		},
+        {
+            "path": "pages/search/search",
+            "style": {
+                "navigationBarTitleText": "搜索"
+            }
+        }
    ],
    "globalStyle": {
        "navigationBarTextStyle": "black",