ct

learnOnline/project.config.json

 {
 	"description": "项目配置文件。",
 	"setting": {
-		"urlCheck": true,
+		"urlCheck": false,
 		"es6": true,
 		"postcss": true,
 		"minified": true,
-		"newFeature": true
+		"newFeature": true,
+		"coverView": true,
+		"nodeModules": false,
+		"autoAudits": false,
+		"showShadowRootInWxmlPanel": true,
+		"scopeDataCheck": false,
+		"uglifyFileName": true,
+		"checkInvalidKey": true,
+		"checkSiteMap": true,
+		"uploadWithSourceMap": true,
+		"babelSetting": {
+			"ignore": [],
+			"disablePlugins": [],
+			"outputPath": ""
+		}
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.3.0",

learnOnline/utils/util.js

@@ -144,17 +144,11 @@ const loginApi = (obj, callback) => {
     semester_id = ''
   }
   wx.request({
-<<<<<<< HEAD
-    url: config.URL_PATH + '/user/authorization', 
-    data: { code: obj.code, encrypted_data: obj.encryptedData, iv: obj.iv, course_ids: cids, semester_id: semester_id, class_id: class_id, survey_id: wenti_id, idt: config.tenant }, method: 'POST', header: {
-      tenant: config.tenant
-=======
     url: config.URL_PATH1 + '/user/check-unionid', 
     data: { code: obj.code, encrypted_data: obj.encryptedData, iv: obj.iv }, method: 'POST', header: {
       tenant: config.tenant,
       'version': config.version,
       apikey: 'pP5ECUqRDLDzuh4qRuJro0L1LPgjLP0N'
->>>>>>> master
     }, 
     success: res => {
       if (res.statusCode == 200) {