wangxy 1 month ago
parent
commit
cb0be556c7

+ 12 - 0
api/chanpinShuxue.js

@@ -43,4 +43,16 @@ export function getShuxueChanpinShitiList(data = {}) {
         data,
         timeout: 20000
     })
+}
+
+export function getShuxueChanpinShitiSave(data = {}) {
+    return request({
+        'url': '/app/shuxue/chanpin/shiti/save',
+        headers: {
+            isToken: true
+        },
+        method: 'post',
+        data,
+        timeout: 20000
+    })
 }

+ 1 - 1
pages/chanpinXuanze/components/unitAnswer.vue

@@ -18,7 +18,7 @@
 								<view class="answer-dtjx-row">
 									<view class="answer-title"></view>
 									<!-- 答案解析 -->
-									<view>答案</view>	
+                  <view @click="showJiexiPopup(item)" class="answer-btn"></view>
 								</view>
 								<view class="answer-btn-box" v-if="item.type!=3">
 									<!-- 你的答案 -->

+ 16 - 5
pages/chanpinXuanze/components/useShuxueUnitTest.js

@@ -12,7 +12,7 @@ import {
 } from "@/utils/common.js"
 
 
-export function useShuxueTest(handleSeeResult, handleCheckAnswer) {
+export function useShuxueTest(handleSeeResult,handleSeeResultClose) {
 
 
 	const data = reactive({
@@ -112,7 +112,7 @@ export function useShuxueTest(handleSeeResult, handleCheckAnswer) {
 		uni.showLoading({
 			title: '交卷中...'
 		});
-		const [error, cdata] = await catchError(httpUnit.getExamSubmit({
+		const [error, cdata] = await catchError(httpApi.getShuxueChanpinShitiSave({
 			jieId: data.jieId,
 			shitiList: result
 		}));
@@ -124,8 +124,8 @@ export function useShuxueTest(handleSeeResult, handleCheckAnswer) {
 
 		// 执行跳页
 		uni.$emit('unitShuxueTest-submit', {
-			right: cdata.dui,
-			wrong: cdata.cuo,
+			rightAnswer: cdata.dui,
+			wrongAnswer: cdata.cuo,
 		})
 
 		handleSeeResult()
@@ -136,10 +136,21 @@ export function useShuxueTest(handleSeeResult, handleCheckAnswer) {
 		initPage()
 	})
 
+	function resetStart() {
+		data.list = [];
+		data.total = 0;
+		data.current= 0;
+		data.rightAnswer = 0; // 答对
+		data.wrongAnswer = 0; // 答错
+		handleSeeResultClose();
+		initPage();
+	}
+
 
 	return {
 		data,
 		handleSubmit,
-		updateRightWrong
+		updateRightWrong,
+		resetStart
 	}
 }

+ 14 - 5
pages/chanpinXuanze/unitTest.vue

@@ -69,8 +69,10 @@
 	} from "./components/useShuxueUnitTest.js"
 	const {
 		data,
-		handleSubmit
-	} = useShuxueTest(handleSeeResult, handleCheckAnswer)
+		handleSubmit,
+    updateRightWrong,
+    resetStart
+	} = useShuxueTest(handleSeeResult, handleSeeResultClose)
 
 	const curTiankong = ref(null);
 	const result = ref('');
@@ -78,11 +80,14 @@
 	const uniResRef = ref(null);
 	const uniAnsRef = ref(null);
 
+  function handleSeeResultClose() {
+    uniResRef.value.closePopup()
+  }
 
 	function handleSeeResult() {
 		uniResRef.value.showPopup({
-			right: data.right,
-			wrong: data.wrong
+			right: data.rightAnswer,
+			wrong: data.wrongAnswer
 		})
 	}
 
@@ -93,7 +98,7 @@
 	}
 
 	function onDoReplay() {
-
+    resetStart()
 	}
 
 	function onCheckAnswer() {
@@ -112,6 +117,10 @@
 			const dom = getPopupRef();
 			dom && dom.showPopup();
 		})
+
+    uni.$on('unitShuxueTest-submit',val => {
+      updateRightWrong(val)
+    })
 	})
 
 	function getPopupRef() {