Merge branch '2025北京诚祥' of https://gogs.mtavip.com/wangguoyu/uniProject into 2025北京诚祥

components/zhuapaiConfirm/submitScore.vue

@@ -8,8 +8,8 @@
 			</view>
 
 			<view class="score-content-box">
-				<view class="score-content-name">{{data.ksName}}</view>
-				<view class="content-score-box">
+          <view class="score-content-name">{{data[nameKey]}}</view>
+          <view class="content-score-box">
 					<view>
 						<view class="score-content-text">正确数量：{{data.rightCount}}</view>
 						<view class="score-content-text">试题总数：{{data.shitiTotal}}</view>
@@ -38,6 +38,7 @@
 	const popupRef = ref(null)
 	const data = reactive({
 		ksName: '',
+    lxName: '',
 		ksScore: '',
 		okScore: '',
 		rightCount: '',
@@ -53,7 +54,11 @@
 		labelName: {
 			type: String,
 			default: '考试总分'
-		}
+		},
+    nameKey: {
+      type: String,
+      default: 'ksName'
+    }
 	})
 
 	const emits = defineEmits(['confirm', 'close'])
@@ -70,6 +75,7 @@
 
 	function showDialog(options) {
 		data.ksName = options.ksName;
+    data.lxName = options.lxName;
 		data.ksScore = options.ksScore;
 		data.okScore = options.okScore;
 		data.rightCount = options.rightCount;

pages.json

@@ -42,9 +42,13 @@
 		{
 			"path": "pages/admin/Kaoshi/exam",
 			"style": {
-				"navigationBarTitleText": "考试",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"app-plus": {
+					"softinputMode": "adjustResize",
+					"softinputNavBar": "none"
+				}
 			}
+			
 		},
 		{
 			"path": "pages/admin/Kecheng/list",
@@ -74,7 +78,11 @@
 		{
 			"path": "pages/admin/Lianxi/lianxi",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"app-plus": {
+					"softinputMode": "adjustResize",
+					"softinputNavBar": "none"
+				}
 			}
 		},
 		{
@@ -98,14 +106,24 @@
 		{
 			"path": "pages/client/Kaoshi/exam",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"app-plus": {
+					"softinputMode": "adjustResize",
+					"softinputNavBar": "none"
+				}
 			}
+			
 		},
 		{
 			"path": "pages/client/Lianxi/exam",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"app-plus": {
+					"softinputMode": "adjustResize",
+					"softinputNavBar": "none"
+				}
 			}
+			
 		},
 		{
 			"path" : "pages/client/Chengji/lxScoreShijuan",

pages/client/Lianxi/exam.vue

@@ -80,7 +80,7 @@
 		<!-- 交卷确认 -->
 		<answerQueren ref="answerQrRef" @confirm="handleQuerenConfirm"></answerQueren>
 		<!-- 考试得分 -->
-		<submitScoreVue title="练习得分" ref="subScoreRef" labelName="练习总分" @confirm="handleScoreConfirm" @close="handleScoreClose"></submitScoreVue>
+		<submitScoreVue title="练习得分" nameKey="lxName" ref="subScoreRef" labelName="练习总分" @confirm="handleScoreConfirm" @close="handleScoreClose"></submitScoreVue>
 	</view>
 </template>