From bfd34a548bda456830c81fcccb50d5ad7fbcd795 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 11:42:08 +0800
Subject: [PATCH 1/2] =?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        | 331 +++++++++++++++--------------
 newPages/examinationList/index.vue |  19 +-
 newPages/newIndex/index.vue        |  24 ++-
 pages/login/login.vue              |  10 +-
 static/imgs/idphoto.png            | Bin 0 -> 8020 bytes
 5 files changed, 207 insertions(+), 177 deletions(-)
 create mode 100644 static/imgs/idphoto.png

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 99ae040..4c2348f 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>
@@ -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',
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 0000000000000000000000000000000000000000..fdaafafbeacead62ba43fbf9140cd63496c0847d
GIT binary patch
literal 8020
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

literal 0
HcmV?d00001


From 0b8e9c401cc3fe5e2b7fb2c3ae8f8bd182fe0c56 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 13:40:12 +0800
Subject: [PATCH 2/2] =?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  |  7 ++-
 newPages/courseDetail/index.vue               |  9 +++-
 newPages/courseList/index.vue                 |  6 +--
 newPages/newIndex/index.vue                   | 44 +------------------
 newPages/schoolDetail/index.vue               |  4 +-
 5 files changed, 19 insertions(+), 51 deletions(-)

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/newIndex/index.vue b/newPages/newIndex/index.vue
index 4c2348f..5d50751 100644
--- a/newPages/newIndex/index.vue
+++ b/newPages/newIndex/index.vue
@@ -85,50 +85,8 @@ 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,
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>