解决冲突

pages.json

@@ -43,38 +43,29 @@
 				"navigationBarTitleText": "改善任务",
 				"enablePullDownRefresh": false
 			}
-		}
-	    ,{
-            "path" : "pages/home/home",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "个人中心",
-                "enablePullDownRefresh": false
-            }
-            
-<<<<<<< HEAD
-        }
-        ,{
-            "path" : "pages/role-switching/role-switching",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "角色切换",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-=======
-        },
+		},
+		{
+			"path": "pages/home/home",
+			"style": {
+				"navigationBarTitleText": "个人中心",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
-		    "path" : "pages/messages/messages",
-		    "style" : {
-		        "navigationBarTitleText": "消息中心",
-		        "enablePullDownRefresh": false
-		    }
-		    
+			"path": "pages/role-switching/role-switching",
+			"style": {
+				"navigationBarTitleText": "角色切换",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/messages/messages",
+			"style": {
+				"navigationBarTitleText": "消息中心",
+				"enablePullDownRefresh": false
+			}
 		}
->>>>>>> 9ffbc6f6836be68303111dee85ddba6607d8ea09
-    ],
+	],
 	"globalStyle": {
 		"navigationStyle": "custom",
 		"navigationBarTextStyle": "black",

pages/home/home.vue

@@ -47,14 +47,10 @@
 				</view> -->
 			</view>
 		</view>
-<<<<<<< HEAD
 		<view class="logout-box" @click="logOut">
 			<text class="logout-text">退出登录</text>
 		</view>
 		<tm-tabbar :permission="nowPermission" />
-=======
-		<tm-tabbar />
->>>>>>> 9ffbc6f6836be68303111dee85ddba6607d8ea09
 	</view>
 </template>
 
@@ -71,7 +67,7 @@
 				hospName:'',//医院名
 				totalTodo:0,//总待办数
 				pemissionList:[
-					{permission: 1, name: '管理员'}, 
+					{permission: 1, name: '管理员'},
 					{permission: 2, name: '查核组长'},
 					{permission: 3, name: '查核组员'},
 					{permission: 4, name: '单位负责人'},

pages/model.js

@@ -7,11 +7,8 @@ import mission from './mission/model.js';
 export default module = {
   login,
   configure,
-<<<<<<< HEAD
-	home,
-	roleSwitching,
-=======
+  home,
+  roleSwitching,
   messages,
   mission,
->>>>>>> 9ffbc6f6836be68303111dee85ddba6607d8ea09
 }