Merge refs/remotes/origin/master into refs/heads/master

zhongshujie

2024-12-20 32986b54a0e2661f7ad6ed79f3ef12c4289eace9

 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>