From 45fb4b11ad51bb38306765b11a6747402e382cee Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 20 Feb 2021 17:37:33 +0800
Subject: [PATCH] fix

---
 hive-app/pages.json |  615 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 600 insertions(+), 15 deletions(-)

diff --git a/hive-app/pages.json b/hive-app/pages.json
index c3309da..aa6dc5f 100644
--- a/hive-app/pages.json
+++ b/hive-app/pages.json
@@ -1,15 +1,6 @@
 {
 	"pages": [
 		{
-			"path": "pages/workbench/index",
-			"style": {
-				"transparentTitle": "always",
-				"app-plus":{ 
-					"scrollIndicator": "none"
-				}
-			}
-		},
-		{
 			"path": "pages/login/index",
 			"style": {
 				"transparentTitle": "always",
@@ -18,9 +9,32 @@
 				}
 			}
 		},
-		
+		{
+			"path": "pages/workbench/index",
+			"style": {
+				"transparentTitle": "always",
+				 "navigationBarTextStyle": "black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
 		{
 			"path": "pages/member/index",
+			"style": {
+				"transparentTitle": "always",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": true,
+				"app-plus":{ 
+					"scrollIndicator": "none",
+					"pullToRefresh": {
+						"color": "#000000"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/manager/index",
 			"style": {
 				"transparentTitle": "always",
 				"app-plus":{ 
@@ -43,6 +57,33 @@
 			"path": "pages/member/membershipCard",
 			"style": {
 				"navigationBarTitleText": "卡项",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/member/skinDetection",
+			"style": {
+				"navigationBarTitleText": "皮肤检测",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"enablePullDownRefresh": true,
+				"app-plus":{ 
+					"scrollIndicator": "none",
+					"pullToRefresh": {
+						"color": "#000000"
+					}
+					
+				}
+			}
+		},
+		{
+			"path": "pages/member/skinDetectionDetail",
+			"style": {
+				"navigationBarTitleText": "皮肤检测详情",
 				"navigationBarBackgroundColor":"#FFFFFF",
 				"navigationBarTextStyle":"black",
 				"app-plus":{ 
@@ -86,6 +127,21 @@
 				"navigationBarTitleText": "知识库",
 				"navigationBarBackgroundColor":"#FFFFFF",
 				"navigationBarTextStyle":"black",
+				"enablePullDownRefresh": true,
+				"app-plus":{ 
+					"scrollIndicator": "none",
+					"pullToRefresh": {
+						"color": "#000000"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/mine/knowledgeDetail",
+			"style": {
+				"navigationBarTitleText": "详情",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
 				"app-plus":{ 
 					"scrollIndicator": "none"
 				}
@@ -97,16 +153,21 @@
 				"navigationBarTitleText": "订单列表",
 				"navigationBarBackgroundColor":"#FFFFFF",
 				"navigationBarTextStyle":"black",
+				"enablePullDownRefresh": true,
 				"app-plus":{ 
 					"scrollIndicator": "none",
+					"pullToRefresh": {
+						"color": "#000000"
+					},
 					"titleNView": {
 						"buttons": [
 							{
-								"text": "\ue600",
+								"text": "\ue620",
 								"fontSrc": "/static/iconfont/iconfont.ttf",
 								"fontSize": "18px",
 								"width":"25px",
-								"float":"right"
+								"float":"right",
+								"key": "add"
 							}
 						]
 					}
@@ -117,6 +178,32 @@
 			"path": "pages/workbench/selectCustomer",
 			"style": {
 				"navigationBarTitleText": "选择客户",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"enablePullDownRefresh": true,
+				"app-plus":{ 
+					"scrollIndicator": "none",
+					"pullToRefresh": {
+						"color": "#000000"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/member/selectCustomer",
+			"style": {
+				"navigationBarTitleText": "选择客户",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/manager/selectEmployee",
+			"style": {
+				"navigationBarTitleText": "选择员工",
 				"navigationBarBackgroundColor":"#FFFFFF",
 				"navigationBarTextStyle":"black",
 				"app-plus":{ 
@@ -136,13 +223,17 @@
 			}
 		},
 		{
-			"path": "pages/workbench/selectProduct",
+			"path": "pages/workbench/selectProduct/index",
 			"style": {
 				"navigationBarTitleText": "当前客户:李某",
 				"navigationBarBackgroundColor":"#FFFFFF",
 				"navigationBarTextStyle":"black",
+				"enablePullDownRefresh": true,
 				"app-plus":{ 
-					"scrollIndicator": "none"
+					"scrollIndicator": "none",
+					"pullToRefresh": {
+						"color": "#000000"
+					}
 				}
 			}
 		},
@@ -167,6 +258,492 @@
 					"scrollIndicator": "none"
 				}
 			}
+		},
+		{
+			"path": "pages/workbench/selectService/index",
+			"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",
+				"enablePullDownRefresh": true,
+				"app-plus":{ 
+					"scrollIndicator": "none",
+					"pullToRefresh": {
+						"color": "#000000"
+					},
+					"titleNView": {
+						"buttons": [
+							{
+								"text": "\ue620",
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								"fontSize": "18px",
+								"width":"25px",
+								"float":"right",
+								"key": "add"
+							}
+						]
+					}
+				}
+			}
+		},
+		{
+			"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":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/member/projectPlan",
+			"style": {
+				"navigationBarTitleText": "项目套餐",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/manager/storeRanking",
+			"style": {
+				"navigationBarTitleText": "门店业绩排行榜",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none",
+					"titleNView": {
+						"buttons": [
+							{
+								"text": "\ue6aa",
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								"fontSize": "16px",
+								"width":"25px",
+								"float":"right"
+							},
+							{
+								"text":"月榜",
+								"fontSize": "14px"
+							}	
+						]
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/manager/counselorRanking",
+			"style": {
+				"navigationBarTitleText": "业绩排行榜",
+				"navigationBarBackgroundColor":"#518EFF",
+				"navigationBarTextStyle":"white",
+				"app-plus":{ 
+					"scrollIndicator": "none",
+					"titleNView": {
+						"buttons": [
+							{
+								"text": "\ue6aa",
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								"fontSize": "16px",
+								"width":"25px"
+							},
+							{
+								"text":"月榜",
+								"fontSize": "14px"
+							}	
+						]
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/member/addLabel",
+			"style": {
+				"navigationBarTitleText": "添加标签",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none",
+					"titleNView": {
+						"buttons": [
+							{
+								"text": "\ue620",
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								"fontSize": "18px",
+								"width":"25px",
+								"float":"right",
+								"key": "add"
+							}
+						]
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/manager/companyReports",
+			"style": {
+				"navigationBarTitleText": "公司经营报表",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"enablePullDownRefresh": true,
+				"app-plus":{ 
+					"scrollIndicator": "none",
+					"pullToRefresh": {
+						"color": "#000000"
+					},
+					"titleNView": {
+						"buttons": [
+							{
+								"text": "\ue663",
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								"fontSize": "16px",
+								"width":"30px"
+							},
+							{
+								"text": "\ue65e",
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								"fontSize": "16px",
+								"width":"25px"
+							}
+						]
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/manager/employeeReport",
+			"style": {
+				"navigationBarTitleText": "员工业绩报表",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"enablePullDownRefresh": true,
+				"app-plus":{ 
+					"scrollIndicator": "none",
+					"pullToRefresh": {
+						"color": "#000000"
+					},
+					"titleNView": {
+						"buttons": [
+							{
+								"text": "\ue663",
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								"fontSize": "16px",
+								"width":"25px",
+								"float":"right"
+							},
+							{
+								"text": "\ue65e",
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								"fontSize": "16px",
+								"width":"25px",
+								"float":"right"
+							}
+						]
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/manager/hint",
+			"style": {
+				"navigationBarTitleText": "提示",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/manager/analyse/index",
+			"style": {
+				"navigationBarTitleText": "专项分析",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none",
+					"titleNView": {
+						"buttons": [
+							{
+								"text": "\ue65e",
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								"fontSize": "16px",
+								"width":"25px",
+								"float":"right"
+							}
+						]
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/stockSearch",
+			"style": {
+				"navigationBarTitleText": "库存查询",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"enablePullDownRefresh": true,
+				"app-plus":{ 
+					"scrollIndicator": "none",
+					"pullToRefresh": {
+						"color": "#000000"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/storeRecord",
+			"style": {
+				"navigationBarTitleText": "出入库记录",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"enablePullDownRefresh": true,
+				"app-plus":{ 
+					"scrollIndicator": "none",
+					"pullToRefresh": {
+						"color": "#000000"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/member/memberProfile",
+			"style": {
+				"navigationBarTitleText": "会员档案",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/board",
+			"style": {
+				"navigationBarTitleText": "看板",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/followRecords/index",
+			"style": {
+				"navigationBarTitleText": "跟进记录",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none",
+					"titleNView": {
+						"buttons": [
+							{
+								"text": "\ue620",
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								"fontSize": "16px",
+								"width":"25px",
+								"float":"right"
+							},
+							{
+								"text": "\ue75e",
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								"fontSize": "16px",
+								"width":"25px",
+								"float":"right"
+							}
+						]
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/login/forgetPassword",
+			"style": {
+				"navigationBarTitleText": "忘记密码",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/login/newPassword",
+			"style": {
+				"navigationBarTitleText": "输入新密码",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/receive",
+			"style": {
+				"navigationBarTitleText": "领用",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/receiveRecord",
+			"style": {
+				"navigationBarTitleText": "产品领用记录",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/confirmReceive",
+			"style": {
+				"navigationBarTitleText": "确认领取",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/mine/myInfo",
+			"style": {
+				"navigationBarTitleText": "我的信息",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/check/index",
+			"style": {
+				"navigationBarTitleText": "盘点",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/check/checkEntry",
+			"style": {
+				"navigationBarTitleText": "盘点录入明细",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/check/checkDetail",
+			"style": {
+				"navigationBarTitleText": "盘点明细查看",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/followRecords/addRecord",
+			"style": {
+				"navigationBarTitleText": "添加跟进记录",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/mine/changePassword",
+			"style": {
+				"navigationBarTitleText": "修改密码",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/workbench/followRecords/orderList",
+			"style": {
+				"navigationBarTitleText": "订单列表",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/member/createLabel",
+			"style": {
+				"navigationBarTitleText": "创建标签",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"navigationBarTextStyle":"black",
+				"app-plus":{ 
+					"scrollIndicator": "none"
+				}
+			}
 		}
 	],
 	"globalStyle": {
@@ -176,6 +753,8 @@
 		"color": "#abb1cc",
 		"selectedColor": "#518EFF",
 		"backgroundColor": "#FFFFFF",
+		"iconWidth": "18px",
+		"spacing": "5px",
 		"list":[
 			{
 			    "pagePath": "pages/workbench/index",
@@ -190,9 +769,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