wangxy 7 月之前
父节点
当前提交
b083d4642f
共有 4 个文件被更改,包括 38 次插入30 次删除
  1. 12 0
      api/catalogue.js
  2. 12 0
      api/unitTest.js
  3. 9 16
      components/catalogue/useCatalogue.js
  4. 5 14
      pages/unitTest/useUnit.js

+ 12 - 0
api/catalogue.js

@@ -0,0 +1,12 @@
+import request from '@/utils/request'
+export function getCatalogue(data = {}) {
+	return request({
+		url: "/common/zhangjie/list",
+		headers: {
+			isToken: true
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}

+ 12 - 0
api/unitTest.js

@@ -0,0 +1,12 @@
+import request from '@/utils/request'
+export function getExamData(data = {}) {
+	return request({
+		url: "/common/zhangjie/list",
+		headers: {
+			isToken: true
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}

+ 9 - 16
components/catalogue/useCatalogue.js

@@ -6,8 +6,10 @@ import {
 import {
 	onLoad
 } from '@dcloudio/uni-app'
-import request from "@/utils/request.js"
-import {catchError} from "@/utils/common.js"
+import {
+	catchError
+} from "@/utils/common.js"
+import * as httpCatalogue from "@/api/catalogue.js"
 
 export function useCatalogue() {
 	const data = reactive({
@@ -25,19 +27,11 @@ export function useCatalogue() {
 	})
 
 
-	function httpGetCatalogue() {
-		return request({
-			url: "/common/zhangjie/list",
-			method: "POST",
-			data: {
-				nianji: +data.nianji,
-				xueqi: +data.xueqi
-			}
-		})
-	}
-
 	async function getCatalogue() {
-		return await catchError(httpGetCatalogue());
+		return await catchError(httpCatalogue.getCatalogue({
+			nianji: +data.nianji,
+			xueqi: +data.xueqi
+		}));
 	}
 
 	return {
@@ -46,5 +40,4 @@ export function useCatalogue() {
 		// 获取章节数据
 		getCatalogue
 	}
-}
-
+}

+ 5 - 14
pages/unitTest/useUnit.js

@@ -13,19 +13,7 @@ import {
 	catchError,
 	toast
 } from "@/utils/common.js"
-import request from "@/utils/request.js"
-
-// 获取单元测试数据
-function httpGetExamData() {
-	return request({
-		url: "/common/zhangjie/list",
-		method: "POST",
-		data: {
-			nianji: 1,
-			xueqi: 1
-		}
-	})
-}
+import * as httpUnit from "@/api/unitTest.js"
 
 function useJifen() {
 	const data = reactive({
@@ -94,7 +82,10 @@ export function useExam(dom) {
 
 	// 初始化页面数据
 	async function initPage() {
-		const [err, data] = await catchError(httpGetExamData());
+		const [err, data] = await catchError(httpUnit.getExamData({
+			nianji: 1,
+			xueqi: 1
+		}));
 		if (err) {
 			toast("单元测试数据获取异常");
 			return;