From 80cee152c8c7f314d43a05ae1994aeeecd28b08a Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 20 九月 2024 18:35:47 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/digitalCourses/index.js | 12 ++-
packageBookService/pages/bookServices/detail/buyResource/index.js | 4 +
packageBookService/pages/bookServices/detail/components/tree/index.js | 3 -
packageDomain/pages/resourceDetails/myVideo/index.js | 20 +++---
pages/retrievalPage/index.js | 125 -----------------------------------------
pages/digitalCourses/index.wxml | 5 +
6 files changed, 26 insertions(+), 143 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/buyResource/index.js b/packageBookService/pages/bookServices/detail/buyResource/index.js
index 58ce970..cec5617 100644
--- a/packageBookService/pages/bookServices/detail/buyResource/index.js
+++ b/packageBookService/pages/bookServices/detail/buyResource/index.js
@@ -569,6 +569,8 @@
const updated = this.findAndUpdateItemsByIds(this.data.learn, ids, state)
this.setData({
learn: updated
+ }, () => {
+ wx.hideLoading()
})
},
// 鍗曚釜鍕鹃�変簨浠�
@@ -577,6 +579,8 @@
const updated = this.checkResoucrceInfo(this.data.learn, id)
this.setData({
learn: updated
+ }, () => {
+ wx.hideLoading()
})
},
upDateShopCar(id, tree) {
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index 3dc0d1b..c5c622c 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -66,7 +66,6 @@
purchaseList: []
},
ready() {},
-
onLoad() {},
observers: {
treeList: function (newValue) {
@@ -412,7 +411,6 @@
this.setData({
openIds: this.data.openIds,
});
- wx.hideLoading()
},
// 瀛愰」鍕鹃��
checkResource(e) {
@@ -483,7 +481,6 @@
this.triggerEvent("changeListChecked", myEventDetail, myEventOption);
}
}
- wx.hideLoading()
},
// 鍔犲叆璐墿杞�
async onCloudShoppingCart(e) {
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index d617ffb..c4906d2 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -299,16 +299,16 @@
} else {
if (item.selectType === "video" || item.learnSelectType === "video") {
if (this.data.storeInfo == 'jsek_digitalCourses') {
- if (item.sysType == 'CmsItem') this.data.threeLeveData.push(item)
- // if (this.data.isBuy) {
- // if (item.sysType == 'CmsItem') {
- // this.data.threeLeveData.push(item)
- // }
- // } else {
- // if (item.sysType == 'CmsItem' && item.freeFile) {
- // this.data.threeLeveData.push(item)
- // }
- // }
+ // if (item.sysType == 'CmsItem') this.data.threeLeveData.push(item)
+ if (this.data.isBuy) {
+ if (item.sysType == 'CmsItem') {
+ this.data.threeLeveData.push(item)
+ }
+ } else {
+ if (item.sysType == 'CmsItem' && item.freeFile) {
+ this.data.threeLeveData.push(item)
+ }
+ }
} else {
// 涔颁簡
if (this.data.buyList.length) {
diff --git a/pages/digitalCourses/index.js b/pages/digitalCourses/index.js
index a99fbbf..b09fa0b 100644
--- a/pages/digitalCourses/index.js
+++ b/pages/digitalCourses/index.js
@@ -21,7 +21,7 @@
activeItem: null,
loading: false,
contentLoading: false,
- noData:false,
+ noData: false,
shoppingCartGetId: [],
sorter: {
value: "*",
@@ -175,6 +175,9 @@
},
getCourseList(item) {
+ this.setData({
+ noData: false,
+ })
let searchObj = {}
let sort = {}
// // 鎼滅储妗�
@@ -231,10 +234,11 @@
}
}
app.MG.store.getProductList(obj).then((res) => {
- if(!res.datas.length) {
+ if (!res.datas.length) {
return this.setData({
- noData:true,
- contentLoading:false
+ courseList: [],
+ noData: true,
+ contentLoading: false
})
}
res.datas.forEach(item => {
diff --git a/pages/digitalCourses/index.wxml b/pages/digitalCourses/index.wxml
index 4955298..e01e897 100644
--- a/pages/digitalCourses/index.wxml
+++ b/pages/digitalCourses/index.wxml
@@ -91,7 +91,7 @@
</view>
<view class="viewCount"> {{item.viewCount }}娆＄偣鍑� </view>
<view class="author">
- <view class="courseLeader" > {{ item.courseLeader}} </view>
+ <view class="courseLeader"> {{ item.courseLeader}} </view>
<view> {{ item.classHours}}璇炬椂 </view>
</view>
<view class="money">
@@ -105,7 +105,8 @@
</view>
</view>
<view wx:if="{{noData}}" class="noDataBox">
- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" />
+ <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" /> -->
+ <empty />
</view>
</scroll-view>
</view>
diff --git a/pages/retrievalPage/index.js b/pages/retrievalPage/index.js
index 29f5b3d..1d1843f 100644
--- a/pages/retrievalPage/index.js
+++ b/pages/retrievalPage/index.js
@@ -178,13 +178,6 @@
},
/**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
- onReachBottom() {
-
- },
-
- /**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
onShareAppMessage() {},
@@ -355,8 +348,6 @@
...digitalTextbooksObj,
...fields
}
-
-
let seminarObj = {}
if (this.data.searchVal) {
seminarObj = {
@@ -523,6 +514,7 @@
this.setData({
loading: false,
hidden: false,
+ isMore: null
})
})
wx.stopPullDownRefresh()
@@ -640,7 +632,6 @@
},
onBookExhibitionDetails(e) {
const item = e.currentTarget.dataset.item
-
wx.navigateTo({
url: '/pages/bookExhibitionDetails/index?id=' + item.id + '&bookName=' + item.name // 鍋囪璺宠浆鍒拌鎯呴〉闈紝骞朵紶閫掍簡id鍙傛暟
});
@@ -649,120 +640,6 @@
//涓婃媺鍑芥暟
onPullDownRefresh() {
console.log("涓嬫媺鍒锋柊...");
- },
- /**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
- onReachBottom(e) {
- if (this.data.tabValue == 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)
-
- }
- } 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)
-
- }
- } 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)
- }
- } 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)
- }
- } 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)
- }
- }
},
// 涓嬫媺鍑芥暟
--
Gitblit v1.9.1