处理page.json冲突

pages.json

@@ -389,8 +389,11 @@
         },
         {
             "path": "pages/im/private/index",
+            "name": "imPrivate",
             "style": {
-                "navigationBarTitleText": "单聊",
+                "navigationBarTitleText": "聊天",
+                "navigationBarBackgroundColor": "#FFFFFF",
+                "disableScroll": true,
                 "app-plus": {
                     "titleNView": {
                         "type": "default",
@@ -408,36 +411,42 @@
         },
         {
             "path": "pages/im/private/setting",
+            "name": "imPrivateSetting",
             "style": {
                 "navigationBarTitleText": "设置"
             }
         },
         {
             "path": "pages/im/friends/index",
+            "name": "imFriends",
             "style": {
                 "navigationBarTitleText": "我的好友"
             }
         },
         {
             "path": "pages/im/friends/pending",
+            "name": "imFriendsPending",
             "style": {
                 "navigationBarTitleText": "新的朋友"
             }
         },
         {
             "path": "pages/im/friends/info",
+            "name": "imFriendsInfo",
             "style": {
                 "navigationBarTitleText": ""
             }
         },
         {
             "path": "pages/im/friends/mine",
+            "name": "imFriendsMine",
             "style": {
                 "navigationBarTitleText": "我的资料"
             }
         },
         {
             "path": "pages/im/group/index",
+            "name": "imGroup",
             "style": {
                 "navigationBarTitleText": "我的群聊"
             }