From 1f3406acbac28b5b98c8d9dde2557374b97c0ef9 Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Mon, 21 Dec 2020 17:40:58 +0800
Subject: [PATCH] gx

---
 hive-app/pages.json |  217 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 203 insertions(+), 14 deletions(-)

diff --git a/hive-app/pages.json b/hive-app/pages.json
index e8cbaa4..6971be3 100644
--- a/hive-app/pages.json
+++ b/hive-app/pages.json
@@ -29,9 +29,51 @@
 			}
 		},
 		{
-			"path": "pages/member/addMember",
+			"path": "pages/manager/index",
+			"style": {
+				"transparentTitle": "always",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/member/editMember",
 			"style": {
 				"navigationBarTitleText": "新增会员",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/member/membershipCard",
+			"style": {
+				"navigationBarTitleText": "卡项",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/member/skinDetection",
+			"style": {
+				"navigationBarTitleText": "皮肤检测",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/member/skinDetectionDetail",
+			"style": {
+				"navigationBarTitleText": "皮肤检测详情",
 				"navigationBarBackgroundColor":"#FFFFFF",
 				"navigationBarTextStyle":"black",
 				"app-plus":{ 
@@ -54,18 +96,7 @@
 				"navigationBarTitleText": "",
 				"navigationBarBackgroundColor":"#518EFF",
 				"app-plus":{ 
-					"scrollIndicator": "none",
-					"titleNView": {
-						"buttons": [
-							{
-								"text": "\ue696",
-								"fontSrc": "/static/iconfont/iconfont.ttf",
-								"fontSize": "18px",
-								"width":"25px",
-								"float":"right"
-							}
-						]
-					}
+					"scrollIndicator": "none"
 				}
 			}
 		},
@@ -84,6 +115,158 @@
 			"path": "pages/mine/knowledge",
 			"style": {
 				"navigationBarTitleText": "知识库",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/orderList",
+			"style": {
+				"navigationBarTitleText": "订单列表",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none",
+					"titleNView": {
+						"buttons": [
+							{
+								"text": "\ue600",
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								"fontSize": "18px",
+								"width":"25px",
+								"float":"right"
+							}
+						]
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/selectCustomer",
+			"style": {
+				"navigationBarTitleText": "选择客户",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/customerInfo",
+			"style": {
+				"navigationBarTitleText": "客户信息",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/selectProduct/index",
+			"style": {
+				"navigationBarTitleText": "当前客户:李某",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/confirmOrder",
+			"style": {
+				"navigationBarTitleText": "确认订单",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/submitSucceed",
+			"style": {
+				"navigationBarTitleText": "提交成功",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/selectService",
+			"style": {
+				"navigationBarTitleText": "当前客户:李某",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/productDetail/index",
+			"style": {
+				"transparentTitle": "always",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/orderDetail",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/serviceOrderList",
+			"style": {
+				"navigationBarTitleText": "服务单列表",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none",
+					"titleNView": {
+						"buttons": [
+							{
+								"text": "\ue600",
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								"fontSize": "18px",
+								"width":"25px",
+								"float":"right"
+							}
+						]
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/serviceOrderDetail",
+			"style": {
+				"navigationBarTitleText": "服务单详情",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/confirmService",
+			"style": {
+				"navigationBarTitleText": "确认订单",
 				"navigationBarBackgroundColor":"#FFFFFF",
 				"navigationBarTextStyle":"black",
 				"app-plus":{ 
@@ -113,9 +296,15 @@
 			    "text": "会员"
 			},
 			{
-			    "pagePath": "pages/mine/index",
+			    "pagePath": "pages/manager/index",
 			    "iconPath": "static/images/tabbar3.png",
 			    "selectedIconPath": "static/images/tabbar3-2.png",
+			    "text": "管理"
+			},
+			{
+			    "pagePath": "pages/mine/index",
+			    "iconPath": "static/images/tabbar4.png",
+			    "selectedIconPath": "static/images/tabbar4-2.png",
 			    "text": "我的"
 			}
 		]

--
Gitblit v1.9.1