Skip to content

P
pica-annual-summary
提交 1916439c 编写于 作者: guangjun.yang's avatar guangjun.yang
浏览文件
操作

Merge branch 'dev-question-bank-0916' of... 

Merge branch 'dev-question-bank-0916' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-professional-exam into dev-question-bank-0916

* 'dev-question-bank-0916' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-professional-exam:
  把学科详情页头部抽成组件
  各种练习前加登录校验
  学科详情样式优化
上级 6899014f 8ebfc0fd
隐藏空白字符变更
内嵌 并排
正在显示 包含 151 行增加 和 144 行删除
src/components/question/directory-info.vue 0 → 100644
浏览文件 @ 1916439c
<template>
<div class="fixed-qb-header">
<div class="header-info" :class="!isWeb ? 'top-set' : ''">
<div class="info-first">
<img v-if="directoryInfo.avatarImageUrl" :src="directoryInfo.avatarImageUrl">
<img v-if="!directoryInfo.avatarImageUrl" src="../../images/question/portrait.png">
<div class="infor">
<p class="name">{{directoryInfo.name}} 医生</p>
<p class="question-result">已做题<span>{{directoryInfo.finishedNum}}</span>错误题<span class="err">{{directoryInfo.wrongTitle}}</span>正确率<span class="suc">{{directoryInfo.correctRatio}}%</span></p>
</div>
</div>
<div class="info-second">
<div class="item" @click="wrongBook(1)"><img src="../../images/question/text.png">错题集<span v-if="directoryInfo.wrongTitleBook">({{directoryInfo.wrongTitleBook}})</span></div>
<div class="item" @click="wrongBook(2)"><img src="../../images/question/heart-h.png">收藏<span v-if="directoryInfo.collectTitleBook">({{directoryInfo.collectTitleBook}})</span></div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
isWeb: window.__isWeb,
}
},
props: {
directoryInfo: {
type: Object,
default: () => {}
},
},
methods: {
wrongBook(type) {
this.$emit('handlerBook',type)
},
},
}
</script>
<style lang="less" scoped>
.fixed-qb-header{
position: relative;
.header-info{
position: fixed;
z-index: 200;
background-color: #FFFFFF;
padding: 0 16px;
box-sizing: border-box;
width: 100%;
&.top-set{
top: 73px;
}
.info-first{
display: flex;
padding: 20px 0;
img{
width: 44px;
height: 44px;
border-radius: 50%;
}
.infor{
margin-left: 12px;
.name{
color: #373839;
font-size: 18px;
font-weight: 700;
line-height: 22px;
}
.question-result{
font-size: 14px;
color: #676869;
line-height: 16px;
margin-top: 9px;
span{
margin-left: 3px;
margin-right: 15px;
color: #373839;
&.err{
color: #ED3131;
}
&.suc{
color: #449284;
}
}
}
}
}
.info-second{
display: flex;
justify-content: space-between;
align-items: center;
.item{
width: 165.5px;
height: 40px;
/*line-height: 40px;*/
text-align: center;
border-radius: 6px;
background-color: #F8F9FA;
font-size: 14px;
font-weight: 700;
color: #373839;
display: flex;
align-items: center;
justify-content: center;
img{
width: 20px;
height: 20px;
margin-right: 8px;
}
span{
font-size: 12px;
margin-left: 2px;
height: 40px;
line-height: 40px;
}
}
}
}
}
</style>
src/views/question-bank.vue
浏览文件 @ 1916439c
...@@ -8,22 +8,7 @@ ...@@ -8,22 +8,7 @@
:isFixNavbar="isFixNavbar" :isFixNavbar="isFixNavbar"
borderStyle="1px solid #fff" borderStyle="1px solid #fff"
></CommonNavbar> ></CommonNavbar>
<div class="fixed-qb-header"> <DirectoryInfo :directoryInfo="directoryInfo" @handlerBook="handlerBook"></DirectoryInfo>
<div class="header-info" :class="!isWeb ? 'top-set' : ''">
<div class="info-first">
<img v-if="directoryInfo.avatarImageUrl" :src="directoryInfo.avatarImageUrl">
<img v-if="!directoryInfo.avatarImageUrl" src="../images/question/portrait.png">
<div class="infor">
<p class="name">{{directoryInfo.name}} 医生</p>
<p class="question-result">已做题<span>{{directoryInfo.finishedNum}}</span>错误题<span class="err">{{directoryInfo.wrongTitle}}</span>正确率<span class="suc">{{directoryInfo.correctRatio}}%</span></p>
</div>
</div>
<div class="info-second">
<div class="item" @click="wrongBook"><img src="../images/question/text.png">错题集<span v-if="directoryInfo.wrongTitleBook">({{directoryInfo.wrongTitleBook}})</span></div>
<div class="item" @click="collectBook"><img src="../images/question/heart-h.png">收藏<span v-if="directoryInfo.collectTitleBook">({{directoryInfo.collectTitleBook}})</span></div>
</div>
</div>
</div>
<div class="question-bank-content" :class="!isWeb ? 'add-padding' : ''"> <div class="question-bank-content" :class="!isWeb ? 'add-padding' : ''">
<div class="question-intro" v-if="directoryInfo.directoryImageUrl || directoryInfo.directoryIntro"> <div class="question-intro" v-if="directoryInfo.directoryImageUrl || directoryInfo.directoryIntro">
<img v-if="directoryInfo.directoryImageUrl" :src="directoryInfo.directoryImageUrl"> <img v-if="directoryInfo.directoryImageUrl" :src="directoryInfo.directoryImageUrl">
...@@ -42,7 +27,7 @@ ...@@ -42,7 +27,7 @@
</div> </div>
<div class="right-btn"> <div class="right-btn">
<span v-if="!bindStatus && (item.freeFlag == 0)" @click="goStudy(item)">开始练习</span> <span v-if="!bindStatus && (item.freeFlag == 0)" @click="goStudy(item)">开始练习</span>
<span v-if="!bindStatus && (item.freeFlag == 1) && (item.freePractice > 0)" @click="freeStudy(item)">免费练习</span> <span v-if="!bindStatus && (item.freeFlag == 1) && (item.freePractice > 0)" @click="goStudy(item)">免费练习</span>
<img v-if="!bindStatus && (item.freeFlag == 1) && (item.freePractice == 0)" src="../images/question/lock.png" @click="unlockHand"> <img v-if="!bindStatus && (item.freeFlag == 1) && (item.freePractice == 0)" src="../images/question/lock.png" @click="unlockHand">
<span v-if="bindStatus == 1" @click="goStudy(item)">{{setTxt(item.finishedRatio)}}</span> <span v-if="bindStatus == 1" @click="goStudy(item)">{{setTxt(item.finishedRatio)}}</span>
</div> </div>
...@@ -68,6 +53,7 @@ ...@@ -68,6 +53,7 @@
:isShowDialog="showBindCardTips" :isShowDialog="showBindCardTips"
@handlerAction="handlerAction" @handlerAction="handlerAction"
></CourseDialog> ></CourseDialog>
<Loading v-show="showLoading" />
</div> </div>
</template> </template>
<script> <script>
...@@ -75,6 +61,8 @@ ...@@ -75,6 +61,8 @@
import BindCardButton from "@/components/cme/bind-card-button"; import BindCardButton from "@/components/cme/bind-card-button";
import ChangeCard from "@/components/cme/change-card"; import ChangeCard from "@/components/cme/change-card";
import CourseDialog from "@/components/course/course-dialog"; import CourseDialog from "@/components/course/course-dialog";
import Loading from "@/components/common/common-loading";
import DirectoryInfo from "@/components/question/directory-info";
import {Progress, Toast} from 'vant'; import {Progress, Toast} from 'vant';
import { mapGetters, mapActions } from "vuex"; import { mapGetters, mapActions } from "vuex";
import { getWebPageUrl } from "@/utils/index"; import { getWebPageUrl } from "@/utils/index";
...@@ -84,17 +72,18 @@ export default { ...@@ -84,17 +72,18 @@ export default {
BindCardButton, BindCardButton,
ChangeCard, ChangeCard,
Progress, Progress,
CourseDialog CourseDialog,
Loading,
DirectoryInfo
}, },
data() { data() {
return { return {
token: '', token: '',
isWeb: window.__isWeb, isWeb: window.__isWeb,
// isWeb: false,
isInfresh: false, isInfresh: false,
bgColor: "#fff", bgColor: "#fff",
isShowNavbar: true, isShowNavbar: true,
navTitle: '中级-内科', navTitle: '',
isFixNavbar: false, isFixNavbar: false,
secondSubjectId: null, secondSubjectId: null,
directoryInfo: { directoryInfo: {
...@@ -113,6 +102,7 @@ export default { ...@@ -113,6 +102,7 @@ export default {
showBindCardTips: false, showBindCardTips: false,
showChangeCard: false, showChangeCard: false,
changeCardErrorMsg: "", changeCardErrorMsg: "",
showLoading: false
} }
}, },
created() { created() {
...@@ -142,10 +132,7 @@ export default { ...@@ -142,10 +132,7 @@ export default {
_this.getProvinceIdByPosition(param); _this.getProvinceIdByPosition(param);
}; };
}, },
mounted() { mounted() {},
},
computed: { computed: {
...mapGetters(["userInfo"]), ...mapGetters(["userInfo"]),
setTxt() { setTxt() {
...@@ -175,6 +162,7 @@ export default { ...@@ -175,6 +162,7 @@ export default {
token: this.token, token: this.token,
setEntry: true setEntry: true
}; };
this.showLoading = true;
this.GET(`portal/titleTest/user/getBrushTitleInfo/${this.secondSubjectId}`, param).then(res => { this.GET(`portal/titleTest/user/getBrushTitleInfo/${this.secondSubjectId}`, param).then(res => {
if (res.code == "000000") { if (res.code == "000000") {
this.directoryInfo = JSON.parse(JSON.stringify(res.data)); this.directoryInfo = JSON.parse(JSON.stringify(res.data));
...@@ -182,8 +170,11 @@ export default { ...@@ -182,8 +170,11 @@ export default {
this.subDirectoryModelList = subDirectoryModelList; this.subDirectoryModelList = subDirectoryModelList;
this.userId = userId; this.userId = userId;
this.bindStatus = bindStatus; this.bindStatus = bindStatus;
this.navTitle = `${firstSubjectCodeName}-${secondSubjectName}${secondSubjectCode}` this.navTitle = `${firstSubjectCodeName}-${secondSubjectName}${secondSubjectCode}`;
setTimeout(() => {
this.showLoading = false;
}, 800);
//获取底部卡信息 //获取底部卡信息
// 如果 bindStatus 为false，则获取卡信息 0：未绑卡 1：已绑卡 // 如果 bindStatus 为false，则获取卡信息 0：未绑卡 1：已绑卡
if (!this.bindStatus) { if (!this.bindStatus) {
...@@ -294,25 +285,16 @@ export default { ...@@ -294,25 +285,16 @@ export default {
this.beforeChangeCardAction(this.cmeCardModels.cardKey, true) this.beforeChangeCardAction(this.cmeCardModels.cardKey, true)
} }
}, },
//错题集 //错题集或收藏夹
wrongBook() { handlerBook(val) {
this.checkTokenForNative(() => { let commitKind = null,currentTitle = '';
this.$router.push({ if (val == 1) {
path: '/question-detail', commitKind = 1;
query: { currentTitle = '错题集';
directoryId: 0, }else if (val == 2) {
secondSubjectId: this.secondSubjectId, commitKind = 2;
cardType: this.directoryInfo.cardType, currentTitle = '收藏';
goodsType : this.directoryInfo.goodsType, }
commitKind : 1,
freeFlag: 1,
currentTitle: '错题集'
}
})
});
},
//收藏
collectBook() {
this.checkTokenForNative(() => { this.checkTokenForNative(() => {
this.$router.push({ this.$router.push({
path: '/question-detail', path: '/question-detail',
...@@ -321,9 +303,9 @@ export default { ...@@ -321,9 +303,9 @@ export default {
secondSubjectId: this.secondSubjectId, secondSubjectId: this.secondSubjectId,
cardType: this.directoryInfo.cardType, cardType: this.directoryInfo.cardType,
goodsType : this.directoryInfo.goodsType, goodsType : this.directoryInfo.goodsType,
commitKind : 2, commitKind : commitKind,
freeFlag: 1, freeFlag: 1,
currentTitle: '收藏' currentTitle: currentTitle
} }
}) })
}); });
...@@ -434,8 +416,8 @@ export default { ...@@ -434,8 +416,8 @@ export default {
cancleChangeCard() { cancleChangeCard() {
this.showChangeCard = false; this.showChangeCard = false;
}, },
//免费练习 //各种练习
freeStudy(obj) { goStudy(obj) {
this.checkTokenForNative(() => { this.checkTokenForNative(() => {
this.$router.push({ this.$router.push({
path: '/question-detail', path: '/question-detail',
...@@ -455,21 +437,6 @@ export default { ...@@ -455,21 +437,6 @@ export default {
unlockHand() { unlockHand() {
this.$toast('购买后可练习') this.$toast('购买后可练习')
}, },
//开始练习
goStudy(obj) {
this.$router.push({
path: '/question-detail',
query: {
directoryId: obj.directoryId,
secondSubjectId: this.secondSubjectId,
cardType: this.directoryInfo.cardType,
goodsType : this.directoryInfo.goodsType,
commitKind : 3,
freeFlag: obj.freeFlag,
currentTitle: obj.directoryName
}
})
},
}, },
} }
</script> </script>
...@@ -479,92 +446,13 @@ export default { ...@@ -479,92 +446,13 @@ export default {
width: 100%; width: 100%;
padding-bottom: 60px; padding-bottom: 60px;
box-sizing: border-box; box-sizing: border-box;
.fixed-qb-header{
position: relative;
.header-info{
position: fixed;
z-index: 200;
background-color: #FFFFFF;
padding: 0 16px;
box-sizing: border-box;
width: 100%;
&.top-set{
top: 78px;
}
.info-first{
display: flex;
padding: 20px 0;
img{
width: 44px;
height: 44px;
border-radius: 50%;
}
.infor{
margin-left: 12px;
.name{
color: #373839;
font-size: 18px;
font-weight: 700;
line-height: 22px;
}
.question-result{
font-size: 14px;
color: #676869;
line-height: 16px;
margin-top: 9px;
span{
margin-left: 3px;
margin-right: 15px;
color: #373839;
&.err{
color: #ED3131;
}
&.suc{
color: #449284;
}
}
}
}
}
.info-second{
display: flex;
justify-content: space-between;
align-items: center;
.item{
width: 165.5px;
height: 40px;
line-height: 40px;
text-align: center;
border-radius: 6px;
background-color: #F8F9FA;
font-size: 14px;
font-weight: 700;
color: #373839;
display: flex;
align-items: center;
justify-content: center;
img{
width: 20px;
height: 20px;
margin-right: 8px;
}
span{
font-size: 12px;
margin-left: 2px;
}
}
}
}
}
.question-bank-content{ .question-bank-content{
padding: 0 16px; padding: 126px 16px 0;
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
/*margin-top: 155px;*/
padding-top: 128px;
&.add-padding{ &.add-padding{
padding-top: 143px; padding-top: 135px;
} }
.question-intro{ .question-intro{
margin-top: 15px; margin-top: 15px;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或