diff --git a/newPages/courseDetail/assets/style/index.rpx.scss b/newPages/courseDetail/assets/style/index.rpx.scss
index 0f44ecf..f07bc34 100644
--- a/newPages/courseDetail/assets/style/index.rpx.scss
+++ b/newPages/courseDetail/assets/style/index.rpx.scss
@@ -2,6 +2,7 @@
   background-color: rgba(242, 244, 248, 1);
   position: relative;
   width: 750rpx;
+  min-height: 100vh;
   //height: 4112rpx;
   overflow: hidden;
   .group_1 {
@@ -249,8 +250,8 @@
     border-radius: 8px;
     //height: 2870rpx;
     width: 686rpx;
-    position: relative;
-    margin: -30rpx 0 0 32rpx;
+    //position: relative;
+    margin: -30rpx 0 160rpx 32rpx;
     .section_4 {
       width: 148rpx;
       height: 32rpx;
@@ -296,6 +297,8 @@
     width: 750rpx;
     height: 136rpx;
     margin-top: 50rpx;
+    position: absolute;
+    bottom: 0;
     .image-text_1 {
       width: 80rpx;
       height: 72rpx;
diff --git a/newPages/courseDetail/index.vue b/newPages/courseDetail/index.vue
index 184c066..f3e29b4 100644
--- a/newPages/courseDetail/index.vue
+++ b/newPages/courseDetail/index.vue
@@ -35,9 +35,16 @@
         <view class="block_3 flex-col"></view>
         <text class="text_10">课程介绍</text>
       </view>
-      <view class="u-content">
+      <view class="u-content" v-if="courseDetails.remark">
         <u-parse :content="courseDetails.remark"></u-parse>
       </view>
+      <view class="u-content" v-else>
+        <u-empty
+            mode="list"
+            text="该课程没有简介..."
+        >
+        </u-empty>
+      </view>
     </view>
     <view class="group_6 flex-row">
       <view class="image-text_1 flex-col justify-between" @click="zxkf()">
diff --git a/newPages/courseList/index.vue b/newPages/courseList/index.vue
index 3f363ee..2bc54c1 100644
--- a/newPages/courseList/index.vue
+++ b/newPages/courseList/index.vue
@@ -18,14 +18,14 @@
           :src="imagesUrl + '/' + item.photo"
         />
         <view class="text-group_1 flex-col justify-between">
-          <text class="text_3">{{ item.tittle }}</text>
+          <text class="text_3">{{ item.name }}</text>
           <view class="text-wrapper_1 flex-row justify-between">
             <text class="text_4">￥{{ item.price }}</text>
           </view>
         </view>
         <view class="text-wrapper_3 flex-col">
           <view style="display: flex">
-            <text class="text_7" style="background-color: rgba(223, 235, 255, 1);padding: 5rpx 15rpx">{{ item.name }}</text>
+            <text class="text_7" style="background-color: rgba(223, 235, 255, 1);padding: 5rpx 15rpx">{{ item.tittle }}</text>
             <text class="text-wrapper_2 text_7" style="color: black;padding: 5rpx 15rpx;margin-left: 10rpx">{{ item.type }}</text>
           </view>
         </view>
@@ -106,7 +106,7 @@ export default {
 		url: `/newPages/courseDetail/index?courseId=${courseId}&tenantId=${this.tenantId}`,
 	  });
 	},
-	
+
   }
 };
 </script>
diff --git a/newPages/evaluate/index.vue b/newPages/evaluate/index.vue
index e71ccac..fe70b38 100644
--- a/newPages/evaluate/index.vue
+++ b/newPages/evaluate/index.vue
@@ -1,171 +1,188 @@
 <template>
-	<view class="page flex-col">
-		<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_4 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">
-					<view class="list-items_1 flex-col" v-for="(item, index) in evaluate" :key="index"
-						@click="goEvaluateDetail(item)">
-						<view class="text-wrapper_1 flex-row">
-							<text class="text_2">{{ item.busiName }}</text>
-						</view>
-						<view class="group_6 flex-row justify-between">
-							<view class="text-wrapper_2 flex-col">
-								<text class="text_3">{{ item.busiName.slice(0, 3) }}</text>
-							</view>
-							<view class="text-wrapper_3 flex-col">
-								<text class="text_4">{{ item.courseType }}</text>
-							</view>
-						</view>
-						<view class="group_7 flex-row">
-							<view class="image-text_1 flex-row justify-between" style="align-items: center;">
-								<image class="label_2" referrerpolicy="no-referrer"
-									src="/static/lanhu_pingjiabiaodan/FigmaDDSSlicePNG9781bf564ae15eee66e88c90622422db.png" />
-								<text class="text-group_1">{{ item.coachName }}</text>
-							</view>
-							<view style="display: flex; align-items: center;">
-								<u-rate active-color="#EAA140" v-model="item.rate" allowHalf inactive-color="#b2b2b2"
-									readonly></u-rate>
-								<text style="margin-left: 5rpx;color:#E1A652;">{{ item.rate }}</text>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
+  <view class="page flex-col">
+    <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_4 flex-col">
+      <view class="list_1 flex-col" v-if="evaluate.length > 0">
+        <scroll-view
+            :style="{ height: scrollHeight + 'px' }"
+            scroll-y="true" class="itemContent"
+            @scrolltolower="onReachBottomCus" refresher-enabled @refresherrefresh="onRefresherrefresh"
+            :refresher-triggered="isTriggered">
+          <view class="list-items_1 flex-col" v-for="(item, index) in evaluate" :key="index"
+                @click="goEvaluateDetail(item)">
+            <view class="text-wrapper_1 flex-row">
+              <text class="text_2">{{ item.busiName }}</text>
+            </view>
+            <view class="group_6 flex-row justify-between">
+              <view class="text-wrapper_2 flex-col">
+                <text class="text_3">{{ item.busiName.slice(0, 3) }}</text>
+              </view>
+              <view class="text-wrapper_3 flex-col">
+                <text class="text_4">{{ item.courseType }}</text>
+              </view>
+            </view>
+            <view class="group_7 flex-row">
+              <view class="image-text_1 flex-row justify-between" style="align-items: center;">
+                <image class="label_2" referrerpolicy="no-referrer"
+                       src="/static/lanhu_pingjiabiaodan/FigmaDDSSlicePNG9781bf564ae15eee66e88c90622422db.png"/>
+                <text class="text-group_1">{{ item.coachName }}</text>
+              </view>
+              <view style="display: flex; align-items: center;">
+                <u-rate active-color="#EAA140" v-model="item.rate" allowHalf inactive-color="#b2b2b2"
+                        readonly></u-rate>
+                <text style="margin-left: 5rpx;color:#E1A652;">{{ item.rate }}</text>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
       <view class="empty-container" v-else>
         <u-empty
             mode="data"
             text="评价为空"
         />
       </view>
-		</view>
-	</view>
+    </view>
+  </view>
 </template>
 <script>
-	import headers from "@/components/header/headers.vue";
-	import {
-		getLocalUserInfo
-	} from "@/utils/auth";
-	import request from "@/utils/request";
+import headers from "@/components/header/headers.vue";
+import {
+  getLocalUserInfo
+} from "@/utils/auth";
+import request from "@/utils/request";
 
-	export default {
-		components: {
-			headers
-		},
-		data() {
-			return {
-				loopData0: [{
-						lanhutext0: '科目二训练',
-						lanhutext1: '科目二',
-						lanhutext2: 'C2',
-						lanhuimage0: 'https://lanhu-oss-2537-2.lanhuapp.com/FigmaDDSSlicePNG9781bf564ae15eee66e88c90622422db.png',
-						lanhutext3: '马文峰',
-						lanhutext4: '4.0'
-					},
-					{
-						lanhutext0: '科目二考试',
-						lanhutext1: '科目二',
-						lanhutext2: 'C2',
-						lanhuimage0: 'https://lanhu-oss-2537-2.lanhuapp.com/FigmaDDSSlicePNG9781bf564ae15eee66e88c90622422db.png',
-						lanhutext3: '马文峰',
-						lanhutext4: '4.0'
-					}
-				],
-				evaluate: [],
-				constants: {},
-				userId: getLocalUserInfo().id,
-				pageNo: 1,
-				pageSize: 10,
-				total: 0,
-				isTriggered: false
-			};
-		},
-		onLoad() {
-			this.getList()
-		},
-		methods: {
-			getList() {
-				request({
-					url: '/app-api/feed-back/page',
-					method: 'GET',
-					params: {
-						userId: this.userId,
-						pageNo: this.pageNo,
-						pageSize: this.pageSize
-					}
-				}).then(res => {
-					console.log(res)
-					this.total = res.data.total
-					if (this.pageNo == 1) {
-						this.evaluate = res.data.records
-					} else {
-						this.evaluate = this.evaluate.concat(res.data.records)
-					}
-					this.isTriggered = false
-				})
-			},
-			/**
-			 * 上滑加载数据
-			 */
-			onReachBottomCus() {
-				//判断 如果页码*页容量大于等于总条数，提示该页数据加载完毕
-				if (this.pageNo * this.pageSize >= this.total) {
-					uni.$u.toast('没有更多数据了')
-					return
-				}
-				//页码+1,调用获取数据的方法获取第二页数据
-				this.pageNo++
-				//此处调用自己获取数据列表的方法
-				if (this.curNow === 1) {
-					this.getTrainList()
-				} else {
-					this.getList()
-				}
-			},
-			/**
-			 * 下拉刷新数据
-			 */
-			onRefresherrefresh() {
-				this.isTriggered = true
-				this.pageNo = 1
-				this.total = 0
-				this.appointmentList = []
-				if (this.curNow === 1) {
-					this.getTrainList()
-				} else {
-					this.getList()
-				}
-			},
-			goEvaluateDetail(data) {
-				data = JSON.stringify(data)
-				uni.navigateTo({
-					url: `/newPages/evaluateAdd/index?data=${data}`
-				})
-			}
-		}
-	};
+export default {
+  components: {
+    headers
+  },
+  data() {
+    return {
+      loopData0: [{
+        lanhutext0: '科目二训练',
+        lanhutext1: '科目二',
+        lanhutext2: 'C2',
+        lanhuimage0: 'https://lanhu-oss-2537-2.lanhuapp.com/FigmaDDSSlicePNG9781bf564ae15eee66e88c90622422db.png',
+        lanhutext3: '马文峰',
+        lanhutext4: '4.0'
+      },
+        {
+          lanhutext0: '科目二考试',
+          lanhutext1: '科目二',
+          lanhutext2: 'C2',
+          lanhuimage0: 'https://lanhu-oss-2537-2.lanhuapp.com/FigmaDDSSlicePNG9781bf564ae15eee66e88c90622422db.png',
+          lanhutext3: '马文峰',
+          lanhutext4: '4.0'
+        }
+      ],
+      evaluate: [],
+      scrollHeight: 0,
+      constants: {},
+      userId: getLocalUserInfo().id,
+      pageNo: 1,
+      pageSize: 10,
+      total: 0,
+      isTriggered: false
+    };
+  },
+  onLoad() {
+    this.getList()
+  },
+  onReady() {
+    // 动态计算滚动区域高度
+    this.calculateScrollHeight();
+  },
+  methods: {
+    getList() {
+      request({
+        url: '/app-api/feed-back/page',
+        method: 'GET',
+        params: {
+          userId: this.userId,
+          pageNo: this.pageNo,
+          pageSize: this.pageSize
+        }
+      }).then(res => {
+        console.log(res)
+        this.total = res.data.total
+        if (this.pageNo == 1) {
+          this.evaluate = res.data.records
+        } else {
+          this.evaluate = this.evaluate.concat(res.data.records)
+        }
+        this.isTriggered = false
+      })
+    },
+    /**
+     * 上滑加载数据
+     */
+    onReachBottomCus() {
+      //判断 如果页码*页容量大于等于总条数，提示该页数据加载完毕
+      if (this.pageNo * this.pageSize >= this.total) {
+        uni.$u.toast('没有更多数据了')
+        return
+      }
+      //页码+1,调用获取数据的方法获取第二页数据
+      this.pageNo++
+      //此处调用自己获取数据列表的方法
+      if (this.curNow === 1) {
+        this.getTrainList()
+      } else {
+        this.getList()
+      }
+    },
+    calculateScrollHeight() {
+      // 获取屏幕高度
+      const screenHeight = uni.getSystemInfoSync().windowHeight;
+      // 获取顶部区域高度
+      const topHeight = 160;
+      // 计算滚动区域高度
+      this.scrollHeight = screenHeight - topHeight;
+    },
+    /**
+     * 下拉刷新数据
+     */
+    onRefresherrefresh() {
+      this.isTriggered = true
+      this.pageNo = 1
+      this.total = 0
+      this.appointmentList = []
+      if (this.curNow === 1) {
+        this.getTrainList()
+      } else {
+        this.getList()
+      }
+    },
+    goEvaluateDetail(data) {
+      data = JSON.stringify(data)
+      uni.navigateTo({
+        url: `/newPages/evaluateAdd/index?data=${data}`
+      })
+    }
+  }
+};
 </script>
 <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;           /* 或者你需要撑满的高度 */
-  }
-  .text-group_1 {
-    display: inline-block;
-    max-width: 4em; /* 一个汉字大概占1em，3em就是三个字 */
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
+@import '../common/common.scss';
+@import './assets/style/index.rpx.scss';
+
+.empty-container {
+  display: flex;
+  justify-content: center; /* 水平居中 */
+  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/examinationList/index.vue b/newPages/examinationList/index.vue
index 46399ca..659f4c6 100644
--- a/newPages/examinationList/index.vue
+++ b/newPages/examinationList/index.vue
@@ -1,20 +1,11 @@
 <template>
   <view class="page flex-col">
-    <view class="block_1 flex-row">
-
-
+    <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="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()"
-        />
-        <text class="text_1">考试结果录入</text>
-
-      </view>
       <view>
         <scroll-view
             class="scroll-view"
@@ -118,8 +109,10 @@
 <script>
 import {getLocalUserInfo} from '../../utils/auth';
 import request from '@/utils/request.js'
+import headers from "@/components/header/headers.vue";
 
 export default {
+  components: {headers},
   data() {
     return {
       loopData0: [
diff --git a/newPages/newIndex/index.vue b/newPages/newIndex/index.vue
index 9b3aefa..72051de 100644
--- a/newPages/newIndex/index.vue
+++ b/newPages/newIndex/index.vue
@@ -22,7 +22,7 @@
       </view>
       <view class="box_4 flex-row justify-between">
         <view class="image-text_2 flex-row justify-between">
-          <u-notice-bar direction="column" duration="10000" bgColor="#e9f1ff"  color="black" :text="announcement" icon="/static/lanhu_shouye2gai/FigmaDDSSlicePNGd2c17b5f24182e597acbfa50481040c1.png"></u-notice-bar>
+          <u-notice-bar direction="column" duration="10000" bgColor="#e9f1ff"  color="black" :text="textList" 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>
@@ -85,61 +85,21 @@ export default {
       ],
       swiperList: [],
       msg: "1",
-      announcement:['ceshi1111','测试111111111111111111111111111111111111111111'],
       constants: {},
-      schoolList: [
-        // {
-        //   imageUrl: '/static/lanhu_jiaxiaoliebiao/FigmaDDSSlicePNG530e91ec069b391e8972e9ed0aeebc58.png',
-        //   corpName: '兄弟驾校',
-        //   status: '未营业',
-        //   time: '08:00-18:00',
-        //   address: '山东省济南市历下区工业南路168号',
-        //   features: ['有接送', '规模大']
-        // },
-        // {
-        //   imageUrl: '/static/lanhu_jiaxiaoliebiao/FigmaDDSSlicePNG530e91ec069b391e8972e9ed0aeebc58.png',
-        //   corpName: '兄弟驾校',
-        //   status: '营业中',
-        //   time: '08:00-18:00',
-        //   address: '山东省济南市历下区工业南路168号',
-        //   features: ['有接送', '规模大']
-        // },
-        // {
-        //   imageUrl: '/static/lanhu_jiaxiaoliebiao/FigmaDDSSlicePNG530e91ec069b391e8972e9ed0aeebc58.png',
-        //   corpName: '兄弟驾校',
-        //   status: '营业中',
-        //   time: '08:00-18:00',
-        //   address: '山东省济南市历下区工业南路168号',
-        //   features: ['有接送', '规模大']
-        // },
-        // {
-        //   imageUrl: '/static/lanhu_jiaxiaoliebiao/FigmaDDSSlicePNG530e91ec069b391e8972e9ed0aeebc58.png',
-        //   corpName: '兄弟驾校',
-        //   status: '营业中',
-        //   time: '08:00-18:00',
-        //   address: '山东省济南市历下区工业南路168号',
-        //   features: ['有接送', '规模大']
-        // },
-        // {
-        //   imageUrl: '/static/lanhu_jiaxiaoliebiao/FigmaDDSSlicePNG530e91ec069b391e8972e9ed0aeebc58.png',
-        //   corpName: '兄弟驾校',
-        //   status: '营业中',
-        //   time: '08:00-18:00',
-        //   address: '山东省济南市历下区工业南路168号',
-        //   features: ['有接送', '规模大']
-        // },
-      ],
+      schoolList: [],
       //下来刷新状态
       isTriggered: false,
       pageNo: 1,
       pageSize: 10,
       total: 0,
-      imageUrl: this.$imagesUrl
+      imageUrl: this.$imagesUrl,
+      textList:[]
     };
   },
   onLoad() {
     this.getList()
     this.getSwiperList()
+    this.getTextList()
   },
   methods: {
     getList() {
@@ -161,6 +121,24 @@ export default {
         this.isTriggered = false
       })
     },
+    /**
+     * 实时讯息
+     */
+    async getTextList() {
+      let res = await request({
+        url: '/app-api/drivingSchool/text/list',
+        method: 'get',
+        params: {
+          pageNum: 1,
+          pageSize: 10000
+        }
+      })
+      // this.textList = res.data.records
+      // 将textList中的title拼接成数组赋值给textList
+      res.data.records.forEach(item => {
+        this.textList.push(item.title)
+      })
+    },
     getSwiperList() {
       request({
         url: '/drivingSchool/applet/swiper/list',
diff --git a/newPages/schoolDetail/index.vue b/newPages/schoolDetail/index.vue
index 763577e..77bce51 100644
--- a/newPages/schoolDetail/index.vue
+++ b/newPages/schoolDetail/index.vue
@@ -79,7 +79,7 @@
               :src="imagesUrl + '/' + item.photo"
           />
           <view class="text-group_2 flex-col justify-between">
-            <text class="text_9">{{ item.tittle }}</text>
+            <text class="text_9">{{ item.name }}</text>
             <view class="text-wrapper_2 flex-row justify-between">
               <text class="text_10">￥{{ item.price }}</text>
             </view>
@@ -90,7 +90,7 @@
           <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.name
+                  item.tittle
                 }}
               </text>
 
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 979afe9..49faa07 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -11,8 +11,8 @@
 
     <view class="xiaoannoi">
       <u-button v-if="privacyPolicyChecked == true" text="手机号快捷登录" class="dl" :customStyle="{color:'#ffffff'}"
-                color="#4AA76F" open-type='getPhoneNumber' @getphonenumber="getPhone"></u-button>
-      <u-button v-else text="手机号快捷登录" class="dl" :customStyle="{color:'#ffffff'}" color="#4AA76F"
+                color="#2c78f5" open-type='getPhoneNumber' @getphonenumber="getPhone"></u-button>
+      <u-button v-else text="手机号快捷登录" class="dl" :customStyle="{color:'#ffffff'}" color="#2c78f5"
                 @click="shibai()"></u-button>
     </view>
     <view class="dbottom">
@@ -564,14 +564,14 @@ button:focus {
 }
 
 .lan {
-  color: #4AA76F;
+  color: #2c78f5;
 }
 
 .land {
 
   font-size: 25px;
   font-weight: bold;
-  color: #4AA76F;
+  color: #2c78f5;
   margin-bottom: 5px;
 }
 
@@ -595,6 +595,6 @@ button:focus {
   border-radius: 50%;
   border: 1px solid #AAAAAA;
   margin-right: 5px;
-  background-color: #4AA76F;
+  background-color: #2c78f5;
 }
 </style>
diff --git a/static/imgs/idphoto.png b/static/imgs/idphoto.png
new file mode 100644
index 0000000..fdaafaf
Binary files /dev/null and b/static/imgs/idphoto.png differ