From 5dcba93841a0dadb81a74b55062e440af20ad9d3 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期三, 18 十二月 2024 12:03:28 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageCourse/pages/course/index.wxml | 60 ++++++++++++++++++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/packageCourse/pages/course/index.wxml b/packageCourse/pages/course/index.wxml
index 52194d1..9d016e7 100644
--- a/packageCourse/pages/course/index.wxml
+++ b/packageCourse/pages/course/index.wxml
@@ -56,34 +56,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>
@@ -114,6 +86,38 @@
</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>
+ <!-- </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>
+ </view>
+ </view>
+ </t-popup>
</t-popup>
</view>
--
Gitblit v1.9.1