Merge branch 'master' of https://gitee.com/wjl2008_admin/medicine_app

pages.json

@@ -468,7 +468,49 @@
 					"popGesture": "none"
 				}
 			}
-		}		
+		},
+		{
+			"path": "pages/medicaldes/medicaldes",
+			"style": {
+				"navigationBarTitleText": "吴门医述",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/medicaldes/zhuanzhuchuban",
+			"style": {
+				"navigationBarTitleText": "专著出版",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/medicaldes/xueshugongxianDetail",
+			"style": {
+				"navigationBarTitleText": "学术贡献详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/medicaldes/medicaldesDetail",
+			"style": {
+				"navigationBarTitleText": "医述详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/medicaldes/recordDetail",
+			"style": {
+				"navigationBarTitleText": "纪实详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/medicaldes/video",
+			"style": {
+				"navigationBarTitleText": "医述详情",
+				"enablePullDownRefresh": false
+			}
+		}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -491,17 +533,11 @@
 				"selectedIconPath": "static/tab/icon1_y.png",
 				"text": "首页"
 			},
-			// {
-			// 	"pagePath": "pages/peanut/shopping",
-			// 	"iconPath": "static/tab/tab_nor_02.png",
-			// 	"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/peanut/shopping",
+				"iconPath": "static/tab/tab_nor_02.png",
+				"selectedIconPath": "static/tab/tab_cur_02.png",
+				"text": "购物车"
 			},
 			{
 				"pagePath": "pages/bookShop/orderList",
@@ -509,6 +545,12 @@
 				"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",