diff --git a/.env.development b/.env.development
index 79a42a14..f47e4ae9 100644
--- a/.env.development
+++ b/.env.development
@@ -19,12 +19,14 @@ VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
# h5专用地址x2
-VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
-# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
+
+# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
+#VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601'
-# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
+#VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
+
# VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue
index eeb28782..3de74b76 100644
--- a/src/pages/courseDetail/index.vue
+++ b/src/pages/courseDetail/index.vue
@@ -225,7 +225,7 @@
name: form.value.crsName,
crsId: crsId.value
});
- common.navigateTo('/pages/practice/index');
+ common.navigateTo('/pages/practice/index?examStat='+form.value.examStat);
})
.finally(() => {
common.hideLoading();
diff --git a/src/pages/practice/index.vue b/src/pages/practice/index.vue
index fb3099b6..be67ffb1 100644
--- a/src/pages/practice/index.vue
+++ b/src/pages/practice/index.vue
@@ -1,787 +1,759 @@
-
-
-
-
- {{ paperData.name }}
-
-
-
-
-
-
-
-
- 当前题目/总题数
- {{ questionNumber + 1 }}
- /{{ storageTopicList.length }}
-
-
- 练习时长
-
- {{ formatSeconds(practiceTime) }}
-
-
-
+
+
+
+
+ {{ paperData.name }}
+
+
+
+
+
+
+
+
+ 当前题目/总题数
+ {{ questionNumber + 1 }}
+ /{{ storageTopicList.length }}
+
+
+ 练习时长
+
+ {{ formatSeconds(practiceTime) }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/practice/result.vue b/src/pages/practice/result.vue
index b7e5b847..107e36d3 100644
--- a/src/pages/practice/result.vue
+++ b/src/pages/practice/result.vue
@@ -86,6 +86,8 @@
};
// 去考试
const goto_examination = async () => {
+ // if (examStat.value.examStat === '01') return common.msg('该课程下暂无试题');
+ if (examStat.value === '02') return common.msg('该课程下的试题未设置考试规则');
if (loading.value !== '') return;
try {
loading.value = '01';
@@ -125,13 +127,17 @@
const exrId = ref('')
const examLenTm = ref('')
const stat = ref('')
+ const examStat = ref('')
const commit = ref(false)
onLoad((e) => {
+ console.log('xx23333');
crsId.value = e.crsId
name.value = e.name
exrId.value = e.exrId
examLenTm.value = e.examLenTm
stat.value = e.stat
+ examStat.value = e.examStat??''
+ console.log('xxxx111');
practiceCommitFun()
});
const practiceCommitFun = () => {