From 73af3ed9fbcc616cdecc739fc4307163c19c5764 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 07 六月 2024 14:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages.json | 266 ++++++++++++++++++++++++++---------------------------
1 files changed, 130 insertions(+), 136 deletions(-)
diff --git a/h5/pages.json b/h5/pages.json
index 0afcd34..72bb9f4 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -111,7 +111,6 @@
"navigationStyle": "custom"
}
},
- // 浼氳瀹�
{
"path": "pages/meeting/index/index",
"style": {
@@ -176,7 +175,6 @@
"navigationBarTitleText": "瀹夋嘲鐗╂祦",
"enablePullDownRefresh": false
}
-
},
{
"path": "pages/staff/visitorReport",
@@ -184,235 +182,230 @@
"navigationBarTitleText": "璁垮鎶ュ",
"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/task/visitorReport",
+ "style": {
+ "navigationBarTitleText": "璁垮鎶ュ",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/staff/task/vDangetAppr",
+ "style": {
+ "navigationBarTitleText": "闅愭偅澶勭悊",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
"path": "pages/staff/vehicle/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/driver/queueUpRecord",
+ "style": {
+ "navigationBarTitleText": "浣滀笟涓溅杈�",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/driver/taskDetail",
+ "style": {
+ "navigationBarTitleText": "浠诲姟璇︽儏",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/driver/reservedDetail",
+ "style": {
+ "navigationBarTitleText": "璁垮瀹℃壒",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/driver/taskConfirm",
+ "style": {
+ "navigationBarTitleText": "纭浠诲姟",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/auth/auth",
+ "style": {
+ "navigationBarTitleText": "寰俊鎺堟潈",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/staffLogin/forgetPsd",
+ "style": {
+ "navigationBarTitleText": "鎵惧洖瀵嗙爜",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/staff/snapshotResult",
+ "style": {
+ "navigationBarTitleText": "闅愭偅闅忔墜鎷�",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/staff/vehicle/applePeo",
+ "style": {
+ "navigationBarTitleText": "閫夋嫨浜哄憳",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/staff/vehicle/sendACarDetail",
+ "style": {
+ "navigationBarTitleText": "鐢ㄨ溅瀹℃壒",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/staff/meetingSel",
+ "style": {
+ "navigationBarTitleText": "閫夋嫨浜哄憳",
+ "enablePullDownRefresh": false
+ }
}
- ,{
- "path" : "pages/driver/queueUpRecord",
- "style" :
- {
- "navigationBarTitleText": "浣滀笟涓溅杈�",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/driver/taskDetail",
- "style" :
- {
- "navigationBarTitleText": "浠诲姟璇︽儏",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/driver/reservedDetail",
- "style" :
- {
- "navigationBarTitleText": "璁垮瀹℃壒",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/driver/taskConfirm",
- "style" :
- {
- "navigationBarTitleText": "纭浠诲姟",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/auth/auth",
- "style" :
- {
- "navigationBarTitleText": "寰俊鎺堟潈",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/staffLogin/forgetPsd",
- "style" :
- {
- "navigationBarTitleText": "鎵惧洖瀵嗙爜",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/staff/snapshotResult",
- "style" :
- {
- "navigationBarTitleText": "闅愭偅闅忔墜鎷�",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/staff/vehicle/applePeo",
- "style" :
- {
- "navigationBarTitleText": "閫夋嫨浜哄憳",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/staff/vehicle/sendACarDetail",
- "style" :
- {
- "navigationBarTitleText": "鐢ㄨ溅瀹℃壒",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/staff/meetingSel",
- "style" :
- {
- "navigationBarTitleText": "閫夋嫨浜哄憳",
- "enablePullDownRefresh": false
- }
-
- }
- ],
- "subPackages": [{
+ ],
+ "subPackages": [
+ {
"root": "n_pages",
- "pages": [{
+ "pages": [
+ {
"path": "login/login",
"style": {
"navigationBarTitleText": "鐧诲綍",
@@ -457,7 +450,8 @@
{
"root": "packagesMine",
"name": "mine",
- "pages": [{
+ "pages": [
+ {
"path": "notice/notice",
"style": {
"navigationBarTitleText": "閫氱煡",
@@ -509,4 +503,4 @@
"backgroundColor": "#ffffff"
},
"uniIdRouter": {}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3