Commit 216aa567 authored by Damon's avatar Damon

Merge branch 'dev-v1.0.0' of git.banshouhui.com:wuzhenzhe/study into dev-v1.0.0

parents 2655ef8e 28e6d620
......@@ -3,7 +3,7 @@
v-model="visible"
mode="center"
safe-area-inset-bottom
width="690rpx"
width="650rpx"
:mask-close-able="flase"
close-icon-color="#FFFFFF"
height="86%"
......
......@@ -112,7 +112,7 @@ export default {
return this.learnData.startDate || ' '
},
learnDate() {
return this.learnData.startDate + '~' + this.learnData.endDate
return String(this.learnData.startDate).length > 1 && (this.learnData.startDate + '~' + this.learnData.endDate) || ' '
},
name() {
return this.learnData.name || ' '
......@@ -121,7 +121,7 @@ export default {
return this.learnData.idCard || ' '
},
company() {
return this.workPlace
return this.workPlace || ' '
},
subjectName() {
return this.learnData.subjectName || ' '
......
......@@ -277,7 +277,7 @@ export default {
continue
}
let item = {}
item.certificateName = res[key].echoMap.questionWarehouseId.title.replace('作业', '证')
item.certificateName = res[key].echoMap.questionWarehouseId.title
item.id = res[key].echoMap.questionWarehouseId.id
item.bgImage = this.learnCertImage
item.type = 'learn'
......
......@@ -503,9 +503,10 @@ export default {
},
})
} else {
this.$u.route({
url: 'pages/learn/selectCategory',
})
this.show = true
// this.$u.route({
// url: 'pages/learn/selectCategory',
// })
}
},
// getProvinceList() {
......
......@@ -134,8 +134,9 @@ export default {
},
avatar() {
return (
(this.student && this.student.avatarPath) ||
(this.userInfo && this.userInfo.avatarUrl) ||
(this.vuex_token &&
((this.student && this.student.avatarPath) ||
this.userInfo.avatarUrl)) ||
this.pic
)
},
......
......@@ -10,7 +10,7 @@
></u-navbar>
<view class="body-view">
<view class="image-view"
><image class="image" :src="successImage"></image
><image class="image" :src="kapianImage" mode="widthFix"></image
></view>
<view class="content-view">
<view class="field-title">学习卡卡号</view>
......@@ -97,6 +97,9 @@ export default {
borderRadius: '12rpx',
}
},
kapianImage() {
return process.uniEnv.qn_base_url + 'kapian.png'
},
placeplaceholderStyle() {
return 'color:#9EA5BB;font-size:28rpx'
},
......@@ -166,8 +169,8 @@ export default {
text-align: center;
.image {
width: 700rpx;
height: 360rpx;
background-color: red;
// height: 360rpx;
// background-color: red;
border-radius: 24rpx;
box-shadow: 0px 10px 16px rgba(29, 53, 155, 0.2);
}
......
......@@ -182,8 +182,8 @@ export default {
this.chartData.series = [
{
name: '时间轴1',
pointShape: "circle",
legendShape: "circle",
pointShape: 'circle',
legendShape: 'circle',
data: [
[10000, 55],
[30000, 25],
......@@ -194,8 +194,8 @@ export default {
},
{
name: '时间轴2',
pointShape: "circle",
legendShape: "circle",
pointShape: 'circle',
legendShape: 'circle',
data: [
[0, 25],
[20000, 55],
......@@ -295,8 +295,8 @@ export default {
<style lang="scss" scoped>
.record-view {
display: flex;
flex-direction: column;
// display: flex;
// flex-direction: column;
height: 100vh;
position: relative;
background-color: #f7f9fc;
......@@ -340,7 +340,7 @@ export default {
}
border-radius: 24rpx 24rpx 0 0;
background-color: #ffffff;
height: 100%;
height: calc(100vh - 178px);
overflow: auto;
.scroll-view {
height: 100%;
......
......@@ -44,6 +44,7 @@
>
</view>
</CircleProgress>
<view style="height:600rpx;width:100%"></view>
</view>
<view class="head-view">
<view class="image-view">
......@@ -230,8 +231,8 @@ export default {
<style lang="scss" scoped>
.score-view {
display: flex;
flex-direction: column;
// display: flex;
// flex-direction: column;
height: 100vh;
background-color: #f7f9fc;
::-webkit-scrollbar {
......
......@@ -11,7 +11,7 @@
<view class="selected-list-content">
<view class="label-content">
<view
v-for="(item, index) in lables"
v-for="(item, index) in showLabels"
:key="index"
class="special-item"
hover-class="hover-class"
......@@ -21,7 +21,7 @@
<image :src="item.image" class="item-image"></image>
<view class="item-title">{{ item.title }}</view>
<view
>共<text class="item-count">{{ info[item.key] }}</text
>共<text class="item-count">{{ item.number }}</text
>道</view
>
</view>
......@@ -43,35 +43,39 @@ export default {
},
computed: {
// 1.顺序答题 2.随机练习 3.模拟考试 4.收藏答题 5.错题答题 6.专项练习-单选 7.专项练习-多选 8.专项练习-判断 9.专项练习-答案是
lables() {
return [
{
key: 'oneAnswerCount',
number: this.info['oneAnswerCount'],
title: '单选题',
source: 6,
image: process.uniEnv.qn_base_url + 'danxuan.png',
},
{
key: 'anyAnswerCount',
number: this.info['anyAnswerCount'],
title: '多选题',
source: 7,
image: process.uniEnv.qn_base_url + 'duoxuan.png',
},
{
key: 'trueOrFalseCount',
number: this.info['trueOrFalseCount'],
title: '判断题',
source: 8,
image: process.uniEnv.qn_base_url + 'panduan.png',
},
{
key: 'trueAnswerCount',
number: this.info['trueAnswerCount'],
title: '判断题(结果为正确)',
source: 9,
image: process.uniEnv.qn_base_url + 'zhengquepanduanti.png',
},
]
},
showLabels() {
return this.lables.filter((item) => {
return item.number > 0
})
},
},
onLoad(e) {
this.getPageInfo()
......
......@@ -147,7 +147,7 @@ export default {
},
getFront() {
//身份证正面图片识别
upload.getPhoto(1, this.token).then((res) => {
upload.getPhoto(2, this.token).then((res) => {
this.student.identityFrontPath = res.key
this.$u.api
.getCertifyInfoByType('front', {
......@@ -165,7 +165,7 @@ export default {
},
getBack() {
//身份证反面图片识别
upload.getPhoto(1, this.token).then((res) => {
upload.getPhoto(2, this.token).then((res) => {
this.student.identityBackPath = res.key
this.$u.api
.getCertifyInfoByType('back', {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment