tanxue vor 2 Monaten
Ursprung
Commit
7eb6a4b9a2

+ 19 - 2
common/styles/global/pages.scss

@@ -188,8 +188,6 @@
 
 		.ks-btn-prev {position: absolute;bottom: 130rpx;left:24rpx;}
 		.ks-btn-next {position: absolute;bottom: 130rpx;right: 24rpx;}
-
-	
 	}
 	
 /*** 课程学习 ***/
@@ -240,6 +238,25 @@
 	}
 }	
 
+/*** 进入练习 ***/
+.phone-score-page{
+	height: 100vh;display: flex;flex-direction: column;background-color: #f4f6fa;position: relative;
+	.score-page-title{height: 80rpx;line-height: 80rpx;background-color: #fff;font-size: 26rpx;color: #333;
+			display: flex;justify-content: space-between;padding: 0 24rpx;border-bottom: 10rpx solid #f4f6fa;
+			.title-types{font-size: 32rpx;color: #000;}
+	}
+	.score-shiti-content{
+		padding: 24rpx 0 0;background-color: #fff;flex: 1;overflow: auto;
+		.phone-danxuan-box{height: auto;margin: 0 32rpx;}
+		}
+	.score-answer-box{
+		background-color: #fff;border-top: 10rpx solid #f4f6fa;
+		.score-line-title{margin-bottom: 0;}
+		.score-answer-btn-box{display: flex;align-items: center;justify-content: space-between;margin-bottom: 20rpx;}
+		.score-answer-btn{margin: 0;}
+	}
+}
+
 /*** 答题卡 ***/
 .answer-card-popup{
 	height: 100vh;

+ 2 - 2
components/score/topCard.vue

@@ -1,6 +1,6 @@
 <template>
-	<view>
-		<view><text>{{name}}</text> <text>{{zyLevelName}}</text></view>
+	<view class="score-page-title">
+		<view class="title-types"><text>{{name}}</text> <text>{{zyLevelName}}</text></view>
 		<view>
 			<text>{{userScore}}/{{Score}}</text>
 			<text @click="handleOpenCard"><i></i> {{count}}/{{total}}</text>

+ 29 - 32
pages/client/Chengji/ksScoreShijuan.vue

@@ -1,16 +1,15 @@
 <template>
-	<view class="socre-shijuan">
+	<view class="phone-score-page">
 		<!-- 导航区域 -->
-		<view class="icon-title-navBar-box">
+		<view class="icon-title-bjcolor-navBar-box">
 			<view @click="handleBack" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">{{data.ksName}}</text>
 		</view>
 		<!-- 上方区域 -->
 		<topCard @openCard="handleOpenCard" :name="data.ksName" :zyLevelName="data.zyLevelName" :userScore="data.userScore" :Score="data.Score" :count="activeSt && activeSt.onlyNum||0" :total="data.StListForSearch.length"></topCard>
 		
-		<view>
 			<!-- 段落 -->
-			<view class="kaoshi-shiti-content">
+			<view class="score-shiti-content">
 				<!-- 试题区域 -->
 				<view v-if="activeSt">
 					<template v-if="activeSt.stTypeId == 1">
@@ -30,38 +29,37 @@
 						<tiankong :question="activeSt" :key="activeSt.stId"></tiankong>
 					</template>
 				</view>
-			</view>
-			<!-- 解析 -->
-			<view v-if="activeSt">
-				<view class="phone-question-answer-box" v-if="activeSt.stTypeId != 4">
-					<view class="phone-line-title">答案解析</view>
-					<view class="btdf-row">本题得分:<text>{{answerRes.score}}</text>分</view>
-					<view class="zqda-row">正确答案:<text>{{answerRes.result}}</text></view>
-					<view class="ndda-row">您的答案:<text>{{answerRes.reply}}</text></view>
-					<view class="dajx-row">答案解析: 
-						<rich-text :nodes="answerRes.answer"></rich-text>
-					</view>
-				</view>
-				<view class="phone-question-answer-box" v-else>
-					<view class="phone-line-title">答案解析</view>
-					<view class="btdf-row">本题得分:<text>{{answerRes.score}}</text>分</view>
-					<view class="zqda-row">正确答案:
-						<view v-for="(item,index) in answerRes.result">{{`填空${index+1}`}} : {{item}}</view>
-					</view>
-					<view class="ndda-row">您的答案:
-					<view v-for="(item,index) in answerRes.reply"> {{`填空${index+1}`}}: {{item}}</view>
+				<!-- 解析 -->
+				<view v-if="activeSt" class="score-answer-box">
+					<view class="phone-question-answer-box" v-if="activeSt.stTypeId != 4">
+						<view class="phone-line-title">答案解析</view>
+						<view class="btdf-row">本题得分:<text>{{answerRes.score}}</text>分</view>
+						<view class="zqda-row">正确答案:<text>{{answerRes.result}}</text></view>
+						<view class="ndda-row">您的答案:<text>{{answerRes.reply}}</text></view>
+						<view class="dajx-row">答案解析: 
+							<rich-text :nodes="answerRes.answer"></rich-text>
+						</view>
 					</view>
-					<view class="dajx-row">答案解析: 
-						<rich-text :nodes="answerRes.answer"></rich-text>
+					<view class="phone-question-answer-box" v-else>
+						<view class="phone-line-title">答案解析</view>
+						<view class="btdf-row">本题得分:<text>{{answerRes.score}}</text>分</view>
+						<view class="zqda-row">正确答案:
+							<view v-for="(item,index) in answerRes.result">{{`填空${index+1}`}} : {{item}}</view>
+						</view>
+						<view class="ndda-row">您的答案:
+						<view v-for="(item,index) in answerRes.reply"> {{`填空${index+1}`}}: {{item}}</view>
+						</view>
+						<view class="dajx-row">答案解析: 
+							<rich-text :nodes="answerRes.answer"></rich-text>
+						</view>
 					</view>
-				</view>
-			</view>	
+				</view>	
+			</view>
 			<!-- 上下按钮 -->
 			<template v-if="activeSt">
-				<button type="default" size="mini" hover-class="none" class="phone-green-btn ks-btn-prev" @click="handlePrev" v-if="!isFistStId">上一题</button>
-				<button type="default" size="mini" hover-class="none"class="phone-green-btn ks-btn-next" @click="handleNext" v-if="!isLastStId">下一题</button>
+				<button type="default" size="mini" hover-class="none" class="phone-green-btn score-answer-btn" @click="handlePrev" v-if="!isFistStId">上一题</button>
+				<button type="default" size="mini" hover-class="none"class="phone-green-btn score-answer-btn" @click="handleNext" v-if="!isLastStId">下一题</button>
 			</template>
-			
 			<!-- 答题卡 -->
 			<uni-popup ref="popupRef" background-color="#fff" :is-mask-click="false" :mask-click="false">
 				<view class="answer-card-popup">
@@ -80,7 +78,6 @@
 				</view>
 			</uni-popup>
 			
-		</view>
 	</view>
 </template>
 

+ 1 - 1
pages/client/Kaoshi/exam.vue

@@ -7,13 +7,13 @@
 		</view>
 		<!-- 第一行 -->
 		<view class="kaoshi-page-title">
+			<view v-if="activeSt" class="title-types">{{dlName}}</view>
 			<!--  倒计时 -->
 			<view v-if="!!data.endSecond">
 				<text>考试倒计时:</text>
 				<uni-countdown :show-day="true" :second="1000" @timeup="onTimeUp"
 					:start="startCountDown"></uni-countdown>
 			</view>
-			<view v-if="activeSt" class="title-types">{{dlName}}</view>
 		</view>