Merge remote-tracking branch 'origin/main'

common/styles/global/components.scss

@@ -101,11 +101,11 @@ view{box-sizing: border-box;}
 .icon-title-navBar-box{
 	background-color: #fff;box-sizing: border-box;
 	.icon-title-box{display: flex;align-items: center;justify-content: center;padding:10rpx 10rpx 20rpx;position: relative;}
-	.nav-bar-title{
-		font-size: 32rpx;height: 64rpx;line-height: 64rpx;color: #333;max-width: 70%;
-	}
+	.nav-bar-title{font-size: 32rpx;height: 64rpx;line-height: 64rpx;color: #333;max-width: 70%;}
+	.nav-bar-box{width: 64rpx;height: 64rpx;line-height: 64rpx;position: absolute;left: 10rpx;top: 10rpx;
+	display: flex;align-items: center;justify-content: center;}
 	.nav-bar-icon{
-		width: 24rpx;height: 38rpx;position: absolute;left: 24rpx;top: 24rrpx;
+		width: 24rpx;height: 38rpx;
 		background-image: url("@/static/images/common/nav-bar-jt.svg");@include ezy-no-repeat-cover();
 	}
 	.bar-ml10{margin-left: 10rpx;}
@@ -332,7 +332,7 @@ view{box-sizing: border-box;}
 	}
 	.answer-card-btn-box{
 		display: flex;border-top: 1rpx solid #E3E3E3;background-color: #FEF0F0;line-height: 1;
-		.card-btn{width: 50%;text-align: center;font-size: 32rpx;color: #333;padding: 32rpx 0;}
+		.card-btn{width: 50%;text-align: center;font-size: 32rpx;color: #333;padding: 42rpx 0;}
 		.card-jj-btn{background-color: #0856e6;color: #FFF;}}
 }
 /***** 通用试题页面组件 *****/
@@ -343,7 +343,7 @@ view{box-sizing: border-box;}
 	}
 	.shiti-content-box {padding: 24rpx 24rpx 0 24rpx;background-color: #fff;flex: 1;}	
 	.shiti-bottom-box{
-	  width: 100%;height: 100rpx;background-color: #f0f0f0;
+	  width: 100%;height: 120rpx;background-color: #f0f0f0;
 	  display: flex;align-items: center;justify-content: space-between;
 	  padding: 0 24rpx;box-sizing: border-box;position: fixed;bottom: var(--window-bottom);
 	  // 按钮

components/custom-navbar/custom-navbar.vue

@@ -3,7 +3,9 @@
 	  <!-- 状态栏填充（兼容刘海屏） -->
 	  <view class="status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
 	  <view class="icon-title-box">
-		  <view class="nav-bar-icon" v-if="showBackBtn" @click="handleBack"></view>
+		  <view class="nav-bar-box" v-if="showBackBtn" @click="handleBack">
+			  <view class="nav-bar-icon"></view>
+		  </view>
 		  <!-- 标题区域 -->
 		  <view class="nav-bar-title" :style="{fontSize: titleSize + 'rpx', color: titleColor}">
 			{{ title }}

components/questions/panduan.vue

@@ -8,11 +8,11 @@
 		<!-- 选项区域 -->
 		<radio-group @change="radioChange" class="panduan-option-box">
 			<label class="option-question" :class="formatClass('1')">
-				<radio value="1" :disabled="showError" :checked="question.reply == '1'"/>
+				<radio value="1" :disabled="showError" :checked="question.reply == '1'" color="#6186fb"/>
 				<view>正确</view>
 			</label>
 			<label class="option-question" :class="formatClass('0')"> 
-				<radio value="0" :disabled="showError" :checked="question.reply == '0'"/>
+				<radio value="0" :disabled="showError" :checked="question.reply == '0'" color="#6186fb"/>
 				<view>错误</view>
 			</label>
 		</radio-group>