From 9f916f98c6cc6827c84da18fbc9a5e2cacbefc0a Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 02 四月 2024 16:20:08 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packagePersonal/pages/userSetting/index.wxss | 6
pages/bookExhibitionList/index.wxss | 7
pages/retrievalPage/index.json | 3
packageDomain/pages/sampleBookList/applicationForm/index.js | 18
pages/bookExhibitionList/index.js | 42 ++
pages/bookExhibitionList/index.wxml | 28 +
pages/retrievalPage/index.wxml | 213 ++++++++-------
packageDomain/pages/sampleBookList/applicationForm/index.wxss | 3
packageDomain/pages/teacherCertification/index.js | 46 ++-
pages/retrievalPage/index.wxss | 20
packagePersonal/pages/userSetting/index.js | 32 +
packageDomain/pages/sampleBookList/applicationForm/index.wxml | 6
pages/bookExhibitionList/index.json | 5
packageDomain/pages/teacherCertification/index.wxss | 2
packageDomain/pages/teacherCertification/index.wxml | 14
pages/cart/index.js | 20 +
pages/bibliographyList/index.wxss | 14
packageDomain/pages/sampleBookList/index.js | 79 +++--
pages/bookServices/assort/index.wxss | 10
pages/personalCenter/index.js | 6
pages/retrievalPage/index.js | 124 ++++++++
pages/cart/index.wxss | 17 +
pages/cart/index.wxml | 40 +-
23 files changed, 493 insertions(+), 262 deletions(-)
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.js b/packageDomain/pages/sampleBookList/applicationForm/index.js
index 4865e4c..6b599f9 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.js
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.js
@@ -146,11 +146,17 @@
const {
phoneError
} = this.data;
- const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
- if (phoneError === isPhoneNumber) {
+ if (e.detail.value) {
+ const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
+ if (phoneError === isPhoneNumber) {
+ this.setData({
+ phoneError: !isPhoneNumber,
+ "contactInfo.phone": e.detail.value,
+ });
+ }
+ } else {
this.setData({
- phoneError: !isPhoneNumber,
- "contactInfo.phone": e.detail.value,
+ phoneError: false,
});
}
},
@@ -234,13 +240,13 @@
electronicBookList: [],
bookList: [],
})
- wx.setStorageSync("electronicBookList", []);
+ wx.removeStorageSync("electronicBookList")
} else {
that.setData({
paperBookList: [],
bookList: [],
})
- wx.setStorageSync("paperBookList", []);
+ wx.removeStorageSync("paperBookList")
}
wx.showModal({
title: '鎻愮ず锛�', //鎻愮ず鐨勬爣棰�
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxml b/packageDomain/pages/sampleBookList/applicationForm/index.wxml
index eea814a..35902ba 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.wxml
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.wxml
@@ -58,19 +58,19 @@
<view class="item">
<text class="label">濮撳悕锛�</text>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless adjust-position="false" value="{{contactInfo.fullName}}" bindchange="onFullNameInput" />
+ <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless value="{{contactInfo.fullName}}" bindchange="onFullNameInput" />
</view>
</view>
<view class="item">
<text class="label">鑱旂郴鐢佃瘽锛�</text>
<view class="item-content">
- <t-input placeholder="杈撳叆鑱旂郴鐢佃瘽" borderless adjust-position="false" value="{{contactInfo.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onPhoneInput" />
+ <t-input placeholder="杈撳叆鑱旂郴鐢佃瘽" borderless value="{{contactInfo.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onPhoneInput" />
</view>
</view>
<view class="item">
<text class="label">璇︾粏鍦板潃锛�</text>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless adjust-position="false" value="{{contactInfo.detailedAddress}}" bindchange="onAddressInput" />
+ <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless value="{{contactInfo.detailedAddress}}" bindchange="onAddressInput" />
</view>
</view>
</view>
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxss b/packageDomain/pages/sampleBookList/applicationForm/index.wxss
index 613a3ff..1627d37 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.wxss
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.wxss
@@ -199,8 +199,9 @@
}
.btn-area {
- margin: 40rpx 0;
+ margin: 40rpx;
padding: 0 40rpx;
+ padding-bottom: 60rpx;
}
.submit {
diff --git a/packageDomain/pages/sampleBookList/index.js b/packageDomain/pages/sampleBookList/index.js
index 9d63ba3..0858a02 100644
--- a/packageDomain/pages/sampleBookList/index.js
+++ b/packageDomain/pages/sampleBookList/index.js
@@ -145,11 +145,7 @@
this.setData({
userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
})
- this.getAlreadyPBookList()
- this.getAlreadyEBookList()
- // 鑾峰彇鐢宠娆℃暟
- this.getSelectPaperBookCount()
- this.getSelectBookCount()
+
}
},
@@ -164,19 +160,32 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
- if (wx.getStorageSync("paperBookList")) {
- this.setData({
- paperBookList: wx.getStorageSync("paperBookList"),
- })
- }
- if (wx.getStorageSync("electronicBookList")) {
- this.setData({
- electronicBookList: wx.getStorageSync("electronicBookList"),
- })
- }
this.setData({
- num: this.data.paperBookList.length + this.data.electronicBookList.length
+ page: 1,
+ paperBookList: [],
+ electronicBookList: []
})
+ this.getAlreadyPBookList()
+ this.getAlreadyEBookList()
+ // 鑾峰彇鐢宠娆℃暟
+ this.getSelectPaperBookCount()
+ this.getSelectBookCount()
+ console.log(this.data.electronicBookList.length, this.data.paperBookList.length, 1)
+ if (wx.getStorageSync("paperBookList") || wx.getStorageSync("electronicBookList")) {
+ if (wx.getStorageSync("paperBookList")) {
+ this.setData({
+ paperBookList: wx.getStorageSync("paperBookList"),
+ })
+ }
+ if (wx.getStorageSync("electronicBookList")) {
+ this.setData({
+ electronicBookList: wx.getStorageSync("electronicBookList"),
+ })
+ }
+ this.setData({
+ num: this.data.paperBookList.length + this.data.electronicBookList.length
+ })
+ }
this.getBookList(false);
},
goBack() {
@@ -184,7 +193,7 @@
},
// 鑾峰彇绾歌川涔﹀墿浣欐鏁�
- getSelectPaperBookCount(item) {
+ getSelectPaperBookCount() {
app.MG.app
.getTicketResult({
ticketRefCodeOrGuid: 'paperSampleBookapplyNum',
@@ -197,7 +206,7 @@
})
},
// 鑾峰彇鐢靛瓙涔﹀墿浣欐鏁�
- getSelectBookCount(item) {
+ getSelectBookCount() {
app.MG.app
.getTicketResult({
ticketRefCodeOrGuid: 'electronicSampleBookapplyNum',
@@ -430,26 +439,30 @@
}
if (that.data.alreadyPaperBookList.length > 0) {
that.data.alreadyPaperBookList.forEach((pBook) => {
- pBook.content.forEach((pBookItem) => {
- if (pBookItem.id === item.id && pBook.state == 'WaitAudit') {
- item.paperDisabled = true
- item.paperChecked = true
- }
- if (pBookItem.id === item.id && pBook.state == 'Normal') {
- item.paperDisabled = false
- }
- })
+ if (pBook.content.length > 0) {
+ pBook.content.forEach((pBookItem) => {
+ if (pBookItem.id === item.id && pBook.state == 'WaitAudit') {
+ item.paperDisabled = true
+ item.paperChecked = true
+ }
+ if (pBookItem.id === item.id && pBook.state == 'Normal') {
+ item.paperDisabled = false
+ }
+ })
+ }
})
}
if (that.data.alreadyElectronicBookList.length > 0) {
that.data.alreadyElectronicBookList.forEach((eBook) => {
- eBook.content.forEach((eBookItem) => {
- if (eBookItem.id === item.id && !eBook.isExpiry && eBook.state != 'Reject') {
- item.electronDisabled = true
- item.electronChecked = true
- }
- })
+ if (eBook.content.length > 0) {
+ eBook.content.forEach((eBookItem) => {
+ if (eBookItem.id === item.id && !eBook.isExpiry && eBook.state != 'Reject') {
+ item.electronDisabled = true
+ item.electronChecked = true
+ }
+ })
+ }
})
}
if (that.data.paperBookList.length > 0) {
diff --git a/packageDomain/pages/teacherCertification/index.js b/packageDomain/pages/teacherCertification/index.js
index afaf20a..28fa09f 100644
--- a/packageDomain/pages/teacherCertification/index.js
+++ b/packageDomain/pages/teacherCertification/index.js
@@ -112,7 +112,7 @@
defaultUser = {
...teacherInfos,
nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
- icon: nickNameData && JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+ icon: nickNameData && JSON.parse(nickNameData.data).icon != "" ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
userId: res.userId,
role: 'Teacher',
roleId: teacherRole.role.id,
@@ -122,7 +122,7 @@
defaultUser = {
...WeChatInfo,
nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
- icon: nickNameData && JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+ icon: nickNameData && JSON.parse(nickNameData.data).icon != "" ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
userId: res.userId,
}
}
@@ -326,11 +326,17 @@
const {
phoneError
} = this.data;
- const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
- if (phoneError === isPhoneNumber) {
+ if (e.detail.value) {
+ const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
+ if (phoneError === isPhoneNumber) {
+ this.setData({
+ phoneError: !isPhoneNumber,
+ "teacherInfo.phone": e.detail.value,
+ });
+ }
+ } else {
this.setData({
- phoneError: !isPhoneNumber,
- "teacherInfo.phone": e.detail.value,
+ phoneError: false,
});
}
},
@@ -339,11 +345,17 @@
const {
telphoneError
} = this.data;
- const isPhoneNumber = /^0\d{2}-\d{8}$|^0\d{3}-\d{7}$/.test(e.detail.value);
- if (telphoneError === isPhoneNumber) {
+ if (e.detail.value) {
+ const isPhoneNumber = /^0\d{2}-\d{8}$|^0\d{3}-\d{7}$/.test(e.detail.value);
+ if (telphoneError === isPhoneNumber) {
+ this.setData({
+ telphoneError: !isPhoneNumber,
+ "teacherInfo.telphone": e.detail.value,
+ });
+ }
+ } else {
this.setData({
- telphoneError: !isPhoneNumber,
- "teacherInfo.telphone": e.detail.value,
+ telphoneError: false,
});
}
},
@@ -351,11 +363,17 @@
const {
emailError
} = this.data;
- const isPhoneNumber = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(e.detail.value);
- if (emailError === isPhoneNumber) {
+ if (e.detail.value) {
+ const isPhoneNumber = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(e.detail.value);
+ if (emailError === isPhoneNumber) {
+ this.setData({
+ emailError: !isPhoneNumber,
+ "teacherInfo.email": e.detail.value,
+ });
+ }
+ } else {
this.setData({
- emailError: !isPhoneNumber,
- "teacherInfo.email": e.detail.value,
+ emailError: false,
});
}
},
diff --git a/packageDomain/pages/teacherCertification/index.wxml b/packageDomain/pages/teacherCertification/index.wxml
index eb95bd7..18eec56 100644
--- a/packageDomain/pages/teacherCertification/index.wxml
+++ b/packageDomain/pages/teacherCertification/index.wxml
@@ -19,13 +19,13 @@
<view class="from-item">
<view class="label"> 瀛︽牎锛� </view>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ュ鏍�" borderless adjust-position="false" value="{{teacherInfo.schoolName}}" disabled="{{!editState}}" bindchange="onSchoolNameInput" />
+ <t-input placeholder="璇疯緭鍏ュ鏍�" borderless value="{{teacherInfo.schoolName}}" disabled="{{!editState}}" bindchange="onSchoolNameInput" />
</view>
</view>
<view class="from-item">
<view class="label"> 鐪熷疄濮撳悕锛� </view>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless adjust-position="false" value="{{teacherInfo.fullName}}" disabled="{{!editState}}" bindchange="onFullNameInput" />
+ <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless value="{{teacherInfo.fullName}}" disabled="{{!editState}}" bindchange="onFullNameInput" />
</view>
</view>
<view class="from-item">
@@ -43,31 +43,31 @@
<view class="from-item">
<view class="label"> 浠绘暀璇剧▼锛� </view>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ヤ换鏁欒绋�" borderless adjust-position="false" value="{{teacherInfo.courseName}}" bindchange="onCourseNameInput" disabled="{{!editState}}" />
+ <t-input placeholder="璇疯緭鍏ヤ换鏁欒绋�" borderless value="{{teacherInfo.courseName}}" bindchange="onCourseNameInput" disabled="{{!editState}}" />
</view>
</view>
<view class="from-item">
<view class="label"> 鎵嬫満鍙凤細 </view>
<view class="item-content">
- <t-input placeholder="杈撳叆鎵嬫満鍙风爜" borderless adjust-position="false" value="{{teacherInfo.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onPhoneInput" disabled="{{!editState}}" />
+ <t-input placeholder="杈撳叆鎵嬫満鍙风爜" borderless value="{{teacherInfo.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onPhoneInput" disabled="{{!editState}}" />
</view>
</view>
<view class="from-item">
<view class="label"> 搴ф満锛� </view>
<view class="item-content">
- <t-input placeholder="杈撳叆搴ф満鍙�" borderless value="{{teacherInfo.telphone}}" adjust-position="false" tips="{{telphoneError ? '搴ф満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onTelphoneInput" disabled="{{!editState}}" />
+ <t-input placeholder="杈撳叆搴ф満鍙�" borderless value="{{teacherInfo.telphone}}" tips="{{telphoneError ? '搴ф満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onTelphoneInput" disabled="{{!editState}}" />
</view>
</view>
<view class="from-item">
<view class="label"> 閭锛� </view>
<view class="item-content">
- <t-input placeholder="杈撳叆閭" borderless adjust-position="false" value="{{teacherInfo.email}}" tips="{{emailError ? '閭杈撳叆涓嶆纭�' : ''}}" bindchange="onEmailInput" disabled="{{!editState}}" />
+ <t-input placeholder="杈撳叆閭" borderless value="{{teacherInfo.email}}" tips="{{emailError ? '閭杈撳叆涓嶆纭�' : ''}}" bindchange="onEmailInput" disabled="{{!editState}}" />
</view>
</view>
<view class="from-item">
<view class="label"> 璇︾粏鍦板潃锛� </view>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless adjust-position="false" value="{{teacherInfo.detailedAddress}}" bindchange="onAddressInput" disabled="{{!editState}}" />
+ <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless value="{{teacherInfo.detailedAddress}}" bindchange="onAddressInput" disabled="{{!editState}}" />
</view>
</view>
</view>
diff --git a/packageDomain/pages/teacherCertification/index.wxss b/packageDomain/pages/teacherCertification/index.wxss
index 80d5e0b..da744f1 100644
--- a/packageDomain/pages/teacherCertification/index.wxss
+++ b/packageDomain/pages/teacherCertification/index.wxss
@@ -173,7 +173,7 @@
.block {
position: relative;
width: 600rpx;
- height: 600rpx;
+ height: 820rpx;
padding: 20rpx 0;
background: #fff;
border-radius: 16rpx;
diff --git a/packagePersonal/pages/userSetting/index.js b/packagePersonal/pages/userSetting/index.js
index 1fcc0ea..fee72d8 100644
--- a/packagePersonal/pages/userSetting/index.js
+++ b/packagePersonal/pages/userSetting/index.js
@@ -64,8 +64,8 @@
if (teacherRole && teacherInfos) {
defaultUser = {
...teacherInfos,
- nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : teacherInfos.name,
- icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+ nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : WeChatInfo ? WeChatInfo.name : '',
+ icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo ? WeChatInfo.icon : '',
userId: res.userId,
role: 'Teacher',
roleId: teacherRole.role.id,
@@ -207,11 +207,17 @@
const {
phoneError
} = this.data;
- const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
- if (phoneError === isPhoneNumber) {
+ if (e.detail.value) {
+ const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
+ if (phoneError === isPhoneNumber) {
+ this.setData({
+ phoneError: !isPhoneNumber,
+ "userInfoForm.phone": e.detail.value,
+ });
+ }
+ } else {
this.setData({
- phoneError: !isPhoneNumber,
- "userInfoForm.phone": e.detail.value,
+ phoneError: false,
});
}
},
@@ -220,11 +226,17 @@
const {
emailError
} = this.data;
- const isPhoneNumber = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(e.detail.value);
- if (emailError === isPhoneNumber) {
+ if (e.detail.value) {
+ const isPhoneNumber = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(e.detail.value);
+ if (emailError === isPhoneNumber) {
+ this.setData({
+ emailError: !isPhoneNumber,
+ "userInfoForm.email": e.detail.value,
+ });
+ }
+ } else {
this.setData({
- emailError: !isPhoneNumber,
- "userInfoForm.email": e.detail.value,
+ emailError: false,
});
}
},
diff --git a/packagePersonal/pages/userSetting/index.wxss b/packagePersonal/pages/userSetting/index.wxss
index 490dc08..5868c3f 100644
--- a/packagePersonal/pages/userSetting/index.wxss
+++ b/packagePersonal/pages/userSetting/index.wxss
@@ -71,14 +71,11 @@
}
.inputBox1 {
- height: 72rpx;
border: 2rpx solid #D9D9D9;
flex: 1;
}
-.inputBox1 .t-input {
- width: 380rpx !important;
-}
+
.block {
position: relative;
@@ -96,7 +93,6 @@
.block .body .inputBox {
width: 300rpx;
- height: 72rpx;
border: 2rpx solid #D9D9D9;
}
diff --git a/pages/bibliographyList/index.wxss b/pages/bibliographyList/index.wxss
index 2b08ccc..5ba4768 100644
--- a/pages/bibliographyList/index.wxss
+++ b/pages/bibliographyList/index.wxss
@@ -50,14 +50,12 @@
}
.outsideHigherImageBox {
-
position: relative;
}
.downloadIcon {
width: 34rpx;
height: 34rpx;
-
border-radius: 5rpx 5rpx 5rpx 5rpx;
background: rgba(0, 0, 0, 0.3);
position: absolute;
@@ -71,7 +69,6 @@
/* background-color: #8bc34a; */
width: 100%;
height: 100%;
-
}
.downloadshiftin {
@@ -115,7 +112,6 @@
.t-tabs__item--active {
color: #FF6C00 !important;
-
}
.t-tabs__track {
@@ -184,7 +180,7 @@
align-items: center;
}
-.dialog-input {
+/* .dialog-input {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
@@ -192,7 +188,7 @@
border-radius: 8rpx;
background-color: #f3f3f3;
box-sizing: border-box;
-}
+} */
.placeholder {
color: rgba(0, 0, 0, 0.4);
@@ -200,13 +196,11 @@
}
.dialogBox .t-input__control {
-
min-height: 100rpx;
}
.t-button--text {
color: #000 !important;
-
}
.t-button--text.t-button--primary {
@@ -216,6 +210,6 @@
.t-input__control {
/* border: 1rpx #000 solid; */
- background-color: #F9F9F9;
- width: 100%;
+ background-color: #ccc;
+ /* width: 100%; */
}
\ No newline at end of file
diff --git a/pages/bookExhibitionList/index.js b/pages/bookExhibitionList/index.js
index a16ce9e..6e7bee3 100644
--- a/pages/bookExhibitionList/index.js
+++ b/pages/bookExhibitionList/index.js
@@ -8,6 +8,9 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
+ totalSize: '',
+ start: 0,
+ isMore: null,
keynoteDisabled: true,
value: '',
keyword: '',
@@ -164,9 +167,32 @@
onPullDownRefresh() {
},
- onPullDownRefresh() {
- this.data.page.size = 16 //鏇存敼鏄剧ず鐨勫��
- this.bookExhibitionGet(); // 璋冪敤鏂规硶鍔犺浇鏇村鏁版嵁
+ // onPullDownRefresh() {
+ // this.data.page.size = 16 //鏇存敼鏄剧ず鐨勫��
+ // this.bookExhibitionGet(); // 璋冪敤鏂规硶鍔犺浇鏇村鏁版嵁
+ // },
+
+ onScrollToLower() {
+ console.log(789);
+ console.log(this.data.bookExhibitionList.length);
+ console.log(this.data.totalSize);
+ if (this.data.bookExhibitionList.length < this.data.totalSize) {
+ this.setData({
+ isMore: true,
+ start: this.data.start + 1
+ })
+ this.bookExhibitionGet()
+ } else {
+ this.setData({
+ isMore: true,
+ })
+ setTimeout(() => {
+ this.setData({
+ isMore: false
+ })
+ console.log('300');
+ }, 300)
+ }
},
/**
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
@@ -251,7 +277,10 @@
'bookClassification*': this.data.keynoteValue || [],
...searchObj
},
- paging: this.data.page,
+ paging: {
+ start: '0',
+ size: this.data.start * 10
+ },
sort: sort,
// coverSize: {
// width: 100
@@ -277,9 +306,10 @@
}
const list = [...res.datas]
-
+ console.log(res);
this.setData({
- bookExhibitionList: list
+ bookExhibitionList: list,
+ totalSize: res.total
})
// 鍒ゆ柇鏁版嵁闀垮害
console.log(list.length, 'list.length');
diff --git a/pages/bookExhibitionList/index.json b/pages/bookExhibitionList/index.json
index 484ed65..cf97c15 100644
--- a/pages/bookExhibitionList/index.json
+++ b/pages/bookExhibitionList/index.json
@@ -7,9 +7,10 @@
"t-dropdown-item": "tdesign-miniprogram/dropdown-item/dropdown-item",
"t-toast": "tdesign-miniprogram/toast/toast",
"t-icon": "tdesign-miniprogram/icon/icon",
- "t-empty": "tdesign-miniprogram/empty/empty"
+ "t-empty": "tdesign-miniprogram/empty/empty",
+ "t-loading": "tdesign-miniprogram/loading/loading"
},
- "onReachBottomDistance": 200,
+ "onReachBottomDistance": 100,
"navigationStyle": "custom",
"enablePullDownRefresh": true,
"disableScroll": true
diff --git a/pages/bookExhibitionList/index.wxml b/pages/bookExhibitionList/index.wxml
index f68126f..3b275c9 100644
--- a/pages/bookExhibitionList/index.wxml
+++ b/pages/bookExhibitionList/index.wxml
@@ -48,16 +48,24 @@
<image src="/static/images/bookExhibitionList/zhuantitaolun.png" mode="aspectFit" />
</view>
</view>
- <view class="outside">
- <view wx:if="{{!bookExhibitionList.length }}" class="noData">
- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
- </view>
- <view class="contentBox" wx:for="{{bookExhibitionList}}" wx:key="index" wx:for-item="item" wx:for-index="index" bindtap="onBookExhibitionDetails" data-item="{{item}}">
- <view class="imageBox">
- <image wx:if="{{item.icon}}" src="{{item.icon}}" mode="aspectFit" />
- <image wx:else src="/static/images/bookExhibitionList/banner.png" mode="aspectFit" />
+
+ <scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
+ <view class="outside">
+ <view wx:if="{{!bookExhibitionList.length }}" class="noData">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
- <view class="textBox" title="{{item.subtitleName}}"> <text>{{item.subtitleName}}</text></view>
+ <view class="contentBox" wx:for="{{bookExhibitionList}}" wx:key="index" wx:for-item="item" wx:for-index="index" bindtap="onBookExhibitionDetails" data-item="{{item}}">
+ <view class="imageBox">
+ <image wx:if="{{item.icon}}" src="{{item.icon}}" mode="aspectFit" />
+ <image wx:else src="/static/images/bookExhibitionList/banner.png" mode="aspectFit" />
+ </view>
+ <view class="textBox" title="{{item.subtitleName}}"> <text>{{item.subtitleName}}</text></view>
+ </view>
</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>
+ </scroll-view>
+
</view>
\ No newline at end of file
diff --git a/pages/bookExhibitionList/index.wxss b/pages/bookExhibitionList/index.wxss
index bcc5026..8d592d3 100644
--- a/pages/bookExhibitionList/index.wxss
+++ b/pages/bookExhibitionList/index.wxss
@@ -243,8 +243,15 @@
top: 0px;
background-color: #fff;
height: 135px;
+ z-index: 999;
}
.disableds {
color: var(--td-dropdown-menu-disabled-colorm, var(--td-font-gray-4, rgba(0, 0, 0, 0.26))) !important;
+}
+
+.scrollViewBox {
+ height: calc(100vh - 300rpx);
+ /* width: calc(100vw - 60rpx); */
+ /* height: 700rpx; */
}
\ No newline at end of file
diff --git a/pages/bookServices/assort/index.wxss b/pages/bookServices/assort/index.wxss
index ad19994..bf82130 100644
--- a/pages/bookServices/assort/index.wxss
+++ b/pages/bookServices/assort/index.wxss
@@ -166,4 +166,14 @@
.bottom-box {
height: 40rpx;
+}
+
+
+.bottom-box {
+ display: flex;
+ justify-content: center;
+ color: #999;
+ height: 80rpx;
+ font-size: 28rpx;
+ --td-loading-color: #ff6c00
}
\ No newline at end of file
diff --git a/pages/cart/index.js b/pages/cart/index.js
index 672eecc..d00cc4c 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -58,7 +58,17 @@
title: '鍒犻櫎鍥句功鎴愬姛',
icon: 'none'
});
+ this.setData({
+ totalPrice: 0.00,
+ selectedCount: 0,
+ checkAll: false,
+ })
+
+
});
+
+
+
},
shoppingCartGet() {
@@ -75,15 +85,12 @@
})
res.datas.forEach(item => {
- console.log(item, 'item456');
item.imgUrl = getPublicImage(item.productMonWithLinkDto.product.icon, '', '160');
-
// this.setData({
// type: item.saleMethod.type == 'createProductItemSaleMethod' ? 'item' : 'product'
// })
const type = item.saleMethod.type == 'createProductItemSaleMethod' ? 'item' : 'product';
item.type = type; // 灏唗ype璁剧疆涓篿tem瀵硅薄鐨勫睘鎬э紝鑰屼笉鏄娇鐢╯etData
-
// debugger
});
@@ -94,7 +101,6 @@
if (this.data.shoppingCartData.length === 0) {
- console.log(11111);
this.setData({
onDisabled: true
})
@@ -233,8 +239,9 @@
url: '/pages/testLogin/index'
});
},
- //瑙﹀簳鍑芥暟
- onReachBottom() {
+
+
+ onScrollToLower() {
if (this.data.shoppingCartData.length < this.data.totalSize) {
this.setData({
isMore: true,
@@ -251,7 +258,6 @@
})
console.log('300');
}, 300)
-
}
},
// 涓嬫媺鍑芥暟
diff --git a/pages/cart/index.wxml b/pages/cart/index.wxml
index 0da4120..2dc5e3a 100644
--- a/pages/cart/index.wxml
+++ b/pages/cart/index.wxml
@@ -1,10 +1,4 @@
-<scroll-view scroll-y="{{true}}" class="outsideContentBox">
-
-
-
-
-
-
+<scroll-view scroll-y="{{true}}" class="outsideContentBox" bindscrolltolower="onScrollToLower">
<view>
@@ -71,7 +65,8 @@
<t-checkbox icon="rectangle" value=" {{item.id}}" data-item="{{item}}" checked="{{item.checked}}" bindchange="HandelItemChange" />
</view>
<view class="left-image">
- <image src="{{item.imgUrl}}" class="imageStyle" mode="aspectFit" />
+ <image wx:if="{{item.imgUrl}}" src="{{item.imgUrl}}" class="imageStyle" mode="aspectFit" />
+ <image src="/static/images/default-book-img.png" class="imageStyle" mode="aspectFit" />
</view>
</view>
</t-cell>
@@ -84,19 +79,20 @@
</view>
</view>
- <view class="bottomBox">
- <view class="checkGroupBox">
- <checkbox-group bindchange="bottomChange">
- <checkbox disabled="{{onDisabled}}" value="鍏ㄩ��" checked="{{checkAll}}">鍏ㄩ��</checkbox>
- </checkbox-group>
- </view>
- <view class="settlementBox">
- <view class="totalPrice">鎬讳环:<text class="totalPriceText">锟{totalPrice}}</text></view>
- <view class="buttonBox">
- <t-button class="tButtonBox" size="small" shape="round" bind:tap="goPaymentPage">鍘荤粨绠�({{selectedCount}})</t-button>
- </view>
- </view>
- </view>
+
<t-toast id="t-toast" />
-</scroll-view>
\ No newline at end of file
+</scroll-view>
+<view class="bottomBox">
+ <view class="checkGroupBox">
+ <checkbox-group bindchange="bottomChange">
+ <checkbox disabled="{{onDisabled}}" value="鍏ㄩ��" checked="{{checkAll}}">鍏ㄩ��</checkbox>
+ </checkbox-group>
+ </view>
+ <view class="settlementBox">
+ <view class="totalPrice">鎬讳环:<text class="totalPriceText">锟{totalPrice}}</text></view>
+ <view class="buttonBox">
+ <t-button class="tButtonBox" size="small" shape="round" bind:tap="goPaymentPage">鍘荤粨绠�({{selectedCount}})</t-button>
+ </view>
+ </view>
+</view>
\ No newline at end of file
diff --git a/pages/cart/index.wxss b/pages/cart/index.wxss
index fcd49f8..5fe8864 100644
--- a/pages/cart/index.wxss
+++ b/pages/cart/index.wxss
@@ -25,11 +25,13 @@
}
.outsideContentBox {
- padding: 30rpx;
+ /* padding: 30rpx; */
background: #F2F3F8;
border-radius: 18rpx 18rpx 18rpx 18rpx;
padding-bottom: 325rpx;
- /* height: 260rpx; */
+ height: calc(100vh - 300rpx);
+ /* width: calc(100vw - 60rpx); */
+
}
.bottomBox {
@@ -125,6 +127,7 @@
margin: 30rpx 0;
border-radius: 18rpx 18rpx 18rpx 18rpx;
height: 260rpx;
+
}
.totalPriceText {
@@ -150,7 +153,8 @@
.contentCheckbox {
- width: 100rpx;
+ /* width: 100rpx; */
+ margin-right: 30rpx;
}
.left-icon {
@@ -162,8 +166,9 @@
.left-image {
width: 152rpx;
height: 212rpx;
- background: #FFFFFF;
+ /* background: #FFFFFF; */
border-radius: 0rpx 0rpx 0rpx 0rpx;
+ box-shadow: 0px 3px 6px 1px rgba(0, 0, 0, 0.16);
}
.imageStyle {
@@ -275,4 +280,8 @@
height: 80rpx;
font-size: 28rpx;
--td-loading-color: #ff6c00
+}
+
+.t-checkbox__content {
+ height: 0rpx !important;
}
\ No newline at end of file
diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index 9fa904c..8301703 100644
--- a/pages/personalCenter/index.js
+++ b/pages/personalCenter/index.js
@@ -199,8 +199,8 @@
if (teacherRole && teacherInfos) {
defaultUser = {
...teacherInfos,
- nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
- icon: nickNameData && JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+ nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : WeChatInfo ? WeChatInfo.name : '',
+ icon: nickNameData && JSON.parse(nickNameData.data).icon != "" ? JSON.parse(nickNameData.data).icon : WeChatInfo ? WeChatInfo.icon : '',
userId: res.userId,
role: 'Teacher',
roleId: teacherRole.role.id,
@@ -214,7 +214,7 @@
defaultUser = {
...WeChatInfo,
nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
- icon: nickNameData && JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+ icon: nickNameData && JSON.parse(nickNameData.data).icon != "" ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
userId: res.userId,
userType: type,
role: 'Student',
diff --git a/pages/retrievalPage/index.js b/pages/retrievalPage/index.js
index 9874ac2..ce675e7 100644
--- a/pages/retrievalPage/index.js
+++ b/pages/retrievalPage/index.js
@@ -714,17 +714,13 @@
isMore: false
})
}, 100)
-
}
}
-
-
-
},
// 涓嬫媺鍑芥暟
onPullDownRefresh() {
-
+ console.log(456);
if (this.data.tabValue == 4) {
this.setData({
"pageCount.page": 1
@@ -750,7 +746,6 @@
console.log(e);
const key = e.currentTarget.dataset.key;
const item = e.currentTarget.dataset.item;
-
this.setData({
[key]: true,
dialogKey: key,
@@ -775,8 +770,6 @@
this.setData({
[dialogKey]: false
});
-
-
console.log(this.data.input);
console.log(this.data.Md5);
if (this.data.input) {
@@ -795,7 +788,6 @@
icon: 'none',
});
}
-
},
// 寮圭獥鍙栨秷
closeDialog() {
@@ -807,6 +799,120 @@
});
console.log(111);
},
+ onScrollToLower() {
+ 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 8a94889..69736ad 100644
--- a/pages/retrievalPage/index.json
+++ b/pages/retrievalPage/index.json
@@ -15,5 +15,6 @@
"navigationStyle": "custom",
"enablePullDownRefresh": true,
"onReachBottomDistance": 200,
- "backgroundTextStyle": "dark"
+ "backgroundTextStyle": "dark",
+ "disableScroll": true
}
\ No newline at end of file
diff --git a/pages/retrievalPage/index.wxml b/pages/retrievalPage/index.wxml
index 58e2947..a7e3779 100644
--- a/pages/retrievalPage/index.wxml
+++ b/pages/retrievalPage/index.wxml
@@ -21,62 +21,70 @@
<view class="tabsBox">
<!-- sticky="true" -->
- <t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel" sticky="true">
+ <t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel">
<t-tab-panel label="鍥句功({{bookTotal}})" value="0">
<view wx:if="{{bookData.length <= 0}}" class="noDataBox">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
- <view class="bookDataBox">
- <view class="bookDataForBox" wx:for="{{bookData}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="onBook">
- <view class="imageBox">
- <image src="{{item.icon}}" mode="aspectFill" />
+
+ <scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
+ <view class="bookDataBox">
+ <view class="bookDataForBox" wx:for="{{bookData}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="onBook">
+ <view class="imageBox">
+ <image src="{{item.icon}}" mode="aspectFill" />
+ </view>
+ <view class="bookDataNmae">
+ {{item.name}}
+ </view>
+ <view class="bookDataAuthor">{{item.author}}</view>
</view>
- <view class="bookDataNmae">
- {{item.name}}
- </view>
- <view class="bookDataAuthor">{{item.author}}</view>
</view>
- </view>
- <view wx:if="{{bookData.length != 0}}" class="bottom-box">
- <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
- <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
- </view>
+ <view wx:if="{{bookData.length != 0}}" class="bottom-box">
+ <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
+ </view>
+ </scroll-view>
+
+
</t-tab-panel>
<t-tab-panel label="璇剧▼({{courseTotal}})" value="1">
<view wx:if="{{courseData.length <= 0}}" class="noDataBox">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
- <view class="listBox1">
- <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" data-item="{{item}}" bind:tap="underConstruction">
- <view class="specialSubject-img-box">
- <image src="{{item.icon}}" mode="aspectFill" />
- </view>
- <view class="body-info">
- <view class="name">{{item.name}}</view>
- <view class="flex jc-sb">
- <text class="author">{{item.courseLeader}}</text>
- <text>{{item.classHours}}璇炬椂</text>
+ <scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
+ <view class="listBox1">
+ <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" data-item="{{item}}" bind:tap="underConstruction">
+ <view class="specialSubject-img-box">
+ <image src="{{item.icon}}" mode="aspectFill" />
</view>
- <view class="priceBox flex jc-sb">
- <text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
- <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
- <image src="/static/images/home/home-cart.png" mode="aspectFill" class="addCartImg" />
+ <view class="body-info">
+ <view class="name">{{item.name}}</view>
+ <view class="flex jc-sb">
+ <text class="author">{{item.courseLeader}}</text>
+ <text>{{item.classHours}}璇炬椂</text>
+ </view>
+ <view class="priceBox flex jc-sb">
+ <text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
+ <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
+ <image src="/static/images/home/home-cart.png" mode="aspectFill" class="addCartImg" />
+ </view>
</view>
</view>
</view>
</view>
+
</view>
- </view>
+ <view wx:if="{{courseData.length != 0}}" class="bottom-box">
+ <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
+ </view>
+ </scroll-view>
- <view wx:if="{{courseData.length != 0}}" 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">
@@ -84,27 +92,25 @@
<view wx:if="{{digitalTextbooksData.length <= 0}}" class="noDataBox">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
-
- <view class="bookDataBox">
-
-
- <view class="bookDataForBox" wx:for="{{digitalTextbooksData}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="underConstruction">
- <view class="imageBox">
- <image src="{{item.icon}}" mode="" />
+ <scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
+ <view class="bookDataBox">
+ <view class="bookDataForBox" wx:for="{{digitalTextbooksData}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="underConstruction">
+ <view class="imageBox">
+ <image src="{{item.icon}}" mode="" />
+ </view>
+ <view class="bookDataNmae">
+ {{item.name}}
+ </view>
+ <view class="bookDataAuthor">{{item.author}}</view>
</view>
- <view class="bookDataNmae">
- {{item.name}}
- </view>
- <view class="bookDataAuthor">{{item.author}}</view>
</view>
- </view>
- <view wx:if="{{digitalTextbooksData.length != 0}}" class="bottom-box">
- <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
- <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
- </view>
-
+ <view wx:if="{{digitalTextbooksData.length != 0}}" class="bottom-box">
+ <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
+ </view>
+ </scroll-view>
</t-tab-panel>
@@ -112,32 +118,35 @@
<view wx:if="{{seminarData.length <= 0}}" class="noDataBox">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
- <view class="listBox">
- <view wx:for="{{seminarData}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox" data-item="{{item}}" bind:tap="underConstruction">
- <view class="listItem" bindtap="goSubjectDetail" data-book="{{item}}">
- <view class="specialSubject-img">
- <image src="{{item.icon}}" mode="aspectFill" class="img" />
- </view>
- <view class="body-info">
- <view class="name">{{item.name}}</view>
- <view class="time" wx:if="{{item.liveTime}}">鐩存挱鏃堕棿锛歿{item.liveTime}}</view>
- <view class="time" wx:if="{{item.startTime}}">寮�鎾椂闂达細{{ item.startTime }}</view>
- <view class="time" wx:if="{{!item.liveTime && !item.startTime}}">寮�鎾椂闂达細<text class="grey">寰呭畾</text></view>
- <view class="flex jc-sb">
- <text class="author">{{item.lecturer}} {{item.position}}</text>
- <text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
- <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
+ <scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
+ <view class="listBox">
+ <view wx:for="{{seminarData}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox" data-item="{{item}}" bind:tap="underConstruction">
+ <view class="listItem" bindtap="goSubjectDetail" data-book="{{item}}">
+ <view class="specialSubject-img">
+ <image src="{{item.icon}}" mode="aspectFill" class="img" />
+ </view>
+ <view class="body-info">
+ <view class="name">{{item.name}}</view>
+ <view class="time" wx:if="{{item.liveTime}}">鐩存挱鏃堕棿锛歿{item.liveTime}}</view>
+ <view class="time" wx:if="{{item.startTime}}">寮�鎾椂闂达細{{ item.startTime }}</view>
+ <view class="time" wx:if="{{!item.liveTime && !item.startTime}}">寮�鎾椂闂达細<text class="grey">寰呭畾</text></view>
+ <view class="flex jc-sb">
+ <text class="author">{{item.lecturer}} {{item.position}}</text>
+ <text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
+ <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
+ </view>
</view>
</view>
</view>
</view>
- </view>
- <view wx:if="{{seminarData.length != 0}}" class="bottom-box">
- <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
- <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
- </view>
+ <view wx:if="{{seminarData.length != 0}}" class="bottom-box">
+ <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
+ </view>
+
+ </scroll-view>
</t-tab-panel>
<t-tab-panel label="涔︾洰({{bookFairTotal}})" value="4">
@@ -146,34 +155,37 @@
<view wx:if="{{bookFairData.length <= 0 }}" class="noDataBox">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
- <view class="outsideHigherBox">
- <view class="higherBox" wx:for="{{bookFairData}}" wx:key="index" wx:for-item="item" wx:for-index="index">
- <view class="outsideHigherImageBox">
- <view bind:tap="downloadData" data-item="{{item}}">
+ <scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
+ <view class="outsideHigherBox">
- <image class="higherImageBox" src="{{item.icon}}" mode="" />
+ <view class="higherBox" wx:for="{{bookFairData}}" wx:key="index" wx:for-item="item" wx:for-index="index">
+ <view class="outsideHigherImageBox">
+ <view bind:tap="downloadData" data-item="{{item}}">
+
+ <image class="higherImageBox" src="{{item.icon}}" mode="" />
+ </view>
+
+ <view class="downloadIcon" data-item="{{item}}" data-key="showWithInput" bind:tap="mailbox">
+
+ <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/email-click.png" mode="" />
+ <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/email.png" mode="" />
+ </view>
</view>
- <view class="downloadIcon" data-item="{{item}}" data-key="showWithInput" bind:tap="mailbox">
-
- <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/email-click.png" mode="" />
- <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/email.png" mode="" />
- </view>
+ <view class="higherTextBox">{{item.name}}</view>
</view>
-
- <view class="higherTextBox">{{item.name}}</view>
</view>
- </view>
- <view wx:if="{{bookFairData.length != 0}}" class="bottom-box">
- <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
- <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
- </view>
+ <view wx:if="{{bookFairData.length != 0}}" class="bottom-box">
+ <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
+ </view>
+ </scroll-view>
</t-tab-panel>
@@ -181,21 +193,24 @@
<view wx:if="{{biblioClassificationData.length <= 0}}" class="noDataBox">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
- <view class="outside">
- <view class="contentBox" wx:for="{{biblioClassificationData}}" wx:key="index" wx:for-item="item" wx:for-index="index" bindtap="onBookExhibitionDetails" data-item="{{item}}">
- <image class="bookFairImage" wx:if="{{item.icon}}" src="{{item.icon}}" mode="" />
- <image class="bookFairImage" wx:else="" src="/static/images/bookExhibitionList/banner.png" mode="" />
- <view class="textBox" title="{{item.name}}"> <text>{{item.subtitleName}}</text></view>
+ <scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
+ <view class="outside">
+ <view class="contentBox" wx:for="{{biblioClassificationData}}" wx:key="index" wx:for-item="item" wx:for-index="index" bindtap="onBookExhibitionDetails" data-item="{{item}}">
+ <image class="bookFairImage" wx:if="{{item.icon}}" src="{{item.icon}}" mode="" />
+ <image class="bookFairImage" wx:else="" src="/static/images/bookExhibitionList/banner.png" mode="" />
+ <view class="textBox" title="{{item.name}}"> <text>{{item.subtitleName}}</text></view>
+ </view>
+
</view>
- </view>
+ <view wx:if="{{biblioClassificationData.length != 0}}" class="bottom-box">
+ <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
+ </view>
- <view wx:if="{{biblioClassificationData.length != 0}}" class="bottom-box">
- <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
- <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
- </view>
+ </scroll-view>
</t-tab-panel>
</t-tabs>
</view>
diff --git a/pages/retrievalPage/index.wxss b/pages/retrievalPage/index.wxss
index a491016..d1c5d04 100644
--- a/pages/retrievalPage/index.wxss
+++ b/pages/retrievalPage/index.wxss
@@ -198,7 +198,6 @@
.download {
width: 100%;
height: 100%;
-
}
.downloadshiftin {
@@ -250,19 +249,19 @@
}
.outsideRetrievalPageBox {
- position: relative;
+ /* position: relative; */
}
.retrievalPageBox {
- position: fixed;
- top: 0px;
- background-color: #fff;
- height: 120px;
+ /* position: fixed;
+ top: 0px; */
+ /* background-color: #fff; */
+ /* height: 120px; */
/* z-index: 999; */
}
.tabsBox {
- margin-top: 300rpx;
+ /* margin-top: 300rpx; */
}
@@ -353,13 +352,11 @@
}
.dialogBox .t-input__control {
-
min-height: 100rpx;
}
.t-button--text {
color: #000 !important;
-
}
.t-button--text.t-button--primary {
@@ -371,4 +368,9 @@
/* border: 1rpx #000 solid; */
background-color: #F9F9F9;
width: 100%;
+}
+
+.scrollViewBox {
+ height: calc(100vh - 326rpx);
+ /* width: calc(100vw - 60rpx); */
}
\ No newline at end of file
--
Gitblit v1.9.1