:twisted_rightwards_arrows: Merge branch 'dev_base' into online_school

src/util/API/AJAXHelper.js

@@ -61,6 +61,7 @@ class AJAXHelper {
 		xmlHttpReq.setRequestHeader('eid', eid);
 		xmlHttpReq.setRequestHeader('uid', uid);
 		xmlHttpReq.setRequestHeader('sign', sign);
+		xmlHttpReq.setRequestHeader('merchant', 'baby');
 		xmlHttpReq.setRequestHeader('terminal', platform);
 		xmlHttpReq.setRequestHeader('merchant','school');
 		xmlHttpReq.setRequestHeader('requestId', requestId);

src/util/API/APIClient.js

@@ -66,15 +66,16 @@ class APIClient {
 		AJAXHelper.get('/recommend/courses', params, callback);
 	}
 
-	// 获取标签组下的标签列表
+	// 获取标签组下的标签列表(标签组概念已去除，改用标签类型)
 	static getTagListByGroupCode(type, callback) {
 		const typeToCode = {
-			'RESOURCE': 'SCHOOL_RESOURCE',
-			'TRAINING': 'SCHOOL_TRAINING',
-			'PERIPHERY': 'SCHOOL_SUPPORT',
+			'RESOURCE': 'RESOURCE',
+			'TRAINING': 'TRAINING',
+			'PERIPHERY': 'SUPPORT',
 		};
 		let params = APIClient.addCacheParam({});
-		AJAXHelper.get(`/tagGroup/${typeToCode[type]}`, params, callback);
+		//AJAXHelper.get(`/tagGroup/${typeToCode[type]}`, params, callback);
+		AJAXHelper.get(`/tagType/${typeToCode[type]}`, params, callback);
 	}
 
 	// 获取标签下的课程/配套列表