tanxue 1 mese fa
parent
commit
b511243efe

+ 5 - 5
common/styles/global/components.scss

@@ -236,7 +236,7 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 
 /***** 单选题 *****/
 .phone-danxuan-box{
-	margin: 0 10rpx;overflow: auto;height: calc(100vh - 440rpx - var(--status-bar-height));
+	margin: 0 10rpx;overflow: auto;height: calc(100vh - 450rpx - var(--status-bar-height));
 	.danxuan-option-box{
 		width: 100%;line-height:96rpx;border-radius: 8px;margin-bottom: 20rpx;
 		font-size: 32rpx;color: #666;box-sizing: border-box;padding: 10rpx 24rpx;
@@ -255,14 +255,14 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 }
 /***** 判断题 *****/
 .phone-duoxuan-box{
-	margin: 0 10rpx;overflow: auto;height: calc(100vh - 440rpx - var(--status-bar-height));
+	margin: 0 10rpx;overflow: auto;height: calc(100vh - 450rpx - var(--status-bar-height));
 	.duoxuan-option-box{
 		width: 100%;line-height:96rpx;border-radius: 8px;margin-bottom: 20rpx;
 		font-size: 32rpx;color: #666;box-sizing: border-box;padding: 10rpx 24rpx;
 		display: flex;
 		.option-change{
 			width: 48rpx;height: 48rpx;line-height: 48rpx;box-sizing: border-box;
-			flex-shrink: 0;border-radius: 50%;border: 1rpx solid;margin-right: 16rpx;
+			flex-shrink: 0;border: 1rpx solid;margin-right: 16rpx;
 			    display: flex;align-items: center;justify-content: center;
 			}
 		.option-question{font-size: 32rpx;line-height: 1.6;margin-left: 6rpx;@include ezy-rich-text;
@@ -276,7 +276,7 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 
 /***** 判断题 *****/
 .phone-panduan-box{
-	margin: 0 10rpx;overflow: auto;height: calc(100vh - 440rpx - var(--status-bar-height));
+	margin: 0 10rpx;overflow: auto;height: calc(100vh - 450rpx - var(--status-bar-height));
 	.panduan-option-box{
 		width: 100%;line-height:96rpx;border-radius: 8px;margin-bottom: 20rpx;
 		font-size: 32rpx;color: #666;box-sizing: border-box;padding: 10rpx 24rpx;
@@ -293,7 +293,7 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 
 /***** 填空题 *****/
 .phone-tiankong-box{
-	overflow: auto;height: calc(100vh - 440rpx - var(--status-bar-height));
+	overflow: auto;height: calc(100vh - 450rpx - var(--status-bar-height));
 	.tiankong-option-box{
 		padding:0 40rpx;box-sizing: border-box;margin-bottom: 36rpx;
 		.option-question{font-size: 30rpx;color: #333;}

+ 4 - 9
components/zhuapaiConfirm/submitScore.vue

@@ -1,11 +1,8 @@
 <template>
-	<uni-popup ref="popupRef" :animation="false" :is-mask-click="false" type="bottom"
+	<uni-popup ref="popupRef" :animation="false" :is-mask-click="false" type="top"
 		mask-background-color="rgba(0, 0, 0, 0.4);">
 		<view class="exam-score-dialog">
-			<view class="icon-title-bjcolor-navBar-box">
-				<view @click="handleClose" class="nav-bar-icon"></view>
-				<text class="nav-bar-title">{{title}}</text>
-			</view>
+			<customNavbarVue :title="title" :show-back-btn="true" @back="handleClose"></customNavbarVue>
 
 			<view class="score-content-box">
           <view class="score-content-name">{{data[nameKey]}}</view>
@@ -31,10 +28,8 @@
 </template>
 
 <script setup>
-	import {
-		ref,
-		reactive
-	} from "vue";
+	import {ref,reactive} from "vue";
+	import customNavbarVue from "@/components/custom-navbar/custom-navbar.vue";
 	const popupRef = ref(null)
 	const data = reactive({
 		ksName: '',

+ 3 - 11
pages/client/Lianxi/exam.vue

@@ -1,10 +1,7 @@
 <template>
 	<view class="phone-kaoshi-page">
 		<!-- 导航区域 -->
-		<view class="icon-title-bjcolor-navBar-box">
-			<view @click="handleBack" class="nav-bar-icon"></view>
-			<text class="nav-bar-title">{{data.lxName}}</text>
-		</view>
+		<customNavbarVue :title="data.lxName" :show-back-btn="true" @back="handleBack"></customNavbarVue>
 		<!-- 第一行 -->
 		<view class="kaoshi-page-title">
 			<!--  倒计时 -->
@@ -87,13 +84,8 @@
 </template>
 
 <script setup>
-	import {
-		ref,
-		reactive,
-		computed,
-		watch,
-		nextTick
-	} from "vue";
+	import {ref,reactive,computed,watch,nextTick} from "vue";
+	import customNavbarVue from "@/components/custom-navbar/custom-navbar.vue";
 	import answerQueren from "@/components/zhuapaiConfirm/answerQueren.vue";
 	import submitScoreVue from "@/components/zhuapaiConfirm/submitScore.vue";
 	import {