更新

newPages/evaluate/index.vue

@@ -7,7 +7,9 @@
     </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"
+        <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"
@@ -78,6 +80,7 @@
         }
       ],
       evaluate: [],
+      scrollHeight: 0,
       constants: {},
       userId: getLocalUserInfo().id,
       pageNo: 1,
@@ -89,6 +92,10 @@
   onLoad() {
     this.getList()
   },
+  onReady() {
+    // 动态计算滚动区域高度
+    this.calculateScrollHeight();
+  },
   methods: {
     getList() {
       request({
@@ -128,6 +135,14 @@
         this.getList()
       }
     },
+    calculateScrollHeight() {
+      // 获取屏幕高度
+      const screenHeight = uni.getSystemInfoSync().windowHeight;
+      // 获取顶部区域高度
+      const topHeight = 160;
+      // 计算滚动区域高度
+      this.scrollHeight = screenHeight - topHeight;
+    },
     /**
      * 下拉刷新数据
      */
@@ -154,12 +169,14 @@
 <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就是三个字 */

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: [

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>
@@ -134,12 +134,14 @@ export default {
       pageNo: 1,
       pageSize: 10,
       total: 0,
-      imageUrl: this.$imagesUrl
+      imageUrl: this.$imagesUrl,
+      textList:[]
     };
   },
   onLoad() {
     this.getList()
     this.getSwiperList()
+    this.getTextList()
   },
   methods: {
     getList() {
@@ -161,6 +163,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',

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>
+                color="#2c78f5" open-type='getPhoneNumber' @getphonenumber="getPhone"></u-button>
-      <u-button v-else text="手机号快捷登录" class="dl" :customStyle="{color:'#ffffff'}" color="#4AA76F"
+      <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>