解决冲突

wuye-manager-uniapp/pages.json

@@ -1,192 +1,4 @@
 {
-<<<<<<< HEAD
-	"pages": [
-		{
-			"path": "pages/guide/guide",
-			"style": {
-				"navigationBarTitleText": "引导页",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "工作台",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/my/my",
-			"style": {
-				"navigationBarTitleText": "我的",
-				"navigationStyle": "custom"
-			}
-		}
-	],
-	"subPackages": [
-		{
-			"root": "pageSubPack/loginSub",
-			"pages": [
-				{
-					"path": "pwd-login",
-					"style": {
-						"navigationBarTitleText": "账号登录",
-						"navigationStyle": "custom"
-					}
-				},
-			    {
-			        "path": "login",
-			        "style": {
-						"navigationBarTitleText": "手机号登录",
-						"navigationStyle": "custom"
-			          }
-			    },
-				{
-				    "path": "privacy",
-				    "style": {
-						"navigationBarTitleText": "用户隐私政策"
-				      }
-				},
-				{
-				    "path": "register-new-user",
-				    "style": {
-						"navigationBarTitleText": "注册新用户",
-						"navigationStyle": "custom"
-				      }
-				},
-				{
-				    "path": "forget-pwd",
-				    "style": {
-						"navigationBarTitleText": "忘记密码",
-						"navigationStyle": "custom"
-				      }
-				},
-				{
-				    "path": "change-pwd",
-				    "style": {
-						"navigationBarTitleText": "修改密码",
-						"navigationStyle": "custom"
-				      }
-				}
-
-
-			]
-		},
-		{
-			"root": "pageSubPack/notice-list",
-			"pages": [
-				{
-					"path": "select-community",
-					"style": {
-						"navigationBarTitleText": "选择小区"
-					}
-				},
-			    {
-			        "path": "notice-list",
-			        "style": {
-						"navigationBarTitleText": "通知公告"
-			          }
-			    },
-				{
-				    "path": "noticeListDetails",
-				    "style": {
-						"navigationBarTitleText": "公告详情"
-				      }
-				}
-
-			]
-		},
-		{
-			"root": "pageSubPack/oneClickOpen",
-			"pages": [
-				{
-					"path": "oneClickOpen",
-					"style": {
-						"navigationBarTitleText": "一键开门",
-						"navigationStyle": "custom"
-					}
-				}
-			]
-		},
-		{
-			"root": "pageSubPack/report-record",
-			"pages": [
-				{
-					"path": "report-record",
-					"style": {
-						"navigationBarTitleText": "填写维修信息"
-					}
-				},
-				{
-					"path": "repairSelect",
-					"style": {
-						"navigationBarTitleText": "维修项目"
-					}
-				}
-			]
-		},
-		{
-			"root": "pageSubPack/setting",
-			"pages": [
-				{
-					"path": "setting",
-					"style": {
-						"navigationBarTitleText": "设置",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "change-phone",
-					"style": {
-						"navigationBarTitleText": "更改手机号码"
-
-					}
-				},
-				{
-					"path": "change -password",
-					"style": {
-						"navigationBarTitleText": "修改密码"
-
-					}
-				}
-			]
-		}
-
-
-	],
-	  "easycom": {
-	    "autoscan": true,
-	    "custom": {
-	      "^uni-(.*)": "@/components/uni-$1.vue"
-	    }
-	  },
-	"tabBar": {
-		"color": "#333333",
-		"backgroundColor": "#F5F6F6",
-		"borderStyle": "white",
-		"selectedColor": "#666666",
-		"list": [
-			{
-				"pagePath": "pages/index/index",
-				"iconPath": "/static/imgs/index.png",
-				"selectedIconPath": "/static/imgs/index-lan.png",
-				"text": "工作台"
-			},
-			{
-				"pagePath": "pages/my/my",
-				"iconPath": "/static/imgs/my.png",
-				"selectedIconPath": "/static/imgs/my-lan.png",
-				"text": "我的"
-			}
-		]
-	},
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
-	},
-	"uniIdRouter": {}
   "pages": [{
       "path": "pages/guide/guide",
       "style": {
@@ -349,12 +161,6 @@
       "^uni-(.*)": "@/components/uni-$1.vue"
     }
   },
-  "condition": {
-    "list": [{
-      "name": "巡检记录",
-      "path": "pageSubPack/inspection/inspection_record"
-    }]
-  },
   "tabBar": {
     "color": "#333333",
     "backgroundColor": "#F5F6F6",