1326

app.json

@@ -50,12 +50,6 @@
         "iconPath": "images/tabBar004.png",
         "pagePath": "pages/me/me",
         "text": "我的"
-      },
-      {
-        "selectedIconPath": "images/tabBar014.png",
-        "iconPath": "images/tabBar004.png",
-        "pagePath": "pages/login/login",
-        "text": "login"
       }
     ]
   },

project.config.json

@@ -26,6 +26,7 @@
 			"disablePlugins": [],
 			"outputPath": ""
 		},
+<<<<<<< HEAD
 <<<<<<< HEAD
 		"useIsolateContext": true,
 		"useCompilerModule": false,
@@ -36,6 +37,11 @@
 		"compileHotReLoad": false,
 		"useIsolateContext": true
 >>>>>>> 76272386d7c64b0315ecebaf5fac3f49a65ad141
+=======
+		"useIsolateContext": true,
+		"useCompilerModule": true,
+		"userConfirmedUseCompilerModuleSwitch": false
+>>>>>>> 1163b2e6643b126c4a73124d4ec61326928d3315
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.11.1",