From 164acabd9e14052cb730826f427ef9d353fd0529 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Mon, 21 Dec 2020 18:06:13 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app
---
hive-app/pages.json | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/hive-app/pages.json b/hive-app/pages.json
index 96bea94..bcddc4f 100644
--- a/hive-app/pages.json
+++ b/hive-app/pages.json
@@ -29,6 +29,15 @@
}
},
{
+ "path": "pages/manager/index",
+ "style": {
+ "transparentTitle": "always",
+ "app-plus":{
+ "scrollIndicator": "none"
+ }
+ }
+ },
+ {
"path": "pages/member/editMember",
"style": {
"navigationBarTitleText": "新增会员",
@@ -54,8 +63,8 @@
"path": "pages/member/skinDetection",
"style": {
"navigationBarTitleText": "皮肤检测",
- "navigationBarBackgroundColor":"#518EFF",
- "navigationBarTextStyle":"white",
+ "navigationBarBackgroundColor":"#FFFFFF",
+ "navigationBarTextStyle":"black",
"app-plus":{
"scrollIndicator": "none"
}
@@ -222,6 +231,39 @@
}
},
{
+ "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": "确认订单",
@@ -265,9 +307,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