11

pages.json

@@ -8,7 +8,7 @@
 			}
 		},
 		{
-			"path" : "pages/home/cloudCard",
+			"path": "pages/home/cloudCard",
 			"style": {
 				"navigationStyle": "custom"
 			}
@@ -49,20 +49,6 @@
 
 			}
 		},
-		{
-			"path": "pages/card/card_booking",
-			"style": {
-				"navigationBarTitleText": "预约提货",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/card/card_record",
-			"style": {
-				"navigationBarTitleText": "预约记录"
-			}
-		},
-		
 
 		{
 			"path": "pages/bind/bind_pickUpCard",
@@ -130,14 +116,6 @@
 				}
 			}
 		},
-		
-		{
-			"path": "pages/card/card_record_detail",
-			"style": {
-				"navigationBarTitleText": "预约详情",
-				"enablePullDownRefresh": false
-			}
-		},
 		{
 			"path": "pages/home/recordList",
 			"style": {
@@ -233,39 +211,45 @@
 			}
 		},
 		{
-			"path" : "pages/cloud/detail_cloudCard",
+			"path": "pages/cloud/detail_cloudCard",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/cloud/optionalCard",
+			"path": "pages/cloud/optionalCard",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		},
 		{
-				"path": "uni_modules/common-pay/pages/pay/pay",
+			"path": "uni_modules/common-pay/pages/pay/pay",
-				"style": {
+			"style": {
-					"navigationBarTitleText": "支付订单",
+				"navigationBarTitleText": "支付订单",
-					"backgroundColor": "#F8F8F8"
+				"backgroundColor": "#F8F8F8"
-				}
-			},
-			{
-				"path": "uni_modules/common-pay/pages/success/success",
-				"style": {
-					"navigationBarTitleText": "支付完成",
-					"backgroundColor": "#F8F8F8"
-				}
 			}
-			,
+		},
-			{
+		{
-				"path" : "pages/home/myHome",
+			"path": "uni_modules/common-pay/pages/success/success",
-				"style": {
+			"style": {
-					"navigationStyle": "custom",
+				"navigationBarTitleText": "支付完成",
-					 "disableScroll":true
+				"backgroundColor": "#F8F8F8"
-				}
+			}
+		},
+		{
+			"path": "pages/home/myHome",
+			"style": {
+				"navigationStyle": "custom",
+				"disableScroll": true
+			}
+		},
+		{
+			"path": "pages/me/base_info",
+			"style": {
+				"navigationStyle": "custom",
+				"disableScroll": true
 			}
+		}
 
 	],
 	"globalStyle": {
@@ -275,36 +259,35 @@
 		"backgroundColor": "#FE9039"
 	},
 	"tabBar": {
-		"custom": true,  //自定义tabBar
+		"custom": true, //自定义tabBar
 		"color": "#FFEEE1",
 		"selectedColor": "#191919",
 		"borderStyle": "white",
 		"backgroundColor": "#F69448",
-		"list": [
+		"list": [{
-		{
+				"pagePath": "pages/home/cloudCard",
-			"pagePath": "pages/home/cloudCard",
+				"text": "补充菜窖",
-			"text": "补充菜窖",
+				"iconPath": "static/bomicon/bom_notCloudCard.png",
-			"iconPath": "static/bomicon/bom_notCloudCard.png",
+				"selectedIconPath": "static/bomicon/bom_cloudCard.png"
-			"selectedIconPath": "static/bomicon/bom_cloudCard.png"
+			},
-		},
+			{
-		{
+				"pagePath": "pages/home/pickUpCard",
-			"pagePath": "pages/home/pickUpCard",
+				"text": "选菜窖",
-			"text": "选菜窖",
+				"iconPath": "static/bomicon/bom_notPickUp.png",
-			"iconPath": "static/bomicon/bom_notPickUp.png",
+				"selectedIconPath": "static/bomicon/bom_pickUp.png"
-			"selectedIconPath": "static/bomicon/bom_pickUp.png"
+			},
-		},
+			{
-		{
+				"pagePath": "pages/home/recordList2",
-			"pagePath": "pages/home/recordList2",
+				"text": "预约记录",
-			"text": "预约记录",
+				"iconPath": "static/bomicon/bom_notRecordNew.png",
-			"iconPath": "static/bomicon/bom_notRecordNew.png",
+				"selectedIconPath": "static/bomicon/bom_recordNew.png"
-			"selectedIconPath": "static/bomicon/bom_recordNew.png"
+			}
-		}
+			// {
-		// {
+			// 	"pagePath": "pages/home/myHome",
-		// 	"pagePath": "pages/home/myHome",
+			// 	"text": "我的",
-		// 	"text": "我的",
+			// 	"iconPath": "static/bomicon/bom_NotMy.png",
-		// 	"iconPath": "static/bomicon/bom_NotMy.png",
+			// 	"selectedIconPath": "static/bomicon/bom_my.png"
-		// 	"selectedIconPath": "static/bomicon/bom_my.png"
+			// }
-		// }
 
 		]
 	},