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

src/api/dialog.js

@@ -9,4 +9,14 @@ export const queryHotQuestionApi = (data) => {
 		method: 'post',
 		data
 	});
+};
+// 获取问答历史 
+
+// 问答反馈 
+export const insertTraAskFeedback = (data) => {
+	return request({
+		url: '/traask/traAskFeedback/insertTraAskFeedback',
+		method: 'post',
+		data
+	});
 };

src/api/examination.js

@@ -12,5 +12,34 @@ export const startTraExamPapersInfo = (data) => {
 		data
 	});
 };
+// 提交试卷
+export const commitPaperExam = (data) => {
+	return request({
+		url: base_url + '/traExamPapers/commitPaperExam',
+		method: 'post',
+		toastErrors: true,
+		data
+	});
+};
+
+// 试卷考试查分
+export const queryPaperExamScore = (data) => {
+	return request({
+		url: base_url + '/traExamPapers/queryPaperExamScore',
+		method: 'post',
+		toastErrors: true,
+		data
+	});
+};
 
 
+// ↓↓↓↓↓↓↓↓↓课程考试↓↓↓↓↓↓↓↓
+
+export const startExamByCrs = (data) => {
+	return request({
+		url: base_url + '/traCrsPapers/startExamByCrs',
+		method: 'post',
+		toastErrors: true,
+		data
+	});
+};

src/api/favorites.js

@@ -0,0 +1,49 @@
+import request from '@/api/request'
+const base_url = '/trastudy'
+
+// 课程收藏分页查询
+export const queryTraPersonalCollectionCrsPaging = (data) => {
+	return request({
+		url: base_url + '/traPersonalCollection/queryTraPersonalCollectionCrsPaging',
+		method: 'post',
+		toastErrors: true,
+		data
+	});
+};
+
+// 任务收藏分页查询
+export const queryTraPersonalCollectionTaskPaging = (data) => {
+	return request({
+		url: base_url + '/traPersonalCollection/queryTraPersonalCollectionTaskPaging',
+		method: 'post',
+		toastErrors: true,
+		data
+	});
+};
+
+// 根据收藏ID删除收藏
+export const deleteTraPersonalCollectionById = (data) => {
+	return request({
+		url: base_url + '/traPersonalCollection/deleteTraPersonalCollectionById',
+		method: 'post',
+		toastErrors: true,
+		data
+	});
+};
+
+
+
+/*
+新增任务收藏
+入参：
+	collectTyp 收藏类型 必须 String 01--课程，02--任务
+	collectBusId 收藏业务ID 必须 String
+**/
+export const insertTraPersonalCollectionTask = (data) => {
+	return request({
+		url: base_url + '/traPersonalCollection/insertTraPersonalCollectionTask',
+		method: 'post',
+		toastErrors: true,
+		data
+	});
+};

src/api/learningTasks.js

@@ -0,0 +1,13 @@
+import request from '@/api/request'
+const base_url = '/trastudy'
+
+// 查询所有、未完成、已完成的任务（分页） 
+export const queryAllTraTaskInfoByUserId = (data) => {
+	return request({
+		url: base_url + '/traTaskInfo/queryAllTraTaskInfoByUserId',
+		method: 'post',
+		toastErrors: true,
+		data
+	});
+};
+

src/api/messageNotification.js

@@ -0,0 +1,34 @@
+import request from '@/api/request'
+const base_url = '/trastudy'
+
+// 查询当前用户的所有消息通知 （分页）
+export const queryTraPersonalMessageNoticePaging = (data) => {
+	return request({
+		url: base_url + '/traPersonalMessageNotice/queryTraPersonalMessageNoticePaging',
+		method: 'post',
+		toastErrors: true,
+		data
+	});
+};
+
+
+// 读取单一消息 
+export const readNotice = (data) => {
+	return request({
+		url: base_url + '/traPersonalMessageNotice/readNotice',
+		method: 'post',
+		toastErrors: true,
+		data
+	});
+};
+
+
+// 一键读取所有消息（不展示） 
+export const oneTimeRead = (data) => {
+	return request({
+		url: base_url + '/traPersonalMessageNotice/oneTimeRead',
+		method: 'post',
+		toastErrors: true,
+		data
+	});
+};

src/api/request.js

@@ -5,16 +5,16 @@ import common from '@/common/common.js'
 
 const ENV = import.meta.env
 
-export const get_base_url = url => {
+export const get_base_url = (url = '') => {
 	if (ENV.MODE === 'development') { // 开发环境
 		// H5必须用非https，手机端必须用https
 		// #ifdef H5
-		return ENV.VITE_APP_BASE_H5_API_Url || ENV.VITE_APP_BASE_API_Url
-		const baseUrl = ENV.VITE_APP_BASE_API_Url
-		if (baseUrl.startsWith('https')) {
-			return baseUrl.replace('https', 'http')
+		if (url) {
+			let _str = (url.split('/')[0] || url.split('/')[1])?.toUpperCase()
+			return ENV[`VITE_APP_BASE_H5_API_Url_${_str}`] || ENV.VITE_APP_BASE_H5_API_Url || ENV.VITE_APP_BASE_API_Url
+		} else {
+			return ENV.VITE_APP_BASE_H5_API_Url || ENV.VITE_APP_BASE_API_Url
 		}
-		return baseUrl
 		// #endif
 		// #ifdef  APP-PLUS
 		return ENV.VITE_APP_BASE_API_Url
@@ -50,7 +50,7 @@ export const goto_login_fun = (from = 'http') => {
 		} else {
 			common.navigateTo('/pages/login/login')
 		}
-		
+
 	}).finally(() => {
 		no_login_show_modal_state = false
 	})
@@ -80,6 +80,8 @@ export default function request({
 		headers_base['summary'] = token // 让每个请求携带令牌
 	}
 	let that = this
+
+
 	return new Promise((resolve, reject) => {
 		uni.request({
 			url: `${baseUrl || base_url}${url}`,

src/api/testingHall.js

@@ -9,4 +9,5 @@ export const queryTraExamPapersPage = (data) => {
 		method: 'post',
 		data
 	});
-};
+};
+

src/api/wrong_question_record.js

@@ -0,0 +1,22 @@
+import request from '@/api/request'
+const base_url = '/traexam'
+
+// 错题本列表页
+export const queryTraMistakesCollectionPaging = (data) => {
+	return request({
+		url: base_url + '/traMistakesCollection/queryTraMistakesCollectionPaging',
+		method: 'post',
+		toastErrors: true,
+		data
+	});
+};
+
+// 错题订正
+export const mistakesCorrect = (data) => {
+	return request({
+		url: base_url + '/traMistakesCollection/mistakesCorrect',
+		method: 'post',
+		toastErrors: true,
+		data
+	});
+};