ui”

git commit -m ui”

pages.json

@@ -20,6 +20,30 @@
 				"navigationStyle": "custom"
 			}
 
+		}, {
+			// 生活号
+			"path": "pages/life/life",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"scrollIndicator": "none",
+				"navigationBarTextStyle": "black",
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		}, {
+			// 直播
+			"path": "pages/live/list",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"scrollIndicator": "none",
+				"navigationBarTextStyle": "black",
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
 		},
 		{
 			"path": "pages/home/index",
@@ -574,7 +598,7 @@
 							"titleNView": false
 						}
 					}
-				},{
+				}, {
 					"path": "shareLive",
 					"style": {
 						"navigationBarTitleText": "分享直播间",
@@ -821,10 +845,10 @@
 					"style": {
 						"navigationStyle": "custom",
 						"enablePullDownRefresh": false
-						
+
 					}
 
-				},{
+				}, {
 					"path": "live/complaint",
 					"style": {
 						"navigationBarTitleText": "我的反馈",
@@ -834,7 +858,7 @@
 						}
 					}
 				},
-{
+				{
 					"path": "live/complaintList",
 					"style": {
 						"navigationBarTitleText": "反馈与投诉",
@@ -851,7 +875,7 @@
 						"enablePullDownRefresh": false
 					}
 
-				},{
+				}, {
 					"path": "live/integral",
 					"style": {
 						"navigationBarTitleText": "芳华币",
@@ -905,7 +929,7 @@
 						"enablePullDownRefresh": false
 					}
 
-				},{
+				}, {
 					"path": "live/storeOrderDelivery",
 					"style": {
 						"navigationBarTitleText": "物流信息",
@@ -923,7 +947,7 @@
 						"navigationBarTextStyle": "black"
 					}
 				},
-				
+
 				{
 					"path": "live/storeOrderRefundSubmit",
 					"style": {
@@ -965,7 +989,7 @@
 					}
 				},
 				{
-					"path" : "live/expert",
+					"path": "live/expert",
 					"style": {
 						"navigationBarTitleText": "",
 						"navigationStyle": "custom",
@@ -976,33 +1000,22 @@
 						}
 					}
 				},
+				// {
+				// 	// 直播预告和直播中列表
+				// 	"path": "live/list",
+				// 	"style": {
+				// 		"navigationBarTitleText": "",
+				// 		"navigationStyle": "custom",
+				// 		"scrollIndicator": "none",
+				// 		"navigationBarTextStyle": "black",
+				// 		"app-plus": {
+				// 			"bounce": "none"
+				// 		}
+				// 	}
+				// }, 
 				{
-					// 直播预告和直播中列表
-					"path" : "live/list",
-					"style": {
-						"navigationBarTitleText": "",
-						"navigationStyle": "custom",
-						"scrollIndicator": "none",
-						"navigationBarTextStyle": "black",
-						"app-plus": {
-							"bounce": "none"
-						}
-					}
-				},{
 					// 实时销售榜
-					"path" : "live/salesRanking",
-					"style": {
-						"navigationBarTitleText": "",
-						"navigationStyle": "custom",
-						"scrollIndicator": "none",
-						"navigationBarTextStyle": "black",
-						"app-plus": {
-							"bounce": "none"
-						}
-					}
-				},{
-					// 生活号
-					"path" : "live/life",
+					"path": "live/salesRanking",
 					"style": {
 						"navigationBarTitleText": "",
 						"navigationStyle": "custom",
@@ -1012,8 +1025,23 @@
 							"bounce": "none"
 						}
 					}
-				},{
-					"path" : "live/trailer",
+				},
+				// {
+				// 	// 生活号
+				// 	"path": "live/life",
+				// 	"style": {
+				// 		"navigationBarTitleText": "",
+				// 		"navigationStyle": "custom",
+				// 		"scrollIndicator": "none",
+				// 		"navigationBarTextStyle": "black",
+				// 		"app-plus": {
+				// 			"bounce": "none"
+				// 		}
+				// 	}
+				// },
+
+				{
+					"path": "live/trailer",
 					"style": {
 						"navigationBarTitleText": "直播预告",
 						"navigationBarTextStyle": "black",
@@ -1024,7 +1052,7 @@
 				},
 				{
 					// 生活号文章
-					"path" : "live/article",
+					"path": "live/article",
 					"style": {
 						"navigationBarTitleText": "",
 						"navigationStyle": "custom",
@@ -1034,7 +1062,7 @@
 							"bounce": "none"
 						}
 					}
-				},{
+				}, {
 					// 店铺
 					"path": "live/shop",
 					"style": {
@@ -1047,7 +1075,7 @@
 						}
 					}
 				}
-				
+
 
 			]
 		},
@@ -1167,8 +1195,8 @@
 		"backgroundColor": "#FFFFFF"
 	},
 	"tabBar": {
-		"color": "#666666",
-		"selectedColor": "#2BC7B9",
+		"color": "#333333",
+		"selectedColor": "#02B176",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
 		"height": "64px",
@@ -1181,35 +1209,47 @@
 				"selectedIconPath": "/static/images/home_sel.png",
 				"text": "首页"
 			},
+			{
+				"pagePath": "pages/life/life",
+				"iconPath": "/static/images/life.png",
+				"selectedIconPath": "/static/images/life_sel.png",
+				"text": "生活号"
+			},{
+				"pagePath": "pages/live/list",
+				"iconPath": "/static/images/live.png",
+				"selectedIconPath": "/static/images/live_sel.png",
+				"text": "直播"
+			},
+			
 			// {
 			// 	"pagePath": "pages/home/companyInfo",
 			// 	"iconPath": "/static/images/health.png",
 			// 	"selectedIconPath": "/static/images/health_sel.png",
 			// 	"text": "企业理念"
 			// },
-			{
-				"pagePath": "pages/shopping/cart",
-				"iconPath": "/static/images/cart.png",
-				"selectedIconPath": "/static/images/cart_sel.png",
-				"text": "购物车"
-			},
+			// {
+			// 	"pagePath": "pages/shopping/cart",
+			// 	"iconPath": "/static/images/cart.png",
+			// 	"selectedIconPath": "/static/images/cart_sel.png",
+			// 	"text": "购物车"
+			// },
 			// {
 			// 	"pagePath": "pages/doctor/index",
 			// 	"iconPath": "/static/images/see_doctor.png",
 			// 	"selectedIconPath": "/static/images/see_doctor_sel.png",
 			// 	"text": "问诊"
 			// },
-			{
-				"pagePath": "pages/shopping/index",
-				"iconPath": "/static/images/shop_mall.png",
-				"selectedIconPath": "/static/images/shop_mall_sel.png",
-				"text": "健康商城"
-			},
+			// {
+			// 	"pagePath": "pages/shopping/index",
+			// 	"iconPath": "/static/images/shop_mall.png",
+			// 	"selectedIconPath": "/static/images/shop_mall_sel.png",
+			// 	"text": "健康商城"
+			// },
 			{
 				"pagePath": "pages/user/index",
 				"iconPath": "/static/images/my.png",
 				"selectedIconPath": "/static/images/my_sel.png",
-				"text": "会员中心"
+				"text": "个人中心"
 			}
 		]
 	}