diff --git a/newPages/schoolDetail/index.vue b/newPages/schoolDetail/index.vue
index 7abc034..48444b8 100644
--- a/newPages/schoolDetail/index.vue
+++ b/newPages/schoolDetail/index.vue
@@ -42,11 +42,10 @@
 						<view class="text-wrapper_4 flex-col">
 							<view style="display: flex">
 								<text class="text_13"
-									style="background-color: rgba(223, 235, 255, 1);padding: 5rpx 15rpx">{{
-                    item.tittle
-                  }}
+									style="background-color: rgba(223, 235, 255, 1);padding: 5rpx 15rpx"
+									v-if="item.tittle">{{ item.tittle }}
 								</text>
-								<text class="text-wrapper_3  text_13"
+								<text class="text-wrapper_3  text_13" v-if="item.type"
 									style="color: black;padding: 5rpx 10rpx">{{ item.type }}</text>
 							</view>
 						</view>
@@ -78,7 +77,7 @@
 						<image class="label_3" referrerpolicy="no-referrer" :src="imagesUrl + '/' + item.image" />
 						<view class="text-group_4 flex-col justify-between">
 							<text class="text_25">{{ item.name }}</text>
-							<text class="text_27">教龄&nbsp;{{ item.seniority }}年</text>
+							<text class="text_27" v-if="item.seniority">教龄&nbsp;{{ item.seniority }}年</text>
 						</view>
 					</view>
 				</view>
diff --git a/pagesA/examinationAdd/index.vue b/pagesA/examinationAdd/index.vue
index b5ec560..89f4eb5 100644
--- a/pagesA/examinationAdd/index.vue
+++ b/pagesA/examinationAdd/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <view class="page flex-col">
-    <!-- <view class="group_1 flex-row">
+	<view class="page flex-col">
+		<!-- <view class="group_1 flex-row">
 
 
     </view>
@@ -14,57 +14,43 @@
       <text class="text_1">考试结果</text>
 
     </view> -->
-	<view style="width: 100%;background: #f4f5f6;box-sizing: border-box;padding-top: 88px;">
-	  <headers titles="考试结果">
-	    <uni-icons type="left" color="#000000" size="22px"></uni-icons>
-	  </headers>
-	</view>
-	<view >
-		<scroll-view
-		    :style="{ height: scrollHeight + 'px' }"
-		    scroll-y="true" class="scroll-view"
-		    >
-    <view class="group_4 flex-col">
-      <view class="block_1 flex-row justify-between" @click="show = true">
-        <text class="text_19">是否通过</text>
-          <view>
-            <u-picker v-model="process.examStatus" :show="show" :columns="ifPassColumns" title="是否通过"
-                      @confirm="ifPassOnConfirm" @cancel="show = false">
-            </u-picker>
-            <text class="text_191">{{ selectedValue || '请选择' }}</text>
-          </view>
-      </view>
-      <view class="text-wrapper_7 flex-row justify-between">
-        <text class="text_4">分数</text>
-        <view class="text_5_1 ">
-          <u--input
-              placeholder="请输入分数"
-              border="none"
-              v-model="process.examScore"
-              maxlength="3"
-              inputAlign="right"
-          >分
-          </u--input>
-        </view>
-      </view>
-      <view class="text-wrapper_8 flex-row justify-between">
-        <text class="text_20">时间</text>
-        <view>
-          <u-datetime-picker
-              :show="showTimePicker"
-              v-model="process.examTime"
-              mode="datetime"
-			  :minDate="minTime"
-			  :maxDate="maxTime"
-              @confirm="onConfirmExamTime"
-              @cancel="showTimePicker = false"
-          ></u-datetime-picker>
-          <text class="text_3" @click="showTimePicker = true">
-            {{ process.examTime ? formatDate(process.examTime) : '选择时间' }}
-          </text>
-        </view>
-      </view>
-      <!-- <view class="text-wrapper_9 flex-row justify-between">
+		<view style="width: 100%;background: #f4f5f6;box-sizing: border-box;padding-top: 88px;">
+			<headers titles="考试结果">
+				<uni-icons type="left" color="#000000" size="22px"></uni-icons>
+			</headers>
+		</view>
+		<view>
+			<scroll-view :style="{ height: scrollHeight + 'px' }" scroll-y="true" class="scroll-view">
+				<view class="group_4 flex-col">
+					<view class="block_1 flex-row justify-between" @click="show = true">
+						<text class="text_19">是否通过</text>
+						<view>
+							<u-picker v-model="process.examStatus" :show="show" :columns="ifPassColumns" title="是否通过"
+								@confirm="ifPassOnConfirm" @cancel="show = false">
+							</u-picker>
+							<text class="text_191">{{ selectedValue || '请选择' }}</text>
+						</view>
+					</view>
+					<view class="text-wrapper_7 flex-row justify-between">
+						<text class="text_4">分数</text>
+						<view class="text_5_1 ">
+							<u--input placeholder="请输入分数" border="none" v-model="process.examScore" maxlength="3"
+								inputAlign="right">分
+							</u--input>
+						</view>
+					</view>
+					<view class="text-wrapper_8 flex-row justify-between">
+						<text class="text_20">时间</text>
+						<view>
+							<u-datetime-picker :show="showTimePicker" v-model="process.examTime" mode="datetime"
+								:minDate="minTime" :maxDate="maxTime" @confirm="onConfirmExamTime"
+								@cancel="showTimePicker = false"></u-datetime-picker>
+							<text class="text_3" @click="showTimePicker = true">
+								{{ process.examTime ? formatDate(process.examTime) : '选择时间' }}
+							</text>
+						</view>
+					</view>
+					<!-- <view class="text-wrapper_9 flex-row justify-between">
         <text class="text_6">姓名</text>
         <view class="text_5_1 ">
         <u--input
@@ -76,427 +62,460 @@
           ></u--input>
         </view>
       </view> -->
-      <view class="text-wrapper_10 flex-row justify-between">
-        <text class="text_8">考试类型</text>
-        <text class="text_9" v-if="process.subject != 2 && process.subject != 3">{{ courseType }}</text>
-        <text class="text_9" v-else>{{ opCourseType }}</text>
-      </view>
-      <view class="text-wrapper_11 flex-row justify-between" @click="subjectShow = true"
-            v-if="process.subject != 2 && process.subject != 3">
-        <text class="text_10">考试科目</text>
-        <view>
-          <u-picker v-model="process.subject" :show="subjectShow" :columns="subjectColumns" title="科目"
-                    @confirm="subjectOnConfirm" @cancel="subjectShow = false">
-          </u-picker>
-          <text class="text_11">{{ subjectValue || '请选择科目' }}</text>
-        </view>
-      </view>
-	  
-	  <view class="text-wrapper_11 flex-row justify-between" 
-	        v-else-if="process.subject == 2 || process.subject == 3">
-	    <text class="text_10">考试科目</text>
-	    
-	      <text class="text_11">{{ formatSubject(process.subject) }}</text>
-	    
-	  </view>
-	  
-	  <!-- <view class="text-wrapper_3 flex-row justify-between" v-if="item.subject == 2 || item.subject == 3">
+					<view class="text-wrapper_10 flex-row justify-between">
+						<text class="text_8">考试类型</text>
+						<text class="text_9" v-if="process.subject != 2 && process.subject != 3">{{ courseType }}</text>
+						<text class="text_9" v-else>{{ opCourseType }}</text>
+					</view>
+					<view class="text-wrapper_11 flex-row justify-between" @click="subjectShow = true"
+						v-if="process.subject != 2 && process.subject != 3">
+						<text class="text_10">考试科目</text>
+						<view>
+							<u-picker v-model="process.subject" :show="subjectShow" :columns="subjectColumns" title="科目"
+								@confirm="subjectOnConfirm" @cancel="subjectShow = false">
+							</u-picker>
+							<text class="text_11">{{ subjectValue || '请选择科目' }}</text>
+						</view>
+					</view>
+
+					<view class="text-wrapper_11 flex-row justify-between"
+						v-else-if="process.subject == 2 || process.subject == 3">
+						<text class="text_10">考试科目</text>
+
+						<text class="text_11">{{ formatSubject(process.subject) }}</text>
+
+					</view>
+
+					<!-- <view class="text-wrapper_3 flex-row justify-between" v-if="item.subject == 2 || item.subject == 3">
 	    <text class="text_8">考试地址：</text>
 	    <text class="text_9">{{ item.addr }}</text>
 	  </view> -->
-	  
-    </view>
-    <view class="group_5 flex-col">
-      <text class="text_16">备注</text>
-      <u--textarea class="text_17" v-model="process.remark" placeholder="请输入内容" count></u--textarea>
-      <text class="text_18">图片</text>
-      <view class="image-wrapper_4 flex-row justify-between">
-        <u-upload
 
-            :fileList="displayFileList"
-            @afterRead="afterRead"
-            @delete="deletePic"
-            multiple
-            :maxCount="2"
-        ></u-upload>
-      </view>
-    </view>
-	</scroll-view>
+				</view>
+				<view class="group_5 flex-col">
+					<text class="text_16">备注</text>
+					<u--textarea class="text_17" v-model="process.remark" placeholder="请输入内容" count></u--textarea>
+					<text class="text_18">图片</text>
+					<view class="image-wrapper_4 flex-row justify-between">
+						<u-upload :fileList="displayFileList" @afterRead="afterRead" @delete="deletePic" multiple
+							:maxCount="2"></u-upload>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<view class="block_8 flex-col">
+			<view class="text-wrapper_8 flex-col" @click="saveData()">
+				<text class="text_19">确定</text>
+			</view>
+		</view>
 	</view>
-    <view class="block_8 flex-col">
-      <view class="text-wrapper_8 flex-col" @click="saveData()">
-        <text class="text_19">确定</text>
-      </view>
-    </view>
-  </view>
 </template>
 <script>
-import upload from '@/utils/upload.js'
-import request from '@/utils/request.js'
-import {getLocalUserInfo} from '../../utils/auth';
-import headers from "@/components/header/headers.vue";
+	import upload from '@/utils/upload.js'
+	import request from '@/utils/request.js'
+	import {
+		getLocalUserInfo
+	} from '../../utils/auth';
+	import headers from "@/components/header/headers.vue";
 
-export default {
-	components: {
-	  headers
-	},
-  data() {
-    return {
-      show: false,
-      showTimePicker: false,
-      subjectShow: false,
-      ifPassColumns: [['已通过', '未通过']],
-      subjectColumns: [['科目一']],
-      selectedValue: '',
-      subjectValue: '',
-      fileList: [],
-      imageUrl: this.$imagesUrl,
-      userInfo: [],
-      courseType: null,
-      courseCompleteStatusList: {},
-      opTenantId: null,
-      opCourseType: null,
-      examId: null,
-      batchId: null,
-      batchItemId: null,
-      process: {
-        id: null,
-        userName: null,
-        userId: null,
-        subject: null,
-        fraction: null,
-        examNum: null,
-        examStatus: null,
-        examScore: null,
-        remark: '',
-        examTime: Date.now(),
-        images: null,
-        tenantId: null,
-        courseId: null,
-        ifPass: null,
-        batchId: null,
-        coachId: null,
-      },
-	  minTime: 0,
-	  maxTime: 0,
-	  scrollHeight: 0,
-      constants: {}
-    };
-  },
-  onLoad(options) {
-	  console.log('options', options)
-    this.userInfo = getLocalUserInfo()
-    // this.getUserOrderDetails()
-    this.process.subject = options.subject
-    this.opTenantId = options.tenantId
-    this.opCourseType = options.courseType
-    this.process.subject = options.subject
-    this.process.courseId = options.courseId
-    this.process.batchId = options.batchId
-    this.examId = options.id
-    this.batchId = options.batchId
-    this.batchItemId = options.id
-    this.process.id = options.id
-    this.process.coachId = options.coachId
-    this.process.userId = this.userInfo.id
-	this.process.coachId = options.coachId
-	this.process.userName = options.nickname
-	this.process.tenantId = options.tenantId
-	this.getCourseCompleteStatus();
-  },
-  onReady() {
-    // 动态计算滚动区域高度
-    this.calculateScrollHeight();
-  },
-  computed: {
-    displayFileList() {
-      return this.fileList.map(item => {
-        if (item.url.startsWith('http')) {
-          return item;
-        }
+	export default {
+		components: {
+			headers
+		},
+		data() {
+			return {
+				show: false,
+				showTimePicker: false,
+				subjectShow: false,
+				ifPassColumns: [
+					['已通过', '未通过']
+				],
+				subjectColumns: [
+					['科目一']
+				],
+				selectedValue: '',
+				subjectValue: '',
+				fileList: [],
+				imageUrl: this.$imagesUrl,
+				userInfo: [],
+				courseType: null,
+				courseCompleteStatusList: {},
+				opTenantId: null,
+				opCourseType: null,
+				examId: null,
+				batchId: null,
+				batchItemId: null,
+				process: {
+					id: null,
+					userName: null,
+					userId: null,
+					subject: null,
+					fraction: null,
+					examNum: null,
+					examStatus: null,
+					examScore: null,
+					remark: '',
+					examTime: Date.now(),
+					images: null,
+					tenantId: null,
+					courseId: null,
+					ifPass: null,
+					batchId: null,
+					coachId: null,
+				},
+				minTime: 0,
+				maxTime: 0,
+				scrollHeight: 0,
+				constants: {}
+			};
+		},
+		onLoad(options) {
+			console.log('options', options)
+			this.userInfo = getLocalUserInfo()
+			console.log('userInfo', this.userInfo)
+			// this.getUserOrderDetails()
+			this.process.subject = options.subject
+			this.opTenantId = options.tenantId
+			this.opCourseType = options.courseType
+			this.process.subject = options.subject
+			this.process.courseId = options.courseId
+			this.process.batchId = options.batchId
+			this.examId = options.id
+			this.batchId = options.batchId
+			this.batchItemId = options.id
+			this.process.id = options.id
+			this.process.coachId = options.coachId
+			this.process.userId = this.userInfo.id
+			this.process.coachId = options.coachId
+			this.process.userName = options.nickname
+			this.process.tenantId = options.tenantId
+			this.getCourseCompleteStatus();
+		},
+		onReady() {
+			// 动态计算滚动区域高度
+			this.calculateScrollHeight();
+		},
+		computed: {
+			displayFileList() {
+				return this.fileList.map(item => {
+					if (item.url.startsWith('http')) {
+						return item;
+					}
 
-        const prefix = this.$imagesUrl.endsWith('/') ? this.$imagesUrl : `${this.$imagesUrl}/`;
-        const fullUrl = item.url.startsWith('/')
-            ? `${prefix}${item.url.slice(1)}`
-            : `${prefix}${item.url}`;
+					const prefix = this.$imagesUrl.endsWith('/') ? this.$imagesUrl : `${this.$imagesUrl}/`;
+					const fullUrl = item.url.startsWith('/') ?
+						`${prefix}${item.url.slice(1)}` :
+						`${prefix}${item.url}`;
 
-        return {
-          ...item,
-          url: fullUrl,
-        };
-      });
-    },
-  },
-  created() {
-      const now = new Date()
-      this.maxTime = now.getTime()
-  
-      const min = new Date()
-      min.setFullYear(min.getFullYear() - 5)
-      this.minTime = min.getTime()
-    },
-  methods: {
-    handleBack() {
-      uni.navigateBack({
-        delta: 1
-      });
-    },
-    ifPassOnConfirm(value) {
-      const statusMap = {
-        '已通过': 1,
-        '未通过': 0
-      };
+					return {
+						...item,
+						url: fullUrl,
+					};
+				});
+			},
+		},
+		created() {
+			const now = new Date()
+			this.maxTime = now.getTime()
 
-      // 更新数据
-      this.process.examStatus = statusMap[value.value[0]];
-      this.selectedValue = value.value[0];
-      this.show = false;
-    },
+			const min = new Date()
+			min.setFullYear(min.getFullYear() - 5)
+			this.minTime = min.getTime()
+		},
+		methods: {
+			handleBack() {
+				uni.navigateBack({
+					delta: 1
+				});
+			},
+			ifPassOnConfirm(value) {
+				const statusMap = {
+					'已通过': 1,
+					'未通过': 0
+				};
 
-    subjectOnConfirm(value) {
-      const statusMap = {
-        '科目一': 1,
-        '科目四': 4
-      };
+				// 更新数据
+				this.process.examStatus = statusMap[value.value[0]];
+				this.selectedValue = value.value[0];
+				this.show = false;
+			},
 
-      // 更新数据
-      this.process.subject = statusMap[value.value[0]];
-      this.subjectValue = value.value[0];
-      this.subjectShow = false;
-    },
+			subjectOnConfirm(value) {
+				const statusMap = {
+					'科目一': 1,
+					'科目四': 4
+				};
 
-    onConfirmExamTime(value) {
-      this.process.examTime = value;
-      this.showTimePicker = false;
-	  console.log('process', this.process)
-    },
-	
-    // 格式化时间
-    formatDate(timestamp) {
-      const date = new Date(timestamp);
-      const year = date.getFullYear();
-      const month = String(date.getMonth() + 1).padStart(2, '0');
-      const day = String(date.getDate()).padStart(2, '0');
-      const hours = String(date.getHours()).padStart(2, '0');
-      const minutes = String(date.getMinutes()).padStart(2, '0');
-      return `${year}-${month}-${day} ${hours}:${minutes}`;
-    },
-	
-	formatSubject(subject) {
-	      switch (Number(subject)) {
-	        case 2: return '科目二';
-	        case 3: return '科目三';
-			default: return '未知科目';
-	      }
-	    },
+				// 更新数据
+				this.process.subject = statusMap[value.value[0]];
+				this.subjectValue = value.value[0];
+				this.subjectShow = false;
+			},
+
+			onConfirmExamTime(value) {
+				this.process.examTime = value;
+				this.showTimePicker = false;
+				console.log('process', this.process)
+			},
+
+			// 格式化时间
+			formatDate(timestamp) {
+				const date = new Date(timestamp);
+				const year = date.getFullYear();
+				const month = String(date.getMonth() + 1).padStart(2, '0');
+				const day = String(date.getDate()).padStart(2, '0');
+				const hours = String(date.getHours()).padStart(2, '0');
+				const minutes = String(date.getMinutes()).padStart(2, '0');
+				return `${year}-${month}-${day} ${hours}:${minutes}`;
+			},
+
+			formatSubject(subject) {
+				switch (Number(subject)) {
+					case 2:
+						return '科目二';
+					case 3:
+						return '科目三';
+					default:
+						return '未知科目';
+				}
+			},
 
 
-    deletePic(event) {
-      this.fileList.splice(event.index, 1);
-    },
-    // 新增图片
-    async afterRead(event) {
-      let lists = [].concat(event.file);
-      let fileListLen = this.fileList.length;
+			deletePic(event) {
+				this.fileList.splice(event.index, 1);
+			},
+			// 新增图片
+			async afterRead(event) {
+				let lists = [].concat(event.file);
+				let fileListLen = this.fileList.length;
 
-      for (let i = 0; i < lists.length; i++) {
-        try {
-          const resultUrl = await this.uploadFilePromise(lists[i].url);
-          let item = {
-            status: 'success',
-            url: resultUrl,
-          };
-          this.fileList.splice(fileListLen, 0, item);
-          fileListLen++;
-        } catch (error) {
-          console.error('图片上传失败', error);
-        }
-      }
-    },
-    uploadFilePromise(filePath) {
-      return new Promise((resolve, reject) => {
-        upload({
-          url: '/app-api/small-upload/common/upload',
-          filePath: filePath,
-        }).then((res) => {
-          if (res.data && res.data.url) {
-            resolve(res.data.url);
-          } else {
-            reject(new Error('上传失败'));
-          }
-        }).catch(err => reject(err));
-      });
-    },
+				for (let i = 0; i < lists.length; i++) {
+					try {
+						const resultUrl = await this.uploadFilePromise(lists[i].url);
+						let item = {
+							status: 'success',
+							url: resultUrl,
+						};
+						this.fileList.splice(fileListLen, 0, item);
+						fileListLen++;
+					} catch (error) {
+						console.error('图片上传失败', error);
+					}
+				}
+			},
+			uploadFilePromise(filePath) {
+				return new Promise((resolve, reject) => {
+					upload({
+						url: '/app-api/small-upload/common/upload',
+						filePath: filePath,
+					}).then((res) => {
+						if (res.data && res.data.url) {
+							resolve(res.data.url);
+						} else {
+							reject(new Error('上传失败'));
+						}
+					}).catch(err => reject(err));
+				});
+			},
 
-    // getUserOrderDetails() {
-    //   request({
-    //     url: '/app-api/small/drive/school-course-order/page',
-    //     method: 'GET',
-    //     params: {
-    //       userId: this.userInfo.id,
-    //       paymentStatus: '2',
-    //       ifEnd: false,
-		  // tenantId: 180,
-    //     },
-    //     tenantIdFlag: false
-    //   }).then(res => {
-		  // console.log('123123', res)
-    //     this.orderList = res.data.records;
-    //     if (res.data.records.length > 0) {
-    //       const tempData = res.data.records[0]
-    //       if (this.process.subject != 2 && this.process.subject != 3) {
-    //         this.process.courseId = tempData.courseId
-    //       }
+			// getUserOrderDetails() {
+			//   request({
+			//     url: '/app-api/small/drive/school-course-order/page',
+			//     method: 'GET',
+			//     params: {
+			//       userId: this.userInfo.id,
+			//       paymentStatus: '2',
+			//       ifEnd: false,
+			// tenantId: 180,
+			//     },
+			//     tenantIdFlag: false
+			//   }).then(res => {
+			// console.log('123123', res)
+			//     this.orderList = res.data.records;
+			//     if (res.data.records.length > 0) {
+			//       const tempData = res.data.records[0]
+			//       if (this.process.subject != 2 && this.process.subject != 3) {
+			//         this.process.courseId = tempData.courseId
+			//       }
 
-    //       if (this.process.subject != 2 && this.process.subject != 3) {
-    //         this.courseType = tempData.courseType
-    //       }
+			//       if (this.process.subject != 2 && this.process.subject != 3) {
+			//         this.courseType = tempData.courseType
+			//       }
 
-    //       this.process.tenantId = tempData.tenantId
-    //       this.getCourseCompleteStatus()
-    //     }
-    //   });
-    // },
+			//       this.process.tenantId = tempData.tenantId
+			//       this.getCourseCompleteStatus()
+			//     }
+			//   });
+			// },
 
-    getCourseCompleteStatus() {
-      request({
-        url: '/app-api/process/page',
-        method: 'GET',
-        params: {
-          userId: this.userInfo.id,
-          courseId: this.process.courseId,
-        }
-      }).then(res => {
-		  console.log('res123',res)
-        this.courseCompleteStatusList = res.data.records
-        if (this.courseCompleteStatusList.length > 0) {
-          const subject2 = this.courseCompleteStatusList.find(item => item.subject === 2)
-          const subject3 = this.courseCompleteStatusList.find(item => item.subject === 3)
-		  const subject1Or4 = this.courseCompleteStatusList.find(item => item.subject === 1 || item.subject === 4)
-			if (subject1Or4) {
-			  this.courseType = subject1Or4.courseType
+			getCourseCompleteStatus() {
+				request({
+					url: '/app-api/process/page',
+					method: 'GET',
+					params: {
+						userId: this.userInfo.id,
+						courseId: this.process.courseId,
+					}
+				}).then(res => {
+					console.log('res123', res)
+					this.courseCompleteStatusList = res.data.records
+					if (this.courseCompleteStatusList.length > 0) {
+						const subject2 = this.courseCompleteStatusList.find(item => item.subject === 2)
+						const subject3 = this.courseCompleteStatusList.find(item => item.subject === 3)
+						const subject1Or4 = this.courseCompleteStatusList.find(item => item.subject === 1 || item
+							.subject === 4)
+						if (subject1Or4) {
+							this.courseType = subject1Or4.courseType
+						}
+
+						if (subject2?.status === '2' && subject3?.status === '2') {
+							this.subjectColumns = [
+								['科目一', '科目四']
+							]
+						}
+					}
+				})
+			},
+			calculateScrollHeight() {
+				// 获取屏幕高度
+				const screenHeight = uni.getSystemInfoSync().windowHeight;
+				// 获取顶部区域高度
+				const topHeight = 145;
+				// 计算滚动区域高度
+				this.scrollHeight = screenHeight - topHeight;
+			},
+
+			saveData() {
+				console.log('process', this.process)
+				if (!this.process.userId || !this.process.subject || this.process.examScore === null || this.process
+					.examStatus === null || !this.process.examTime) {
+					uni.showToast({
+						title: '信息填写不完整',
+						icon: 'none'
+					});
+					return;
+				}
+				if (this.process.subject == 1 || this.process.subject == 4) {
+					this.saveDataOne()
+				}
+				if (this.process.subject == 2 || this.process.subject == 3) {
+					this.saveDataTwo()
+				}
+			},
+			saveDataOne() {
+				if (this.process.subject === 1 && this.courseCompleteStatusList.length <= 0) {
+					uni.showToast({
+						title: '请联系驾校人员!',
+						icon: 'none'
+					});
+					return;
+
+				}
+				if (this.process.subject === 4 && this.courseCompleteStatusList.length <= 0) {
+					uni.showToast({
+						title: '请联系驾校人员!',
+						icon: 'none'
+					});
+					return;
+
+				}
+				const postData = {
+					...this.process, // 先拷贝 process 原有数据
+					remark: this.process.remark,
+					userName: this.userInfo.nickname,
+					images: this.fileList?.map(item => item.url).join(',') || '',
+				}
+				// this.process.images = this.fileList?.map(item => item.url).join(',') || '';
+
+				if (!this.process.userId || !this.process.subject || this.process.examScore === null || this.process
+					.examStatus === null || !this.process.examTime) {
+					uni.showToast({
+						title: '信息填写不完整',
+						icon: 'none'
+					});
+					return;
+				}
+				console.log('postData', postData)
+				request({
+					url: '/app-api/process/updateProcess',
+					method: 'PUT',
+					data: postData,
+					// data: this.process,
+				}).then(res => {
+					if (res.code === 0) {
+						uni.showToast({
+							title: '保存成功',
+							icon: 'success',
+							duration: 1000
+						});
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1
+							});
+						}, 1500);
+					} else {
+						uni.showToast({
+							title: res.data?.message || '保存失败',
+							icon: 'none'
+						});
+					}
+				})
+			},
+			saveDataTwo() {
+				const postData = {
+					...this.process, // 先拷贝 process 原有数据
+					tenantId: this.opTenantId,
+					fraction: this.process.examScore,
+					ifPass: this.process.examStatus === 1,
+					id: this.batchItemId,
+					remark: this.process.remark,
+					userName: this.userInfo.nickname,
+					images: this.fileList?.map(item => item.url).join(',') || '',
+				}
+				console.log('postData', postData)
+				/* this.process.userId = this.userInfo.id
+				this.process.tenantId = this.opTenantId
+				this.process.fraction = this.process.examScore
+				this.process.ifPass = this.process.examStatus
+				this.process.images = this.fileList?.map(item => item.url).join(',') || ''; */
+				if (!this.process.userId || !this.process.subject || this.process.examScore === null || this.process
+					.examStatus === null || !this.process.examTime) {
+					uni.showToast({
+						title: '信息填写不完整',
+						icon: 'none'
+					});
+					return;
+				}
+				request({
+					url: '/app-api/examBatch/update',
+					method: 'PUT',
+					data: postData,
+					// data: this.process,
+				}).then(res => {
+					if (res.code === 0) {
+						uni.showToast({
+							title: '保存成功',
+							icon: 'success',
+							duration: 1000
+						});
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1
+							});
+						}, 1500);
+					} else {
+						uni.showToast({
+							title: res.data?.message || '保存失败',
+							icon: 'none'
+						});
+					}
+				})
 			}
 
-          if (subject2?.status === '2' && subject3?.status === '2') {
-            this.subjectColumns = [['科目一', '科目四']]
-          }
-        }
-      })
-    },
-	calculateScrollHeight() {
-	  // 获取屏幕高度
-	  const screenHeight = uni.getSystemInfoSync().windowHeight;
-	  // 获取顶部区域高度
-	  const topHeight = 145;
-	  // 计算滚动区域高度
-	  this.scrollHeight = screenHeight - topHeight;
-	},
-
-    saveData() {
-		console.log('process', this.process)
-	  if (!this.process.userId || !this.process.subject || this.process.examScore === null || this.process.examStatus === null || !this.process.examTime) {
-	    uni.showToast({title: '信息填写不完整', icon: 'none'});
-	    return;
-	  }
-      if (this.process.subject == 1 || this.process.subject == 4) {
-        this.saveDataOne()
-      }
-      if (this.process.subject == 2 || this.process.subject == 3) {
-        this.saveDataTwo()
-      }
-    },
-    saveDataOne() {
-      if (this.process.subject === 1 && this.courseCompleteStatusList.length <= 0) {
-        uni.showToast({title: '请联系驾校人员!', icon: 'none'});
-        return;
-
-      }
-      if (this.process.subject === 4 && this.courseCompleteStatusList.length <= 0) {
-        uni.showToast({title: '请联系驾校人员!', icon: 'none'});
-        return;
-
-      }
-	  const postData = {
-	      ...this.process, // 先拷贝 process 原有数据
-	    remark: this.process.remark,
-	    images: this.fileList?.map(item => item.url).join(',') || '',
-	    }
-      // this.process.images = this.fileList?.map(item => item.url).join(',') || '';
-
-      if (!this.process.userId || !this.process.subject || this.process.examScore === null || this.process.examStatus === null || !this.process.examTime) {
-        uni.showToast({title: '信息填写不完整', icon: 'none'});
-        return;
-      }
-	  console.log('postData', postData)
-      request({
-        url: '/app-api/process/updateProcess',
-        method: 'PUT',
-		data: postData,
-        // data: this.process,
-      }).then(res => {
-        if (res.code === 0) {
-          uni.showToast({
-            title: '保存成功',
-            icon: 'success',
-            duration: 1000
-          });
-          setTimeout(() => {
-            uni.navigateBack({
-              delta: 1
-            });
-          }, 1500);
-        } else {
-          uni.showToast({title: res.data?.message || '保存失败', icon: 'none'});
-        }
-      })
-    },
-    saveDataTwo() {
-      const postData = {
-          ...this.process, // 先拷贝 process 原有数据
-          tenantId: this.opTenantId,
-          fraction: this.process.examScore,
-          ifPass: this.process.examStatus,
-          id: this.batchItemId,
-        remark: this.process.remark,
-        images: this.fileList?.map(item => item.url).join(',') || '',
-        }
-      /* this.process.userId = this.userInfo.id
-      this.process.tenantId = this.opTenantId
-      this.process.fraction = this.process.examScore
-      this.process.ifPass = this.process.examStatus
-      this.process.images = this.fileList?.map(item => item.url).join(',') || ''; */
-      if (!this.process.userId || !this.process.subject || this.process.examScore === null || this.process.examStatus === null || !this.process.examTime) {
-        uni.showToast({title: '信息填写不完整', icon: 'none'});
-        return;
-      }
-      request({
-        url: '/app-api/examBatch/update',
-        method: 'PUT',
-        data: postData,
-        // data: this.process,
-      }).then(res => {
-        if (res.code === 0) {
-          uni.showToast({
-            title: '保存成功',
-            icon: 'success',
-            duration: 1000
-          });
-          setTimeout(() => {
-            uni.navigateBack({
-              delta: 1
-            });
-          }, 1500);
-        } else {
-          uni.showToast({title: res.data?.message || '保存失败', icon: 'none'});
-        }
-      })
-    }
-
-  }
-};
+		}
+	};
 </script>
 <style lang='scss'>
-@import '../common/common.scss';
-@import './assets/style/index.rpx.scss';
-
-</style>
+	@import '../common/common.scss';
+	@import './assets/style/index.rpx.scss';
+</style>
\ No newline at end of file
diff --git a/pagesA/examinationList/index.vue b/pagesA/examinationList/index.vue
index 9cbfd00..8f1ae30 100644
--- a/pagesA/examinationList/index.vue
+++ b/pagesA/examinationList/index.vue
@@ -13,9 +13,8 @@
 					<view class="block_3 flex-row justify-between">
 						<view class="text-group_1 flex-col justify-between">
 
-							<text class="text_2" v-if="item.subject == 1 || item.subject == 4">{{
-                    formatDate(item.examTime)
-                  }}
+							<text class="text_2"
+								v-if="item.subject == 1 || item.subject == 4">{{ formatDate(item.examTime) }}
 							</text>
 							<text class="text_2" v-else>{{ formatDate(item.startTime) }}</text>
 							<text class="text_3">{{ item.courseName }}</text>
@@ -23,7 +22,9 @@
 						<view class="text-group_2 flex-col justify-between">
 							<text class="text_4" v-if="item.examScore">{{ item.examScore }}</text>
 							<text class="text_4" v-else>{{ '--' }}</text>
-							<text class="text_5">{{ getStatusText(item.examStatus) }}</text>
+							<text class="text_5"
+								v-if="item.ifPassStatus === '9'">{{ getStatusText(item.ifPassStatus) }}</text>
+							<text class="text_5" v-else>{{ getStatusText(item.examStatus) }}</text>
 						</view>
 					</view>
 					<view class="block_4 flex-row justify-between">