From 73a96931c99e2f849c8856dc8e78d3d25adaa654 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期五, 20 十二月 2024 16:44:06 +0800
Subject: [PATCH] 1111
---
packageCourse/pages/course/detail/index.js | 27 ++++++++++++-
packageCourse/pages/course/detail/index.json | 3 +
packageCourse/pages/course/detail/index.wxml | 14 ++++++
packageCourse/pages/course/index.wxml | 2
packageCourse/pages/course/detail/index.wxss | 24 ++++++++++++
packageCourse/pages/studentClass/index.wxml | 15 +++----
6 files changed, 72 insertions(+), 13 deletions(-)
diff --git a/packageCourse/pages/course/detail/index.js b/packageCourse/pages/course/detail/index.js
index 4a2f495..bdb935c 100644
--- a/packageCourse/pages/course/detail/index.js
+++ b/packageCourse/pages/course/detail/index.js
@@ -26,6 +26,8 @@
},
courseLoading: true,
classLoading: false,
+ showContentOnly: false,
+ reason: '',
// 鍔犺浇鍙傛暟
bottomLoading: false,
isMoreData: false,
@@ -49,6 +51,24 @@
title: '鍩烘湰淇℃伅',
})
this.getData()
+ },
+
+
+ showDialog(e) {
+ const {
+ item
+ } = e.currentTarget.dataset;
+ const str = item.reason ? item.reason : '-'
+ this.setData({
+ showContentOnly: true,
+ reason: str
+ });
+ },
+
+ closeDialog() {
+ this.setData({
+ showContentOnly: false
+ });
},
// 鑾峰彇璇剧▼淇℃伅
@@ -354,14 +374,17 @@
classId,
item
} = e.currentTarget.dataset
- if (item.applyState == 'WaitAudit' || item.applyState == 'Reject') {
+ if (item.applyState == 'WaitAudit') {
wx.showToast({
- title: item.applyState == 'WaitAudit' ? '瀹℃牳涓�' : '鏈�氳繃',
+ title: '瀹℃牳涓�',
duration: 1000,
icon: 'none',
})
return false
}
+ if (item.applyState == 'Reject') {
+ return false
+ }
wx.navigateTo({
url: '/packageCourse/pages/teachClass/index?classId=' + classId + '&courseId=' + this.data.courseId + '&author=' + this.data.bookData.author + '&isbn=' + this.data.bookData.isbn + '&bookId=' + this.data.bookData.id + '&rootCmsItemId=' + this.data.bookData.rootCmsItemId + "&bookRefCode=" + this.data.defaultCmsPath,
})
diff --git a/packageCourse/pages/course/detail/index.json b/packageCourse/pages/course/detail/index.json
index 3a73cdf..49d114f 100644
--- a/packageCourse/pages/course/detail/index.json
+++ b/packageCourse/pages/course/detail/index.json
@@ -10,6 +10,7 @@
"t-back-top": "tdesign-miniprogram/back-top/back-top",
"empty": "/components/empty/index",
"t-skeleton": "tdesign-miniprogram/skeleton/skeleton",
- "t-loading": "tdesign-miniprogram/loading/loading"
+ "t-loading": "tdesign-miniprogram/loading/loading",
+ "t-dialog": "tdesign-miniprogram/dialog/dialog"
}
}
\ No newline at end of file
diff --git a/packageCourse/pages/course/detail/index.wxml b/packageCourse/pages/course/detail/index.wxml
index 2a71244..b7ca226 100644
--- a/packageCourse/pages/course/detail/index.wxml
+++ b/packageCourse/pages/course/detail/index.wxml
@@ -67,7 +67,11 @@
<text class="classTag" wx:if="{{item.applyState == 'Normal'}}" style="color: #1dbd11">鐘舵��: 杩涜涓�</text>
<text class="classTag" wx:if="{{item.applyState == 'Reject'}}" style="color: red">鐘舵��: 鏈�氳繃</text>
<t-icon bindtap="delClass" data-del-id="{{item.id}}" class="delete" wx:if="{{item.applyState == 'Reject'}}" name="delete" color="red" size='18px' />
- <text class="classTag" wx:if="{{item.applyState == 'Reject'}}" style="color: red">鎷掔粷鍘熷洜锛歿{ item.reason != '' ? item.reason : '-' }}</text>
+ <view wx:if="{{item.applyState == 'Reject'}}" class="reason">
+ <text> 鎷掔粷鍘熷洜锛�</text>
+ <t-tag style="margin-left: 0;" bind:tap="showDialog" data-item="{{item}}" class="margin-16 replay" theme="danger">鐐瑰嚮鏌ョ湅</t-tag>
+ </view>
+ <!-- <text class="classTag" wx:if="{{item.applyState == 'Reject'}}" style="color: red">鎷掔粷鍘熷洜锛歿{ item.reason != '' ? item.reason : '-' }}</text> -->
<text class="classTag">鐝骇浜烘暟: {{ item.memberCount }} / {{ item.maxUserCount }}</text>
<text class="classTag">鏈夋晥鏈燂細{{ item.beginDate }} - {{ item.endDate }}</text>
</view>
@@ -124,6 +128,14 @@
</view>
</view>
</t-popup>
+ <t-dialog visible="{{showContentOnly}}" bind:confirm="closeDialog" close-on-overlay-click>
+ <view slot="content" class="reasonContent">
+ {{reason}}
+ </view>
+ <view slot="confirm-btn" style="width: 100%;">
+ <t-button style="color: #ff6d00;border-top: 1px solid #eee ;" variant="text" bindtap="closeDialog" size="large" block t-class="external-class">鐭ラ亾浜�</t-button>
+ </view>
+ </t-dialog>
</view>
</view>
<view class="tabbar-bottom">
diff --git a/packageCourse/pages/course/detail/index.wxss b/packageCourse/pages/course/detail/index.wxss
index ea0891d..1c6380a 100644
--- a/packageCourse/pages/course/detail/index.wxss
+++ b/packageCourse/pages/course/detail/index.wxss
@@ -122,6 +122,26 @@
font-weight: 700;
}
+.replay {
+ margin-left: 20rpx;
+ background-color: red !important;
+ border: 0 !important;
+}
+
+.reason {
+ margin-bottom: 10rpx;
+}
+
+.reasonContent {
+ color: #666;
+ font-size: 26rpx;
+ line-height: 44rpx;
+}
+
+.external-class {
+ border-radius: 0 !important;
+}
+
.statics {
width: 100%;
margin-bottom: 40rpx;
@@ -274,6 +294,10 @@
top: 55px !important
}
+.classBox .t-dialog {
+ border: 1rpx solid #eee;
+}
+
.block-title {
padding: 30rpx 20rpx;
font-size: 30rpx;
diff --git a/packageCourse/pages/course/index.wxml b/packageCourse/pages/course/index.wxml
index 264a0ef..0261e09 100644
--- a/packageCourse/pages/course/index.wxml
+++ b/packageCourse/pages/course/index.wxml
@@ -36,7 +36,7 @@
{{item.reason}}
</view>
<view slot="confirm-btn" style="width: 100%;">
- <t-button theme="primary" variant="text" bindtap="closeDialog" size="large" block t-class="external-class">鐭ラ亾浜�</t-button>
+ <t-button style="color: #ff6d00;border-top: 1px solid #eee;" variant="text" bindtap="closeDialog" size="large" block t-class="external-class">鐭ラ亾浜�</t-button>
</view>
</t-dialog>
</view>
diff --git a/packageCourse/pages/studentClass/index.wxml b/packageCourse/pages/studentClass/index.wxml
index e64bb0b..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>
--
Gitblit v1.9.1