diff --git a/src/components/image-preview/video-preview.vue b/src/components/image-preview/video-preview.vue
index 3eb87594..c48b36c5 100644
--- a/src/components/image-preview/video-preview.vue
+++ b/src/components/image-preview/video-preview.vue
@@ -9,7 +9,14 @@
-
+
@@ -57,6 +64,10 @@
methods: {
playError(info){
console.log('err:',info)
+ this.$refs.playerRef.stop();
+ },
+ playEnded(){
+ this.$refs.playerRef.stop();
},
getPreviewUrlBlob(id) {
if (!id) {
diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue
index 081cf3b1..f7875d56 100644
--- a/src/pages/course/components/talkingItem.vue
+++ b/src/pages/course/components/talkingItem.vue
@@ -10,924 +10,938 @@
8 问题反馈信息
9 已学完当前知识点反馈信息
-->
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{ teacherInfo?.teacherName }}
+ {{teacherInfo?.teacherDesc}}
+
-
- {{ teacherInfo?.teacherName }}
- {{teacherInfo?.teacherDesc}}
+
+
+
+
+
+
+
+
+
+
+
+ 参考答案:{{ dataInfo.itemAnswer }}
+
+
+
+
+
+
+
+
+
+ {{type === 5?'试题解析:':''}}{{ showContent }}
+
+ 问答题
+
+
+ {{ showContent }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 举例:{{ dataInfo.exampie }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 重新学
+
+
+
+ 重新答
+
+
+
+ 继续学
+
+
+ 继续
+
+
+
+
+
+ {{ changeBr(dataInfo.suggestContent || '--') }}
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+ {{ teacherInfo?.teacherName }}
+ {{teacherInfo?.teacherDesc}}
+
-
-
-
-
-
- 参考答案:{{ dataInfo.itemAnswer }}
+
+
+
+ {{ showContent }}
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
- {{type === 5?'试题解析:':''}}{{ showContent }}
-
-
-
+
+ {{ userInfo.userName }}
+
+
+
+
+
+
+
+ {{voiceTime}}
+
+
+ {{ showContent }}
+
+
+
+
+
+
+
+
+
+
+
+ 文
+ 完成
+ 撤回
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ userInfo.userName }}
+
+
+
+
{{ showContent }}
-
-
-
-
-
-
-
-
-
-
-
- 举例:{{ dataInfo.exampie }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 重新学
-
-
-
- 重新答
-
-
-
- 继续学
-
-
- 继续
-
-
-
-
-
- {{ changeBr(dataInfo.suggestContent || '--') }}
-
-
-
-
-
-
-
-
-
-
-
- {{ teacherInfo?.teacherName }}
- {{teacherInfo?.teacherDesc}}
-
-
-
-
-
- {{ showContent }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ userInfo.userName }}
-
-
-
-
-
-
-
- {{voiceTime}}
-
-
- {{ showContent }}
-
-
+
-
-
-
-
-
-
- 文
- 完成
- 撤回
-
-
-
-
-
-
-
-
-
-
-
-
- {{ userInfo.userName }}
-
-
-
-
- {{ showContent }}
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+ .user-answer{
+ overflow: hidden;
+ width: 100%;
+ margin-bottom: 20rpx;
+ .user-info{
+ overflow: hidden;
+ .avatar-box{
+ float: right;
+ width: 76rpx;
+ height: 76rpx;
+ border: 3rpx solid #fff;
+ background-color: #f1f1f1;
+ overflow: hidden;
+ border-radius: 10rpx;
+ margin-left: 16rpx;
+ margin-bottom: 16rpx;
+ .img-box{
+ width: 100%;
+ height: 100%;
+ }
+ }
+ .ai-name{
+ float: right;
+ color: #666;
+ font-size: 25rpx;
+ line-height: 35rpx;
+ }
+ }
+
+ .talking-info-less{
+ padding: 20rpx;
+ float: right;
+ border-radius: 15rpx;
+ background-color: #06f;
+ color: #fff;
+ }
+ .talking-info{
+ padding: 20rpx;
+ border-radius: 15rpx;
+ background-color: #06f;
+ padding-bottom: 30rpx;
+ position: relative;
+ color: #fff;
+ .talking-gif{
+ width: 200rpx;
+ height: 38rpx;
+ background: url(@/static/images/course/voice-gray.png) no-repeat;
+ background-size: contain;
+ padding-left: 168rpx;
+ &.is-play{
+ background: url(@/static/images/course/voice-white.gif) no-repeat;
+ background-size: contain;
+ }
+ }
+ .right-time{
+ position: absolute;
+ right: 20rpx;
+ top: 20rpx;
+ font-size: 28rpx;
+ height: 38rpx;
+ line-height: 38rpx;
+ }
+ .talking-cont{
+ margin-top: 16rpx;
+ overflow: hidden;
+ .talking-text{
+ font-size: 28rpx;
+ line-height: 48rpx;
+ margin-bottom: 20rpx;
+ word-break: break-all;
+ white-space: pre-line;
+ overflow: hidden;
+ &.translate-text{
+ min-height: 48rpx;
+ }
+ }
+ }
+ .btns-cont{
+ overflow: hidden;
+ border-top: 3rpx solid #eee;
+ .replay-btn{
+ float: left;
+ width: 46rpx;
+ height: 46rpx;
+ overflow: hidden;
+ margin-right: 16rpx;
+ margin-top: 25rpx;
+ }
+ .play-btn{
+ float: left;
+ width: 46rpx;
+ height: 46rpx;
+ overflow: hidden;
+ margin-right: 16rpx;
+ margin-top: 25rpx;
+ }
+ .text-btn{
+ float: left;
+ width: 46rpx;
+ height: 46rpx;
+ overflow: hidden;
+ line-height: 46rpx;
+ text-align: center;
+ color: #fff;
+ margin-right: 16rpx;
+ margin-top: 25rpx;
+ background-color: #67A4ff;
+ font-size: 24rpx;
+ font-weight: bold;
+ border-radius: 20rpx;
+ }
+ .text-right-btn{
+ float: right;
+ padding: 0 10rpx;
+ height: 46rpx;
+ overflow: hidden;
+ line-height: 46rpx;
+ text-align: center;
+ margin-left: 16rpx;
+ margin-top: 25rpx;
+ }
+ .next-btn{
+ float: right;
+ padding: 0 60rpx 0 20rpx;
+ height: 62rpx;
+ line-height: 62rpx;
+ font-size: 30rpx;
+ background-color: #06f;
+ color: #fff;
+ border-radius: 8rpx;
+ margin-top: 16rpx;
+ position: relative;
+ .icon-iamge{
+ width: 25rpx;
+ height: 25rpx;
+ position: absolute;
+ right: 20rpx;
+ top: 50%;
+ margin-top: -12rpx;
+ }
+ }
+ }
+ }
+ }
+
\ No newline at end of file
diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue
index d814eb41..a8280b1b 100644
--- a/src/pages/course/index.vue
+++ b/src/pages/course/index.vue
@@ -207,10 +207,12 @@ import { onShow } from "@dcloudio/uni-app"
// 点击生产线分类
const changePrdLine = (item)=>{
activePrdlineType.value = item.value === activePrdlineType.value ? '' : item.value
+ getMoreList(1)
}
// 点击课程分类
const changeCourseType = (item)=>{
activeCourseType.value = item.value === activeCourseType.value ? '' : item.value
+ getMoreList(1)
}
const showTypeName = computed(()=>{
return (activeTab.value === '全部' && activeCourseType.value === '') || (activeTab.value === '生产线' && activePrdlineType.value === '')
@@ -312,7 +314,8 @@ import { onShow } from "@dcloudio/uni-app"
case '全部':
queryCrsInfoByCatalogApi({
...pageObj.value,
- tagId: activeTag.value.join(',')
+ tagId: activeTag.value.join(','),
+ catalogId: activeCourseType.value
}).then(res=>{
courseListBase.value = courseListBase.value.concat(res.body || [])
pageObj.value.total = res.total
@@ -327,7 +330,8 @@ import { onShow } from "@dcloudio/uni-app"
case '生产线':
queryCrsInfoByPrdLineApi({
...pageObj.value,
- tagId: activeTag.value.join(',')
+ tagId: activeTag.value.join(','),
+ prdLineId: activePrdlineType.value
}).then(res=>{
courseListBase.value = courseListBase.value.concat(res.body || [])
pageObj.value.total = res.total
diff --git a/src/pages/index/components/history.vue b/src/pages/index/components/history.vue
index 16694b17..3167c9b5 100644
--- a/src/pages/index/components/history.vue
+++ b/src/pages/index/components/history.vue
@@ -1,99 +1,103 @@
-
+
\ No newline at end of file
+.history-popup-view {
+ width: 582rpx;
+ height: 100vh;
+ background-color: #fff;
+ padding: 40rpx;
+ padding-top: calc(20rpx + var(--status-bar-height));
+ .history-title {
+ height: 40rpx;
+ line-height: 40rpx;
+ padding-left: 40rpx;
+ position: relative;
+ font-size: 29rpx;
+ color: #000;
+ margin-bottom: 20rpx;
+ .icon-image {
+ position: absolute;
+ left: 0;
+ height: 32rpx;
+ width: 32rpx;
+ top: 4rpx;
+ }
+ }
+ .history-list {
+ height: calc(100% - 60rpx);
+ .history-item {
+ height: 78rpx;
+ line-height: 78rpx;
+ font-size: 28rpx;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+ }
+}
+