From 32986b54a0e2661f7ad6ed79f3ef12c4289eace9 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期五, 20 十二月 2024 17:52:52 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageCourse/pages/course/index.wxml | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/packageCourse/pages/course/index.wxml b/packageCourse/pages/course/index.wxml
index 9d016e7..0261e09 100644
--- a/packageCourse/pages/course/index.wxml
+++ b/packageCourse/pages/course/index.wxml
@@ -22,10 +22,24 @@
<view class="courseId">
<text>ID: {{item.id}}</text>
<t-tag class="margin-16" wx:if="{{item.applyState == 'WaitAudit'}}" variant="light" theme="warning">瀹℃牳涓�</t-tag>
- <t-tag class="margin-16" wx:if="{{item.applyState == 'Reject'}}" variant="light" theme="danger">鏈�氳繃</t-tag>
+ <view wx:if="{{item.applyState == 'Reject'}}">
+ <t-tag class="margin-16" variant="light" theme="danger">鏈�氳繃</t-tag>
+ <t-tag bindtap="replayCourse" data-item="{{item}}" class="margin-16 replay" theme="danger">閲嶆柊鐢宠</t-tag>
+ </view>
<t-tag class="margin-16" wx:if="{{item.applyState == 'Normal'}}" variant="light" theme="success">浣跨敤涓�</t-tag>
</view>
- <view wx:if="{{item.applyState == 'Reject'}}" class="reason">鎷掔粷鍘熷洜: {{item.reason}}</view>
+ <view wx:if="{{item.applyState == 'Reject'}}" class="reason">
+ <text> 鎷掔粷鍘熷洜锛�</text>
+ <t-tag style="margin-left: 0;" bind:tap="showDialog" class="margin-16 replay" theme="danger">鐐瑰嚮鏌ョ湅</t-tag>
+ <t-dialog visible="{{showContentOnly}}" bind:confirm="closeDialog" close-on-overlay-click>
+ <view slot="content" class="reasonContent">
+ {{item.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 class="desc">鎻忚堪锛歿{item.description}}</view>
</view>
</view>
@@ -73,8 +87,8 @@
</view>
</view>
<view class="courseSubmit">
- <t-button style="margin: 0 15px;" size="small" bindtap="cancle" variant="outline">鍙栨秷</t-button>
- <t-button style="margin: 0;" size="small" bindtap="submitCourse">纭</t-button>
+ <t-button style="padding:0 25px;margin: 0 15px;" size="small" bindtap="cancle" variant="outline">鍙栨秷</t-button>
+ <t-button style="padding:0 25px;margin: 0;" size="small" bindtap="submitCourse">纭</t-button>
</view>
</view>
<view class="block" wx:if="{{pageBook.loading}}">
@@ -109,12 +123,10 @@
<view wx:else>
<empty />
</view>
- <!-- </t-radio-group> -->
-
</view>
<view class="radioSubmit">
- <t-button style="margin: 0;" size="extra-small" bindtap="radioCancle" variant="outline">鍏抽棴</t-button>
- <t-button style="margin: 0 16px;" size="extra-small" bindtap="radioSubmit">纭</t-button>
+ <t-button style="padding:0 25px;margin: 0;" size="extra-small" bindtap="radioCancle" variant="outline">鍏抽棴</t-button>
+ <t-button style=" padding:0 25px;margin: 0 16px;" size="extra-small" bindtap="radioSubmit">纭</t-button>
</view>
</view>
</t-popup>
--
Gitblit v1.9.1