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] =?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: [
         // {