From 88d80c9f40935c6ce7ea51683c6cdc1a80d1997b Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 22 三月 2024 11:17:45 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/retrievalPage/index.wxml | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/pages/retrievalPage/index.wxml b/pages/retrievalPage/index.wxml
index c36c3f5..97a1e59 100644
--- a/pages/retrievalPage/index.wxml
+++ b/pages/retrievalPage/index.wxml
@@ -10,7 +10,6 @@
<view class="example-search">
<t-search bind:submit="onSearchSubmit" class="searchBox" model:value="{{searchVal}}" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��" />
-
<view class="cancellation" bind:tap="onCancellation">鍙栨秷</view>
</view>
@@ -37,7 +36,10 @@
</view>
-
+ <view class="bottom-box">
+ <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
+ </view>
</t-tab-panel>
<t-tab-panel label="璇剧▼({{courseTotal}})" value="1">
@@ -47,7 +49,7 @@
<view wx:if="{{courseData.length <= 0}}" class="noDataBox">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
- <view wx:if="{{courseData.length>0}}">
+ <view>
<view wx:for="{{courseData}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toList" data-info="{{item}}" class="listItemBox">
<view class="listItem flex">
<view class="specialSubject-img">
@@ -71,7 +73,10 @@
</view>
-
+ <view class="bottom-box">
+ <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
+ </view>
</t-tab-panel>
<t-tab-panel label="鏁板瓧鏁欐潗({{digitalTextbooksTotal}})" value="2">
@@ -95,7 +100,10 @@
</view>
-
+ <view class="bottom-box">
+ <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
+ </view>
@@ -125,7 +133,10 @@
</view>
</view>
-
+ <view class="bottom-box">
+ <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
+ </view>
</t-tab-panel>
<t-tab-panel label="涔︾洰({{bookFairTotal}})" value="4">
@@ -154,7 +165,10 @@
-
+ <view class="bottom-box">
+ <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
+ </view>
@@ -173,7 +187,10 @@
</view>
-
+ <view class="bottom-box">
+ <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
+ </view>
</t-tab-panel>
</t-tabs>
\ No newline at end of file
--
Gitblit v1.9.1