From f7ae9d99b12988cd09975aeee1fbcc90e072303c Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 19 九月 2024 20:44:02 +0800
Subject: [PATCH] 云学习查看
---
packageBookService/pages/bookServices/detail/components/tree/index.wxml | 2 +-
packageDomain/pages/resourceDetails/myVideo/index.js | 12 ++++++++++--
pages/cart/index.wxss | 8 ++------
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index 01e0577..e01fd77 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -152,7 +152,7 @@
<view class="title-t">
<view class="title-name">{{item.name}} </view>
<view wx:if="{{item.sysType =='CmsFolder'}}" class="title-num">
- 锛坽{item.childrenItem}}锛�
+ 锛坽{item.childrenItem ? item.childrenItem: 0 }}锛�
</view>
</view>
<view class="title-icon">
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index 54d914b..d617ffb 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -298,7 +298,6 @@
}
} 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) {
@@ -311,10 +310,19 @@
// }
// }
} else {
+ // 涔颁簡
if (this.data.buyList.length) {
if (this.data.buyList.some(citem => item.productLinkPath.includes(citem.productLinkPath))) this.data.threeLeveData.push(item)
} else {
- if (!item.saleMethod.length) this.data.threeLeveData.push(item)
+
+ if (!item.saleMethod.length) {
+ // 娌′拱涓旀棤閿�鍞柟寮�
+ this.data.threeLeveData.push(item)
+ } else {
+ // 娌′拱涓旈攢鍞柟寮忚繃鏈�
+ const itemSaleMethod = item.saleMethod.find(citem => citem.SaleType == 'Normal')
+ if (new Date().getTime() > new Date(itemSaleMethod.EndDate).getTime()) this.data.threeLeveData.push(item)
+ }
}
}
this.setData({
diff --git a/pages/cart/index.wxss b/pages/cart/index.wxss
index 62ca2d2..d5bcfae 100644
--- a/pages/cart/index.wxss
+++ b/pages/cart/index.wxss
@@ -27,14 +27,10 @@
}
.outsideContentBox {
- /* padding: 30rpx; */
background: #F2F3F8;
border-radius: 18rpx 18rpx 18rpx 18rpx;
- /* padding-bottom: 325rpx; */
- height: calc(100vh - 250rpx);
-
- /* width: calc(100vw - 60rpx); */
-
+ height: calc(100vh - 200rpx);
+ /* padding-bottom: 30rpx; */
}
.bottomBox {
--
Gitblit v1.9.1