From 33413c6be7f338ba1ee92b3218e5c078364675dc Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期三, 24 七月 2024 17:29:07 +0800
Subject: [PATCH] 提交
---
pages/tabBar/firstPage/firstPage.vue | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/pages/tabBar/firstPage/firstPage.vue b/pages/tabBar/firstPage/firstPage.vue
index 9b444ba..ee0f109 100644
--- a/pages/tabBar/firstPage/firstPage.vue
+++ b/pages/tabBar/firstPage/firstPage.vue
@@ -15,6 +15,9 @@
<view style="width: 100%;padding: 0 15px;box-sizing: border-box;margin: 20px 0">
<u-swiper :list="swiperList" indicatorMode="dot" circular height="160" indicator previousMargin="30" nextMargin="30"></u-swiper>
</view>
+
+ <scroll-view scroll-y="true" class="scroll-Y" @scrolltoupper="upper"
+ @scrolltolower="lower" lower-threshold="150" @scroll="scrollView" style="height:calc(100vh - 335px)">
<view class="m-p-15">
<view class="card" style="width:100%">
<view class="card-t">
@@ -46,12 +49,10 @@
<span class="card-t-l">我的考试</span>
</view>
<view class="card-c card-d">
- <scroll-view scroll-y="true" class="scroll-Y" @scrolltoupper="upper"
- @scrolltolower="lower" lower-threshold="150" @scroll="scrollView" style="height:350px">
<view class="paper-card" v-for="(item,index) in examList" :key="index">
<view class="paper-card-t"><span :class="item.completed == 1?'green':'red'">[{{item.completed == 1?'已完成':'未完成'}}]</span>{{item.examPaper.name}}</view>
<u-tag style="margin-right: 20rpx;display: inline-block" :text="item.examPaper.categoryName" size="mini"></u-tag>
- <u-tag style="display: inline-block" :text="'时长：' + item.examPaper.limitTime + '分钟'" plain plainFill size="mini"></u-tag>
+ <u-tag style="display: inline-block" :text="item.examPaper.limited == 1?'时长：' + item.examPaper.limitTime + '分钟':'不限时'" plain plainFill size="mini"></u-tag>
<view class="paper-card-b">
<view style="font-size: 12px;margin-top: 10px;color: #999">
<view>创建人：{{item.createName}}</view>
@@ -63,10 +64,12 @@
</view>
</view>
</view>
- </scroll-view>
+
</view>
</view>
</view>
+
+ </scroll-view>
<tabBar :currentPagePath="page"></tabBar>
</view>
</template>
@@ -127,6 +130,9 @@
// this.tabBarLists = uni.getStorageSync('tabBarList');
},
+ created(){
+ uni.hideTabBar()
+ },
methods: {
loginOut() {
uni.clearStorageSync();
@@ -189,7 +195,7 @@
},
toExam(item,type){
- if(type == 1 && !item.startTime){
+ if(type == 1 && !item.startTime && item.examPaper.limited == 1){
uni.showModal({
title: '提示',
content: '该考试限制时长为：' + item.examPaper.limitTime + '分钟，进入后开始计时，计时结束自动交卷，是否继续？',
@@ -368,7 +374,7 @@
justify-content: space-between;
.study-button{
- width: 240rpx;
+ width: 220rpx;
margin: 0;
box-shadow: 3px 3px 12px rgba(51,133,217,.3), -2px -2px 6px #fff;
border: 1px solid rgba(255,255,255,.8);
@@ -379,7 +385,7 @@
}
.card-d{
background: none;
- padding: 0;
+ padding: 0 0 15px;
.paper-card{
background: #fff;
margin-bottom: 15px;
@@ -417,7 +423,7 @@
justify-content: space-between;
.exam-button{
- width: 240rpx;
+ width: 220rpx;
margin: 0;
box-shadow: 3px 3px 12px rgba(51,133,217,.3), -2px -2px 6px #fff;
border: 1px solid rgba(255,255,255,.8);
--
Gitblit v1.9.2