From c3d81e837e6350b431583c5cdcc1e0e09b4376c0 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期三, 18 十二月 2024 16:45:47 +0800
Subject: [PATCH] 111

---
 packageCourse/pages/course/index.wxml |   67 ++++++++++++++++++---------------
 1 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/packageCourse/pages/course/index.wxml b/packageCourse/pages/course/index.wxml
index 52194d1..9bf6c59 100644
--- a/packageCourse/pages/course/index.wxml
+++ b/packageCourse/pages/course/index.wxml
@@ -22,7 +22,10 @@
           <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>
@@ -56,34 +59,6 @@
         <view class="selectBox">
           <text>閫夋嫨鏁欐潗</text>
           <t-button style="margin: 0;" bindtap="selectedBook" icon="add" content="閫夋嫨鏁欐潗" size="extra-small"></t-button>
-          <t-popup visible="{{visibleCart}}" style="top: 0;" usingCustomNavbar show-overlay="{{true}}" placement="right">
-            <view class="cartTilte">
-              <text class="cartText">閫夋嫨鏁欐潗</text>
-              <t-search value="{{selectName}}" bind:clear="changeHandleBook" bind:submit="changeHandleBook" placeholder="鎼滅储鏁欐潗鍚嶇О" clearable />
-            </view>
-            <view class="cartBox">
-              <view class="cartList" wx:if="{{cartList.length > 0}}">
-                <t-radio-group t-class="theme-card" value="{{radioVal}}" allow-uncheck bind:change="onChange">
-                  <view wx:for="{{cartList}}" wx:key="index" class="card {{radioVal == index ? 'card--active' : ''}}">
-                    <t-icon wx:if="{{radioVal == index}}" name="check" t-class="card__icon" />
-                    <t-radio value="{{index}}" label="{{item.product.name}}" icon="none" borderless>
-                      <view class="radioCon" slot='content'>
-                        <image wx:if="{{item.icon}}" class="radioIcon" src="{{item.icon}}" mode="widthFix" />
-                        <image wx:else class="radioIcon" src="/static/images/default-book-img.png" mode="widthFix" />
-                      </view>
-                    </t-radio>
-                  </view>
-                </t-radio-group>
-              </view>
-              <view wx:else>
-                <empty />
-              </view>
-            </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>
-            </view>
-          </t-popup>
         </view>
         <view class="selectedBook">
           <view class="selectTitle">宸查�夋暀鏉�</view>
@@ -101,8 +76,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}}">
@@ -114,6 +89,36 @@
       </view>
     </view>
     <t-toast id="t-toast" />
+    <t-popup visible="{{visibleCart}}" style="top: 0;" usingCustomNavbar placement="right">
+      <view class="wall">
+        <view class="cartTilte">
+          <text class="cartText">閫夋嫨鏁欐潗</text>
+          <t-search value="{{selectName}}" bind:clear="changeHandleBook" bind:submit="changeHandleBook" placeholder="鎼滅储鏁欐潗鍚嶇О" clearable />
+        </view>
+        <view class="cartBox">
+          <view class="cartList" wx:if="{{cartList.length > 0}}">
+            <scroll-view class="scroll" class="content" scroll-y bindrefresherpulling="{{refresh.onPulling}}">
+              <view wx:for="{{cartList}}" bindtap="onChange" data-index="{{index}}" wx:key="index" class="card {{radioVal == index ? 'card--active' : ''}}">
+                <t-icon wx:if="{{radioVal == index}}" name="check" t-class="card__icon" />
+                <t-radio value="{{index}}" label="{{item.product.name}}" icon="none" borderless>
+                  <view class="radioCon" slot='content'>
+                    <image wx:if="{{item.icon}}" class="radioIcon" src="{{item.icon}}" mode="aspectFit" />
+                    <image wx:else class="radioIcon" src="/static/images/default-book-img.png" mode="aspectFit" />
+                  </view>
+                </t-radio>
+              </view>
+            </scroll-view>
+          </view>
+          <view wx:else>
+            <empty />
+          </view>
+        </view>
+        <view class="radioSubmit">
+          <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>
   </t-popup>
 </view>
 

--
Gitblit v1.9.1