Merge remote-tracking branch 'origin/master'

This commit is contained in:
Lx 2025-04-17 18:45:14 +08:00
commit b9fb9bf81c

View File

@ -8,8 +8,9 @@
<view style="padding: 10rpx 30rpx">
<u-subsection :list="list" :current="curNow" @change="sectionChange"></u-subsection>
</view>
<scroll-view :style="{ height: scrollHeight + 'px' }" scroll-y="true" class="scroll-view" @scrolltolower="onReachBottomCus"
refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered" v-if="appointmentList.length > 0">
<scroll-view :style="{ height: scrollHeight + 'px' }" scroll-y="true" class="scroll-view"
@scrolltolower="onReachBottomCus" 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">
@ -41,38 +42,37 @@
</view>
<!-- 新增内容容器 -->
<view class="box_2 flex-col" v-if="curNow === 1">
<view class="box_4 flex-col" v-for="item in appointmentList"
:key="item.id">
<view class="box_4 flex-col" v-for="item in appointmentList" :key="item.id">
<view @click="goDetail(item,'train')">
<view class="group_5 flex-row justify-between">
<view class="block_3 flex-col justify-between">
<text class="text_2">{{ item.trainDay }}</text>
<view class="group_6 flex-row justify-between">
<view class="text-wrapper_1 flex-col">
<text class="text_3">{{ subjectArr[item.subject - 1] }}</text>
</view>
<view class="text-wrapper_2 flex-col">
<text class="text_4">{{ item.courseType }}</text>
<view class="group_5 flex-row justify-between">
<view class="block_3 flex-col justify-between">
<text class="text_2">{{ item.trainDay }}</text>
<view class="group_6 flex-row justify-between">
<view class="text-wrapper_1 flex-col">
<text class="text_3">{{ subjectArr[item.subject - 1] }}</text>
</view>
<view class="text-wrapper_2 flex-col">
<text class="text_4">{{ item.courseType }}</text>
</view>
</view>
</view>
</view>
</view>
<view class="text-wrapper_4 flex-row justify-between">
<text class="text_6">交通方式</text>
<text class="text_7">{{ item.transWay }}</text>
</view>
<view class="text-wrapper_4 flex-row justify-between">
<text class="text_6">训练地址</text>
<text class="text_7">{{ item.addr }}</text>
</view>
<view class="text-wrapper_4 flex-row justify-between">
<text class="text_6">训练时长</text>
<text class="text_7">{{ item.trainTime }}分钟</text>
</view>
<view class="text-wrapper_5 flex-row justify-between">
<text class="text_8">教练名称</text>
<text class="text_9">{{ item.coachName }}</text>
</view>
<view class="text-wrapper_4 flex-row justify-between">
<text class="text_6">交通方式</text>
<text class="text_7">{{ item.transWay == null ? '' : item.transWay}}</text>
</view>
<view class="text-wrapper_4 flex-row justify-between">
<text class="text_6">训练地址</text>
<text class="text_7">{{ item.addr == null ? '' : item.addr }}</text>
</view>
<view class="text-wrapper_4 flex-row justify-between">
<text class="text_6">训练时长</text>
<text class="text_7">{{ item.trainTime }}分钟</text>
</view>
<view class="text-wrapper_5 flex-row justify-between">
<text class="text_8">教练名称</text>
<text class="text_9">{{ item.coachName }}</text>
</view>
</view>
<view class="block_5 box_10 flex-row" style="justify-content: flex-end; margin: 0 20rpx 15rpx 0;"
v-if="!item.ifEvaluate" @click="goEvaluateAdd(item)">
@ -84,14 +84,12 @@
</view>
</view>
</scroll-view>
<view class="empty-container" v-else>
<u-empty
mode="data"
/>
</view>
<view class="empty-container" v-else>
<u-empty mode="data" />
</view>
<view class="box_6 flex-col bottom_">
<view class="box_6 flex-col bottom_">
<view class="text-wrapper_12 flex-col " @click="goAppointment()">
<text class="text_19">预约</text>
</view>
@ -133,8 +131,8 @@
})
},
onReady() {
//
this.calculateScrollHeight();
//
this.calculateScrollHeight();
},
methods: {
goback() {
@ -199,14 +197,14 @@
})
},
calculateScrollHeight() {
//
const screenHeight = uni.getSystemInfoSync().windowHeight;
// +
const topHeight = 138; // 140rpxpx
// 100rpx
const bottomHeight = uni.upx2px(120);
//
this.scrollHeight = screenHeight - topHeight - bottomHeight;
//
const screenHeight = uni.getSystemInfoSync().windowHeight;
// +
const topHeight = 138; // 140rpxpx
// 100rpx
const bottomHeight = uni.upx2px(120);
//
this.scrollHeight = screenHeight - topHeight - bottomHeight;
},
/**
* 上滑加载数据
@ -301,11 +299,14 @@
margin: 8rpx 0 0 12rpx;
}
}
.empty-container {
display: flex;
justify-content: center; /* 水平居中 */
align-items: center; /* 垂直居中 */
height: 100vh; /* 或者你需要撑满的高度 */
}
</style>
.empty-container {
display: flex;
justify-content: center;
/* 水平居中 */
align-items: center;
/* 垂直居中 */
height: 100vh;
/* 或者你需要撑满的高度 */
}
</style>