diff --git a/components/JoinVip/index.vue b/components/JoinVip/index.vue index ed03622..91e2665 100644 --- a/components/JoinVip/index.vue +++ b/components/JoinVip/index.vue @@ -5,7 +5,7 @@ v - 升级vip会员享受视频课程优惠 + 升级vip会员享受录播课程优惠 diff --git a/manifest.json b/manifest.json index 439b407..2b91b5b 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "梦航教育宝", "appid" : "__UNI__640EC10", "description" : "1.1", - "versionName" : "1.0.1", - "versionCode" : 101, + "versionName" : "1.0.2", + "versionCode" : 102, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -22,7 +22,7 @@ "Payment" : {}, "Camera" : {}, "VideoPlayer" : {}, - "UIWebview" : {}, + "WKWebview" : {}, "Record" : {}, "OAuth" : {}, "Barcode" : {} diff --git a/pages/learning/index.vue b/pages/learning/index.vue index 51de0cd..12b3b13 100644 --- a/pages/learning/index.vue +++ b/pages/learning/index.vue @@ -92,7 +92,7 @@ {{ item.menuName }} 更多 > - + @@ -121,7 +121,7 @@ import store from "@/store"; return { loading: false, indexMenu: [ - { menuName: '视频课', key: 'video' }, + { menuName: '录播课', key: 'video' }, { menuName: '直播课', key: 'live' }, { menuName: '线下课堂', key: 'offline_courses' }, ], diff --git a/pages/special/specialCateCourse.vue b/pages/special/specialCateCourse.vue index a29dc29..4eda942 100644 --- a/pages/special/specialCateCourse.vue +++ b/pages/special/specialCateCourse.vue @@ -7,7 +7,7 @@ {{ item.menuName }} - + 加载更多 @@ -34,7 +34,7 @@ gradeId: '', subjectId: '', specialMenu: [ - { menuName: '视频课程', key: 'video_list' }, + { menuName: '录播课程', key: 'video_list' }, { menuName: '热门课程', key: 'hot_course' }, { menuName: '线下课堂', key: 'offline_courses' }, ], diff --git a/pages/topic/question_detail.vue b/pages/topic/question_detail.vue index 15160bf..78c4b88 100644 --- a/pages/topic/question_detail.vue +++ b/pages/topic/question_detail.vue @@ -61,10 +61,11 @@ - - + + 回答{{ item.is_correct === 2 ? "正确" : "错误" }} + 付费阅卷后才可答案解析 正确答案: @@ -83,8 +84,10 @@ class="iconfont iconxing" > - 答案解析: - + 关联知识点: {{ special.title }} - - 付费阅卷后才可参考答案 - @@ -615,6 +615,11 @@ page { } } .analysis { + .tip { + background: none!important; + padding-left: 0!important; + color: #333!important; + } .subject-flex { display: flex; flex-direction: column; diff --git a/pages/topic/question_result.vue b/pages/topic/question_result.vue index 45ab2fd..8c35229 100644 --- a/pages/topic/question_result.vue +++ b/pages/topic/question_result.vue @@ -62,14 +62,14 @@ 主观题答案解析 - 查看解析 + 查看解析 再考一次 - + @@ -242,6 +242,7 @@ export default { } this.result = result; + console.log(this.result); this.renderCircle(); this.getInspect(); }) diff --git a/pages/topic/question_user.vue b/pages/topic/question_user.vue index e2788f6..bfb4d03 100644 --- a/pages/topic/question_user.vue +++ b/pages/topic/question_user.vue @@ -4,8 +4,8 @@ - 练习 考试 + 练习 @@ -79,7 +79,7 @@ import { getTestPaper } from "@/api/topic"; export default { data() { return { - type: 1, + type: 2, page: 1, limit: 15, loading: false, diff --git a/pages/topic/subjectAnalysisDialog.vue b/pages/topic/subjectAnalysisDialog.vue index d03a2c3..dbef31b 100644 --- a/pages/topic/subjectAnalysisDialog.vue +++ b/pages/topic/subjectAnalysisDialog.vue @@ -23,7 +23,7 @@ @@ -37,9 +37,9 @@ PayDialog, }, props: { - id: { - type: String, - default: () => '', + e_id: { + type: Number, + default: () => 0, } }, data() { @@ -49,7 +49,7 @@ money: 10, nowMoney: 0, member_money: 10, - pay_type_num: 60, + pay_type_num: 80, special_id: 0, orderId: "", isMember: false, @@ -68,9 +68,13 @@ watch: { show() { if (this.show) { + console.log(this.$props, this.e_id); this.getAuthInfo(); } }, + e_id() { + console.log(this.e_id); + }, }, methods: { async getAuthInfo() { @@ -131,7 +135,6 @@ successOrder(msg) { this.$util.showMsg(msg ? msg : "支付成功"); this.payDialogOpen = false; - this.question.isPay = true; }, extendOrder(msg) { if (typeof msg === "object") {