mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-mobile.git
synced 2025-12-10 03:16:45 +08:00
提交修改
This commit is contained in:
@@ -11,11 +11,11 @@
|
||||
<!-- 学习任务 -->
|
||||
<view class="listbox" v-show="tabIndex===0">
|
||||
<view class="listbox-top">
|
||||
<view class="top-ten">
|
||||
<!-- <u-picker v-model="loadstatus" :show="loadstatusSelecShow" @cancel="loadstatusSelecShow = false"
|
||||
<view class="top-ten" style="margin-top: 21px;margin-left: 13px;">
|
||||
<!-- <u-picker v-model="loadstatus" :show="loadstatusSelecShow" @cancel="loadstatusSelecShow = false"
|
||||
@confirm="loadchooseStatust" :columns="statustList" keyName="name"></u-picker> -->
|
||||
<!-- <text class="textbtn" @click="loadstatusSelecShow = !loadstatusSelecShow">状态</text> -->
|
||||
<text class="textbtn" @click="loadstatusSelecShow=!loadstatusSelecShow">状态</text>
|
||||
<!-- <text class="textbtn" @click="loadstatusSelecShow = !loadstatusSelecShow">状态</text> -->
|
||||
<text class="textbtn" @click="loadstatusSelecShow=!loadstatusSelecShow">状态</text>
|
||||
</view>
|
||||
<view class="searchView">
|
||||
<u-search :clearabled="true" @search="loadBoeData(true)" @clear="loadBoeData(true)"
|
||||
@@ -24,12 +24,14 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="sea-show" v-show="loadstatusSelecShow">
|
||||
<text v-for="(item,index) in statustList" :key="index" :class="[item.value === boeStatus?'sea-active':'','sea-index' ]" @click="loadchooseStatust(item.value)">{{item.name}}</text>
|
||||
<text v-for="(item,index) in statustList" :key="index"
|
||||
:class="[item.value === boeStatus?'sea-active':'','sea-index' ]"
|
||||
@click="loadchooseStatust(item.value)">{{item.name}}</text>
|
||||
</view>
|
||||
<!-- <view class="sea-show" v-show="loadstatusSelecShow">
|
||||
<!-- <view class="sea-show" v-show="loadstatusSelecShow">
|
||||
<text v-for="(item,index) in statustList" :class="[item.value == boeStatus?'sea-active':'','sea-index' ]" @click="loadchooseStatust(item.value)">{{item.name}}</text>
|
||||
</view> -->
|
||||
<view class="course content" v-for="(task,idx) in couresList" :key="idx" @click="loaddetail(task)">
|
||||
<view class="course content" v-for="(task,idx) in couresList" :key="idx" @click="loaddetail(task)">
|
||||
<view class="course-info">
|
||||
<!-- <view class="course-title two-line-ellipsis" style="margin-bottom: 20upx;"><text
|
||||
style="font-size: 32upx;color: #343434; font-weight: bold;" v-html="task.cmtask_name"></text></view> -->
|
||||
@@ -76,11 +78,13 @@
|
||||
<text class="textbtn" @click="statusSelectShow = true">{{statusBtnName}}</text>
|
||||
</view> -->
|
||||
<!-- 自主学习类型查询 -->
|
||||
<view class="top-ten" style="margin-right: 20upx;">
|
||||
<!-- <u-picker v-model="statust" :show="statusSelecShow" @cancel="statusSelecShow = false"
|
||||
<view class="top-ten" style="margin-top: 21px;margin-left: 13px;">
|
||||
<!-- <u-picker v-model="statust" :show="statusSelecShow" @cancel="statusSelecShow = false"
|
||||
@confirm="chooseStatust" :columns="typeArray" keyName="name"></u-picker>
|
||||
<text class="textbtn" @click="statusSelecShow = true">{{statusBtns}}</text> -->
|
||||
<text class="textbtn" @click="statusSelecShow=!statusSelecShow">类型</text>
|
||||
<text class="textbtn" @click="statusSelecShow=!statusSelecShow;autonomyStatusShow=false">类型</text>
|
||||
<text class="textbtn" style="margin:0 20upx;"
|
||||
@click="autonomyStatusShow=!autonomyStatusShow;statusSelecShow=false">进度</text>
|
||||
</view>
|
||||
<view class="searchView" style="margin-left: 0;">
|
||||
<u-search :clearabled="true" @search="searchData()" @clear="searchData()" placeholder="搜索关键字"
|
||||
@@ -88,14 +92,16 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="sea-show" v-show="statusSelecShow">
|
||||
<text v-for="(item,tidx) in typeArray" :key="tidx" :class="[item.value == classType ?'sea-active':'','sea-index' ]" @click="Application(item.value)">{{item.name}}</text>
|
||||
<text v-for="(item,tidx) in typeArray" :key="tidx"
|
||||
:class="[item.value == classType ?'sea-active':'','sea-index' ]"
|
||||
@click="Application(item.value)">{{item.name}}</text>
|
||||
</view>
|
||||
<view class="sea-show" v-show="autonomyStatusShow">
|
||||
<text :class="[autonomy.status == 0?'sea-active':'','sea-index']" @click="autonomyStatus(0)">全部</text>
|
||||
<text :class="[autonomy.status == 1?'sea-active':'','sea-index']" @click="autonomyStatus(1)">未开始</text>
|
||||
<text :class="[autonomy.status == 2?'sea-active':'','sea-index']" @click="autonomyStatus(2)">进行中</text>
|
||||
<text :class="[autonomy.status == 9?'sea-active':'','sea-index']" @click="autonomyStatus(9)">已完成</text>
|
||||
</view>
|
||||
<!-- <view class="course-info-text">
|
||||
<text :class="[isSelect === 0?'isSelect':'info-text']" @click="autonomyStatus(0)">全部</text>
|
||||
<text :class="[isSelect === 1?'isSelect':'info-text']" @click="autonomyStatus(1)">未开始</text>
|
||||
<text :class="[isSelect === 2?'isSelect':'info-text']" @click="autonomyStatus(2)">进行中</text>
|
||||
<text :class="[isSelect === 3?'isSelect':'info-text']" @click="autonomyStatus(3)">已完成</text>
|
||||
</view> -->
|
||||
<view v-if="studyList.length == 0 && couresList.length == 0 && isOne" class="zan-wu">
|
||||
您还没有学习课程,快去学习吧~
|
||||
</view>
|
||||
@@ -123,7 +129,7 @@
|
||||
{{c.teacherName}}
|
||||
</view>
|
||||
<!-- <view class="coures-button"> -->
|
||||
<!-- <text class="toStudyText">
|
||||
<!-- <text class="toStudyText">
|
||||
<u-icon v-if="c.progress==100" @click.native.stop="toStudy(c)" :size="16" label="回顾"
|
||||
:bold="true" :labelSize="11" labelColor="#FF8E00" color="#FF8E00" name="reload">
|
||||
</u-icon>
|
||||
@@ -132,28 +138,28 @@
|
||||
</text> -->
|
||||
<!-- </view> -->
|
||||
</view>
|
||||
<view class="rowbtn" >
|
||||
<image @click.native.stop="rowbtn(c)" style="width: 100%;height: 100%;" src="../../static/images/icon/more.png" alt="">
|
||||
<!-- <u-icon @click.native.stop="rowbtn(c)" color="#767676" labelColor="#767676" name="trash" label="删除" size="16" labelSize="12"></u-icon> -->
|
||||
</view>
|
||||
<!-- <view style="font-size: 22upx;color: #777980;" v-if="c.addTime">报名时间:{{ c.addTime }}</view> -->
|
||||
|
||||
<view class="coures-bottom coures-midd">
|
||||
<view class="coures-staus">
|
||||
<text v-html="displayWord(c)"></text>
|
||||
</view>
|
||||
<view class="rowbtn">
|
||||
<image @click.native.stop="rowbtn(c)" style="width: 100%;height: 100%;"
|
||||
src="../../static/images/icon/more.png" alt="">
|
||||
</view>
|
||||
<view class="coures-bottom coures-midd">
|
||||
<view class="coures-staus">
|
||||
<text v-html="displayWord(c)"></text>
|
||||
</view>
|
||||
<view class="coures-button">
|
||||
<text class="toStudyText">
|
||||
<u-icon v-if="c.progress==100" @click.native.stop="toStudy(c)" :size="16" label="回顾"
|
||||
:bold="true" :labelSize="11" labelColor="#FF8E00" color="#FF8E00" name="reload">
|
||||
<u-icon v-if="c.progress==100" @click.native.stop="toStudy(c)" :size="16"
|
||||
label="回顾" :bold="true" :labelSize="11" labelColor="#FF8E00" color="#FF8E00"
|
||||
name="reload">
|
||||
</u-icon>
|
||||
<u-icon v-else @click.native.stop="toStudy(c)" :size="16" label="播放" :bold="true"
|
||||
:labelSize="11" labelColor="#FF8E00" color="#FF8E00" name="play-right"></u-icon>
|
||||
<u-icon v-else @click.native.stop="toStudy(c)" :size="16" label="播放"
|
||||
:bold="true" :labelSize="11" labelColor="#FF8E00" color="#FF8E00"
|
||||
name="play-right"></u-icon>
|
||||
</text>
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -187,7 +193,8 @@
|
||||
</view>
|
||||
<view class="btn-bai"
|
||||
style="position: absolute;right: 0;color: #2A2C31;font-size: 36upx;font-weight: 600;">
|
||||
{{ c.progress }}%</view>
|
||||
{{ c.progress }}%
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -242,8 +249,7 @@
|
||||
</u-modal>
|
||||
<u-popup :show="btnsShow" @close="closeBtns">
|
||||
<view>
|
||||
<view @click="del()" class="big-button" style="color: #db0000;">删除</view>
|
||||
<!-- <view @click="copy()" class="big-button">复制</view> -->
|
||||
<view @click="del()" class="big-button" style="color: #db0000;">删除</view>
|
||||
<view @click="closeBtns()" class="big-button">取消</view>
|
||||
</view>
|
||||
</u-popup>
|
||||
@@ -305,8 +311,9 @@
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
delData:{},
|
||||
btnsShow: false,// 我报名的删除弹出
|
||||
autonomyStatusShow: false,
|
||||
delData: {},
|
||||
btnsShow: false, // 我报名的删除弹出
|
||||
xuanShow: false,
|
||||
boeStatus: '',
|
||||
authorInfo: {},
|
||||
@@ -355,27 +362,26 @@
|
||||
statust: '',
|
||||
status: '',
|
||||
loadstatus: '',
|
||||
typeArray: [
|
||||
typeArray: [{
|
||||
name: '全部',
|
||||
value: ''
|
||||
},
|
||||
{
|
||||
name: '全部',
|
||||
value: ''
|
||||
},
|
||||
{
|
||||
name: '录播课',
|
||||
value: 'online-course'
|
||||
},
|
||||
{
|
||||
name: '线下课',
|
||||
value: 'face-course'
|
||||
},
|
||||
|
||||
{
|
||||
name: '学习项目',
|
||||
value: 'project'
|
||||
}
|
||||
|
||||
name: '录播课',
|
||||
value: 'online-course'
|
||||
},
|
||||
{
|
||||
name: '线下课',
|
||||
value: 'face-course'
|
||||
},
|
||||
|
||||
{
|
||||
name: '学习项目',
|
||||
value: 'project'
|
||||
}
|
||||
|
||||
],
|
||||
|
||||
|
||||
statustList: [{
|
||||
name: '全部',
|
||||
value: ''
|
||||
@@ -409,10 +415,10 @@
|
||||
]
|
||||
],
|
||||
windowHeight: 0,
|
||||
taskPageIndex:1,
|
||||
taskPageSize:10,
|
||||
taskHasMore:true,
|
||||
taskCount:0,
|
||||
taskPageIndex: 1,
|
||||
taskPageSize: 10,
|
||||
taskHasMore: true,
|
||||
taskCount: 0,
|
||||
}
|
||||
},
|
||||
onShow() {
|
||||
@@ -425,29 +431,29 @@
|
||||
},
|
||||
onLoad() {
|
||||
this.loadBoeData(true);
|
||||
this.getLearning();//这里应该是切换时再调用
|
||||
this.getLearning(); //这里应该是切换时再调用
|
||||
//检查是否显示弹窗
|
||||
let curTime=new Date();
|
||||
curTime=parseInt(curTime.getTime()/1000);
|
||||
let curTime = new Date();
|
||||
curTime = parseInt(curTime.getTime() / 1000);
|
||||
//console.log(curTime,'curTime');
|
||||
let hasDlgTime=uni.getStorageSync('user_dlg_temp');
|
||||
if(hasDlgTime){
|
||||
let lastTime=parseInt(hasDlgTime);
|
||||
let hasDlgTime = uni.getStorageSync('user_dlg_temp');
|
||||
if (hasDlgTime) {
|
||||
let lastTime = parseInt(hasDlgTime);
|
||||
//console.log(lastTime,'lastTime2');
|
||||
if(curTime>(lastTime+24*60*60)){
|
||||
if (curTime > (lastTime + 24 * 60 * 60)) {
|
||||
this.xuanShow = true;
|
||||
//console.log('显示');
|
||||
uni.setStorageSync('user_dlg_temp',curTime);
|
||||
}else{
|
||||
uni.setStorageSync('user_dlg_temp', curTime);
|
||||
} else {
|
||||
this.xuanShow = false;
|
||||
this.showOneStady();
|
||||
}
|
||||
}else{
|
||||
} else {
|
||||
this.xuanShow = true;
|
||||
uni.setStorageSync('user_dlg_temp',curTime);
|
||||
uni.setStorageSync('user_dlg_temp', curTime);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
let $this = this;
|
||||
uni.getSystemInfo({
|
||||
success: (res) => {
|
||||
@@ -470,12 +476,12 @@
|
||||
onReachBottom() {
|
||||
this.loadStatus = 'loading'; //more,loading,noMore
|
||||
let $this = this;
|
||||
if(this.tabIndex==0){
|
||||
if(this.taskHasMore){
|
||||
if (this.tabIndex == 0) {
|
||||
if (this.taskHasMore) {
|
||||
this.taskPageSize++;
|
||||
this.loadBoeData(false);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
setTimeout(function() {
|
||||
$this.loadStatus = 'noMore';
|
||||
@@ -484,43 +490,63 @@
|
||||
methods: {
|
||||
rowbtn(row) {
|
||||
this.delData = row;
|
||||
console.log(row,'row',this.delData);
|
||||
this.btnsShow = true;
|
||||
},
|
||||
del(){
|
||||
// const $this=this
|
||||
// uni.showModal({
|
||||
// title: '提示',
|
||||
// content: '您确定要删除此提问吗?',
|
||||
// success: function (res) {
|
||||
// if (res.confirm) {
|
||||
apicourseStudy.deleteSignUp(this.delData.id,this.delData.courseId).then(res=>{
|
||||
this.btnsShow = false;
|
||||
if(res.status=200){
|
||||
this.$refs.articleToast.show({message:'删除成功',type:'success'});
|
||||
this.studyList.forEach((item,index)=>{
|
||||
if(item.id===this.delData.id) {
|
||||
this.studyList.splice(index,1);
|
||||
}
|
||||
})
|
||||
// setTimeout(()=>{
|
||||
|
||||
// $this.loadBoeData(true);
|
||||
// $this.getLearning(true);
|
||||
// },1000)
|
||||
|
||||
// this.getLearning();
|
||||
}else{
|
||||
this.$refs.articleToast.show({message:'删除失败,请稍后再试',type:'error'});
|
||||
del() {
|
||||
if (this.delData.isOld) {
|
||||
apiBoeCourse.delLearning(this.delData.kid).then(res => {
|
||||
if (res.status == 200) {
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '删除成功!'
|
||||
});
|
||||
this.studyList.forEach((item, index) => {
|
||||
if (item.id === this.delData.id) {
|
||||
this.studyList.splice(index, 1);
|
||||
}
|
||||
})
|
||||
// } else if (res.cancel) {
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
this.studyData.forEach((it, i) => {
|
||||
if (this.delData.id == it.id) {
|
||||
this.studyData.splice(i, 1);
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.$message({
|
||||
type: 'error',
|
||||
message: res.message
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
apicourseStudy.deleteSignUp(this.delData.id, this.delData.courseId).then(res => {
|
||||
this.btnsShow = false;
|
||||
if (res.status = 200) {
|
||||
this.$refs.articleToast.show({
|
||||
message: '删除成功',
|
||||
type: 'success'
|
||||
});
|
||||
this.studyList.forEach((item, index) => {
|
||||
if (item.id === this.delData.id) {
|
||||
this.studyList.splice(index, 1);
|
||||
}
|
||||
})
|
||||
this.studyData.forEach((it, i) => {
|
||||
if (this.delData.id == it.id) {
|
||||
this.studyData.splice(i, 1);
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.$refs.articleToast.show({
|
||||
message: '删除失败,请稍后再试',
|
||||
type: 'error'
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
showOneStady(){
|
||||
|
||||
showOneStady() {
|
||||
if (this.isOneStady === 0) {
|
||||
this.getLastStudy();
|
||||
}
|
||||
@@ -563,37 +589,35 @@
|
||||
})
|
||||
},
|
||||
autonomyStatus(num) {
|
||||
this.isSelect = num;
|
||||
// this.isSelect = num;
|
||||
this.autonomy.status = num;
|
||||
this.searchData();
|
||||
},
|
||||
closeBtns(){
|
||||
this.btnsShow=false;
|
||||
closeBtns() {
|
||||
this.btnsShow = false;
|
||||
},
|
||||
searchData() {
|
||||
// this.page.pageIndex = 1;
|
||||
// this.isListOne = true;
|
||||
let list = this.studyList;
|
||||
// this.couresList = this.dataList;
|
||||
if (this.isSelect == 0) {
|
||||
this.autonomy.status = '';
|
||||
} else {
|
||||
this.autonomy.status = this.isSelect;
|
||||
let list = this.studyData;
|
||||
let type;
|
||||
let wei;
|
||||
if (this.autonomy.type == 'online-course') {
|
||||
type = 20;
|
||||
wei = 10;
|
||||
}
|
||||
if (this.autonomy.type == 0) {
|
||||
this.autonomy.type = '';
|
||||
}
|
||||
if (this.autonomy.type === '' && this.autonomy.status === '' && this.autonomy.keyword === '') {
|
||||
if (this.autonomy.type === 0 && this.autonomy.status === 0 && this.autonomy.keyword === '') {
|
||||
this.studyList = this.studyData;
|
||||
return;
|
||||
}
|
||||
if (this.autonomy.type !== '') {
|
||||
list = list.filter(item => {
|
||||
if (item.courseType === this.autonomy.type) {
|
||||
if (item.courseType === this.autonomy.type || type === 20 || wei === 10) {
|
||||
return item;
|
||||
}
|
||||
});
|
||||
}
|
||||
if (this.autonomy.status !== '') {
|
||||
if (this.autonomy.status !== 0) {
|
||||
list = list.filter(item => {
|
||||
if (item.status == this.autonomy.status) {
|
||||
return item;
|
||||
@@ -617,8 +641,8 @@
|
||||
},
|
||||
|
||||
loadBoeData(flag) {
|
||||
if(flag){
|
||||
this.taskPageIndex=1; //回到首页
|
||||
if (flag) {
|
||||
this.taskPageIndex = 1; //回到首页
|
||||
}
|
||||
let params = {
|
||||
page: this.taskPageIndex,
|
||||
@@ -637,11 +661,11 @@
|
||||
// item.created_at = this.formatDate(item.created_at*1000);
|
||||
});
|
||||
this.couresList = res.result.list;
|
||||
this.taskCount=res.result.count;
|
||||
if(this.taskCount>this.taskPageIndex*this.taskPageSize){
|
||||
this.taskHasMore=true;
|
||||
}else{
|
||||
this.taskHasMore=false;
|
||||
this.taskCount = res.result.count;
|
||||
if (this.taskCount > this.taskPageIndex * this.taskPageSize) {
|
||||
this.taskHasMore = true;
|
||||
} else {
|
||||
this.taskHasMore = false;
|
||||
}
|
||||
if (this.isOne) {
|
||||
this.value = res.result.count;
|
||||
@@ -691,35 +715,37 @@
|
||||
}
|
||||
})
|
||||
},
|
||||
loadCouserTeacher(list,ids){ //临时解决方案,单独的查询课程教师
|
||||
let that = this;
|
||||
//先查课程关联教师iD
|
||||
apiCoursePortal.getTeacherByCourseIDs(ids).then(cres => {
|
||||
if(cres.status==200){
|
||||
let userIds = [];
|
||||
list.forEach((item,index)=>{
|
||||
cres.result.some(courseTeahcer=>{
|
||||
if(courseTeahcer.courseId==item.courseId){
|
||||
if(courseTeahcer.teacherIds){
|
||||
// userIds.push(courseTeahcer.teacherIds[0]);
|
||||
// item.authorInfo.aid=courseTeahcer.teacherIds[0];
|
||||
item.teacherName = courseTeahcer.names[0];
|
||||
}
|
||||
return true;
|
||||
}else{
|
||||
return false;
|
||||
}
|
||||
})
|
||||
});
|
||||
// that.loadCourseAuthorInfo(list,userIds);
|
||||
}
|
||||
})
|
||||
loadCouserTeacher(list, ids) { //临时解决方案,单独的查询课程教师
|
||||
let that = this;
|
||||
//先查课程关联教师iD
|
||||
apiCoursePortal.getTeacherByCourseIDs(ids).then(cres => {
|
||||
if (cres.status == 200) {
|
||||
let userIds = [];
|
||||
list.forEach((item, index) => {
|
||||
cres.result.some(courseTeahcer => {
|
||||
if (courseTeahcer.courseId == item.courseId) {
|
||||
if (courseTeahcer.teacherIds) {
|
||||
// userIds.push(courseTeahcer.teacherIds[0]);
|
||||
// item.authorInfo.aid=courseTeahcer.teacherIds[0];
|
||||
item.teacherName = courseTeahcer.names[0];
|
||||
}
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
})
|
||||
});
|
||||
// that.loadCourseAuthorInfo(list,userIds);
|
||||
}
|
||||
})
|
||||
},
|
||||
async getLearning() {
|
||||
uni.showLoading({ title: '加载中...' });
|
||||
uni.showLoading({
|
||||
title: '加载中...'
|
||||
});
|
||||
this.loadStatus = 'loading';
|
||||
// let classType = null;
|
||||
|
||||
|
||||
let data = [];
|
||||
let lear = {
|
||||
pageIndex: 1, //第几页
|
||||
@@ -728,23 +754,23 @@
|
||||
// courseType: classType,
|
||||
status: this.status,
|
||||
}
|
||||
if(this.classType == 'online-course' || this.classType == '') {
|
||||
await apicourseStudy.myStudyList(lear).then(res => {
|
||||
if (res.status == 200) {
|
||||
// 我报名的接口
|
||||
//console.log(res)
|
||||
let courseIds=[];
|
||||
res.result.list.forEach(item => {
|
||||
item.teachersName='';
|
||||
item.addTime = item.addTime.split(' ')[0];
|
||||
courseIds.push(item.courseId);
|
||||
})
|
||||
//console.log(courseIds,'courseIds')
|
||||
this.loadCouserTeacher(res.result.list,courseIds);
|
||||
data.push(...res.result.list);
|
||||
}
|
||||
})
|
||||
}
|
||||
// if(this.classType == 'online-course' || this.classType == '') {
|
||||
await apicourseStudy.myStudyList(lear).then(res => {
|
||||
if (res.status == 200) {
|
||||
// 我报名的接口
|
||||
//console.log(res)
|
||||
let courseIds = [];
|
||||
res.result.list.forEach(item => {
|
||||
item.teachersName = '';
|
||||
item.addTime = item.addTime.split(' ')[0];
|
||||
courseIds.push(item.courseId);
|
||||
})
|
||||
//console.log(courseIds,'courseIds')
|
||||
this.loadCouserTeacher(res.result.list, courseIds);
|
||||
data.push(...res.result.list);
|
||||
}
|
||||
})
|
||||
// }
|
||||
let learData = {
|
||||
page: 1,
|
||||
size: 200,
|
||||
@@ -765,16 +791,25 @@
|
||||
filterConversion(data) {
|
||||
let list = [];
|
||||
data.forEach((item, index) => {
|
||||
let status = null;
|
||||
if (item.status == '0') {
|
||||
status = 1;
|
||||
} else if (item.status == '1') {
|
||||
status = 2;
|
||||
} else if (item.status == '2') {
|
||||
status = 9;
|
||||
}
|
||||
let num = item.completeProgress.replace('%', "");
|
||||
item.completeProgress = Number(num);
|
||||
list.push({
|
||||
courseImage: item.cover[0].url,
|
||||
courseName: item.title,
|
||||
teachersName:'',
|
||||
teachersName: '',
|
||||
courseType: item.type,
|
||||
id: item.id,
|
||||
isOld: true,
|
||||
progress: item.completeProgress,
|
||||
status: item.status,
|
||||
status: status,
|
||||
})
|
||||
})
|
||||
return list;
|
||||
@@ -849,12 +884,13 @@
|
||||
this.boeStatus = e;
|
||||
this.loadBoeData()
|
||||
},
|
||||
Application(e){
|
||||
Application(e) {
|
||||
this.classType = e;
|
||||
// this.searchData();
|
||||
this.getLearning();
|
||||
this.autonomy.type = e;
|
||||
this.searchData();
|
||||
// this.getLearning();
|
||||
},
|
||||
|
||||
|
||||
displayWord(data) {
|
||||
if (data.progress == 0) {
|
||||
return '未开始'
|
||||
@@ -877,8 +913,8 @@
|
||||
font-size: 24upx;
|
||||
color: #777980;
|
||||
// position: relative;
|
||||
|
||||
|
||||
|
||||
|
||||
// /deep/ .toStudyText{
|
||||
// font-size: 8px;
|
||||
// background: #EEEEEE;
|
||||
@@ -892,35 +928,41 @@
|
||||
// }
|
||||
// }
|
||||
}
|
||||
.big-button{
|
||||
|
||||
.big-button {
|
||||
text-align: center;
|
||||
line-height: 80upx;
|
||||
border-top: 1px solid #ebebeb;
|
||||
}
|
||||
.coures-midd{
|
||||
|
||||
.coures-midd {
|
||||
position: relative;
|
||||
display: flex;
|
||||
|
||||
.course-author {
|
||||
// color: #777980;
|
||||
font-size: 28upx;
|
||||
flex: 1;
|
||||
}
|
||||
.coures-button{
|
||||
|
||||
.coures-button {
|
||||
flex: 1;
|
||||
|
||||
.toStudyText {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
bottom:0;
|
||||
bottom: 0;
|
||||
// top: 28px;
|
||||
padding: 6px 14px;
|
||||
|
||||
|
||||
background-color: #EEEEEE;
|
||||
border-radius: 40px;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
.course-titles {
|
||||
|
||||
|
||||
font-weight: bold;
|
||||
font-size: 32upx;
|
||||
color: #343434;
|
||||
@@ -937,6 +979,7 @@
|
||||
// box-sizing: border-box;
|
||||
}
|
||||
}
|
||||
|
||||
.xuan {
|
||||
width: 325px;
|
||||
margin: 0px auto;
|
||||
@@ -969,7 +1012,7 @@
|
||||
}
|
||||
|
||||
.sea-show {
|
||||
padding: 20upx 30upx;
|
||||
padding: 20upx 30upx 10upx 30upx;
|
||||
|
||||
.sea-active {
|
||||
border: 1rpx solid #679cfc !important;
|
||||
@@ -1091,16 +1134,18 @@
|
||||
|
||||
.box-title {
|
||||
margin-left: 20upx;
|
||||
.title-name{
|
||||
|
||||
.title-name {
|
||||
overflow: hidden;
|
||||
word-break:break-all;
|
||||
word-break: break-all;
|
||||
text-overflow: ellipsis;
|
||||
-webkit-box-orient: vertical;
|
||||
-webkit-box-orient: vertical;
|
||||
display: -webkit-box;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
-webkit-line-clamp: 1;
|
||||
}
|
||||
|
||||
uni-text {
|
||||
color: #343434;
|
||||
font-size: 32upx;
|
||||
@@ -1157,7 +1202,7 @@
|
||||
}
|
||||
|
||||
.one-line-ellipsis {
|
||||
word-break:break-all;
|
||||
word-break: break-all;
|
||||
display: -webkit-box;
|
||||
// white-space:pre-wrap;
|
||||
overflow: hidden;
|
||||
@@ -1227,11 +1272,11 @@
|
||||
.top-ten {
|
||||
// width: 120upx;
|
||||
// height: 62upx;
|
||||
margin-top: 26upx;
|
||||
margin-top: 20upx;
|
||||
margin-left: 24upx;
|
||||
// background-color: #fff;
|
||||
text-align: center;
|
||||
line-height: 62upx;
|
||||
// line-height: 62upx;
|
||||
}
|
||||
|
||||
.searchView {
|
||||
@@ -1285,32 +1330,34 @@
|
||||
}
|
||||
|
||||
.content {
|
||||
|
||||
|
||||
padding: 20upx 30upx;
|
||||
margin-bottom: 10px;
|
||||
margin-top: 10px;
|
||||
border-radius: 7upx;
|
||||
}
|
||||
.rowbtn{
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
|
||||
.rowbtn {
|
||||
width: 30upx;
|
||||
height: 30upx;
|
||||
position: absolute;
|
||||
top:0;
|
||||
right: 0;
|
||||
top: 0;
|
||||
right:-10upx;
|
||||
// margin-top: 10upx;
|
||||
// margin-right: 25rpx;
|
||||
}
|
||||
.coures-bottom{
|
||||
display: flex;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
.coures-bottom {
|
||||
display: flex;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
.course {
|
||||
|
||||
|
||||
// padding: 40upx 30upx;
|
||||
.course-title {
|
||||
font-weight: bold;
|
||||
@@ -1321,13 +1368,13 @@
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
.course-info {
|
||||
|
||||
// display: flex;
|
||||
// justify-content: space-between;
|
||||
|
||||
|
||||
|
||||
/deep/ .course-info-left {
|
||||
display: flex;
|
||||
@@ -1417,9 +1464,9 @@
|
||||
|
||||
.textbtn {
|
||||
background-color: #ffffff;
|
||||
padding: 8px 10px;
|
||||
color: #4f4f4f;
|
||||
padding: 16upx 20upx;
|
||||
color: #666;
|
||||
border-radius: 8upx;
|
||||
font-size: 24upx;
|
||||
font-size: 28upx;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -173,7 +173,7 @@
|
||||
<view v-if="scrollItemWidth>0" class="main-cata-active">
|
||||
<scroll-view scroll-x :scroll-y="false" style="height:115px;white-space: nowrap;overflow: hidden;" :scroll-left="scrollInfo.scrollLeft" @scrolltoupper="scrollLeft" @scrolltolower="scrollRight" @scroll="scrollHandler">
|
||||
<!-- <view class="mycrollcontent" style="display: flex;justify-content:flex-start;"> -->
|
||||
<view v-for="(con,conIdx) in scrollList" :key="conIdx" style="display: inline-block;" :id="con.id" @click="playContent(con.cataName,con)">
|
||||
<view v-for="(con,conIdx) in scrollList" :key="conIdx" style="display: inline-block;" :id="con.id" @click="playContent(con.cataName,con,conIdx,0)">
|
||||
<!---->
|
||||
<view :style="{width:scrollItemWidth+'px'}" class="scroll-item" :class="{'studying':curContent.id==con.id}">
|
||||
<view class="scroll-item-sec">{{con.cataName}}
|
||||
@@ -245,7 +245,7 @@
|
||||
</view>
|
||||
</view>
|
||||
<view >
|
||||
<view v-for="(con,conIdx) in cata.children" :key="conIdx" class="catalog-con" @click="playContent(cata.section,con)">
|
||||
<view v-for="(con,conIdx) in cata.children" :key="conIdx" class="catalog-con" @click="playContent(cata.section,con,conIdx,catIdx)">
|
||||
<view class="catalog-con-name" :class="{'studying':curContent.id==con.id}">
|
||||
<!-- <text>{{catIdx+1}}.{{conIdx+1}}, </text> -->
|
||||
<!-- <text class="square-border">{{getConType(con.contentType)}}</text> -->
|
||||
@@ -1020,7 +1020,28 @@
|
||||
summaryCatalog() {
|
||||
this.summarylogShow=false;
|
||||
},
|
||||
playContent(cata,con){
|
||||
playContent(cata,con,conIndex,catIndex){
|
||||
|
||||
if(conIndex!=undefined && catIndex!=undefined) {
|
||||
if(this.courseInfo.orderStudy) {
|
||||
let hasIndex=-1;
|
||||
this.scrollList.some((one,idx)=>{
|
||||
if(one.id==con.id){
|
||||
hasIndex=idx;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
})
|
||||
if(hasIndex>0){
|
||||
let pre=this.scrollList[hasIndex-1];
|
||||
if(pre.status!=9){
|
||||
this.$refs.messager.show({message:'请按顺序学习',type:'error'});
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// console.log(con,'con');
|
||||
if(this.videoPlayer){
|
||||
//console.log('切换视频');
|
||||
@@ -1037,7 +1058,7 @@
|
||||
con.content=cfrs.result.previewFilePath;
|
||||
//console.log(r.content);
|
||||
}else{
|
||||
$this.$message.error('加载pdf课件文件失败');
|
||||
$this.$refs.messager.show({message:'加载pdf课件文件失败',type:'error'});
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -1242,13 +1263,11 @@
|
||||
// line-height: 60rpx;
|
||||
background-color: #f4f5f7;
|
||||
.scroll-item-name{
|
||||
|
||||
width: 100%;
|
||||
height: 76rpx;
|
||||
// white-space: pre-wrap;
|
||||
// word-break:break-all;
|
||||
|
||||
// line-height: 60rpx;
|
||||
word-break:break-all;
|
||||
line-height: 40rpx;
|
||||
overflow: hidden;
|
||||
white-space: pre-wrap;
|
||||
text-overflow: ellipsis;
|
||||
|
||||
Reference in New Issue
Block a user