新建分支前最后一次提交

2023-07-04 13:27:04 +08:00
parent e7d9d12556
commit 5bdbe1afc4
10 changed files with 122 additions and 59 deletions
--- a/pages.json
+++ b/pages.json
@@ -167,7 +167,8 @@
 		{
 			"path": "pages/user/login",
 			"style": {
-				"navigationBarTitleText": "登录"
+				"navigationBarTitleText": "登录",
+				"enablePullDownRefresh":false        // 禁止下拉刷新
 			}
 		},
 		{
@@ -285,11 +286,17 @@
 				"selectedIconPath": "static/tab/icon2_y.png",
 				"text": "购物车"
 			},
+			// {
+			// 	"pagePath": "pages/peanut/bookshelf",
+			// 	"iconPath": "static/tab/icon3_n.png",
+			// 	"selectedIconPath": "static/tab/icon3_y.png",
+			// 	"text": "我的书架"
+			// },
 			{
-				"pagePath": "pages/peanut/bookshelf",
+				"pagePath": "pages/bookShop/orderList",
 				"iconPath": "static/tab/icon3_n.png",
 				"selectedIconPath": "static/tab/icon3_y.png",
-				"text": "我的书架"
+				"text": "我的订单"
 			},
 			{
 				"pagePath": "pages/peanut/mine",