diff --git a/common/js/utils.js b/common/js/utils.js index 2c7d858..38c796b 100644 --- a/common/js/utils.js +++ b/common/js/utils.js @@ -117,7 +117,10 @@ module.exports = { } return arr }, - + //过滤html + filterHtml(html) { + return html.replace(/<[^>]+>/g, "") + }, // 秒数转时分秒格式 sec_to_time(s) { var t; diff --git a/components/kz-page-index-color-1/kz-page-index-color-1.vue b/components/kz-page-index-color-1/kz-page-index-color-1.vue index b4acb5c..5ae352c 100644 --- a/components/kz-page-index-color-1/kz-page-index-color-1.vue +++ b/components/kz-page-index-color-1/kz-page-index-color-1.vue @@ -54,6 +54,18 @@ + + + + + + + + 错题本 + + + --> - - - - - - - - 错题本 - - - + @@ -124,9 +125,7 @@ - - {{ item.text }} - + @@ -1146,9 +1145,9 @@ export default { .question-bank-title { padding: 15rpx; - font-size: 32rpx; + font-size: 28rpx; color: #333333; - display: flex; + text-align: center; } /* 题库卡片样式 end */ diff --git a/pages/index/news-detail.vue b/pages/index/news-detail.vue index 57070cc..a7835d9 100644 --- a/pages/index/news-detail.vue +++ b/pages/index/news-detail.vue @@ -117,7 +117,6 @@ export default { newsApi.getNewsDetail(this, { id: id }).then(res => { - s if (res && res.data) { this.newsData = res.data } diff --git a/pages/train/detail.vue b/pages/train/detail.vue index 51b390a..0ef5659 100644 --- a/pages/train/detail.vue +++ b/pages/train/detail.vue @@ -1,136 +1,155 @@ + /* 注释:如需进一步美化可在此扩展 */ + \ No newline at end of file diff --git a/pages/train/index.vue b/pages/train/index.vue index c7a6002..e4c6a6a 100644 --- a/pages/train/index.vue +++ b/pages/train/index.vue @@ -29,19 +29,16 @@ @click="checkPay">{{btnText}} --> - + - + - - {{ item.text }} - + @@ -221,7 +218,7 @@ export default { if (res.code == 1) { this.questionCount = res.data.total if (this.questionCount) { - this.btnText = '开始练习' + this.btnText = '开始练习' } else { this.btnText = '当前分类无试题' } @@ -267,7 +264,7 @@ export default { if (res.data.status == 1) { this.utils.goto('/pages/train/detail?id=' + cateId); return - } + } // 无须支付 // if (res.data.status == 1) { // this.goTrain() @@ -299,41 +296,43 @@ export default { \ No newline at end of file diff --git a/pages/wrong/index.vue b/pages/wrong/index.vue index da6f692..81468c9 100644 --- a/pages/wrong/index.vue +++ b/pages/wrong/index.vue @@ -20,15 +20,17 @@ over: 0, questionIds: [], showNodata: false, + cate_ids:'', } }, onLoad(e) { + this.cate_ids=e.cate_ids; this.questionIds = e.question_ids this.ajax() }, methods: { ajax() { - this.http('question/wrongList', {page:this.page, question_ids: this.questionIds}, 'post').then(res => { + this.http('question/wrongList', {page:this.page, question_ids: this.questionIds,cate_ids:this.cate_ids}, 'post').then(res => { if (res.code == 0) { this.utils.toast(res.msg) setTimeout(() => { diff --git a/pagesSubject/sign_up.vue b/pagesSubject/sign_up.vue index 5711f7f..48d4d1f 100644 --- a/pagesSubject/sign_up.vue +++ b/pagesSubject/sign_up.vue @@ -36,7 +36,7 @@ + :placeholderStyle="placeholderStyle" maxlength="11"/> @@ -671,18 +671,10 @@ export default { leijishijian: '', // 累计从事本职业时间 pxjd: '' // 培训基地 } - // 清空用户协议选择 this.agreementChecked = [] - // 清空日期选择器状态 this.datePickerShow = false - - uni.showToast({ - title: '表单已重置', - icon: 'success', - duration: 1500 - }) } } }