diff --git a/.env.development b/.env.development
index 015f8308..5c9bc531 100644
--- a/.env.development
+++ b/.env.development
@@ -27,4 +27,4 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
#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.138:9602'
diff --git a/certificate/ios/jiaixuedev.mobileprovision b/certificate/ios/jiaixuedev.mobileprovision
index e3cc651a..f72974ab 100644
Binary files a/certificate/ios/jiaixuedev.mobileprovision and b/certificate/ios/jiaixuedev.mobileprovision differ
diff --git a/src/components/examination/subject.vue b/src/components/examination/subject.vue
index 9ba4b667..2700e9d6 100644
--- a/src/components/examination/subject.vue
+++ b/src/components/examination/subject.vue
@@ -2,7 +2,7 @@
{{ subject_type_text }}
- {{ item.tgtGrade }}分
+ {{ item.tgtGrade }}分
@@ -14,9 +14,9 @@
>
-
+
展开
-
+
@@ -52,18 +52,15 @@
确定
-
+
正确答案：{{ correctResultLabel.join('') }}
-
你的答案：
- {{ myResultLabel.join('') }}
+ {{ myResultLabel.join('') }}
-
- 题目解析：{{subject_data?.analyContent}}
-
+ 题目解析：{{ subject_data?.analyContent }}
@@ -79,7 +76,7 @@
border: '1rpx solid rgb(12, 123, 245)'
};
- const emit = defineEmits(['subject_click']);
+ const emit = defineEmits(['subject_click', 'update:modelValue']);
const props = defineProps({
modelValue: {
type: Array,
@@ -93,8 +90,8 @@
type: String,
required: true,
validator: (value) => {
- // 考试: examination 练习: practice 错题本: mistake 学习: study
- return ['examination', 'practice', 'mistake', 'study'].includes(value);
+ // 考试: examination 练习: practice 错题本: mistake 学习: study 考试结算页 settlement
+ return ['examination', 'practice', 'mistake', 'study', 'settlement'].includes(value);
}
},
// 是否预览模式
@@ -106,13 +103,13 @@
clearResult: {
type: Boolean,
default: true
- },
+ }
});
const modelValue = computed({
get: () => props.modelValue,
set: (val) => emit('update:modelValue', val)
});
- let answerText = props.item?.my_answer
+ let answerText = props.item?.my_answer;
const item_answer = ref(typeof answerText === 'string' ? answerText.split(',') : []);
const feedback_click = () => {
emit('subject_click', 'feedback', props.item);
@@ -131,12 +128,18 @@
const anserResultArray = props.item.anserResult.split(',');
return subject_data.itemVos.filter((res) => anserResultArray.includes(res.itemId)).map((res) => res.itemNo);
});
+ // 判断选项是否完全正确
+ const right_or_wrong_class = computed(
+ () =>
+ correctResultLabel.value.length === myResultLabel.value.length &&
+ myResultLabel.value.every((res) => correctResultLabel.value.includes(res))
+ );
const subject_data = reactive({
qnsId: props.item.qnsId,
qnsContent: props.item.qnsContent,
qnsTyp: props.item.qnsTyp,
analyContent: props.item.analyContent,
- itemVos: (props.item.itemVos??[]).map((res) => ({
+ itemVos: (props.item.itemVos ?? []).map((res) => ({
...res,
correctFlag: props.clearResult ? '' : res.correctFlag
}))
@@ -213,18 +216,20 @@
justify-content: space-between;
align-items: center;
margin: 32rpx 0 28rpx 0;
-
+
.success_answer {
}
-
+
.your_answer {
- }
-
- .red_color {
- color: #f5212d;
+ .success {
+ color: #15b859;
+ }
+ .error {
+ color: #f5212d;
+ }
}
}
-
+
.analysis_note {
font-family: PingFangSC;
font-weight: 500;
@@ -273,11 +278,13 @@
.right_text {
font-family: PingFangSC;
- font-weight: 600;
+ font-weight: 400;
font-size: 28rpx;
- color: #333;
+ color: #333333;
+ line-height: 40px;
text-align: left;
font-style: normal;
+
}
}
}
diff --git a/src/pages/charts/index.vue b/src/pages/charts/index.vue
index a88a0cc2..643b8193 100644
--- a/src/pages/charts/index.vue
+++ b/src/pages/charts/index.vue
@@ -112,7 +112,7 @@
{{index + 4}}
+ :class="item.userId == userId?'active-rank-sty':'rank-sty'">{{item.position}}
@@ -186,16 +186,16 @@
import common from '@/common/common';
const userId = ref("");
const itemIndex = ref(0);
- const learnTimeList = ref([])
- const practCntList = ref([])
- const examCntList = ref([])
- const crsCntList = ref([])
+ const learnTimeList = ref({})
+ const practCntList = ref({})
+ const examCntList = ref({})
+ const crsCntList = ref({})
const myselfObj = ref({})
const tableLastName = ref("学习时长(h)");
const taskRef = ref(null);
const tabAct = ref(0);
const tabDateAct = ref(0);
- const allChartsList = ref([]);
+ const allChartsList = ref({});
const newChartsList = ref([]);
const tabList = ref([{
name: '学习时长'
@@ -326,7 +326,7 @@
onMounted(() => {
getLeaderBoardStdyTmApi().then(res => {
console.log(res, 'getLeaderBoardStdyTmApi')
- learnTimeList.value = res.body || [];
+ learnTimeList.value = res.body || {};
allChartsList.value = learnTimeList.value;
chartsList.value = allChartsList.value.annual?allChartsList.value.annual.list:[];
myselfObj.value = allChartsList.value.annual?allChartsList.value.annual.self:{};
@@ -345,17 +345,17 @@
})
getLeaderBoardPractCntApi().then(res => {
console.log(res, 'getLeaderBoardPractCntApi')
- practCntList.value = res.body || [];
+ practCntList.value = res.body || {};
console.log(practCntList.value, 'practCntList')
})
getLeaderBoardExamCntApi().then(res => {
console.log(res, 'getLeaderBoardExamCntApi')
- examCntList.value = res.body || [];
+ examCntList.value = res.body || {};
console.log(examCntList.value, 'examCntList')
})
getLeaderBoardCrsCntApi().then(res => {
console.log(res, 'getLeaderBoardCrsCntApi')
- crsCntList.value = res.body || [];
+ crsCntList.value = res.body || {};
console.log(crsCntList.value, 'crsCntList')
})
@@ -665,20 +665,24 @@
.rank-content-backgound-color1 {
margin-top: 32rpx;
width: 206rpx;
- height: 418rpx;
+ // height: 418rpx;
+ padding-bottom: 20rpx;
background-color: #E8F3FF;
+ padding-bottom: 10rpx;
}
.rank-content-backgound-color2 {
width: 220rpx;
- height: 432rpx;
+ // height: 432rpx;
+ padding-bottom: 20rpx;
background: linear-gradient(180deg, #FEEFB7 0%, #FADB66 100%);
}
.rank-content-backgound-color3 {
margin-top: 42rpx;
width: 206rpx;
- height: 418rpx;
+ // height: 418rpx;
+ padding-bottom: 20rpx;
background: linear-gradient(180deg, #FCDAB7 0%, #F9B16C 100%);
}
}
@@ -690,7 +694,10 @@
:deep(.uni-table) {
min-width: 0 !important;
}
-
+ :deep(.uni-list--border-top) {
+ display: none;
+ }
+
.rank-uni-sty {
font-weight: 400;
font-size: 26rpx;
diff --git a/src/pages/examination/index.vue b/src/pages/examination/index.vue
index 58e71bee..f0da6b7e 100644
--- a/src/pages/examination/index.vue
+++ b/src/pages/examination/index.vue
@@ -296,8 +296,8 @@
// 交卷按钮点击，打开交卷确认框
const hand_in_paper_button_click = () => {
console.log('点击交卷', paperData);
- console.log('点击交卷topicList', topicList);
- return;
+ // console.log('点击交卷topicList', topicList);
+ // return;
// 判断是否完成所有题目
const completeList = topicList
.filter((res) => !!(Array.isArray(res.my_answer) ? res.my_answer.length : res.my_answer))
diff --git a/src/pages/examination/result.vue b/src/pages/examination/result.vue
index 234a4913..0c9a0bf9 100644
--- a/src/pages/examination/result.vue
+++ b/src/pages/examination/result.vue
@@ -3,7 +3,7 @@
考试结算
-
+
@@ -116,25 +116,8 @@
你的等待会有更精确的结果，要耐心哦~
-
-
-
-
+
@@ -145,6 +128,8 @@
import { onLoad } from '@dcloudio/uni-app';
import { ref, reactive, computed, onMounted, nextTick, getCurrentInstance } from 'vue';
import { queryPaperExamScore } from '@/api/examination.js';
+ import Subject from '@/components/examination/subject.vue';
+ import common from '@/common/common';
const pass_status = ref(0);
const sheet_swiper_index = ref(0);
const result = reactive({
diff --git a/src/pages/learningTasks/components/list-item.vue b/src/pages/learningTasks/components/list-item.vue
index b5b49f9e..f1d07fc0 100644
--- a/src/pages/learningTasks/components/list-item.vue
+++ b/src/pages/learningTasks/components/list-item.vue
@@ -4,7 +4,7 @@
- 进行中
+ 未完成
已完成
@@ -147,7 +147,7 @@
}
.blod_color {
- color: #0066ff;
+ color: #333333;
}
}
@@ -223,6 +223,7 @@
flex-wrap: nowrap;
height: 23rpx;
overflow: hidden;
+
}
.people_progress_div {
diff --git a/src/pages/learningTasks/details.vue b/src/pages/learningTasks/details.vue
index 587bab39..0675ef69 100644
--- a/src/pages/learningTasks/details.vue
+++ b/src/pages/learningTasks/details.vue
@@ -69,32 +69,38 @@
- 进行中
- 已完成
- 未解锁
+ 进行中
+ 已完成
+ 未解锁
- {{item.crsName}}
+ {{ item.crsName }}
-
+
暂无通过条件，可自动解锁
-
+
完成练习
-
-
- 通过考试
-
+
+
+ 通过考试
+
+
@@ -102,7 +108,7 @@