wangmingchuan
/
zhishifufei_uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改版本号

Browse Source
feature/v-xuexi
wangdong 8 months ago
parent 4acb05b2c6
commit 33974e6813
8 changed files with 34 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      components/JoinVip/index.vue
  2. 6
      manifest.json
  3. 4
      pages/learning/index.vue
  4. 4
      pages/special/specialCateCourse.vue
  5. 19
      pages/topic/question_detail.vue
  6. 5
      pages/topic/question_result.vue
  7. 4
      pages/topic/question_user.vue
  8. 15
      pages/topic/subjectAnalysisDialog.vue

2
components/JoinVip/index.vue
Unescape View File

@ -5,7 +5,7 @@
<text>v</text>
</view>
<view>
<view class="member_title">升级vip会员享受视频课程优惠</view>
<view class="member_title">升级vip会员享受录播课程优惠</view>
</view>
<button class="flex flex-center">立即升级</button>
</view>

6
manifest.json
Unescape View File

@ -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" : {}

4
pages/learning/index.vue
Unescape View File

@ -92,7 +92,7 @@
{{ item.menuName }}
<text class="more-content" @click="toMoreCourse(item.key)">更多 ></text>
</view>
<square-style-course v-if="item.menuName === '视频课'" :specialList="learningData[item.key]" @detail="handleSpecialClick"></square-style-course>
<square-style-course v-if="item.menuName === '录播课'" :specialList="learningData[item.key]" @detail="handleSpecialClick"></square-style-course>
<square-style-course v-if="item.menuName === '直播课'" :specialList="learningData[item.key]" @detail="handleSpecialClick"></square-style-course>
<offline-style-course v-if="item.menuName === '线下课堂'" :specialList="learningData[item.key]"></offline-style-course>
</view>
@ -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' },
],

4
pages/special/specialCateCourse.vue
Unescape View File

@ -7,7 +7,7 @@
<view class="special-content-title">
{{ item.menuName }}
</view>
<square-style-course v-if="item.menuName === '视频课程' || item.menuName === '热门课程'" :specialList="specialData[item.key]" @detail="handleSpecialClick"></square-style-course>
<square-style-course v-if="item.menuName === '录播课程' || item.menuName === '热门课程'" :specialList="specialData[item.key]" @detail="handleSpecialClick"></square-style-course>
<offline-style-course v-if="item.menuName === '线下课堂'" :specialList="specialData[item.key]" @detail="handleSpecialClick"></offline-style-course>
<view class="showMore flex" @click="loadMore(item.key)">加载更多<text class="more"></text> </view>
</view>
@ -34,7 +34,7 @@
gradeId: '',
subjectId: '',
specialMenu: [
{ menuName: '视频课程', key: 'video_list' },
{ menuName: '录播课程', key: 'video_list' },
{ menuName: '热门课程', key: 'hot_course' },
{ menuName: '线下课堂', key: 'offline_courses' },
],

19
pages/topic/question_detail.vue
Unescape View File

@ -61,10 +61,11 @@
</view>
</view>
</view>
<view v-if="item.question_type <= 3 && item.is_correct && is_analysis" class="analysis">
<view :class="{ no: item.is_correct === 1 }">
<view v-if="item.is_correct && is_analysis" class="analysis">
<view v-if="item.question_type <= 3" :class="{ no: item.is_correct === 1 }">
回答{{ item.is_correct === 2 ? "正确" : "错误" }}
</view>
<view v-if="item.question_type > 3 && !item.isPay" class="tip">付费阅卷后才可答案解析</view>
<view :class="{'subject-flex': item.question_type > 3}">
<view>
正确答案：
@ -83,8 +84,10 @@
class="iconfont iconxing"
></span>
</view>
<view>答案解析：</view>
<mpHtml container-style="background: #ffffff;" :content="item.analysis"></mpHtml>
<template v-if="item.question_type <= 3 || (item.question_type > 3 && item.isPay)">
<view>答案解析：</view>
<mpHtml container-style="background: #ffffff;" :content="item.analysis"></mpHtml>
</template>
<view v-if="item.special.length">关联知识点：</view>
<navigator
open-type="redirect"
@ -96,9 +99,6 @@
>{{ special.title }}</navigator
>
</view>
<view v-if="item.question_type > 3 && item.is_correct && is_analysis" class="analysis">
<view>付费阅卷后才可参考答案</view>
</view>
<view class="pl_per"></view>
</view>
<view class="swiper-pagination abs">
@ -615,6 +615,11 @@ page {
}
}
.analysis {
.tip {
background: none!important;
padding-left: 0!important;
color: #333!important;
}
.subject-flex {
display: flex;
flex-direction: column;

5
pages/topic/question_result.vue
Unescape View File

@ -62,14 +62,14 @@
<text class="answer-analysis" @click="openAnalysis">主观题答案解析</text>
</view>
<view v-if="!footerHidden" class="result-ft">
<navigator :url="`/pages/topic/question_sheet?is_analysis=1&test_id=${test_id}&record_id=${result.id}&check_analysis=1`">查看解析
<navigator :url="`/pages/topic/question_sheet?is_analysis=1&test_id=${test_id}&record_id=${result.id}&check_analysis=1&special_id=${special_id}`">查看解析
</navigator>
<navigator open-type="redirect" :url="`/pages/special/question_index?id=${test_id}&special_id=${special_id}&is_analysis=${is_analysis}`">再考一次</navigator>
</view>
</view>
<view :class="{ mask: imgSrc }" @touchmove.prevent @click="imgSrc = ''"></view>
<image v-if="imgSrc" :src="imgSrc" class="certificate-image" />
<subject-analysis-dialog ref="subjectAnalysisDialog" :id="test_id"/>
<subject-analysis-dialog ref="subjectAnalysisDialog" :e_id="result.id || 0"/>
</view>
</BaseContainer>
</template>
@ -242,6 +242,7 @@ export default {
}
this.result = result;
console.log(this.result);
this.renderCircle();
this.getInspect();
})

4
pages/topic/question_user.vue
Unescape View File

@ -4,8 +4,8 @@
<NavBar title="考题测评" />
<view class="user-question-page">
<view class="nav">
<view class="nav-item" :class="{ on: type === 1 }" @click="onNav(1)">练习</view>
<view class="nav-item" :class="{ on: type === 2 }" @click="onNav(2)">考试</view>
<view class="nav-item" :class="{ on: type === 1 }" @click="onNav(1)">练习</view>
</view>
<view class="content">
<view v-if="type === 1" class="problem">
@ -79,7 +79,7 @@ import { getTestPaper } from "@/api/topic";
export default {
data() {
return {
type: 1,
type: 2,
page: 1,
limit: 15,
loading: false,

15
pages/topic/subjectAnalysisDialog.vue
Unescape View File

@ -23,7 +23,7 @@
</view>
<image src="@/static/images/special/close.png" mode="aspectFill" class="guanbi" @click="show = false;"></image>
<PayDialog :open.sync="payDialogOpen" :money="Number(money)"
:now_money="nowMoney" :pay_type_num="pay_type_num" :special_id="Number(id || 0)" :template-id="templateId"
:now_money="nowMoney" :pay_type_num="pay_type_num" :special_id="Number(e_id || 0)" :template-id="templateId"
:is-wechat="isWechat" :is-yue="isYue" :wxpay-h5="wxpayH5" :is-alipay="isAlipay" :is-balance="isBalance" @change="onChange"
:isMember="!!isMember" :isMembership="true" :memberMoney="member_money" />
</view>
@ -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") {

Write Preview
Loading…
Cancel
Save