From ca09addd0bfdf557760d137278f1eeaec3b44dd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Tue, 8 Apr 2025 17:00:07 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 newPages/appointment/index.vue       |  24 +-
 newPages/appointmentAdd/index.vue    | 541 ++++++++++++++-------------
 newPages/appointmentDetail/index.vue |  10 +-
 newPages/evaluate/index.vue          |  14 +-
 newPages/newIndex/index.vue          |  10 +-
 5 files changed, 328 insertions(+), 271 deletions(-)

diff --git a/newPages/appointment/index.vue b/newPages/appointment/index.vue
index 3185e3d..021e062 100644
--- a/newPages/appointment/index.vue
+++ b/newPages/appointment/index.vue
@@ -9,7 +9,7 @@
 			<u-subsection :list="list" :current="curNow" @change="sectionChange"></u-subsection>
 		</view>
 		<scroll-view style="height: 1200rpx;" scroll-y="true" class="itemContent" @scrolltolower="onReachBottomCus"
-			refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
+			refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered" v-if="appointmentList.length > 0">
 			<!-- 新增内容容器 -->
 			<view class="box_2 flex-col" v-if="curNow === 0">
 				<view class="box_4 flex-col" v-for="item in appointmentList" @click="goDetail(item,'')" :key="item.id">
@@ -82,7 +82,14 @@
 				</view>
 			</view>
 		</scroll-view>
-		<view class="box_6 flex-col bottom_">
+    <view class="empty-container" v-else>
+      <u-empty
+          mode="data"
+      />
+    </view>
+
+
+    <view class="box_6 flex-col bottom_">
 			<view class="text-wrapper_12 flex-col " @click="goAppointment()">
 				<text class="text_19">预约</text>
 			</view>
@@ -138,10 +145,10 @@
 			},
 			getList() {
 				request({
-					url: '/app-api/drivingSchool/system/reservationCourse/list',
+					url: '/app-api/reservation-course/page',
 					method: 'GET',
 					params: {
-						pageNum: this.pageNo,
+						pageNo: this.pageNo,
 						pageSize: this.pageSize,
 						ifCancel: false
 					},
@@ -165,7 +172,7 @@
 					params: {
 						pageNum: this.pageNo,
 						pageSize: this.pageSize,
-						selectType: 'all'
+						selectType: 'my'
 					},
 					tenantIdFlag: false
 				}).then(res => {
@@ -279,4 +286,11 @@
 			margin: 8rpx 0 0 12rpx;
 		}
 	}
+  .empty-container {
+    display: flex;
+    justify-content: center; /* 水平居中 */
+    align-items: center;     /* 垂直居中 */
+    height: 100vh;           /* 或者你需要撑满的高度 */
+  }
+
 </style>
diff --git a/newPages/appointmentAdd/index.vue b/newPages/appointmentAdd/index.vue
index b110f29..1d256b2 100644
--- a/newPages/appointmentAdd/index.vue
+++ b/newPages/appointmentAdd/index.vue
@@ -1,246 +1,281 @@
 <template>
-	<view class="page flex-col">
-		<view class="header">
-			<headers titles="预约">
-				<uni-icons type="left" color="#000000" size="22px"></uni-icons>
-			</headers>
-		</view>
-		<view class="form_">
-			<view class="" style="background-color: white;padding: 10rpx 15rpx;border-radius: 15rpx">
-				<u-form labelPosition="left" labelWidth="auto" labelAlign="center" :model="appointmentInfo"
-					:rules="rules" ref="uForm">
-					<u-form-item label="课程名称" prop="userInfo.name" @click="showCourse = true" ref="item1">
-						<u-input v-model="appointmentInfo.courseName" disabled disabledColor="#ffffff"
-							placeholder="请选择课程" border="none"></u-input>
-						<u-icon slot="right" name="arrow-right"></u-icon>
-					</u-form-item>
-					<u-form-item label="训练类型" prop="userInfo.sex" ref="item1">
-						<u-input v-model="appointmentInfo.courseType" disabled disabledColor="#ffffff"
-							placeholder="请选择训练类型" border="none"></u-input>
-					</u-form-item>
-					<u-form-item label="选择科目" prop="userInfo.sex" ref="item1">
-						<u-input v-model="appointmentInfo.subjectStr" disabled disabledColor="#ffffff"
-							placeholder="请选择科目" border="none"></u-input>
-					</u-form-item>
-					<u-form-item label="教练名称" prop="userInfo.sex" ref="item1">
-						<u-input v-model="appointmentInfo.coachName" disabled disabledColor="#ffffff"
-							placeholder="请选择教练" border="none"></u-input>
-					</u-form-item>
-				</u-form>
+  <view class="page flex-col">
+    <view class="header">
+      <headers titles="预约">
+        <uni-icons type="left" color="#000000" size="22px"></uni-icons>
+      </headers>
+    </view>
+    <view class="form_">
+      <view class="" style="background-color: white;padding: 10rpx 15rpx;border-radius: 15rpx">
+        <u-form labelPosition="left" labelWidth="auto" labelAlign="center" :model="appointmentInfo"
+                :rules="rules" ref="uForm">
+          <u-form-item label="课程名称" prop="courseName" @click="showCourse = true" ref="item1">
+            <u-input v-model="appointmentInfo.courseName" disabled disabledColor="#ffffff"
+                     placeholder="请选择课程" border="none"></u-input>
+            <u-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
+          <u-form-item label="训练类型" prop="courseType" ref="item1">
+            <u-input v-model="appointmentInfo.courseType" disabled disabledColor="#ffffff"
+                     placeholder="请选择训练类型" border="none"></u-input>
+          </u-form-item>
+          <u-form-item label="选择科目" prop="subject" ref="item1">
+            <u-input v-model="appointmentInfo.subjectStr" disabled disabledColor="#ffffff"
+                     placeholder="请选择科目" border="none"></u-input>
+          </u-form-item>
+          <u-form-item label="教练名称" prop="coachName" ref="item1">
+            <u-input v-model="appointmentInfo.coachName" disabled disabledColor="#ffffff"
+                     placeholder="请选择教练" border="none"></u-input>
+          </u-form-item>
+        </u-form>
 
-			</view>
-		</view>
-		<view class="form_">
-			<view class="" style="background-color: white;padding: 10rpx 15rpx;border-radius: 15rpx">
-				<u-form labelPosition="left" labelWidth="auto" :model="appointmentInfo" :rules="rules" ref="uForm">
-					<u-form-item label="累计训练时长" prop="userInfo.name" ref="item1">
-						<u-input v-model="appointmentInfo.trainTime" disabled disabledColor="#ffffff"
-							border="none"></u-input>
-					</u-form-item>
-					<u-form-item label="日期选择" prop="userInfo.sex" @click="showDate = true;"
-						ref="item1">
-						<u-input v-model="appointmentInfo.dateStr" disabled disabledColor="#ffffff"
-							placeholder="请选择日期" border="none"></u-input>
-						<u-icon slot="right" name="arrow-right"></u-icon>
-					</u-form-item>
-					<u-form-item label="时间范围" prop="userInfo.sex" borderBottom @click="showTime = true;"
-						ref="item1" :borderBottom="false">
-						<u-input v-model="appointmentInfo.time" disabled disabledColor="#ffffff"
-							placeholder="请选择时间范围" border="none"></u-input>
-						<u-icon slot="right" name="arrow-right"></u-icon>
-					</u-form-item>
-				</u-form>
-			</view>
-		</view>
-		<u-picker :show="showCourse" @close="showCourse = false" keyName="courseName" @cancel="showCourse = false"
-			@confirm="confirmCourse" :columns="[courseList]"></u-picker>
-		<u-picker :show="showTime" @close="showTime = false" keyName="label" @cancel="showTime = false"
-			@confirm="confirmTime" :columns="[timeColumns]"></u-picker>
-		<u-calendar :show="showDate" @confirm="confirmDate" @close="showDate = false"></u-calendar>
-		<view class="section_4 flex-col bottom_">
-			<view class="text-wrapper_5 flex-col" @click="submit">
-				<text class="text_10">开始预约</text>
-			</view>
-		</view>
-	</view>
+      </view>
+    </view>
+    <view class="form_">
+      <view class="" style="background-color: white;padding: 10rpx 15rpx;border-radius: 15rpx">
+        <u-form labelPosition="left" labelWidth="auto" :model="appointmentInfo" :rules="rules" ref="uForm">
+          <u-form-item label="累计训练时长" prop="name" ref="item1">
+            <u-input v-model="appointmentInfo.trainTime" disabled disabledColor="#ffffff"
+                     border="none"></u-input>
+          </u-form-item>
+          <u-form-item label="日期选择" prop="dateStr" @click="showDate = true;"
+                       ref="item1">
+            <u-input v-model="appointmentInfo.dateStr" disabled disabledColor="#ffffff"
+                     placeholder="请选择日期" border="none"></u-input>
+            <u-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
+          <u-form-item label="时间范围" prop="time" borderBottom @click="showTime = true;"
+                       ref="item1" :borderBottom="false">
+            <u-input v-model="appointmentInfo.time" disabled disabledColor="#ffffff"
+                     placeholder="请选择时间范围" border="none"></u-input>
+            <u-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
+        </u-form>
+      </view>
+    </view>
+    <u-picker :show="showCourse" @close="showCourse = false" keyName="courseName" @cancel="showCourse = false"
+              @confirm="confirmCourse" :columns="[courseList]"></u-picker>
+    <u-picker :show="showTime" @close="showTime = false" keyName="label" @cancel="showTime = false"
+              @confirm="confirmTime" :columns="[timeColumns]"></u-picker>
+    <u-calendar :show="showDate" @confirm="confirmDate" @close="showDate = false"></u-calendar>
+    <view class="section_4 flex-col bottom_">
+      <view class="text-wrapper_5 flex-col" @click="submit">
+        <text class="text_10">开始预约</text>
+      </view>
+    </view>
+  </view>
 </template>
 <script>
-	import headers from "@/components/header/headers.vue";
-	import request from "@/utils/request";
-  import {getDictDataByType} from "@/utils/utils";
+import headers from "@/components/header/headers.vue";
+import request from "@/utils/request";
+import {getDictDataByType} from "@/utils/utils";
+import {getLocalUserInfo} from "@/utils/auth";
 
-	export default {
-		components: {
-			headers
-		},
-		data() {
-			return {
-				rules: {}, // 确保 rules 至少是一个空对象
-				constants: {},
-				appointmentInfo: {
-					subjectStr: '',
-					courseName: '',
-					coachName: '',
-					trainTime: '',
-          dateStr:'',
-          time: '',
-          coachId:'',
-				}, // 预约信息
-				showCourse: false,
-				courseList: [], //报名的课程信息
-				showDate: false,
-        showTime: false,
-				tenantId: '',
-				subjectColumns: [{
-						label: '科目二',
-						value: 2
-					},
-					{
-						label: '科目三',
-						value: 3
-					},
-				],
-        //时间段数组 查询字典
-        timeColumns: '',
-				showSubject: false
-			};
-		},
-		async onLoad() {
-      this.getLoginUserCourseInfoList()
-      this.timeColumns = await getDictDataByType('school_reserv_time');
-      console.log('字典', this.timeColumns)
+export default {
+  components: {
+    headers
+  },
+  data() {
+    return {
+      constants: {},
+      appointmentInfo: {
+        subjectStr: '',
+        courseName: '',
+        coachName: '',
+        trainTime: '',
+        dateStr: '',
+        time: '',
+        coachId: '',
+      }, // 预约信息
+      showCourse: false,
+      courseList: [], //报名的课程信息
+      showDate: false,
+      showTime: false,
+      tenantId: '',
+      subjectColumns: [{
+        label: '科目二',
+        value: 2
+      },
+        {
+          label: '科目三',
+          value: 3
+        },
+      ],
+      //时间段数组 查询字典
+      timeColumns: '',
+      showSubject: false,
+      rules: {
+        time: [{
+          required: true,
+          message: '请选择时间',
+          trigger: 'change'
+        }],
+        courseName: [{
+          required: true,
+          message: '请选择课程',
+          trigger: 'change'
+        }],
+        dateStr: [{
+          required: true,
+          message: '请选择日期',
+          trigger: 'change'
+        }],
+        coachName: [{
+          required: true,
+          message: '请选择教练',
+          trigger: 'change'
+        }],
+        subject: [{
+          required: true,
+          message: '请选择科目',
+          trigger: 'change'
+        }],
+      }
+    };
+  },
+  async onLoad() {
+    this.getLoginUserCourseInfoList()
+    this.timeColumns = await getDictDataByType('school_reserv_time');
+    console.log('字典', this.timeColumns)
+  },
+  onReady() {
+    //如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
+    this.$refs.uForm.setRules(this.rules)
+  },
+  methods: {
+    goback() {
+      uni.navigateBack()
     },
-		methods: {
-			goback() {
-				uni.navigateBack()
-			},
-			confirmCourse(e) {
-				this.restForm()
-				this.appointmentInfo.courseId = e.value[0].courseId
-				this.appointmentInfo.courseName = e.value[0].courseName
-				this.appointmentInfo.courseType = e.value[0].courseType
-				this.tenantId = e.value[0].tenantId
-        this.appointmentInfo.userName = e.value[0].userName
-        this.appointmentInfo.userId = e.value[0].userId
-				this.getAllByCourseId(e.value[0].courseId)
-				console.log(e)
-				this.showCourse = false
-			},
-      confirmDate(e) {
-				console.log(e)
-        this.appointmentInfo.dateStr = e[0]
-        console.log(this.appointmentInfo)
-				this.showDate = false
-			},
-      confirmTime(e) {
-				console.log(e)
-        this.appointmentInfo.time = e.value[0].label
-        console.log(this.appointmentInfo)
-				this.showTime = false
-			},
-			restForm() {
-				this.appointmentInfo = {
-					subjectStr: '',
-					courseName: '',
-					coachName: '',
-					trainTime: '',
-				}
-			},
-			// 查询所有报名科目
-			getLoginUserCourseInfoList() {
-				request({
-					url: '/app-api/small/drive/school-course-order/getCourseByLoginUser',
-					method: 'GET'
-				}).then(res => {
-          if (res.data.length == 0) {
-            uni.showModal({
-              title: '提示',
-              content: '请先报名课程',
-              showCancel: false,
-              success: function(res) {
-                if (res.confirm) {
-                  console.log('用户点击确定');
-                  uni.navigateBack()
-                } else if (res.cancel) {
-                  console.log('用户点击取消');
-                }
+    confirmCourse(e) {
+      this.restForm()
+      this.appointmentInfo.courseId = e.value[0].courseId
+      this.appointmentInfo.courseName = e.value[0].courseName
+      this.appointmentInfo.courseType = e.value[0].courseType
+      this.tenantId = e.value[0].tenantId
+      this.appointmentInfo.userName = e.value[0].userName
+      this.appointmentInfo.userId = e.value[0].userId
+      this.getAllByCourseId(e.value[0].courseId)
+      console.log(e)
+      this.showCourse = false
+    },
+    confirmDate(e) {
+      console.log(e)
+      this.appointmentInfo.dateStr = e[0]
+      console.log(this.appointmentInfo)
+      this.showDate = false
+    },
+    confirmTime(e) {
+      console.log(e)
+      this.appointmentInfo.time = e.value[0].label
+      console.log(this.appointmentInfo)
+      this.showTime = false
+    },
+    restForm() {
+      this.appointmentInfo = {
+        subjectStr: '',
+        courseName: '',
+        coachName: '',
+        trainTime: '',
+      }
+    },
+    // 查询所有报名科目
+    getLoginUserCourseInfoList() {
+      request({
+        url: '/app-api/small/drive/school-course-order/getCourseByLoginUser',
+        method: 'GET'
+      }).then(res => {
+        if (res.data.length == 0) {
+          uni.showModal({
+            title: '提示',
+            content: '请先报名课程',
+            showCancel: false,
+            success: function (res) {
+              if (res.confirm) {
+                console.log('用户点击确定');
+                uni.navigateBack()
+              } else if (res.cancel) {
+                console.log('用户点击取消');
               }
-            });
+            }
+          });
+        }
+        this.courseList = res.data
+      })
+    },
+    //根据课程id查询报名进度
+    async getAllByCourseId(courseId) {
+      console.log('courseId', courseId)
+      const res = await request({
+        url: '/app-api/process/getAllByCourseId',
+        method: 'GET',
+        params: {
+          courseId: courseId
+        }
+      })
+      // 找出正在训练中的科目并且科目不是1和4
+      // && item.subject != 1 && item.subject != 4
+      const progress = res.data.filter(item => {
+        return item.status == 1 && item.subject != 1 && item.subject != 4
+      })
+      if (progress.length > 0) {
+        console.log('正在训练中的科目', progress)
+        // 找出正在训练中的科目并且科目不是1和4
+        const subject = progress[0].subject
+        this.$nextTick(() => {
+          this.appointmentInfo.subject = subject
+          this.appointmentInfo.subjectStr = this.subjectColumns.find(item => item.value == subject).label
+        })
+        this.appointmentInfo.coachName = progress[0].coachName
+        this.appointmentInfo.coachId = progress[0].coachId
+        this.appointmentInfo.trainTime = progress[0].trainTime
+        console.log('subject', this.appointmentInfo)
+      } else {
+        // 弹窗只能预约训练科目二
+        uni.showModal({
+          title: '提示',
+          content: '只能预约训练科目二和科目三',
+          showCancel: false,
+          success: function (res) {
+            if (res.confirm) {
+              console.log('用户点击确定');
+              uni.navigateBack()
+            } else if (res.cancel) {
+              console.log('用户点击取消');
+            }
           }
-					this.courseList = res.data
-				})
-			},
-			//根据课程id查询报名进度
-			async getAllByCourseId(courseId) {
-				console.log('courseId', courseId)
-				const res = await request({
-					url: '/app-api/process/getAllByCourseId',
-					method: 'GET',
-					params: {
-						courseId: courseId
-					}
-				})
-				// 找出正在训练中的科目并且科目不是1和4
-				// && item.subject != 1 && item.subject != 4
-				const progress = res.data.filter(item => {
-					return item.status == 1 && item.subject != 1 && item.subject != 4
-				})
-				if (progress.length > 0) {
-					console.log('正在训练中的科目', progress)
-					// 找出正在训练中的科目并且科目不是1和4
-					const subject = progress[0].subject
-					this.$nextTick(() => {
-
-						this.appointmentInfo.subject = subject
-						this.appointmentInfo.subjectStr = this.subjectColumns.find(item => item.value ==
-							subject).label
-					})
-					this.appointmentInfo.coachName = progress[0].coachName
-          this.appointmentInfo.coachId = progress[0].coachId
-					this.appointmentInfo.trainTime = progress[0].trainTime
-					console.log('subject', this.appointmentInfo)
-				} else {
-					// 弹窗只能预约训练科目二
-					uni.showModal({
-						title: '提示',
-						content: '只能预约训练科目二和科目三',
-						showCancel: false,
-						success: function(res) {
-							if (res.confirm) {
-								console.log('用户点击确定');
-								uni.navigateBack()
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					});
-				}
-			},
-			// 查询训练地址
-			getTrainAddress() {
-				request({
-					url: '/app-api/small/address/getList',
-					method: 'GET',
-					params: {
-						type: 0,
-						subject: this.appointmentInfo.subject,
-						tenantId: this.tenantId
-					}
-				}).then(res => {
-					console.log(res)
-				})
-			},
-      submit(){
+        });
+      }
+    },
+    // 查询训练地址
+    getTrainAddress() {
+      request({
+        url: '/app-api/small/address/getList',
+        method: 'GET',
+        params: {
+          type: 0,
+          subject: this.appointmentInfo.subject,
+          tenantId: this.tenantId
+        }
+      }).then(res => {
+        console.log(res)
+      })
+    },
+    submit() {
+      // 获取当前登陆人
+      this.$refs.uForm.validate().then(res => {
+        const userInfo = getLocalUserInfo()
+        const data = {
+          ...this.appointmentInfo,
+          userId: userInfo.id,
+          userName: userInfo.nickname,
+          tenantId: this.tenantId,
+          reservDay: this.appointmentInfo.dateStr,
+          reservTime: this.appointmentInfo.time,
+          subject: this.appointmentInfo.subject,
+        }
         request({
-          url: '/app-api/drivingSchool/system/reservationCourse',
-          method: 'POST',
-          data: {
-            ...this.appointmentInfo,
-            tenantId: this.tenantId,
-            reservDay: this.appointmentInfo.dateStr,
-            reservTime: this.appointmentInfo.time,
-            subject: this.appointmentInfo.subject,
-          }
+          url: '/app-api/reservation-course/create',
+          method: 'PUT',
+          data: data
         }).then(res => {
           console.log(res)
           uni.showToast({
@@ -253,27 +288,29 @@
             uni.navigateBack()
           }, 2000)
         })
-      },
-		}
-	};
+      }).catch(errors => {
+      })
+    },
+  }
+};
 </script>
 <style lang='scss'>
-	@import '../common/common.scss';
-	@import './assets/style/index.rpx.scss';
+@import '../common/common.scss';
+@import './assets/style/index.rpx.scss';
 
-	.bottom_ {
-		position: fixed;
-		bottom: 0;
-	}
+.bottom_ {
+  position: fixed;
+  bottom: 0;
+}
 
-	.header {
-		width: 100%;
-		background: #f4f5f6;
-		box-sizing: border-box;
-		padding-top: 88px;
-	}
+.header {
+  width: 100%;
+  background: #f4f5f6;
+  box-sizing: border-box;
+  padding-top: 88px;
+}
 
-	.form_ {
-		padding: 10rpx 20rpx;
-	}
+.form_ {
+  padding: 10rpx 20rpx;
+}
 </style>
diff --git a/newPages/appointmentDetail/index.vue b/newPages/appointmentDetail/index.vue
index fe379a0..41dc561 100644
--- a/newPages/appointmentDetail/index.vue
+++ b/newPages/appointmentDetail/index.vue
@@ -37,7 +37,7 @@
       <view style="width: 90%; height: 1px; background-color: #e0e0e0; margin: 20px 10rpx auto;"></view>
       <view class="text-wrapper_5 flex-row justify-between" v-if="!isTrain">
         <text class="text_12">累计训练时长</text>
-        <text class="text_13">{{ appointmentInfo.allDriveTime }}分钟</text>
+        <text class="text_13">{{ appointmentInfo.trainTime }}分钟</text>
       </view>
       <view class="text-wrapper_6 flex-row justify-between" v-if="isTrain">
         <text class="text_14">训练地址</text>
@@ -56,7 +56,7 @@
     <view class="text-wrapper_9 flex-col" v-if="!isTrain">
       <text class="text_20">审核意见</text>
       <text class="text_21">
-        {{ appointmentInfo.remark == null ? '暂无' : appointmentInfo.remark }}
+        {{ appointmentInfo.refuseReason == null ? '暂无' : appointmentInfo.refuseReason }}
       </text>
     </view>
   </view>
@@ -112,11 +112,11 @@ export default {
 
         console.log("匹配的训练时间数据:", data);
 
-        this.appointmentInfo.allDriveTime = data ? data.trainTime || "0" : "0";
+        this.appointmentInfo.trainTime = data ? data.trainTime || "0" : "0";
 
         console.log(
-            "this.appointmentInfo.allDriveTime",
-            this.appointmentInfo.allDriveTime
+            "this.appointmentInfo.trainTime",
+            this.appointmentInfo.trainTime
         );
       } catch (error) {
         console.error("获取训练时间失败:", error);
diff --git a/newPages/evaluate/index.vue b/newPages/evaluate/index.vue
index 1f33fcc..1f01ef4 100644
--- a/newPages/evaluate/index.vue
+++ b/newPages/evaluate/index.vue
@@ -6,7 +6,7 @@
 			</headers>
 		</view>
 		<view class="group_4 flex-col">
-			<view class="list_1 flex-col">
+			<view class="list_1 flex-col" v-if="evaluate.length > 0">
 				<scroll-view style="height: 1400rpx;" scroll-y="true" class="itemContent"
 					@scrolltolower="onReachBottomCus" refresher-enabled @refresherrefresh="onRefresherrefresh"
 					:refresher-triggered="isTriggered">
@@ -38,6 +38,12 @@
 					</view>
 				</scroll-view>
 			</view>
+      <view class="empty-container" v-else>
+        <u-empty
+            mode="data"
+            text="评价为空"
+        />
+      </view>
 		</view>
 	</view>
 </template>
@@ -148,4 +154,10 @@
 <style lang='scss'>
 	@import '../common/common.scss';
 	@import './assets/style/index.rpx.scss';
+  .empty-container {
+    display: flex;
+    justify-content: center; /* 水平居中 */
+    align-items: center;     /* 垂直居中 */
+    height: 100vh;           /* 或者你需要撑满的高度 */
+  }
 </style>
diff --git a/newPages/newIndex/index.vue b/newPages/newIndex/index.vue
index f67731b..99ae040 100644
--- a/newPages/newIndex/index.vue
+++ b/newPages/newIndex/index.vue
@@ -22,14 +22,7 @@
       </view>
       <view class="box_4 flex-row justify-between">
         <view class="image-text_2 flex-row justify-between">
-          <image
-              class="label_2"
-              referrerpolicy="no-referrer"
-              src="/static/lanhu_shouye2gai/FigmaDDSSlicePNGd2c17b5f24182e597acbfa50481040c1.png"
-          />
-          <text class="text-group_2">
-            “高科技”驾考作弊团伙被抓，驾校校长教练负责介绍学员
-          </text>
+          <u-notice-bar direction="column" duration="10000" bgColor="#e9f1ff"  color="black" :text="announcement" icon="/static/lanhu_shouye2gai/FigmaDDSSlicePNGd2c17b5f24182e597acbfa50481040c1.png"></u-notice-bar>
         </view>
         <view class="group_3 flex-col justify-between">
           <view class="block_5 flex-col"></view>
@@ -92,6 +85,7 @@ export default {
       ],
       swiperList: [],
       msg: "1",
+      announcement:['ceshi1111','测试111111111111111111111111111111111111111111'],
       constants: {},
       schoolList: [
         // {

From c29ddaf254e1c35a673cde6ff5a794eeb1d72e02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Wed, 9 Apr 2025 09:13:03 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 newPages/evaluate/index.vue        |   8 +
 newPages/evaluateAdd/index.vue     |  14 +-
 newPages/examinationList/index.vue | 678 +++++++++++++++--------------
 3 files changed, 364 insertions(+), 336 deletions(-)

diff --git a/newPages/evaluate/index.vue b/newPages/evaluate/index.vue
index 1f01ef4..e71ccac 100644
--- a/newPages/evaluate/index.vue
+++ b/newPages/evaluate/index.vue
@@ -160,4 +160,12 @@
     align-items: center;     /* 垂直居中 */
     height: 100vh;           /* 或者你需要撑满的高度 */
   }
+  .text-group_1 {
+    display: inline-block;
+    max-width: 4em; /* 一个汉字大概占1em，3em就是三个字 */
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+
 </style>
diff --git a/newPages/evaluateAdd/index.vue b/newPages/evaluateAdd/index.vue
index eaa84e7..9b4cb82 100644
--- a/newPages/evaluateAdd/index.vue
+++ b/newPages/evaluateAdd/index.vue
@@ -111,8 +111,13 @@
 				} else if (options.type === 'kaoshi') {
 					this.title = '考试'
 					//评价类型为考试
-					this.info.evaluateType = 0
+					this.info.evaluateType = 1
+          this.info.busiId = data.batchItemId
 				}
+        this.info.createTime = undefined
+        this.info.updataTime = undefined
+        this.info.creator = undefined
+        this.info.updater = undefined
 			} else {
 				Object.assign(this.info, data);
 			}
@@ -171,4 +176,11 @@
 		justify-content: center;
 		/* 新增：水平居中 */
 	}
+  .text-group_2 {
+    display: inline-block;
+    max-width: 4em; /* 一个汉字大概占1em，3em就是三个字 */
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
 </style>
diff --git a/newPages/examinationList/index.vue b/newPages/examinationList/index.vue
index aa90399..46399ca 100644
--- a/newPages/examinationList/index.vue
+++ b/newPages/examinationList/index.vue
@@ -1,120 +1,124 @@
 <template>
   <view class="page flex-col">
     <view class="block_1 flex-row">
-    
-      
+
+
     </view>
     <view class="block_2 flex-col">
       <view class="box_3 flex-row">
         <image
-          class="label_1"
-          referrerpolicy="no-referrer"
-          src="/static/lanhu_kaoshijieguoluru/FigmaDDSSlicePNGacf527a62cbe7351c6472edd8f5b2814.png"
-		  @click="handleBack()"
+            class="label_1"
+            referrerpolicy="no-referrer"
+            src="/static/lanhu_kaoshijieguoluru/FigmaDDSSlicePNGacf527a62cbe7351c6472edd8f5b2814.png"
+            @click="handleBack()"
         />
         <text class="text_1">考试结果录入</text>
-        
+
       </view>
-	  <view>
-		  <scroll-view
-				class="scroll-view"
-				scroll-y
-				:style="{ height: scrollHeight + 'px' }"
-				refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered"
-			  >
-      <view 
-			class="box_5 flex-col" v-for="(item, index) in examList" 
-			:key="index" 
-			:style="{ height: (item.subject != 2 && item.subject != 3) ? '210rpx' : 'auto' }">
-        <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>
-			<text class="text_2" v-else>{{ formatDate(item.startTime) }}</text>
-			
-            <text class="text_3">{{ item.courseName }}</text>
-          </view>
-          <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>
-          </view>
-        </view>
-        <view class="block_4 flex-row justify-between">
-          <view class="text-wrapper_1 flex-col">
-            <text class="text_6">{{getCourseTypeText(item.subject)}}</text>
-          </view>
-          <view class="text-wrapper_2 flex-col">
-            <text class="text_7">{{ item.courseType }}</text>
-          </view>
-        </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 class="block_5 flex-row" v-if="item.subject == 2 || item.subject == 3">
-          <view class="text-wrapper_4 flex-col" @click="handleButtonClick(item)">
-            <!-- <text class="text_10" v-if="item.fraction != null && item.ifPass">开始评价</text>
-			<text class="text_10" v-else-if="item.fraction == null && (item.ifPass == null || item.ifPass == 0)">成绩录入</text>
-			<text class="text_10" v-else-if="!item.ifEvaluate">查看评价</text> -->
-			<text class="text_10">{{ getButtonInfo(item).text }}</text>
-          </view>
-        </view>
-      </view>
-      <!-- <view class="list_1 flex-col">
-        <view class="list-items_1 flex-col" v-for="(item, index) in examList" :key="index" >
-          <view class="block_6 flex-row justify-between">
-            <view class="text-group_3 flex-col justify-between">
-              <text class="text_11" >{{ formatDate(item.examTime) }}</text>
-              <text class="text_12" >{{item.courseName}}</text>
+      <view>
+        <scroll-view
+            class="scroll-view"
+            scroll-y
+            :style="{ height: scrollHeight + 'px' }"
+            refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered"
+        >
+          <view
+              class="box_5 flex-col" v-for="(item, index) in examList"
+              :key="index"
+              :style="{ height: ((item.subject != 2 && item.subject != 3) || getButtonInfo(item).text === '1') ? '230rpx' : 'auto' }">
+            <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>
+                <text class="text_2" v-else>{{ formatDate(item.startTime) }}</text>
+
+                <text class="text_3">{{ item.courseName }}</text>
+              </view>
+              <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>
+              </view>
             </view>
-            <view class="text-group_4 flex-col justify-between">
-              <text
-                class="text_13"
-                :style="{ color: item.examScore }"
-              >{{item.examScore}}</text>
-              <text
-                class="text_14"
-                :style="{ color: item.examStatus }"
-              >{{ getStatusText(item.examStatus) }}</text>
+            <view class="block_4 flex-row justify-between">
+              <view class="text-wrapper_1 flex-col">
+                <text class="text_6">{{ getCourseTypeText(item.subject) }}</text>
+              </view>
+              <view class="text-wrapper_2 flex-col">
+                <text class="text_7">{{ item.courseType }}</text>
+              </view>
+            </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 class="block_5 flex-row" v-if="(item.subject == 2 || item.subject == 3) && getButtonInfo(item).text !== '1'">
+              <view class="text-wrapper_4 flex-col" @click="handleButtonClick(item)" >
+                <!-- <text class="text_10" v-if="item.fraction != null && item.ifPass">开始评价</text>
+          <text class="text_10" v-else-if="item.fraction == null && (item.ifPass == null || item.ifPass == 0)">成绩录入</text>
+          <text class="text_10" v-else-if="!item.ifEvaluate">查看评价</text> -->
+                <text class="text_10">{{ getButtonInfo(item).text }}</text>
+              </view>
             </view>
           </view>
-          <view class="block_7 flex-row justify-between">
-            <view class="text-wrapper_5 flex-col">
-              <text class="text_15" >{{getCourseTypeText(item.subject)}}</text>
-            </view>
-            <view class="text-wrapper_6 flex-col">
-              <text class="text_16" >{{item.courseType}}</text>
-            </view>
+          <!-- <view class="list_1 flex-col">
+            <view class="list-items_1 flex-col" v-for="(item, index) in examList" :key="index" >
+              <view class="block_6 flex-row justify-between">
+                <view class="text-group_3 flex-col justify-between">
+                  <text class="text_11" >{{ formatDate(item.examTime) }}</text>
+                  <text class="text_12" >{{item.courseName}}</text>
+                </view>
+                <view class="text-group_4 flex-col justify-between">
+                  <text
+                    class="text_13"
+                    :style="{ color: item.examScore }"
+                  >{{item.examScore}}</text>
+                  <text
+                    class="text_14"
+                    :style="{ color: item.examStatus }"
+                  >{{ getStatusText(item.examStatus) }}</text>
+                </view>
+              </view>
+              <view class="block_7 flex-row justify-between">
+                <view class="text-wrapper_5 flex-col">
+                  <text class="text_15" >{{getCourseTypeText(item.subject)}}</text>
+                </view>
+                <view class="text-wrapper_6 flex-col">
+                  <text class="text_16" >{{item.courseType}}</text>
+                </view>
+              </view>
+           <view class="text-wrapper_7 flex-row justify-between">
+            <text class="text_17" >考试地址：</text>
+            <text class="text_18" >山东省济南市历下区</text>
           </view>
-		   <view class="text-wrapper_7 flex-row justify-between">
-			  <text class="text_17" >考试地址：</text>
-			  <text class="text_18" >山东省济南市历下区</text>
-		  </view> 
-        </view>
-		</view> -->
-		</scroll-view>
+            </view>
+        </view> -->
+        </scroll-view>
       </view>
     </view>
     <view class="block_8 flex-col">
       <view class="text-wrapper_8 flex-col" @click="onEnterScoreClick()">
-		  
+
         <text class="text_19">笔试成绩录入</text>
-		<u-picker
-		      :show="pickerShow"
-		      :columns="[pickerColumns]"
-		      keyName="label"
-		      @confirm="onPickerConfirm"
-		      @cancel="pickerShow = false"
-		    />
+        <u-picker
+            :show="pickerShow"
+            :columns="[pickerColumns]"
+            keyName="label"
+            @confirm="onPickerConfirm"
+            @cancel="pickerShow = false"
+        />
       </view>
     </view>
   </view>
-  
+
 </template>
 <script>
-import { getLocalUserInfo } from '../../utils/auth';
+import {getLocalUserInfo} from '../../utils/auth';
 import request from '@/utils/request.js'
+
 export default {
   data() {
     return {
@@ -144,256 +148,260 @@ export default {
           lanhutext7: '山东省济南市历下区'
         }
       ],
-	  userInfo: {},
-	  examList: {},
-	  examTwoList: {},
-	  scrollHeight: 0,
+      userInfo: {},
+      examList: {},
+      examTwoList: {},
+      scrollHeight: 0,
       constants: {},
-	  courseList: [],
-	  pickerShow: false,
-	  pickerColumns: [],
-	  curNow: 0,
-	  isTriggered: false,
+      courseList: [],
+      pickerShow: false,
+      pickerColumns: [],
+      curNow: 0,
+      isTriggered: false,
     };
   },
-  onLoad(){
-	  this.userInfo = getLocalUserInfo()
-	  this.getExamList()
-	  this.getCourseList()
+  onLoad() {
+    this.userInfo = getLocalUserInfo()
+    this.getExamList()
+    this.getCourseList()
   },
   onReady() {
-      // 动态计算滚动区域高度
-      this.calculateScrollHeight();
-    },
+    // 动态计算滚动区域高度
+    this.calculateScrollHeight();
+  },
   methods: {
-	  handleBack() {
-	    uni.navigateBack({
-	    	delta: 1 
-	    });
-	  },
-	  
-	  /**
-	   * 下拉刷新数据
-	   */
-	  onRefresherrefresh() {
-	    this.isTriggered = true
-	    this.pageNo = 1
-	    this.total = 0
-	    this.examList = []
-	    this.getExamList()
-	    
-	  },
-	  
-		onEnterScoreClick() {
-	        if (this.courseList.length > 0) {
-	          this.pickerColumns = this.courseList.map(item => ({
-	            label: item.courseName,
-	            value: item.courseId
-	          }));
-	          this.pickerShow = true;
-	        } else if (this.courseList.length === 1) {
-	          this.goToScoreEntry(this.courseList[0]);
-	        } else {
-	          this.$u.toast("暂无课程信息");
-	        }
-	      },
-		 
-		  onPickerConfirm(e) {
-		    const selectedCourseId = e.value[0];
-		    const selectedCourse = this.courseList.find(item => item.courseId === selectedCourseId.value);
-		    
-		    console.log('courseList', this.courseList);
-		    console.log('selectedCourseId', selectedCourseId);
-		    console.log('selectedCourse', selectedCourse);
-		    
-		    if (selectedCourse) {
-		      this.getProcess(selectedCourse.courseId).then(processData => {
-		        if (!processData || processData.length === 0) {
-		          uni.showToast({
-		            title: '请联系驾校负责人',
-		            icon: 'none'
-		          });
-		          return;
-		        }
-		        
-		        // 检查是否存在科目1或科目4的数据
-		        const hasSubject1Or4 = processData.some(item => 
-		          item.subject === 1 || item.subject === 4
-		        );
-		        
-		        if (hasSubject1Or4) {
-		          this.goToScoreEntry(selectedCourse);
-		        } else {
-		          uni.showToast({
-		            title: '未找到考试信息',
-		            icon: 'none'
-		          });
-		        }
-		      });
-		    }
-		    
-		    this.pickerShow = false;
-		  },
-		  
-		  goToScoreEntry(course) {
-			this.$u.route({
-			  url: '/newPages/examinationAdd/index',
-			  params: {
-				courseId: course.value,
-				courseType: course.courseType,
-				userId: course.userId,
-				tenantId: course.tenantId,
-			  }
-			});
-		  },
+    handleBack() {
+      uni.navigateBack({
+        delta: 1
+      });
+    },
+
+    /**
+     * 下拉刷新数据
+     */
+    onRefresherrefresh() {
+      this.isTriggered = true
+      this.pageNo = 1
+      this.total = 0
+      this.examList = []
+      this.getExamList()
+
+    },
+
+    onEnterScoreClick() {
+      if (this.courseList.length > 0) {
+        this.pickerColumns = this.courseList.map(item => ({
+          label: item.courseName,
+          value: item.courseId
+        }));
+        this.pickerShow = true;
+      } else if (this.courseList.length === 1) {
+        this.goToScoreEntry(this.courseList[0]);
+      } else {
+        this.$u.toast("暂无课程信息");
+      }
+    },
+
+    onPickerConfirm(e) {
+      const selectedCourseId = e.value[0];
+      const selectedCourse = this.courseList.find(item => item.courseId === selectedCourseId.value);
+
+      console.log('courseList', this.courseList);
+      console.log('selectedCourseId', selectedCourseId);
+      console.log('selectedCourse', selectedCourse);
+
+      if (selectedCourse) {
+        this.getProcess(selectedCourse.courseId).then(processData => {
+          if (!processData || processData.length === 0) {
+            uni.showToast({
+              title: '请联系驾校负责人',
+              icon: 'none'
+            });
+            return;
+          }
+
+          // 检查是否存在科目1或科目4的数据
+          const hasSubject1Or4 = processData.some(item =>
+              item.subject === 1 || item.subject === 4
+          );
+
+          if (hasSubject1Or4) {
+            this.goToScoreEntry(selectedCourse);
+          } else {
+            uni.showToast({
+              title: '未找到考试信息',
+              icon: 'none'
+            });
+          }
+        });
+      }
+
+      this.pickerShow = false;
+    },
+
+    goToScoreEntry(course) {
+      this.$u.route({
+        url: '/newPages/examinationAdd/index',
+        params: {
+          courseId: course.value,
+          courseType: course.courseType,
+          userId: course.userId,
+          tenantId: course.tenantId,
+        }
+      });
+    },
+
+    getProcess(courseId) {
+      return new Promise((resolve, reject) => {
+        request({
+          url: '/app-api/process/getAllByUserIdAndCourseId',
+          method: 'GET',
+          params: {
+            userId: this.userInfo.id,
+            courseId: courseId,
+          }
+        }).then(res => {
+          console.log('res123', res);
+          this.processList = res.data;
+          resolve(res.data);
+        }).catch(err => {
+          console.error('查询失败:', err);
+          reject(err);
+        });
+      });
+    },
+
+    getExamList() {
+      request({
+        url: '/app-api/process/getExamListByUserId',
+        method: 'GET',
+        params: {
+          userId: this.userInfo.id,
+        }
+      }).then(res => {
+        this.examList = res.data
+        this.getExamTwoList()
+        console.log('examList', this.examList)
+        console.log('res', res)
+        this.isTriggered = false
+      })
+    },
+    getExamTwoList() {
+      request({
+        url: '/app-api/examBatch/selectExamByUserIdAndCoachId',
+        method: 'GET',
+        params: {
+          userId: this.userInfo.id,
+        }
+      }).then(res => {
+        this.examTwoList = res.data
+        console.log('examTwoList', this.examTwoList)
+        console.log('resTwo', res)
+      })
+    },
+    getCourseList() {
+      request({
+        url: '/app-api/small/drive/school-course-order/getCourseByLoginUser',
+        method: 'GET'
+      }).then(res => {
+        this.courseList = res.data
+        console.log('res111', res)
+      })
+    },
+    getStatusText(status) {
+      const statusMap = {
+        0: '未通过',
+        1: '已通过',
+        9: '已送考',
+        'null': '未送考',
+        'true': '已通过',
+        'false': '未通过',
+      };
+      return statusMap[status] || '未知状态';
+    },
+
+
+    getCourseTypeText(status) {
+      const statusMap = {
+        '1': '科目一',
+        '2': '科目二',
+        '3': '科目三',
+        '4': '科目四',
+      };
+      return statusMap[status] || '未知状态';
+    },
+    formatDate(timestamp) {
+      const date = new Date(timestamp);
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，需要+1
+      const day = String(date.getDate()).padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    },
+
+    calculateScrollHeight() {
+      // 获取屏幕高度
+      const screenHeight = uni.getSystemInfoSync().windowHeight;
+      // 获取顶部区域高度
+      const topHeight = 160;
+      // 计算滚动区域高度
+      this.scrollHeight = screenHeight - topHeight;
+    },
+
+    getButtonInfo(item) {
+      console.log('item', item)
+      if (item.fraction == null) {
+        return {text: '成绩录入', type: 'input'}
+      } else if (!item.ifPass) {
+        return {text: '考试未通过', type: 'failed'}
+      } else if (!item.ifEvaluate) {
+        return {text: '开始评价', type: 'evaluate'}
+      }else {
+        return {text: '1', type: 'evaluate'}
+      }
+      // else if (item.ifEvaluate) {
+      //     return { text: '查看评价', type: 'view' }
+      //   }
+    },
+
+    handleButtonClick(item) {
+      const buttonInfo = this.getButtonInfo(item)
+
+      switch (buttonInfo.type) {
+        case 'input':
+          this.goScoreInput(item)
+          break
+        case 'evaluate':
+          this.goEvaluate(item)
+          break
+        case 'view':
+          this.goViewEvaluation(item)
+          break
+        default:
+
+      }
+    },
+
+    // 跳转到成绩录入页面
+    goScoreInput(item) {
+      uni.navigateTo({
+        url: `/newPages/examinationAdd/index?id=${item.batchItemId}&batchId=${item.batchId}&batchId=${item.batchId}&tenantId=${item.tenantId}&courseType=${item.courseType}&subject=${item.subject}&courseId=${item.courseId}&coachId=${item.coachId}`
+      });
+    },
+    // 跳转到开始评价页面
+    goEvaluate(item) {
+      item = JSON.stringify(item)
+      uni.navigateTo({
+        url: `/newPages/evaluateAdd/index?data=${item}&type=kaoshi&controls=add`
+      })
+    },
+
+    // 跳转到查看评价页面
+    goViewEvaluation(item) {
+      uni.navigateTo({
+        url: `/newPages/evaluationDetail/index?evaluateId=${item.evaluateId}`
+      })
+    }
 
-		getProcess(courseId) {
-		  return new Promise((resolve, reject) => {
-		    request({
-		      url: '/app-api/process/getAllByUserIdAndCourseId',
-		      method: 'GET',
-		      params: {
-		        userId: this.userInfo.id,
-		        courseId: courseId,
-		      }
-		    }).then(res => {
-		      console.log('res123', res);
-		      this.processList = res.data;
-		      resolve(res.data); 
-		    }).catch(err => {
-		      console.error('查询失败:', err);
-		      reject(err);
-		    });
-		  });
-		},
-	  
-	  getExamList(){
-		  request({
-			  url: '/app-api/process/getExamListByUserId',
-			  method:'GET',
-			  params: {
-				  userId: this.userInfo.id,
-			  }
-		  }).then(res => {
-			  this.examList = res.data
-			  this.getExamTwoList()
-			  console.log('examList', this.examList)
-			  console.log('res',res)
-			  this.isTriggered = false
-		  })
-	  },
-	  getExamTwoList(){
-	  	request({
-	  		url: '/app-api/examBatch/selectExamByUserIdAndCoachId',
-	  		method: 'GET',
-	  		params: {
-	  			userId: this.userInfo.id,
-	  		}
-	  	}).then(res => {
-	  		this.examTwoList = res.data
-	  		console.log('examTwoList', this.examTwoList)
-	  		console.log('resTwo',res)
-	  	})
-	  },
-	  getCourseList(){
-		  request({
-			  url:'/app-api/small/drive/school-course-order/getCourseByLoginUser',
-			  method: 'GET'
-		  }).then(res => {
-			  this.courseList = res.data
-			  console.log('res111',res)
-		  })
-	  },
-	  getStatusText(status) {
-	          const statusMap = {
-	            0: '未通过',
-	            1: '已通过',
-	            9: '已送考',
-	            'null': '未送考',
-				'true': '已通过',
-				'false': '未通过',
-	          };
-	          return statusMap[status] || '未知状态';
-	        },
-			
-			
-	  getCourseTypeText(status) {
-	          const statusMap = {
-	            '1': '科目一',
-	            '2': '科目二',
-	            '3': '科目三',
-	            '4': '科目四',
-	          };
-	          return statusMap[status] || '未知状态';
-	        },
-	  formatDate(timestamp) {
-	    const date = new Date(timestamp);
-	    const year = date.getFullYear();
-	    const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，需要+1
-	    const day = String(date.getDate()).padStart(2, '0');
-	    return `${year}-${month}-${day}`;
-	  },
-	  
-	  calculateScrollHeight() {
-	        // 获取屏幕高度
-	        const screenHeight = uni.getSystemInfoSync().windowHeight;
-	        // 获取顶部区域高度
-	        const topHeight = 160;
-	        // 计算滚动区域高度
-	        this.scrollHeight = screenHeight - topHeight;
-	    },
-		  
-		  getButtonInfo(item) {
-			  console.log('item', item)
-		      if (item.fraction == null ) {
-		        return { text: '成绩录入', type: 'input' }
-		      } else if (!item.ifPass) {
-		        return { text: '考试未通过', type: 'failed' }
-		      } else if (item.ifEvaluate) {
-		        return { text: '查看评价', type: 'view' }
-		      } else {
-		        return { text: '开始评价', type: 'evaluate' }
-		      }
-		    },
-			
-			handleButtonClick(item) {
-			    const buttonInfo = this.getButtonInfo(item)
-			    
-			    switch(buttonInfo.type) {
-			      case 'input':
-			        this.goScoreInput(item)
-			        break
-			      case 'evaluate':
-			        this.goEvaluate(item)
-			        break
-			      case 'view':
-			        this.goViewEvaluation(item)
-			        break
-			      default:
-			        
-			    }
-			  },
-			  
-			  // 跳转到成绩录入页面
-			    goScoreInput(item) {
-			      uni.navigateTo({
-			        url: `/newPages/examinationAdd/index?id=${item.batchItemId}&batchId=${item.batchId}&batchId=${item.batchId}&tenantId=${item.tenantId}&courseType=${item.courseType}&subject=${item.subject}&courseId=${item.courseId}&coachId=${item.coachId}`
-			      });
-			    },
-				// 跳转到开始评价页面
-				  goEvaluate(item) {
-				    uni.navigateTo({
-				      url: `/newPages/evaluation/index?batchId=${item.batchId}&evaluateId=${item.evaluateId || ''}`
-				    })
-				  },
-				  
-				  // 跳转到查看评价页面
-				  goViewEvaluation(item) {
-				    uni.navigateTo({
-				      url: `/newPages/evaluationDetail/index?evaluateId=${item.evaluateId}`
-				    })
-				  }
-		
   }
 };
 </script>

From 31bb63fcdf1c6b1d79e8b073aadf8c90863470fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Wed, 9 Apr 2025 10:05:29 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courseDetail/assets/style/index.rpx.scss  |   4 +-
 newPages/courseDetail/index.vue               |  37 ++++++------------
 newPages/register/index.vue                   |  16 ++++----
 static/imgs/qbdd2.png                         | Bin 0 -> 660 bytes
 static/imgs/yfk2.png                          | Bin 0 -> 580 bytes
 5 files changed, 23 insertions(+), 34 deletions(-)
 create mode 100644 static/imgs/qbdd2.png
 create mode 100644 static/imgs/yfk2.png

diff --git a/newPages/courseDetail/assets/style/index.rpx.scss b/newPages/courseDetail/assets/style/index.rpx.scss
index bee3f3d..0f44ecf 100644
--- a/newPages/courseDetail/assets/style/index.rpx.scss
+++ b/newPages/courseDetail/assets/style/index.rpx.scss
@@ -2,7 +2,7 @@
   background-color: rgba(242, 244, 248, 1);
   position: relative;
   width: 750rpx;
-  height: 4112rpx;
+  //height: 4112rpx;
   overflow: hidden;
   .group_1 {
     background-color: rgba(255, 255, 255, 1);
@@ -247,7 +247,7 @@
   .group_5 {
     background-color: rgba(255, 255, 255, 1);
     border-radius: 8px;
-    height: 2870rpx;
+    //height: 2870rpx;
     width: 686rpx;
     position: relative;
     margin: -30rpx 0 0 32rpx;
diff --git a/newPages/courseDetail/index.vue b/newPages/courseDetail/index.vue
index e5242b9..184c066 100644
--- a/newPages/courseDetail/index.vue
+++ b/newPages/courseDetail/index.vue
@@ -1,17 +1,9 @@
 <template>
   <view class="page flex-col">
-    <view class="group_1 flex-row">
-
-    </view>
-    <view class="group_2 flex-row">
-      <image
-          class="label_1"
-          referrerpolicy="no-referrer"
-          src="/static/lanhu_kechengxiangqing/FigmaDDSSlicePNG53ddee177d4f9800624b95a9ec941112.png"
-          @click="goBack()"
-      />
-      <text class="text_2">课程详情</text>
-
+    <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 class="group_3 flex-col">
       <image
@@ -41,20 +33,11 @@
     <view class="group_5 flex-col">
       <view class="section_4 flex-row justify-between">
         <view class="block_3 flex-col"></view>
-        <text class="text_10">报名类型</text>
+        <text class="text_10">课程介绍</text>
       </view>
-      <view class="image-wrapper_2 flex-row">
-        <image
-            class="image_2"
-            referrerpolicy="no-referrer"
-            src="/static/lanhu_kechengxiangqing/FigmaDDSSlicePNG156254d307fe40d6e67828fbe5adb90f.png"
-        />
+      <view class="u-content">
+        <u-parse :content="courseDetails.remark"></u-parse>
       </view>
-      <image
-          class="image_3"
-          referrerpolicy="no-referrer"
-          src="/static/lanhu_kechengxiangqing/FigmaDDSSlicePNG40a433e56593a25193fc18c2d385444f.png"
-      />
     </view>
     <view class="group_6 flex-row">
       <view class="image-text_1 flex-col justify-between" @click="zxkf()">
@@ -75,8 +58,10 @@
 import request from "@/utils/request";
 import config from "@/config.js"
 import {getLocalUserInfo, getUserInfo} from "@/utils/auth";
+import headers from "@/components/header/headers.vue";
 
 export default {
+  components: {headers},
   data() {
     return {
       courseId: undefined,
@@ -149,4 +134,8 @@ export default {
 <style lang='scss'>
 @import '../common/common.scss';
 @import './assets/style/index.rpx.scss';
+.u-content{
+  margin-top: 20rpx;
+  padding: 10rpx;
+}
 </style>
diff --git a/newPages/register/index.vue b/newPages/register/index.vue
index 6be9b3e..e7cf480 100644
--- a/newPages/register/index.vue
+++ b/newPages/register/index.vue
@@ -104,7 +104,7 @@
 
         <view @click="changeStartPay(2)" class="dj-list">
           <view class="dj-list-left">
-            <image class="dj-list-left-img" src="../../static/imgs/yfk.png" mode=""></image>
+            <image class="dj-list-left-img" src="../../static/imgs/yfk2.png" mode=""></image>
             <view class="dj-list-left-name">线下支付</view>
           </view>
           <view class="dj-list-right">
@@ -116,7 +116,7 @@
         </view>
         <view @click="changeStartPay(1)" class="dj-list">
           <view class="dj-list-left">
-            <image class="dj-list-left-img" src="../../static/imgs/qbdd.png" mode=""></image>
+            <image class="dj-list-left-img" src="../../static/imgs/qbdd2.png" mode=""></image>
             <view class="dj-list-left-name">微信</view>
           </view>
           <view class="dj-list-right">
@@ -741,7 +741,7 @@ export default {
 
     .bm-page-button-main {
       border-radius: 50rpx;
-      background-color: #4aa76f;
+      background-color: #2C78F5;
       color: #fff;
     }
   }
@@ -854,7 +854,7 @@ export default {
         font-size: 22rpx;
 
         .bm-page-right-zd {
-          background-color: rgba(94, 255, 153, 0.2);
+          background-color: #dfebff;
         }
 
         .bm-page-right-c2 {
@@ -909,8 +909,8 @@ export default {
   height: 18px;
   border-radius: 50%;
   overflow: hidden;
-  border: 1px solid #4aa76f;
-  background: #4aa76f;
+  border: 1px solid #2C78F5;
+  background: #2C78F5;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -926,7 +926,7 @@ export default {
   width: 120px;
   height: 35px;
   border-radius: 4px;
-  background: #4aa76f;
+  background: #2C78F5;
   color: #fff;
   display: flex;
   align-items: center;
@@ -949,7 +949,7 @@ export default {
 
 .clv {
   color: #fff;
-  background: #4aa76f;
+  background: #2C78F5;
   width: 26px;
   height: 26px;
   border-radius: 50%;
diff --git a/static/imgs/qbdd2.png b/static/imgs/qbdd2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1e4f7d39aefab83e240f587caf97b8f44e756d1
GIT binary patch
literal 660
zcmV;F0&D$=P)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px%PDw;TR9Hu2WWWNvmgnX@y4W!hn;b~&N(VQiPQ};%xa5fuCuD}aes%KJ$O-e%
z&0<6r@LpAH{P0}U8A28kvW$>^QamlMUuwNIa@sMNnQ#ZYugddydaivtH7&zu7Ac;V
zHmda888&GL$ULxvy_aWMJ-pa`lo-d75<1j!FvuJkohq{(F%wUN9ZYI^BqemHnGZnr
zGP*C$OL=;=eKxV7J5V7EvR6*OBA=|>K2RYHPQ#=ohk*>?Q3ul_AB-jmVndnSj5~5d
z*mHSa$>WRd-69;`oNOvu{?D#-uYiTFj6r$Wj)*C%(Muo^^=v^7c0QfI{}>f^$4p#8
zP6<VJ2*VubG^bd8UrO&o5Z`TaLBOuq2^&Cc=h^w<ds8RA1ktSA|5bNHO*#S-gXyKK
zgFy~`b*Je8%yMbnnt+|r{TtC6QJ_#|c=+JQn;%=h!(#y2E})x(iOpEFP)AmhpoK$-
zHFMO##D)~P>PADD+>j$y-)IOE8&c$|8x3J{LylN|!!LwE?N(xaPfpu_ShHd32!^n<
zPFW#whBC4}z0%o9oLcf#5p*#5M$<;;sDo(}t_V{JhA^Q_M~{q#90&v*OzRLM)%;Nh
zlNw^AsviwuQbUYX^^AmOj7T+*mg+$>OJq$M(9%)(%mz;xfE0Kv$v1s+rR~%}IfNK{
zW%Md-L8C|TmYD0(Y_I2+yS5Uenciw7b<4bWM^D`bvKOW4=&>x%=E<e@!}N9#KKo$P
uUGU~5HpS%3EK%E&pc$iWk&`E(n+pI8cV^6pDdvU%0000<MNUMnLSTY`a3>!C

literal 0
HcmV?d00001

diff --git a/static/imgs/yfk2.png b/static/imgs/yfk2.png
new file mode 100644
index 0000000000000000000000000000000000000000..47a8b6fb9f5581af5d691402ee14d48197c68fc1
GIT binary patch
literal 580
zcmV-K0=xZ*P)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px${z*hZR9Hu2WEf(AafrE>0mZ=%^AiN#+?@J;FnL0R!<+L!!+{?#H=#J#Yf)b8
zqigMp29ty3v?}Aa#Z6j_)xi!84jgZOZ2dl%94w-qEqEYt!3V4k1_^>3&7r1eGT@H>
z$N2Ndor{-|lLN?2Lp#$Ac&HNL0B{I{k^!f>Ue4o-?cGG^p}P`U{mRnqk&}ABNy2-1
zmes?H-AC!}3NkDdF{spK)T#LTpA5YNre)N@v<~{w5FQO-v=E>;NnGjR2AAc8N*iL;
z5sD$IIT)X#VU8unV>EZLv{9w!&ag>4U>2c=G_qseSLJy;J=eaSkfZR)Qyjt|!{zl$
zt+z%_JBIFPYC9HOH4{pE#D)gCqmlJdBV^(2VQM)TWFT^g!YrV6r+}gm#^yj`VuX@F
zBHO`|hE=h<!zV5w#)0T++!hxEJiFSuo*cboI~Zh{v~E>3!~Z|ukS%6pU^%)YX5wj(
zn8%WQ)Bg;AtWh1t$oBL~XD2z1rD~=_b^x_132dICD1>o^(x`)xLWZIc9#W-*v~Eqn
z&glM)<YXS#rP*H3FL!MvM=wPoj6Nzui~}egzoW>(qnVC~C>jl6P#}TQHi)LhSTjvR
zn24AqTgj+{$qqUqHI9ZbkpV@vvY{8kAg@x=Wg$DL$j}ICY>m!wkP&bsX#oIm6a*$-
SwC@W50000<MNUMnLSTYaR0E0t

literal 0
HcmV?d00001