From 6df96b3e7a7da1985ee875e84711e9f15c5fbff0 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 24 十二月 2024 18:25:02 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageCourse/pages/studentClass/index.wxml | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/packageCourse/pages/studentClass/index.wxml b/packageCourse/pages/studentClass/index.wxml
index 86e9e32..b431df0 100644
--- a/packageCourse/pages/studentClass/index.wxml
+++ b/packageCourse/pages/studentClass/index.wxml
@@ -20,19 +20,18 @@
<text class="classTag" wx:if="{{item.userState == 'WaitValid'}}" style="color: #ef9f29">鐘舵�� : 瀹℃牳涓�</text>
<text class="classTag" wx:if="{{item.userState == 'Normal'}}" style="color: #1dbd11">鐘舵�� : 杩涜涓�</text>
<text class="classTag" wx:if="{{item.userState == 'Reject'}}" style="color: red">鐘舵�� : 鏈�氳繃</text>
- <t-icon bindtap="delClass" data-del-id="{{item.id}}" class="delete" wx:if="{{item.userState == 'Reject'}}" name="delete" color="red" size='18px' />
+ <!-- <t-icon bindtap="delClass" data-del-id="{{item.id}}" class="delete" wx:if="{{item.userState == 'Reject'}}" name="delete" color="red" size='18px' /> -->
<text class="classTag" wx:if="{{item.userState == 'Reject'}}" style="color: red">鎷掔粷鍘熷洜锛歿{ item.reason != '' ? item.reason : '-' }}</text>
<text class="classTag">鐝骇浜烘暟 : {{ item.memberCount }} / {{ item.maxUserCount }}</text>
<text class="classTag">鏈夋晥鏈� 锛歿{ item.classTime }}</text>
</view>
</view>
-
- </view>
- <view class="bottom-loading" wx:if="{{bottomLoading}}">
- <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
- </view>
- <view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
- <text>娌℃湁鏇村浜�</text>
+ <view class="bottom-loading" wx:if="{{bottomLoading}}">
+ <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
+ </view>
+ <view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
+ <text>娌℃湁鏇村浜�</text>
+ </view>
</view>
</scroll-view>
</view>
@@ -60,7 +59,7 @@
</view>
<view class="c-desc">
<view class="c-desc-title">鐝骇淇℃伅锛�</view>
- <view class="classData" wx:if="{{classDetail}}">
+ <view class="classData" wx:if="{{classDetail && classDetail.memberCount > 0}}">
<view>鐝骇鍚嶇О锛歿{ classDetail.name }}</view>
<view>鐝骇浜烘暟锛歿{ classDetail.memberCount }} / {{ classDetail.maxUserCount }}</view>
<view>寮�璇炬椂闂达細{{classDetail.classTime}}</view>
--
Gitblit v1.9.1