diff --git a/src/pages/promote/promote.vue b/src/pages/promote/promote.vue index d62ad10..614e9d7 100644 --- a/src/pages/promote/promote.vue +++ b/src/pages/promote/promote.vue @@ -376,6 +376,7 @@ export default { withProgress: true }) this.trainList = data.list + await this.getTrainData() }, async getTrainInfoList() { const res = await trainInfoUserListReq() @@ -383,8 +384,6 @@ export default { if (res) { this.trainInfoList = res.data if (this.trainInfoList.length > 0) { - await this.getExamList() - await this.getTrainData() await this.getDeclareList(this.trainInfoList[0].trainId) } } @@ -514,25 +513,26 @@ export default { this.formList = data }, async getTrainData() { + console.log(this.trainList) const {data} = await trainUserLearnLogDataReq({ trainIds: this.trainList.map(item => item.id) }) this.trainData = data - this.trainDataRate = (this.trainData.learnSize / this.trainData.totalTask) - if (this.trainDataRate > 1) this.trainDataRate = 1 + this.trainDataRate = this.trainData.rate }, toCourse(item) { if (!item.hasTask) return toast('暂未开放') uni.navigateTo({url: `/pages/promote/learn?courseId=${item.courseId}&trainId=${item.id}`}) } }, - onShow() { - this.getTrainList() - this.getTrainInfoList() - this.getNewsList() - this.getFormList() + async onShow() { + await this.getNewsList() + await this.getTrainList() + await this.getExamList() + await this.getTrainInfoList() + await this.getFormList() if (getUserInfo().token) { - this.getMatchList() + await this.getMatchList() } }, onLoad() {