From 47462dc6c323cc4ac7b32b93051947d351799c1f Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期四, 21 三月 2024 18:53:20 +0800
Subject: [PATCH] 检索页修改
---
packageDomain/pages/resourceDetails/myVideo/index.json | 3
pages/bookExhibitionList/index.wxss | 10 +
pages/retrievalPage/index.json | 8
packageDomain/pages/resourceDetails/myVideo/index.js | 1
pages/bookExhibitionList/index.js | 64 +++-----
pages/bookExhibitionList/index.wxml | 72 +++++----
pages/retrievalPage/index.wxml | 33 +++-
pages/retrievalPage/index.wxss | 25 +++
pages/bookExhibitionList/index.json | 3
packageDomain/pages/resourceDetails/myVideo/index.wxml | 6
packageBookService/pages/bookServices/list/index.js | 2
packageDomain/pages/resourceDetails/myVideo/index.wxss | 4
pages/retrievalPage/index.js | 201 +++++++++++++++++++++++--
packageDomain/pages/resourceDetails/myAudio/index.wxml | 2
14 files changed, 330 insertions(+), 104 deletions(-)
diff --git a/packageBookService/pages/bookServices/list/index.js b/packageBookService/pages/bookServices/list/index.js
index 81847df..656c94b 100644
--- a/packageBookService/pages/bookServices/list/index.js
+++ b/packageBookService/pages/bookServices/list/index.js
@@ -287,7 +287,7 @@
subAccess: this.data.pathList,
};
} else {
- pathObj = {
+ pathObj = {
path,
queryType: '*',
};
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxml b/packageDomain/pages/resourceDetails/myAudio/index.wxml
index ac2c8b6..8291973 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxml
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxml
@@ -86,7 +86,7 @@
<t-collapse-panel value="{{item.id}}" expandIcon wx:for="{{noteList}}">
<view slot="header" class="collapse-header">
<t-image class="note-icon" src="/static/images/bookService/detail/note-icon.png"></t-image>
- <view class="header-name">{{item.name}}</view>
+ <view class="header-name">{{titleName}}</view>
</view>
<view>
<view class="note-content">{{item.content}}</view>
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index d99b880..95b5e9e 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -345,6 +345,7 @@
// item.deleteHover = false
item.createDate = this.convertTimestamp(item.createDate)
})
+ console.log(res, 'res');
this.setData({
"pageCount.total": res.totalSize,
noteList: res.datas,
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.json b/packageDomain/pages/resourceDetails/myVideo/index.json
index adaa91b..fa11de1 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.json
+++ b/packageDomain/pages/resourceDetails/myVideo/index.json
@@ -12,7 +12,8 @@
"t-image": "tdesign-miniprogram/image/image",
"t-textarea": "tdesign-miniprogram/textarea/textarea",
"t-loading": "tdesign-miniprogram/loading/loading",
- "t-popup": "tdesign-miniprogram/popup/popup"
+ "t-popup": "tdesign-miniprogram/popup/popup",
+ "t-empty": "tdesign-miniprogram/empty/empty"
},
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.wxml b/packageDomain/pages/resourceDetails/myVideo/index.wxml
index 8f5847e..3d2e9b9 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.wxml
+++ b/packageDomain/pages/resourceDetails/myVideo/index.wxml
@@ -31,11 +31,15 @@
<t-tab-panel label="绗旇" value="1" style="{{tabPanelstyle}}">
<view class="wrapper">
+ <view wx:if="{{!noteList.length}}" class="noData">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+
+ </view>
<t-collapse value="{{activeValues}}" bind:change="handleChange">
<t-collapse-panel value="{{item.id}}" expandIcon wx:for="{{noteList}}">
<view slot="header" class="collapse-header">
<t-image class="note-icon" src="/static/images/bookService/detail/note-icon.png"></t-image>
- <view class="header-name">{{item.name}}</view>
+ <view class="header-name">{{titleName}}</view>
</view>
<view>
<view class="note-content">{{item.content}}</view>
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.wxss b/packageDomain/pages/resourceDetails/myVideo/index.wxss
index 511cbd2..7316760 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.wxss
+++ b/packageDomain/pages/resourceDetails/myVideo/index.wxss
@@ -296,4 +296,8 @@
.t-tabs__track {
background-color: #FF6C00 !important;
+}
+
+.noData {
+ margin-top: 120rpx;
}
\ No newline at end of file
diff --git a/pages/bookExhibitionList/index.js b/pages/bookExhibitionList/index.js
index 1febd4e..a3ae6df 100644
--- a/pages/bookExhibitionList/index.js
+++ b/pages/bookExhibitionList/index.js
@@ -8,6 +8,7 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
+ keynoteDisabled: true,
value: '',
keyword: '',
nameSort: null,
@@ -49,9 +50,7 @@
price: 'jsek_teacherEducation',
label: '鏁欏笀鏁欒偛',
},
-
],
-
},
multipleSelect: {
value: [],
@@ -68,33 +67,7 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- // 鑾峰彇灞忓箷楂樺害
- wx.getSystemInfo({
- success: function (res) {
- // this.setData({
- // windowHeight: res.windowHeight
- // })
- // 鑾峰彇鑺傜偣鐨勭被鍚�
- var query = wx.createSelectorQuery();
- query.select('.assembleContent').boundingClientRect();
- query.exec(function (res) {
-
- // console.log(res, 'res');
- let node = res[0];
- node.setStyle({
- backgroundColor: '#0256b9',
- })
- // // 淇敼鑺傜偣鏍峰紡
- // if (node) {
- // node.setStyle({
- // backgroundColor: 'red',
- // color: 'white'
- // });
- // }
- });
- }
- });
// console.log(this.data.filteredItems, 88888);
const systInfo = wx.getSystemInfoSync();
@@ -114,18 +87,18 @@
if (this.data.filteredItems = []) {
console.log(11111);
- singleSelectOptions.push({
- label: '绂佺敤閫夐」',
- value: 'disabled',
- disabled: true,
- });
+ // singleSelectOptions.push({
+ // label: '鏆傛棤鏁版嵁',
+ // value: 'disabled',
+ // disabled: true,
+ // });
+ } else {
+ console.log(7889);
}
- // singleSelectOptions.push({
- // label: '绂佺敤閫夐」',
- // value: 'disabled',
- // disabled: true,
- // });
+
+
+
// 鏇存柊鏁版嵁
@@ -300,6 +273,18 @@
const newValue = e.detail.value;
const selectedOption = this.data.product.options.find(option => option.value === newValue);
const newPrice = selectedOption ? selectedOption.price : null;
+ console.log(newValue, 'newValue');
+ console.log(newPrice, 'newPrice');
+ if (newPrice) {
+ this.setData({
+ keynoteDisabled: false
+ })
+
+ } else {
+ this.setData({
+ keynoteDisabled: true
+ })
+ }
this.setData({
'product.value': newValue,
'product.price': newPrice, // 灏嗛�変腑鐨� price 鍊间繚瀛樺湪鏁版嵁涓�
@@ -330,6 +315,7 @@
});
},
handleConfirm(event) {
+
const { value } = event.detail;
// 纭鎿嶄綔鐨勫鐞嗛�昏緫
@@ -369,8 +355,6 @@
this.data.nameSort = 'Desc'
// console.log('sssssss');
this.bookExhibitionGet()
-
-
},
onBookExhibitionDetails: function (event) {
const item = event.currentTarget.dataset.item;
diff --git a/pages/bookExhibitionList/index.json b/pages/bookExhibitionList/index.json
index 2a46042..fbf7f99 100644
--- a/pages/bookExhibitionList/index.json
+++ b/pages/bookExhibitionList/index.json
@@ -6,7 +6,8 @@
"t-dropdown-menu": "tdesign-miniprogram/dropdown-menu/dropdown-menu",
"t-dropdown-item": "tdesign-miniprogram/dropdown-item/dropdown-item",
"t-toast": "tdesign-miniprogram/toast/toast",
- "t-icon": "tdesign-miniprogram/icon/icon"
+ "t-icon": "tdesign-miniprogram/icon/icon",
+ "t-empty": "tdesign-miniprogram/empty/empty"
},
"onReachBottomDistance": 200,
"navigationStyle": "custom",
diff --git a/pages/bookExhibitionList/index.wxml b/pages/bookExhibitionList/index.wxml
index 212b518..a09728c 100644
--- a/pages/bookExhibitionList/index.wxml
+++ b/pages/bookExhibitionList/index.wxml
@@ -2,41 +2,49 @@
<!-- 寮瑰嚭妗� 绂佹 -->
<t-toast id="t-toast" />
-
-<view style="width: 100%; height: {{barHeight}}px; "></view>
-<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
- <view>
- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
- </view>
- <view class="example-search">
- <t-search model:value="{{value}}" placeholder="璇疯緭鍏ヤ功灞曞悕绉�" bind:submit="onSearchSubmit" />
- </view>
-</view>
-
-
-<view class="menuBox">
- <t-dropdown-menu class="classification">
-
- <t-dropdown-item options="{{product.options}}" value="{{product.value}}" bindchange="onChange" />
- <t-dropdown-item label="閲嶇偣椤圭洰" options="{{multipleSelect.options}}" value="{{multipleSelect.value}}" bindchange="handleMultipleSelect" multiple bind:confirm="handleConfirm" bind:reset="handleReset" />
-
-
-
- </t-dropdown-menu>
-
-
-
- <view class="outsideSortBox">
- <view class="sortBox" bind:tap="onSwapRight">
- <text>鎺掑簭</text>
- <view class="iconBox">
- <t-icon class="swapRight" name="swap-right" size="35rpx" color="{{nameSort == 'Asc' ? '#ff6c00' : ''}}" />
- <t-icon class="swapLeft" name="swap-right" size="35rpx" color="{{nameSort == 'Desc' ? '#ff6c00' : ''}}" />
- </view>
+<view class="bigTitleBox">
+ <view style="width: 100%; height: {{barHeight}}px; "></view>
+ <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
+ <view>
+ <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
+ </view>
+ <view class="example-search">
+ <t-search model:value="{{value}}" placeholder="璇疯緭鍏ヤ功灞曞悕绉�" bind:submit="onSearchSubmit" />
</view>
</view>
+</view>
+
+
+<view>
</view>
+
+<view class="outsideMenuBox">
+ <view class="menuBox">
+ <t-dropdown-menu class="classification">
+
+ <t-dropdown-item options="{{product.options}}" value="{{product.value}}" bindchange="onChange" />
+ <t-dropdown-item disabled="{{keynoteDisabled}}" label=" 閲嶇偣椤圭洰" options="{{multipleSelect.options}}" value="{{multipleSelect.value}}" bindchange="handleMultipleSelect" multiple bind:confirm="handleConfirm" bind:reset="handleReset" />
+
+
+
+ </t-dropdown-menu>
+
+
+
+ <view class="outsideSortBox">
+ <view class="sortBox" bind:tap="onSwapRight">
+ <text>鎺掑簭</text>
+ <view class="iconBox">
+ <t-icon class="swapRight" name="swap-right" size="35rpx" color="{{nameSort == 'Asc' ? '#ff6c00' : ''}}" />
+ <t-icon class="swapLeft" name="swap-right" size="35rpx" color="{{nameSort == 'Desc' ? '#ff6c00' : ''}}" />
+ </view>
+ </view>
+ </view>
+
+ </view>
+</view>
+
<view class="assembleContent">
<view class="titleBox">
@@ -47,7 +55,7 @@
</view>
<view class="outside">
- <view wx:if="{{bookExhibitionList.length }}">
+ <view wx:if="{{!bookExhibitionList.length }}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
diff --git a/pages/bookExhibitionList/index.wxss b/pages/bookExhibitionList/index.wxss
index 3b28263..555a3e2 100644
--- a/pages/bookExhibitionList/index.wxss
+++ b/pages/bookExhibitionList/index.wxss
@@ -139,8 +139,9 @@
.assembleContent {
background-color: #F2F3F8;
-
+ min-height: 90vh;
}
+
.t-dropdown-menu:after,
.t-dropdown-menu::after {
height: 0px;
@@ -202,4 +203,11 @@
.menu--t-dropdown-menu::after {
background-color: var(--td-component-border, var(--td-gray-color-4, #fff)) !important;
+}
+
+.noData {
+ /* display: flex;
+ justify-content: center; */
+ margin: 0 auto;
+ margin-top: 100rpx;
}
\ No newline at end of file
diff --git a/pages/retrievalPage/index.js b/pages/retrievalPage/index.js
index 77f1025..9039b9a 100644
--- a/pages/retrievalPage/index.js
+++ b/pages/retrievalPage/index.js
@@ -9,6 +9,7 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
+ isMore: null,
tabPanelstyle: 'display:flex;justify-content:center;align-items:center;',
navBarHeight: '',
barHeight: '',
@@ -24,7 +25,12 @@
biblioClassificationData: [],//涔﹀睍
biblioClassificationTotal: 0,
bookFairData: [],//涔︾洰
- bookFairTotal: 0
+ bookFairTotal: 0,
+ pageCount: {
+ page: 1,
+ total: 0,
+ },
+ tabValue: ''
},
/**
@@ -44,6 +50,13 @@
this.retrievalPageGet()
this.bibliographyGet()
+ let event = {
+ detail: {
+
+ value: "0"
+ }
+ }
+ this.onTabsChange(event)
},
/**
@@ -105,13 +118,47 @@
this.retrievalPageGet()
this.bibliographyGet()
},
+
+
+ //鏍囩鐨勫垏鎹�
onTabsChange(event) {
- console.log(`Change tab, tab-panel searchVal is ${event.detail.searchVal}.`);
+ const value = event.detail.value
+ if (value === '0') {
+ this.setData({
+ tabValue: value,
+ isMore: false
+ })
+ } else if (value === '1') {
+ console.log(value, 'tab');
+ this.setData({
+ tabValue: value,
+ isMore: false
+ })
+ } else if (value === '2') {
+ this.setData({
+ tabValue: value,
+ isMore: false
+ })
+ } else if (value === '3') {
+ this.setData({
+ tabValue: value,
+ isMore: false
+ })
+ } else if (value === '4') {
+ this.setData({
+ tabValue: value,
+ isMore: false
+ })
+ } else if (value === '5') {
+ this.setData({
+ tabValue: value,
+ isMore: false
+ })
+ }
+
},
- onTabsClick(event) {
- console.log(`Click tab, tab-panel searchVal is ${event.detail.searchVal}.`);
- },
+
retrievalPageGet() {
@@ -149,7 +196,7 @@
},
PageQuery: {
Start: 0,
- Size: 999
+ Size: this.data.pageCount.page * 9,
},
SortQuery: [
{
@@ -194,7 +241,7 @@
},
PageQuery: {
Start: 0,
- Size: 999
+ Size: this.data.pageCount.page * 4
},
SortQuery: [
{
@@ -238,7 +285,7 @@
},
PageQuery: {
Start: 0,
- Size: 999
+ Size: this.data.pageCount.page * 9,
},
SortQuery: [
{
@@ -283,7 +330,7 @@
},
PageQuery: {
Start: 0,
- Size: 999
+ Size: this.data.pageCount.page * 6,
},
SortQuery: [
{
@@ -327,7 +374,7 @@
PageQuery: {
Start: 0,
- Size: 999
+ Size: this.data.pageCount.page * 10
},
SortQuery: [
{
@@ -382,7 +429,8 @@
})
this.setData({
bookData: datas1,
- bookTotal: data1.totalCount
+ bookTotal: data1.totalCount,
+
})
@@ -434,7 +482,7 @@
datas5.forEach((items) => {
items.subtitleName = items.subtitle + items.name
})
- console.log(datas5, 'sadasd');
+ // console.log(datas5, 'sadasd');
this.setData({
biblioClassificationData: datas5,
biblioClassificationTotal: data5.totalCount
@@ -462,7 +510,7 @@
queryType: '*',
paging: {
start: 0,
- size: 999
+ size: this.data.pageCount.page * 9,
},
coverSize: {
width: 260
@@ -478,7 +526,7 @@
},
SysType: "CmsItem"
}).then(res => {
- // console.log(res);
+
this.setData({
bookFairData: res.datas,
bookFairTotal: res.total
@@ -527,8 +575,6 @@
const item = e.currentTarget.dataset.item
wx.navigateTo({
url: '/packageBookService/pages/bookServices/detail/index?id=' + item.id + '&name=' + item.name
-
-
})
},
onBookExhibitionDetails(e) {
@@ -547,6 +593,129 @@
onPullDownRefresh() {
console.log("涓嬫媺鍒锋柊...");
},
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom(e) {
+ if (this.data.tabValue == 0) {
+ console.log(0);
+ if (this.data.bookData.length < this.data.bookTotal) {
+ this.setData({
+ isMore: true,
+ "pageCount.page": this.data.pageCount.page + 1
+ })
+ this.retrievalPageGet()
+ } else {
+ this.setData({
+ isMore: true,
+ })
+ setTimeout(() => {
+ this.setData({
+ isMore: false
+ })
+ }, 100)
+
+ }
+
+ } else if (this.data.tabValue == 1) {
+
+ if (this.data.courseData.length < this.data.courseTotal) {
+ this.setData({
+ isMore: true,
+ "pageCount.page": this.data.pageCount.page + 1
+ })
+ this.retrievalPageGet()
+ } else {
+ this.setData({
+ isMore: true,
+ })
+ setTimeout(() => {
+ this.setData({
+ isMore: false
+ })
+ }, 100)
+
+ }
+ console.log(2);
+ } else if (this.data.tabValue == 2) {
+
+ if (this.data.digitalTextbooksData.length < this.data.digitalTextbooksTotal && this.data.digitalTextbooksData.length > 9) {
+ this.setData({
+ isMore: true,
+ "pageCount.page": this.data.pageCount.page + 1
+ })
+ this.retrievalPageGet()
+ } else {
+ this.setData({
+ isMore: true,
+ })
+ setTimeout(() => {
+ this.setData({
+ isMore: false
+ })
+ }, 100)
+
+ }
+ console.log(2);
+ } else if (this.data.tabValue == 3) {
+ if (this.data.seminarData.length < this.data.seminarTotal) {
+ this.setData({
+ isMore: true,
+ "pageCount.page": this.data.pageCount.page + 1
+ })
+ this.retrievalPageGet()
+ } else {
+ this.setData({
+ isMore: true,
+ })
+ setTimeout(() => {
+ this.setData({
+ isMore: false
+ })
+ }, 100)
+ }
+ console.log(3);
+ } else if (this.data.tabValue == 4) {
+ if (this.data.bookFairData.length < this.data.bookFairTotal) {
+ this.setData({
+ isMore: true,
+ "pageCount.page": this.data.pageCount.page + 1
+ })
+ this.bibliographyGet()
+ } else {
+ this.setData({
+ isMore: true,
+ })
+ setTimeout(() => {
+ this.setData({
+ isMore: false
+ })
+ }, 100)
+ }
+ console.log(4);
+ } else if (this.data.tabValue == 5) {
+ if (this.data.biblioClassificationData.length < this.data.biblioClassificationTotal) {
+ this.setData({
+ isMore: true,
+ "pageCount.page": this.data.pageCount.page + 1
+ })
+ this.retrievalPageGet()
+ } else {
+ this.setData({
+ isMore: true,
+ })
+ setTimeout(() => {
+ this.setData({
+ isMore: false
+ })
+ }, 100)
+
+ }
+ }
+
+
+
+ },
})
\ No newline at end of file
diff --git a/pages/retrievalPage/index.json b/pages/retrievalPage/index.json
index fa9fab5..e01e033 100644
--- a/pages/retrievalPage/index.json
+++ b/pages/retrievalPage/index.json
@@ -5,8 +5,12 @@
"t-search": "tdesign-miniprogram/search/search",
"t-tabs": "tdesign-miniprogram/tabs/tabs",
"t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
- "t-empty": "tdesign-miniprogram/empty/empty"
+ "t-empty": "tdesign-miniprogram/empty/empty",
+ "t-toast": "tdesign-miniprogram/toast/toast",
+ "t-loading": "tdesign-miniprogram/loading/loading",
+ "t-image": "tdesign-miniprogram/image/image"
},
"navigationStyle": "custom",
- "enablePullDownRefresh": true
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 200
}
\ No newline at end of file
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
diff --git a/pages/retrievalPage/index.wxss b/pages/retrievalPage/index.wxss
index b17fdca..e2cc9b1 100644
--- a/pages/retrievalPage/index.wxss
+++ b/pages/retrievalPage/index.wxss
@@ -87,6 +87,11 @@
font-weight: 400;
font-size: 22rpx;
color: #333333;
+ word-break: break-all;
+ display: -webkit-box;
+ -webkit-line-clamp: 1;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
}
@@ -111,6 +116,7 @@
border-radius: 5px;
overflow: hidden;
box-shadow: 0px 0px 20rpx 2px #f1f1f1;
+ min-height: 170rpx;
}
@@ -128,6 +134,7 @@
.body-info {
padding: 20rpx;
font-size: 28rpx;
+ min-height: 110rpx;
}
.body-info .name {
@@ -301,4 +308,22 @@
align-items: center */
margin: 0 auto;
margin-top: 250rpx;
+}
+
+.bottom-box {
+ display: flex;
+ justify-content: center;
+ color: #999;
+ height: 80rpx;
+ font-size: 28rpx;
+ --td-loading-color: #ff6c00
+}
+
+.loading-box {
+ width: 100%;
+ height: calc(100vh - 500rpx);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ --td-loading-color: #ff6c00;
}
\ No newline at end of file
--
Gitblit v1.9.1