解决冲突

a725c271 · kyle · d7c19291 · a725c271
Commit a725c271 authored Nov 24, 2022 by kyle
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 10 deletions

pages.json
+7 -10

No files found.
--- a/pages.json
+++ b/pages.json
@@ -345,10 +345,7 @@
                "enablePullDownRefresh": false
            }
-        }
+        } ,{
-        ,{
            "path" : "pages/dropLists/dropLists",
            "style" :                                                                                    
            {
@@ -366,7 +363,7 @@
            }
        },
-		,{
+		{
 		    "path" : "pages/personalCenter/system/accontsetting",
 		    "style" :                                                                                    
 		    {
@@ -375,7 +372,7 @@
 		    }
 		},
-		,{
+		{
 		    "path" : "pages/personalCenter/accountoperation/phonebinding",
 		    "style" :                                                                                    
 		    {
@@ -384,7 +381,7 @@
 		    }
 		},
-		,{
+		{
 		    "path" : "pages/personalCenter/accountoperation/resetpassword",
 		    "style" :                                                                                    
 		    {
@@ -393,7 +390,7 @@
 		    }
 		},
-		,{
+		{
 		    "path" : "pages/personalCenter/accountoperation/aboutcffp",
 		    "style" :                                                                                    
 		    {
@@ -402,7 +399,7 @@
 		    }
 		},
-		,{
+		{
 		    "path" : "pages/certifyDetail/uploadinformation",
 		    "style" :                                                                                    
 		    {
@@ -410,7 +407,7 @@
 		        "enablePullDownRefresh": false
 		    }
-		},
+		}
    ],
 	// "tabBar": {
 	//         "color": "#7A7E83", // tab 上的文字默认颜色