Merge branch 'release' of http://121.42.41.42:7070/r/epdc-resident-mp-yushan into release

epdc-resident-mp-yushan/pages/toRegister/toRegister.js

@@ -21,7 +21,7 @@ Page({
       }
     })
     let that = this 
-    const versionNum = '1.1.5'
+    const versionNum = '1.2.0'
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag

epdc-resident-mp-yushan/project.config.json

@@ -22,6 +22,7 @@
 			"disablePlugins": [],
 			"outputPath": ""
 		},
+		"useIsolateContext": true,
 		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},