diff --git a/src/components/examination/radio-subject-item.vue b/src/components/examination/radio-subject-item.vue
index 5f1b3cf4..0c62edbc 100644
--- a/src/components/examination/radio-subject-item.vue
+++ b/src/components/examination/radio-subject-item.vue
@@ -40,6 +40,7 @@
if (props.analysisVo.correctFlag === 'R') return 'success';
// 是错误答案但是被用户错误选中的为红
const my_answer_array = props.my_answer;
+ console.log('my_answer_array', my_answer_array);
if(my_answer_array.includes(props.analysisVo.itemId) && props.analysisVo.correctFlag === 'E') return 'error';
// 只有被我选中,不知是正确还是错误的为蓝
diff --git a/src/components/examination/subject.vue b/src/components/examination/subject.vue
index 1fbde1e6..a54138f6 100644
--- a/src/components/examination/subject.vue
+++ b/src/components/examination/subject.vue
@@ -109,7 +109,10 @@
get: () => props.modelValue,
set: (val) => emit('update:modelValue', val)
});
- let answerText = props.item?.my_answer;
+ // result.anserResult
+
+ let answerText = props.item?.my_answer || props.item.anserResult || [];
+ console.log('answerText', props.item.anserResult);
const item_answer = ref(typeof answerText === 'string' ? answerText.split(',') : []);
const feedback_click = () => {
emit('subject_click', 'feedback', props.item);
diff --git a/src/components/examination/touchBtn.vue b/src/components/examination/touchBtn.vue
index ae943aac..aa4aea6c 100644
--- a/src/components/examination/touchBtn.vue
+++ b/src/components/examination/touchBtn.vue
@@ -114,11 +114,14 @@
const popupRef = ref(null);
const inputText = ref('');
let startTime = 0;
-
+
// not_started 未开始, preparing 准备中, in_recording 录音中,ending 结束中
const recordingStatus = ref('not_started');
// 获取全局唯一的录音管理器 recorderManager
+
+ // #ifdef APP-PLUS
const recorderManager = uni.getRecorderManager();
+ // #endif
// const innerAudioContext = uni.createInnerAudioContext();
const startTimer = ref(null); // 延迟启动的定时器ID
const startFlag = ref(1);
diff --git a/src/pages/charts/index.vue b/src/pages/charts/index.vue
index 643b8193..64fd530b 100644
--- a/src/pages/charts/index.vue
+++ b/src/pages/charts/index.vue
@@ -103,7 +103,7 @@
{{tableLastName}}
-
+
暂无数据
@@ -330,8 +330,6 @@
allChartsList.value = learnTimeList.value;
chartsList.value = allChartsList.value.annual?allChartsList.value.annual.list:[];
myselfObj.value = allChartsList.value.annual?allChartsList.value.annual.self:{};
- chartsList.value[0].dept = "吉林银行吉林分行"
- myselfObj.value.dept = "吉林银行吉林分行"
console.log(chartsList.value,'chartsList.value')
console.log(myselfObj.value,myselfObj.value,'myselfObj.value')
chartsList.value.forEach(item => item.score = item.annlStdyTmLen);
diff --git a/src/pages/courseDetail/components/introduce.vue b/src/pages/courseDetail/components/introduce.vue
index ecf11866..d3f8c4c4 100644
--- a/src/pages/courseDetail/components/introduce.vue
+++ b/src/pages/courseDetail/components/introduce.vue
@@ -98,7 +98,7 @@
flex-wrap: wrap;
}
.label-item {
- text-align: center;
+ text-align: left;
border-radius: 22rpx;
padding: 2rpx 14rpx;
font-size: 22rpx;
diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue
index 133a1c24..925ea3e8 100644
--- a/src/pages/courseDetail/index.vue
+++ b/src/pages/courseDetail/index.vue
@@ -1,7 +1,7 @@
-
+
@@ -276,7 +276,6 @@
.detail-main {
background-color: #f5f5f5;
position: relative;
- height: 100%;
overflow: hidden;
}
@@ -285,8 +284,6 @@
}
.detail-body {
- box-sizing: border-box;
- // min-height: calc(100vh - 256rpx);
position: absolute;
top: 256rpx;
border-radius: 23rpx 23rpx 0rpx 0rpx;
@@ -303,10 +300,8 @@
.bg_div {
position: fixed;
- width: 100%;
width: calc(100% + 4rpx);
left: -4rpx;
-
.back-image {
width: 100%;
}
@@ -321,7 +316,9 @@
padding-top: 36rpx;
padding-left: 42rpx;
padding-bottom: 24rpx;
- }
+ min-height: 158rpx;
+ justify-content: space-between;
+ }
.title-text {
font-size: 34rpx;
diff --git a/src/pages/courseDetail/submit.vue b/src/pages/courseDetail/submit.vue
index 4869339b..caf62e6b 100644
--- a/src/pages/courseDetail/submit.vue
+++ b/src/pages/courseDetail/submit.vue
@@ -1,6 +1,6 @@
-
+
@@ -24,20 +24,43 @@
综合评分(1-10)
-
+
-
- 建议
-
- 提问
+
+ 建议
+
+
+ 提问
+
-
+
@@ -48,49 +71,55 @@