Commit 4ad806da authored by Facius's avatar Facius

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

parents 5480195e 356a03e1
...@@ -127,13 +127,13 @@ export default { ...@@ -127,13 +127,13 @@ export default {
return this.learnData.institutionName || '模考大师' return this.learnData.institutionName || '模考大师'
}, },
maxpoint() { maxpoint() {
return String(this.learnData.startDate).length > 0 ? this.learnData.maxPoint : '' return this.learnData.maxPoint || ''
}, },
learnTime() { learnTime() {
return String(this.learnData.startDate).length > 0 ? this.learnData.time : '' return String(this.learnData.startDate).length > 0 ? this.learnData.time : ''
}, },
resultForTest() { resultForTest() {
return String(this.learnData.startDate).length > 0 ? ((this.learnData.maxPoint >= 80 && '合格') || '不合格') : '' return this.learnData.maxPoint ? ((this.learnData.maxPoint >= 80 && '合格') || '不合格') : ''
}, },
}, },
methods: { methods: {
...@@ -159,7 +159,8 @@ export default { ...@@ -159,7 +159,8 @@ export default {
.begin-answer { .begin-answer {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-color: #2953ff; background-image: linear-gradient(to top, #22222E 0%, #444550 40%);
background-color: #22222E;
background-size: 100% 920rpx; background-size: 100% 920rpx;
background-repeat: no-repeat; background-repeat: no-repeat;
height: 100vh; height: 100vh;
......
...@@ -519,7 +519,7 @@ page { ...@@ -519,7 +519,7 @@ page {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 30rpx; padding: 200rpx 30rpx 30rpx 30rpx;
text-align: center; text-align: center;
} }
</style> </style>
...@@ -22,12 +22,7 @@ ...@@ -22,12 +22,7 @@
></my-subject> ></my-subject>
</view> </view>
<view class="content" v-else> <view class="content" v-else>
<u-image <u-image width="374rpx" height="322rpx" :src="nothing"></u-image>
width="374rpx"
height="322rpx"
:src="nothing"
style="margin-top: 100rpx;"
></u-image>
<text style="margin-top: 20rpx;font-size: 28rpx;color: #9EA5BB;" <text style="margin-top: 20rpx;font-size: 28rpx;color: #9EA5BB;"
>当前暂无题库内容</text >当前暂无题库内容</text
> >
...@@ -162,7 +157,7 @@ page { ...@@ -162,7 +157,7 @@ page {
background-color: #f7f9fc; background-color: #f7f9fc;
background-size: 100% 920rpx; background-size: 100% 920rpx;
background-repeat: no-repeat; background-repeat: no-repeat;
height: 120vh; height: 100vh;
position: absolute; position: absolute;
top: 0; top: 0;
width: 100%; width: 100%;
...@@ -174,6 +169,8 @@ page { ...@@ -174,6 +169,8 @@ page {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 30rpx; padding: 30rpx;
height: 100%;
overflow: auto;
} }
.subject-item { .subject-item {
......
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