tanxue 2 mesi fa
parent
commit
9a8b82796f

+ 26 - 12
common/styles/global/pages.scss

@@ -134,7 +134,7 @@
 	.index-tj-box{
 		background-color: #fff;border-radius: 12rpx;margin: 16rpx;padding: 24rpx;box-sizing:border-box;margin-top: -180rpx;
 		.tj-btn-box{
-			text{font-size: 24rpx;padding:6rpx 16rpx;margin-right: 16rpx;
+			text{font-size: 24rpx;padding:6rpx 16rpx;margin-right: 16rpx;display: inline-block;
 			border: 1rpx solid #3fd2a1;color:#3fd2a1;border-radius: 6rpx;}
 			.active{background-color:#3fd2a1;color:#fff;}
 		}
@@ -241,7 +241,7 @@
 }	
 /*** 进入考试页面***/
 .phone-kaoshi-page {
-		height: 100vh;display: flex;flex-direction: column;background-color: #f4f6fa;position: relative;
+		display: flex;flex-direction: column;background-color: #f4f6fa;position: relative;
 
 		.kaoshi-page-title {
 			height: 80rpx;line-height: 80rpx;background-color: #fff;margin-top: 20rpx;font-size: 26rpx;color: #333;
@@ -254,7 +254,8 @@
 		.kaoshi-bottom-box {
 			width: 100%;height: 100rpx;background-color: #f0f0f0;
 			display: flex;align-items: center;justify-content: space-between;
-			padding: 0 24rpx;box-sizing: border-box;
+			padding: 0 24rpx;box-sizing: border-box;position: fixed;bottom: var(--window-bottom);
+			.bj-btn,.jx-btn,.save-btn{height: 60rpx;line-height: 58rpx;box-sizing: border-box;}
 			.bj-btn{margin-left: unset;}
 			.jx-btn,.save-btn{margin-right: unset;}
 			.shiti-num-icon{
@@ -264,8 +265,8 @@
 			.active-num{color: #30c190;}
 		}
 
-		.ks-btn-prev {position: absolute;bottom: 130rpx;left:24rpx;}
-		.ks-btn-next {position: absolute;bottom: 130rpx;right: 24rpx;}
+		.ks-btn-prev {position: fixed;bottom: 130rpx;left:24rpx;}
+		.ks-btn-next {position: fixed;bottom: 130rpx;right: 24rpx;}
 	}
 
 /*** 得分页面***/
@@ -354,7 +355,8 @@
 
 /*** 进入成绩 ***/
 .phone-score-page{
-	height: 100vh;display: flex;flex-direction: column;background-color: #f4f6fa;position: relative;
+	width: 100%;height: 100vh;
+	display: flex;flex-direction: column;background-color: #f4f6fa;
 	.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;
@@ -362,19 +364,24 @@
 		.user-score{color: #30c190;}
 	}
 	.score-shiti-content{
-		padding: 24rpx 0 0;background-color: #fff;flex: 1;overflow: auto;
+		padding: 24rpx 0 160rpx;background-color: #fff;flex: 1;overflow: auto;
 		.phone-danxuan-box,.phone-duoxuan-box,.phone-panduan-box,.phone-tiankong-box{height: auto;margin: 0 32rpx;}
+		.dajx-row{padding-bottom: 150rpx;}
 		}
 	.score-answer-box{
 		background-color: #fff;border-top: 10rpx solid #f4f6fa;
 		.score-line-title{margin-bottom: 0;}
 	}
 	
+	.phone-question-answer-box{
+		overflow: unset;
+	}
+	
 	// bottom
 	.score-bottom-box{
 		width: 100%;height: 100rpx;background-color: #f0f0f0;
 		display: flex;align-items: center;justify-content: space-between;
-		padding: 0 24rpx;box-sizing: border-box;
+		padding: 0 24rpx;box-sizing: border-box;position: fixed;bottom: var(--window-bottom);
 		.score-num-icon{
 			width: 27px;height: 24px;vertical-align: middle;
 			background-image: url("@/static/images/exam/shiti-num-icon.png");@include ezy-no-repeat-cover();
@@ -388,7 +395,7 @@
 
 /*** 答题卡 ***/
 .answer-card-popup{
-	height: 100vh;width: 100%;display: flex;flex-direction: column;
+	width: 100%;height: 100vh;display: flex;flex-direction: column;overflow: auto;background-color: #fff;
 	.card-content-box{overflow: auto;flex: 1;}
 	.answer-card-content{display: flex;flex-wrap: wrap;box-sizing: border-box;padding: 20rpx 16rpx;}
 	.paragraph-title{width: 100%;font-size: 30rpx;margin:0 0 10rpx 24rpx;}
@@ -770,13 +777,20 @@
 /*** 筛选 ***/
 .phone-filter-page{
 	width: 100%;height: 100vh;background-color: #f8f9fd;
-	display: flex;flex-direction: column;
+	display: flex;flex-direction: column;overflow: auto;-webkit-overflow-scrolling: touch;
 	.filter-body-box{margin-top: 20rpx;background-color: #fff;flex:1;overflow: auto;}
 	.filter-body-name{margin: 0 calc(16rpx + 1%);font-size: 28rpx;color: #333;
 	font-weight: 600;box-sizing: border-box;padding: 20rpx 0 0;}
 	.filter-radio-group{border-bottom:1rpx solid #f5f5f5;}
-	.filter-btn-box{display: flex;background-color: #fff;box-sizing: border-box;padding: 32rpx 42rpx;
-	    border-top: 1rpx solid #f5f5f5;justify-content: center;}
+	.filter-btn-box{display: flex;background-color: #fff;box-sizing: border-box;
+	    border-top: 1rpx solid #f5f5f5;justify-content: center;
+		/*  #ifdef  H5  */
+		padding: 32rpx 42rpx 100rpx;
+		/*  #endif  */
+		/*  #ifdef  APP-PLUS  */
+		padding: 32rpx 42rpx;
+		/*  #endif  */
+		}
 	.filter-btn{font-size: 26rpx;width: 200rpx;margin: 0;}	
 	.filter-btn + .filter-btn{margin-left: 60rpx;}
 }

+ 24 - 24
pages/admin/Chengji/ksScoreShijuan.vue

@@ -30,29 +30,29 @@
 					<tiankong :question="activeSt" :key="activeSt.stId"></tiankong>
 				</template>
 			</view>
-		</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="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>
@@ -74,7 +74,7 @@
 		</view>
 
 		<!-- 答题卡 -->
-		<uni-popup ref="popupRef" background-color="#fff" :is-mask-click="false" :mask-click="false">
+		<uni-popup ref="popupRef" background-color="#fff" :animation="false" :is-mask-click="false" :mask-click="false">
 			<view class="answer-card-popup">
 				<view class="icon-title-navBar-box">
 					<view @click="handlePopupBack" class="nav-bar-icon"> </view>
@@ -457,7 +457,7 @@
 	}
 
 	function handleOpenCard() {
-		popupRef.value.open('bottom')
+		popupRef.value.open('top')
 	}
 </script>
 

+ 2 - 2
pages/admin/Kaoshi/exam.vue

@@ -50,7 +50,7 @@
 		</template>
 
 		<!-- 答题卡 -->
-		<uni-popup ref="popupRef" background-color="#fff" :is-mask-click="false" :mask-click="false">
+		<uni-popup ref="popupRef" background-color="#fff" :animation="false" :is-mask-click="false" :mask-click="false">
 			<view class="answer-card-popup">
 				<view class="icon-title-navBar-box">
 					<view @click="handlePopupBack" class="nav-bar-icon"> </view>
@@ -243,7 +243,7 @@
 	}
 
 	function showAnswerCard() {
-		popupRef.value.open('bottom')
+		popupRef.value.open('top')
 	}
 
 	function handlePopupBack() {

+ 2 - 2
pages/admin/Lianxi/lianxi.vue

@@ -51,7 +51,7 @@
 		</template>
 
 		<!-- 答题卡 -->
-		<uni-popup ref="popupRef" background-color="#fff" :is-mask-click="false" :mask-click="false">
+		<uni-popup ref="popupRef" background-color="#fff" :animation="false" :is-mask-click="false" :mask-click="false">
 			<view class="answer-card-popup">
 				<view class="icon-title-navBar-box">
 					<view @click="handlePopupBack" class="nav-bar-icon"> </view>
@@ -244,7 +244,7 @@
 	}
 
 	function showAnswerCard() {
-		popupRef.value.open('bottom')
+		popupRef.value.open('top')
 	}
 
 	function handlePopupBack() {

+ 2 - 2
pages/client/Chengji/ksScoreShijuan.vue

@@ -68,7 +68,7 @@
 				</view>
 			</view>
 			<!-- 答题卡 -->
-			<uni-popup ref="popupRef" background-color="#fff" :is-mask-click="false" :mask-click="false">
+			<uni-popup ref="popupRef" background-color="#fff" :animation="false" :is-mask-click="false" :mask-click="false">
 				<view class="answer-card-popup">
 					<view class="icon-title-bjcolor-navBar-box">
 						<view @click="handlePopupBack" class="nav-bar-icon"> </view>
@@ -440,7 +440,7 @@
 			popupRef.value.close()
 	}
 	function handleOpenCard() {
-		popupRef.value.open('bottom')
+		popupRef.value.open('top')
 	}
 </script>
 

+ 25 - 24
pages/client/Chengji/lxScoreShijuan.vue

@@ -30,32 +30,33 @@
 					<tiankong :question="activeSt" :key="activeSt.stId"></tiankong>
 				</template>
 			</view>
-		</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="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 class="score-bottom-box" v-if="activeSt">
 			<view @click="handleOpenCard" class="score-num-box">
@@ -74,7 +75,7 @@
 		</view>
 
 		<!-- 答题卡 -->
-		<uni-popup ref="popupRef" background-color="#fff" :is-mask-click="false" :mask-click="false">
+		<uni-popup ref="popupRef" background-color="#fff" :animation="false" :is-mask-click="false" :mask-click="false">
 			<view class="answer-card-popup">
 				<view class="icon-title-bjcolor-navBar-box">
 					<view @click="handlePopupBack" class="nav-bar-icon"> </view>
@@ -464,7 +465,7 @@
 	}
 
 	function handleOpenCard() {
-		popupRef.value.open('bottom')
+		popupRef.value.open('top')
 	}
 </script>
 

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

@@ -61,7 +61,7 @@
 		</template>
 
 		<!-- 答题卡 -->
-		<uni-popup ref="popupRef" background-color="#fff" :is-mask-click="false" :mask-click="false">
+		<uni-popup ref="popupRef" background-color="#fff" :animation="false" :is-mask-click="false" :mask-click="false">
 			<view class="answer-card-popup">
 				<view class="icon-title-bjcolor-navBar-box">
 					<view @click="handlePopupBack" class="nav-bar-icon"> </view>
@@ -525,7 +525,7 @@
 	}
 
 	function showAnswerCard() {
-		popupRef.value.open('bottom')
+		popupRef.value.open('top')
 	}
 
 	function handlePopupBack() {

+ 2 - 2
pages/client/Lianxi/exam.vue

@@ -60,7 +60,7 @@
 		</template>
 
 		<!-- 答题卡 -->
-		<uni-popup ref="popupRef" background-color="#fff" :is-mask-click="false" :mask-click="false">
+		<uni-popup ref="popupRef" background-color="#fff" :animation="false" :is-mask-click="false" :mask-click="false">
 			<view class="answer-card-popup">
 				<view class="icon-title-bjcolor-navBar-box">
 					<view @click="handlePopupBack" class="nav-bar-icon"> </view>
@@ -376,7 +376,7 @@
 	}
 
 	function showAnswerCard() {
-		popupRef.value.open('bottom')
+		popupRef.value.open('top')
 	}
 
 	function handlePopupBack() {