From 24f17cb2b4db33b79bbd69b5342cf7dc7c2cdd35 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 03 Aug 2021 14:39:32 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_app

---
 pages.json |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/pages.json b/pages.json
index 74c1c38..de0edcc 100644
--- a/pages.json
+++ b/pages.json
@@ -3,6 +3,13 @@
 		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [{
+			"path": "pages/home/home",
+			"style": {
+				"navigationBarTitleText": "首页",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		}, {
 			"path": "pages/login/login-account",
 			"style": {
 				"navigationBarTitleText": "登录",
@@ -21,14 +28,16 @@
 				// 	"animationDuration": 300
 				// }
 			}
-		}, {
-			"path": "pages/home/home",
-			"style": {
-				"navigationBarTitleText": "首页",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		}, {
+		}, 
+		// {
+		// 	"path": "pages/home/home",
+		// 	"style": {
+		// 		"navigationBarTitleText": "首页",
+		// 		"enablePullDownRefresh": false,
+		// 		"navigationStyle": "custom"
+		// 	}
+		// },
+		{
 			"path": "pages/service/service",
 			"style": {
 				"navigationBarTitleText": "服务",
@@ -328,7 +337,16 @@
 				"navigationStyle": "custom"
 			}
 		}
-	],
+	    ,{
+            "path" : "pages/videoCall/videoCall",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "视频通话",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "",

--
Gitblit v1.9.3