合并后提交

pages.json

@@ -1,7 +1,7 @@
 {
-	"easycom": {
-		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-	},
+	// "easycom": {
+	// 	"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+	// },
 	"pages": [
 		{
 			"path": "pages/peanut/home",
@@ -436,7 +436,30 @@
 			"path" : "pages/course/myCourse",
 			"style" : 
 			{
-				"navigationBarTitleText" : "我的课程"
+				"navigationBarTitleText" : "我的课程",
+				"enablePullDownRefresh": true
+			}
+		},{
+			"path": "pages/goods/index/index",
+			"style": {
+				"navigationBarTitleText": "商品信息",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false,
+					"popGesture": "none"
+				}
+			}
+		},{
+			"path": "pages/goods/order/index",
+			"style": {
+				"navigationBarTitleText": "确认订单",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false,
+					"popGesture": "none"
+				}
 			}
 		}		
 	],
@@ -467,18 +490,18 @@
 				"selectedIconPath": "static/tab/tab_cur_02.png",
 				"text": "购物车"
 			},
-			// {
-			// 	"pagePath": "pages/taihu/index",
-			// 	"iconPath": "static/tab/tab_nor_03.png",
-			// 	"selectedIconPath": "static/tab/tab_cur_03.png",
-			// 	"text": "太湖公益"
-			// },
 			{
 				"pagePath": "pages/bookShop/orderList",
 				"iconPath": "static/tab/order.png",
 				"selectedIconPath": "static/tab/order_active.png",
 				"text": "订单"
 			},
+			{
+				"pagePath": "pages/taihu/index",
+				"iconPath": "static/tab/tab_nor_03.png",
+				"selectedIconPath": "static/tab/tab_cur_03.png",
+				"text": "太湖公益"
+			},			
 			{
 				"pagePath": "pages/mine/mine/index",
 				"iconPath": "static/tab/tab_nor_04.png",