diff --git a/.env.development b/.env.development
index 797038a3..c16a9575 100644
--- a/.env.development
+++ b/.env.development
@@ -8,7 +8,7 @@ ENV = 'development'
VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
-# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
# VITE_APP_BASE_API_Url = 'http://192.168.247.200'
diff --git a/src/api/analytics.js b/src/api/analytics.js
index a2c4fbaa..ddf205f7 100644
--- a/src/api/analytics.js
+++ b/src/api/analytics.js
@@ -22,6 +22,7 @@ export const queryDimesionInfo = (data) => {
return request({
url: '/traapp/traStudyAnalysis/queryDimesionInfo',
method: 'post',
+ timeout: 60000,
data
});
};
@@ -31,6 +32,7 @@ export const queryHabitInfo = (data) => {
return request({
url: '/traapp/traStudyAnalysis/queryHabitInfo',
method: 'post',
+ timeout: 60000,
data
});
};
@@ -40,6 +42,7 @@ export const querySuggestInfo = (data) => {
return request({
url: '/traapp/traStudyAnalysis/querySuggestInfo',
method: 'post',
+ timeout: 60000,
data
});
};
diff --git a/src/components/points-and-badge/usePointsAndBadge.js b/src/components/points-and-badge/usePointsAndBadge.js
index 2a12ca46..73da4a83 100644
--- a/src/components/points-and-badge/usePointsAndBadge.js
+++ b/src/components/points-and-badge/usePointsAndBadge.js
@@ -58,6 +58,8 @@ export default function usePointsAndBadge() {
badgeRef.value.close();
complete(true, '积分获取成功', res);
});
+ }else{
+ complete(false, '积分接口返回数据异常', res);
}
};
diff --git a/src/pages/analytics/study.vue b/src/pages/analytics/study.vue
index 4ff330f4..67859d6c 100644
--- a/src/pages/analytics/study.vue
+++ b/src/pages/analytics/study.vue
@@ -35,7 +35,7 @@
{{statisticsObj.completeCrsCnt }}
- 次
+
@@ -53,7 +53,7 @@
{{statisticsObj.completeTaskCnt }}
- 次
+
@@ -62,7 +62,7 @@
{{statisticsObj.completedExamCnt }}
- 次
+
diff --git a/src/pages/charts/index.vue b/src/pages/charts/index.vue
index 24483a33..06e22078 100644
--- a/src/pages/charts/index.vue
+++ b/src/pages/charts/index.vue
@@ -103,16 +103,16 @@
chooseTyp: 0,
chooseTypSec: 0,
tagsList:[{
- label: '本周',
- value: 'WEEK',
+ label: '本年',
+ value: 'YEAR',
},{
label: '本月',
value: 'MONTH',
},{
- label: '本年',
- value: 'YEAR',
+ label: '本周',
+ value: 'WEEK',
}],
- activeTag: 'WEEK',
+ activeTag: 'YEAR',
rankList: []
}
},
diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue
index e39f0779..9413450c 100644
--- a/src/pages/course/study.vue
+++ b/src/pages/course/study.vue
@@ -1260,7 +1260,15 @@ const chooseRateNow = item => {
color: #000;
position: sticky;
top: 0;
-
+
+ .top-desc{
+ position: absolute;
+ bottom: -10rpx;
+ font-size: 18rpx;
+ color: #999;
+ left: 50%;
+ transform: translateX(-50%);
+ }
// margin-bottom: 23rpx;
.arrow-icon {
position: absolute;
diff --git a/src/pages/courseDetail/components/introduce.vue b/src/pages/courseDetail/components/introduce.vue
index dcfdf226..d44b2821 100644
--- a/src/pages/courseDetail/components/introduce.vue
+++ b/src/pages/courseDetail/components/introduce.vue
@@ -45,7 +45,7 @@
- 附件
+ 知识资料
{{item.fileName}}
diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index 2608579a..7dcd07a9 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -14,6 +14,7 @@
AI问答
+ 内容由AI生成
-
+
+
+
+
+
+
+
+
+
+
+
@@ -13,7 +24,9 @@
reactive,
onMounted,
nextTick,
- watch
+ watch,
+ unref,
+ computed
} from 'vue';
import {
queryTraListPreviewPaging
@@ -33,6 +46,18 @@
fetchFunction: queryTraListPreviewPaging
});
const props = defineProps(['tabIndex', 'currentIndex']);
+
+
+ const sparringList = computed(() => {
+ return unref(data_list)
+ })
+ const leftsparringList = computed(() => {
+ return sparringList.value.filter((t, index) => index % 2 === 0)
+ })
+ const rightsparringList = computed(() => {
+ return sparringList.value.filter((t, index) => index % 2 === 1)
+ })
+
const toSparringDetail = (item) => {
if (item.traId) {
checkTraPartnerInfoById({
@@ -64,15 +89,34 @@
border-radius: 16rpx;
}
- .sparring-item-box {
+ // .sparring-item-box {
+ // width: 50%;
+ // float: left;
+ // margin-top: 24rpx;
+ // margin-bottom: -24rpx;
+ // // background-color: #f1f1f1;
+ // // margin-bottom: 16rpx;
+ // &:nth-child(2n-1) {
+ // // margin-right: 16rpx;
+ // }
+ // }
+
+ .left-items {
width: 50%;
float: left;
- margin-top: 24rpx;
- margin-bottom: -24rpx;
- // background-color: #f1f1f1;
- // margin-bottom: 16rpx;
- &:nth-child(2n-1) {
- // margin-right: 16rpx;
- }
+ overflow: hidden;
+ }
+
+ .right-items {
+ width: 50%;
+ float: left;
+ overflow: hidden;
+ }
+
+ .sparring-item-box {
+ // width: 50%;
+ width: 100%;
+ float: left;
+
}
\ No newline at end of file
diff --git a/src/pages/search/result.vue b/src/pages/search/result.vue
index d1997ca3..a9949916 100644
--- a/src/pages/search/result.vue
+++ b/src/pages/search/result.vue
@@ -185,7 +185,7 @@
onLoad(params => {
inputValue.value = params.searchName
fromType.value = params.from
- pageInfo.value.limit = fromType.value === 'course' ? 20 : 3
+ pageInfo.value.limit = ['course','sparring'].includes(fromType.value) ? 20 : 3
})
onShow(() => {
search()
@@ -326,6 +326,9 @@
case 'course':
pageInfo.value.limit = 20
break
+ case 'sparring':
+ pageInfo.value.limit = 20
+ break
case 'task':
pageInfo.value.limit = 20
break
diff --git a/src/pages/sparring/components/answer.vue b/src/pages/sparring/components/answer.vue
index 68b93536..52a6db88 100644
--- a/src/pages/sparring/components/answer.vue
+++ b/src/pages/sparring/components/answer.vue
@@ -164,6 +164,7 @@
setTimeout(() => {
talkVoiceObj.value.src = itemVoice.value;
if (voiceIsPlaying.value) return
+ if(unref(dataInfo)?.id !== props.activeVoiceId) return
talkVoiceObj.value.play();
}, 100);
} else {
@@ -185,6 +186,7 @@
itemVoice.value = url;
talkVoiceObj.value.src = url;
if (voiceIsPlaying.value) return
+ if(unref(dataInfo)?.id !== props.activeVoiceId) return
talkVoiceObj.value.play();
} else {
downloadVoiceFile(_url)
@@ -197,6 +199,7 @@
itemVoice.value = res.tempFilePath;
talkVoiceObj.value.src = res.tempFilePath;
if (voiceIsPlaying.value) return
+ if(unref(dataInfo)?.id !== props.activeVoiceId) return
talkVoiceObj.value.play();
storageStore.setStorage('audio', _url + _params.teachNo, itemVoice.value);
})
@@ -260,6 +263,7 @@
() => props.dataInfo,
(val) => {
if (val.execLogId && isStudy.value) {
+ if(unref(dataInfo)?.id !== props.activeVoiceId) return
playVoice()
}
}, {
diff --git a/src/pages/sparring/components/question.vue b/src/pages/sparring/components/question.vue
index 886858e2..d9b1e7d4 100644
--- a/src/pages/sparring/components/question.vue
+++ b/src/pages/sparring/components/question.vue
@@ -13,7 +13,7 @@
-
+
{
// talkUserVoiceObj.value.src = itemVoice.value
talkUserVoiceObj.value.play()
+ isPlaying.value = true
}, 300)
return
} else {
@@ -137,7 +138,7 @@
isTesting.value = true
talkUserVoiceObj.value.volume = 0
talkUserVoiceObj.value.play()
- talkUserVoiceObj.value.pause()
+ // talkUserVoiceObj.value.pause()
}
// #endif
setTimeout(() => {
@@ -171,6 +172,21 @@
deep: true,
immediate: true
})
+ watch(
+ () => props.activeVoiceId,
+ (val) => {
+ if (val !== props.dataInfo.id) {
+ if (isPlaying.value) {
+ isPlaying.value = false
+ if (!talkUserVoiceObj.value) return
+ talkUserVoiceObj.value.pause()
+ }
+ }
+ }, {
+ deep: true,
+ immediate: true
+ }
+ )