From ccf69ee82f77a2e67a565cec02f95e64324a283f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 15 五月 2024 09:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages.json | 232 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 142 insertions(+), 90 deletions(-)
diff --git a/h5/pages.json b/h5/pages.json
index 97adbe7..efe08e6 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -171,7 +171,7 @@
"navigationBarTitleText": "淇敼瀵嗙爜",
"enablePullDownRefresh": false
}
- },
+ },
{
"path": "pages/staff/index",
"style": {
@@ -179,7 +179,7 @@
"enablePullDownRefresh": false
}
- },
+ },
{
"path": "pages/staff/visitorReport",
"style": {
@@ -187,90 +187,160 @@
"enablePullDownRefresh": false
}
+ }, {
+ "path": "pages/staff/snapshot",
+ "style": {
+ "navigationBarTitleText": "闅愭偅闅忔墜鎷�",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/staff/memberSel",
+ "style": {
+ "navigationBarTitleText": "閫夋嫨浜哄憳",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/staff/meetingSub",
+ "style": {
+ "navigationBarTitleText": "棰勭害浼氳瀹�",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/staff/meetingSubOrder",
+ "style": {
+ "navigationBarTitleText": "纭棰勭害",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/staff/vehicle/index",
+ "style": {
+ "navigationBarTitleText": "鐢ㄨ溅鐢宠",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/staff/vehicle/shinei",
+ "style": {
+ "navigationBarTitleText": "鐢ㄨ溅鐢宠",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/staff/vehicle/apply",
+ "style": {
+ "navigationBarTitleText": "鐢ㄨ溅鐢宠",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/staff/vehicle/shiwai",
+ "style": {
+ "navigationBarTitleText": "鐢ㄨ溅鐢宠",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/staff/task/index",
+ "style": {
+ "navigationBarTitleText": "浠诲姟涓績",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/staff/task/visitorApprove",
+ "style": {
+ "navigationBarTitleText": "璁垮瀹℃壒",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/staff/sendACar",
+ "style": {
+ "navigationBarTitleText": "娲捐溅璁板綍",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/staff/meetingCalendar",
+ "style": {
+ "navigationBarTitleText": "浼氳鏃ュ巻",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/staff/meetingDetail",
+ "style": {
+ "navigationBarTitleText": "浼氳璇︽儏",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/staff/meetingManager",
+ "style": {
+ "navigationBarTitleText": "浼氳瀹ょ鐞�",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/driver/index",
+ "style": {
+ "navigationBarTitleText": "鐗╂祦杞︿腑蹇�",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/driver/reserved",
+ "style": {
+ "navigationBarTitleText": "鍏ュ洯棰勭害",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/driver/reservedGuide",
+ "style": {
+ "navigationBarTitleText": "棰勭害鎸囧崡",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/driver/reservedRecord",
+ "style": {
+ "navigationBarTitleText": "棰勭害璁板綍",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/driver/queueUp",
+ "style": {
+ "navigationBarTitleText": "鎺掗槦鎯呭喌",
+ "enablePullDownRefresh": false
+ }
+
}
,{
- "path" : "pages/staff/snapshot",
+ "path" : "pages/driver/queueUpRecord",
"style" :
{
- "navigationBarTitleText": "闅愭偅闅忔墜鎷�",
+ "navigationBarTitleText": "浣滀笟涓溅杈�",
"enablePullDownRefresh": false
}
}
,{
- "path" : "pages/staff/memberSel",
+ "path" : "pages/driver/taskDetail",
"style" :
{
- "navigationBarTitleText": "閫夋嫨浜哄憳",
+ "navigationBarTitleText": "浠诲姟璇︽儏",
"enablePullDownRefresh": false
}
}
,{
- "path" : "pages/staff/meetingSub",
- "style" :
- {
- "navigationBarTitleText": "棰勭害浼氳瀹�",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/staff/meetingSubOrder",
- "style" :
- {
- "navigationBarTitleText": "纭棰勭害",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/staff/vehicle/index",
- "style" :
- {
- "navigationBarTitleText": "鐢ㄨ溅鐢宠",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/staff/vehicle/shinei",
- "style" :
- {
- "navigationBarTitleText": "鐢ㄨ溅鐢宠",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/staff/vehicle/apply",
- "style" :
- {
- "navigationBarTitleText": "鐢ㄨ溅鐢宠",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/staff/vehicle/shiwai",
- "style" :
- {
- "navigationBarTitleText": "鐢ㄨ溅鐢宠",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/staff/task/index",
- "style" :
- {
- "navigationBarTitleText": "浠诲姟涓績",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/staff/task/visitorApprove",
+ "path" : "pages/driver/reservedDetail",
"style" :
{
"navigationBarTitleText": "璁垮瀹℃壒",
@@ -279,28 +349,10 @@
}
,{
- "path" : "pages/staff/sendACar",
+ "path" : "pages/driver/taskConfirm",
"style" :
{
- "navigationBarTitleText": "娲捐溅璁板綍",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/staff/meetingCalendar",
- "style" :
- {
- "navigationBarTitleText": "浼氳鏃ュ巻",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/staff/meetingDetail",
- "style" :
- {
- "navigationBarTitleText": "浼氳璇︽儏",
+ "navigationBarTitleText": "纭浠诲姟",
"enablePullDownRefresh": false
}
--
Gitblit v1.9.3