Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

src/api/common.js

@@ -79,15 +79,7 @@ export function previewFile(id, responseType = 'arraybuffer') {
 			header,  
 			responseType,
 			success(result) {  
-				//#ifdef APP-PLUS
-				let _header = result.header['Content-Type'].split(';')[0]
-				// #endif
-				//#ifndef APP-PLUS
-				let _header = result.header['content-type'].split(';')[0]
-				// #endif
-				// let base64 = new Blob([result.data],{type:result.header['content-type'].split(';')[0]})
-				let base64 = `data:${_header};base64,` + uni.arrayBufferToBase64(result.data)
-				resolve(base64)
+				resolve(result)
 			},  
 			fail(error) {    
 				reject(new Error(error));  

src/api/course.js

@@ -1,6 +1,8 @@
 import request from '@/api/request'
 
 const base_url = '/traapp'
+const course_base_url = '/trastudy'
+
 
 // 获取课程分类树接口
 export const getCourseTypeListApi = (data) => {
@@ -29,7 +31,7 @@ export const getTraTagListApi = (data) => {
 //  全部模块
 export const queryCrsInfoByCatalogApi = (data) => {
 	return request({
-		url: base_url + '/crsInfo/queryCrsInfoByCatalog',
+		url: course_base_url + '/crsInfo/queryCrsInfoByCatalog',
 		method: 'post',
 		data
 	});
@@ -37,7 +39,7 @@ export const queryCrsInfoByCatalogApi = (data) => {
 //  生产线模块-
 export const queryCrsInfoByPrdLineApi = (data) => {
 	return request({
-		url: base_url + '/crsInfo/queryCrsInfoByPrdLine',
+		url: course_base_url + '/crsInfo/queryCrsInfoByPrdLine',
 		method: 'post',
 		data
 	});
@@ -45,7 +47,7 @@ export const queryCrsInfoByPrdLineApi = (data) => {
 //  最新
 export const queryCrsInfoByLastnewApi = (data) => {
 	return request({
-		url: base_url + '/crsInfo/queryCrsInfoByLastnew',
+		url: course_base_url + '/crsInfo/queryCrsInfoByLastnew',
 		method: 'post',
 		data
 	});
@@ -53,7 +55,7 @@ export const queryCrsInfoByLastnewApi = (data) => {
 // 最热 
 export const queryCrsInfoByPopularApi = (data) => {
 	return request({
-		url: base_url + '/crsInfo/queryCrsInfoByPopular',
+		url: course_base_url + '/crsInfo/queryCrsInfoByPopular',
 		method: 'post',
 		data
 	});
@@ -61,7 +63,7 @@ export const queryCrsInfoByPopularApi = (data) => {
 // 推荐
 export const queryCrsInfoByRecmdApi = (data) => {
 	return request({
-		url: base_url + '/crsInfo/queryCrsInfoByRecmd',
+		url: course_base_url + '/crsInfo/queryCrsInfoByRecmd',
 		method: 'post',
 		data
 	});

src/api/study.js

@@ -0,0 +1,12 @@
+import request from '@/api/request'
+
+const base_url = '/trastudy'
+
+// 获取课程分类树接口
+export const getCourseStudyInfoApi = (data) => {
+	return request({
+		url: base_url + '/traStdyInfo/queryTraStdyProgressAndTeacher',
+		method: 'post',
+		data
+	});
+};