|
@@ -282,7 +282,7 @@ Page({
|
|
|
kcArr: res.data.list,
|
|
|
istask2: res.data.allDone
|
|
|
});
|
|
|
- console.log(this.data.kcArr,"9999999999999999")
|
|
|
+ console.log(this.data.kcArr, "9999999999999999")
|
|
|
for (let i = 0; i < res.data.list.length; i++) {
|
|
|
if (res.data.list[i].isStudyDone == 0) {
|
|
|
this.setData({
|
|
@@ -383,29 +383,29 @@ Page({
|
|
|
})
|
|
|
}
|
|
|
} else {
|
|
|
- if (id == this.data.IngCourseArr.id) {
|
|
|
- if (e.currentTarget.dataset.item.isLive == 1) {
|
|
|
- if (e.currentTarget.dataset.item.isActive == 1) {
|
|
|
- wx.navigateTo({
|
|
|
- url: '../zbDetails/zbDetails?id=' + id
|
|
|
- })
|
|
|
- } else {
|
|
|
- wx.showModal({
|
|
|
- showCancel: false,
|
|
|
- content: "直播还未开始哦"
|
|
|
- })
|
|
|
- return false;
|
|
|
- }
|
|
|
+ if (e.currentTarget.dataset.item.isLive == 1) {
|
|
|
+ if (e.currentTarget.dataset.item.isActive == 1) {
|
|
|
+ wx.navigateTo({
|
|
|
+ url: '../zbDetails/zbDetails?id=' + id
|
|
|
+ })
|
|
|
} else {
|
|
|
+ wx.showModal({
|
|
|
+ showCancel: false,
|
|
|
+ content: "直播还未开始哦"
|
|
|
+ })
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if (id == this.data.IngCourseArr.id) {
|
|
|
wx.navigateTo({
|
|
|
url: '../dbDetails/dbDetails?id=' + id
|
|
|
})
|
|
|
+ } else {
|
|
|
+ wx.showModal({
|
|
|
+ showCancel: false,
|
|
|
+ content: "您的" + this.data.IngCourseArr.courseName + "课还未学完,快去学习吧"
|
|
|
+ })
|
|
|
}
|
|
|
- } else {
|
|
|
- wx.showModal({
|
|
|
- showCancel: false,
|
|
|
- content: "您的" + this.data.IngCourseArr.courseName + "课还未学完,快去学习吧"
|
|
|
- })
|
|
|
}
|
|
|
}
|
|
|
},
|
|
@@ -604,35 +604,35 @@ Page({
|
|
|
content: '期末考试还未开始哦!'
|
|
|
})
|
|
|
} else {
|
|
|
- if (res.data.list[0]) {
|
|
|
- if (res.data.list[0].answersId) {
|
|
|
- if (res.data.list[0].status == '1') {
|
|
|
- wx.request({
|
|
|
- url: app.globalData.publicUrl + '/wx/answer/detail',
|
|
|
- method: "post",
|
|
|
- data: {
|
|
|
- answersId: res.data.list[0].answersId
|
|
|
- },
|
|
|
- success: (res1) => {
|
|
|
- if (res1.data.list[0].answerScore) {
|
|
|
- wx.navigateTo({
|
|
|
- url: '/pages/grade/grade?answersId=' + res.data.list[0].answersId,
|
|
|
- })
|
|
|
- } else {
|
|
|
- wx.showModal({
|
|
|
- showCancel: false,
|
|
|
- content: '当前老师批阅中,请耐心等待'
|
|
|
- })
|
|
|
- }
|
|
|
+ // if (res.data.list[0]) {
|
|
|
+ if (res.data.list[0].answersId) {
|
|
|
+ if (res.data.list[0].status == '1') {
|
|
|
+ wx.request({
|
|
|
+ url: app.globalData.publicUrl + '/wx/answer/detail',
|
|
|
+ method: "post",
|
|
|
+ data: {
|
|
|
+ answersId: res.data.list[0].answersId
|
|
|
+ },
|
|
|
+ success: (res1) => {
|
|
|
+ if (res1.data.list[0].answerScore) {
|
|
|
+ wx.navigateTo({
|
|
|
+ url: '/pages/grade/grade?answersId=' + res.data.list[0].answersId,
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ wx.showModal({
|
|
|
+ showCancel: false,
|
|
|
+ content: '当前老师批阅中,请耐心等待'
|
|
|
+ })
|
|
|
}
|
|
|
- })
|
|
|
- } else {
|
|
|
- this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'answerAfterclass');
|
|
|
- }
|
|
|
+ }
|
|
|
+ })
|
|
|
} else {
|
|
|
- this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'answerAfterclass');
|
|
|
+ this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'answerAfterclass');
|
|
|
}
|
|
|
+ } else {
|
|
|
+ this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'answerAfterclass');
|
|
|
}
|
|
|
+ // }
|
|
|
}
|
|
|
}
|
|
|
}
|