Merge remote-tracking branch 'origin/main'

pages/exam/exam.vue

@@ -67,10 +67,7 @@
 		<!-- 答题卡 -->
 		<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>
-					<text class="nav-bar-title">答题卡</text>
-				</view>
+				<customNavbarVue class="card-navBar-box" title="答题卡" :show-back-btn="true" @back="handlePopupBack"></customNavbarVue>
 				<view class="card-content-box">
 					<view class="answer-card-content" v-for="(paragraph,paragraphIndex) in questionData"
 						:key="paragraphIndex">
@@ -82,6 +79,10 @@
 						</view>
 					</view>
 				</view>
+				<view class="answer-card-btn-box">
+					<view class="card-btn card-save-btn" @click="handleSave(true)">保存</view>
+					<view @click="handleJiaojuan" class="card-btn card-jj-btn"> 交卷并查看成绩</view>
+				</view>
 			</view>
 		</uni-popup>
 		<!-- 摄像头确认 -->